From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 13 Jan 2014 14:05:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~36^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=aa08833827d3ea4e1b27b5c079eca15a0ef023a9;hp=136ec4d6c95beb2537cc5e61615cdee741529f60;p=unfold.git

Merge branch 'master' of ssh://git.onelab.eu/git/myslice
---

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 64eca81f..f0fcd90a 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -45,12 +45,14 @@ class RegistrationView (FreeAccessView):
             print "FIREXP ENABLED"
 
         authorities = execute_admin_query(request, authorities_query)
+        authorities = sorted(authorities)
         # xxx tocheck - if authorities is empty, it's no use anyway
         # (users won't be able to validate the form anyway)
 
         page = Page(request)
         page.add_js_files  ( [ "js/jquery.validate.js", "js/my_account.register.js" ] )
         page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] )
+        page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
 
         print 'registration view, method',method
 
diff --git a/portal/static/js/my_account.register.js b/portal/static/js/my_account.register.js
index 73b76aca..fe8f575c 100644
--- a/portal/static/js/my_account.register.js
+++ b/portal/static/js/my_account.register.js
@@ -26,8 +26,7 @@ jQuery(document).ready(function(){
             jQuery("#upload_key").hide();
         }
     });
-
-});
+ });
 
 jQuery(function() {
     var availableTags = [
diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 52cb402d..450575d2 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -36,17 +36,10 @@
     <div class="form-group">
       <label for="auth_list" class="col-xs-2 control-label">Authority</label>
       <div class="col-xs-4">
-	<select id="auth_list" name="authority_hrn" size="1" class="form-control" required>
-	  {% if authorities %}
-	  {% for authority in authorities %}
-      <option value="{{ authority.authority_hrn }}"/>{{authority.authority_hrn}}</option>
-	  <!-- <option value="{{ authority.authority_hrn }}">{{authority.name}} ({{authority.authority_hrn}})</option> -->
-	  {% endfor %}
-	  {% else %} <!-- should not happen -->
-	  <option value="test">No authority found !!! </option>
-	  {% endif %}
-	</select>
-      </div>
+        <div class="ui-widget">
+            <input id="auth_list">
+        </div>
+     </div>
       <div class="col-xs-6"><p class="form-hint">An authority responsible for vetting your account</p></div>
     </div>
 
@@ -110,6 +103,22 @@
   </fieldset>
   </form>  
 </div>
-
+<script>
+jQuery(document).ready(function(){
+    var availableTags = [
+    {% if authorities %}
+        {% for authority in authorities %}
+        {value:"{{ authority.authority_hrn }}",label:"{{authority.name}}"},
+        {% endfor %}    
+    {% else %}
+        {value:"",label:"No authority found !!!"}
+    {% endif %}
+    ];
+    $( "#auth_list" ).autocomplete({
+      source: availableTags,
+      select: function( event, ui ) {console.log(jQuery(this))}
+    });
+});
+</script>
 {% endblock %}