From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 26 Sep 2013 10:16:07 +0000 (+0200)
Subject: Merge branch 'master' of git://git.onelab.eu/myslice
X-Git-Tag: myslice-0.2-5~85^2~7^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=15ca59cb1f80be244df33026add2cf97f2f87a62;hp=-c;p=unfold.git

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

Conflicts:
	portal/registrationview.py
---

15ca59cb1f80be244df33026add2cf97f2f87a62
diff --combined portal/sliceview.py
index 97802f60,d3dea6f8..4f66dfdc
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@@ -24,8 -24,7 +24,8 @@@ from plugins.messages                im
  tmp_default_slice='ple.upmc.myslicedemo'
  
  # temporary : turn off the users part to speed things up
 -do_query_users=True
 +#do_query_users=True
 +do_query_users=False
  
  class SliceView (LoginRequiredAutoLogoutView):
  
@@@ -33,7 -32,6 +33,7 @@@
      
          page = Page(request)
          page.add_css_files ('css/slice-view.css')
 +        page.add_js_files  ( [ "js/common.functions.js" ] )
          page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });')
          page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
          page.expose_js_metadata()
@@@ -139,13 -137,13 +139,13 @@@
                  'aoColumns'     : [None, None, None, None, {'bSortable': False}],
                  'iDisplayLength': 25,
                  'bLengthChange' : True,
-                 'bAutiWidth'    : True,
+                 'bAutoWidth'    : True,
                  },
              )
  
          resources_query_editor = QueryEditor(
              page  = page,
 -            query = sq_resource,
 +            query = query_resource_all,
              title = "Select Columns",
              )
          resources_active_filters = ActiveFilters(
@@@ -207,11 -205,9 +207,9 @@@
                  query_all  = query_user_all,
                  checkboxes  = True,
                  datatables_options = { 
-                     # for now we turn off sorting on the checkboxes columns this way
-                     # this of course should be automatic in hazelnut
-                     'aoColumns'      : [None, None, None, None, {'bSortable': False}],
                      'iDisplayLength' : 25,
                      'bLengthChange'  : True,
+                     'bAutoWidth'     : True,
                  },
              ))
      
@@@ -237,11 -233,9 +235,9 @@@
              query       = sq_measurement,
              checkboxes  = True,
              datatables_options = { 
-                 # for now we turn off sorting on the checkboxes columns this way
-                 # this of course should be automatic in hazelnut
-                 'aoColumns'      : [None, None, None, None, {'bSortable': False}],
                  'iDisplayLength' : 25,
                  'bLengthChange'  : True,
+                 'bAutoWidth'     : True,
              },
          ))
      
diff --combined portal/templates/registration_view.html
index 71ef1b86,c895f52c..039a07aa
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@@ -1,13 -1,5 +1,5 @@@
  {% extends "layout-unfold1.html" %}
  
- {% block head %}
- <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
- <!-- xxx ideally only onelab.css but ... xxx -->
- <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
- <script type="text/javascript" src="{{STATIC_URL}}/js/jquery.validate.js"></script> 
- <script type="text/javascript" src="{{STATIC_URL}}/js/my_account.register.js"></script>
- {% endblock %}                              
-                                     
  {% block unfold1_main %}        
  
  <div class="onelab-title well well-lg">
@@@ -24,7 -16,7 +16,7 @@@
  {% endif %}
     
  <div class="well">
 -  <form class="cmxform form-horizontal" id="registrationForm" method="post" action="" enctype="multipart/form-data" role="form">
 + <form class="cmxform form-horizontal" id="registrationForm" method="post" action="" enctype="multipart/form-data" role="form">
      <fieldset>
      {% csrf_token %}
      <div class="form-group">
@@@ -47,8 -39,7 +39,8 @@@
  	<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.name}} ({{authority.authority_hrn}})</option>
 +      <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>
@@@ -105,7 -96,6 +97,7 @@@
      </div>
    </fieldset>
    </form>  
 +>>>>>>> abb43f86edd5a2888cb96ca92a58350db9e32fcf
  </div>
  
  {% endblock %}