From 3d10392c8202d7e0495b92c3d83f3eaa85dfc590 Mon Sep 17 00:00:00 2001
From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 7 Jul 2014 18:47:55 +0200
Subject: [PATCH] moved jquery-ui to base

---
 portal/registrationview.py      | 2 +-
 portal/static/js/myslice-ui.js  | 3 +++
 portal/templates/base.html      | 1 +
 portal/templates/join_view.html | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/portal/registrationview.py b/portal/registrationview.py
index a8a2f9eb..46c64b1c 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -45,7 +45,7 @@ class RegistrationView (FreeAccessView, ThemeView):
         
         # Page rendering
         page = Page(wsgi_request)
-        page.add_js_files  ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/jquery.qtip.min.js", "js/jquery-ui.js" ] )
+        page.add_js_files  ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/jquery.qtip.min.js" ] )
         page.add_css_files ( [ "css/onelab.css", "css/registration.css", "css/jquery.qtip.min.css" ] )
         page.add_css_files ( [ "https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
 
diff --git a/portal/static/js/myslice-ui.js b/portal/static/js/myslice-ui.js
index de2ac740..b8b331a7 100644
--- a/portal/static/js/myslice-ui.js
+++ b/portal/static/js/myslice-ui.js
@@ -15,6 +15,9 @@ function mysliceAlert(msg, level, timeout) {
 };
 /* Table initialisation */
 $(document).ready(function() {
+	$('button[type=submit]').click(function() {
+		$('form').submit();
+	});
 	
 	var platformParameters = {};
 	
diff --git a/portal/templates/base.html b/portal/templates/base.html
index b42834b0..449c5d22 100644
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -7,6 +7,7 @@
 {# This is where insert_str will end up #}{% media_container prelude %}
 {% include 'messages-transient-header.html' %}
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
+<script src="{{ STATIC_URL }}js/jquery-ui.js"></script>
 <script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
 <script src="{{ STATIC_URL }}js/jquery.qtip.min.js"></script>
 <script src="{{ STATIC_URL }}js/bootstrap.datatables.js"></script>
diff --git a/portal/templates/join_view.html b/portal/templates/join_view.html
index 85ecece5..061243fb 100644
--- a/portal/templates/join_view.html
+++ b/portal/templates/join_view.html
@@ -110,10 +110,11 @@
 </div>
 	<div class="form-group" >
 		<p></p>
-		<button type="submit" class="btn btn-onelab">Submit</button>
+		<input type="submit" class="btn btn-onelab" val="Submit" />
 	</div>
 </form>
 <script>
+
 /*
 jQuery(document).ready(function(){
   var availableTags = [
-- 
2.43.0