From: Loic Baron Date: Thu, 27 Feb 2014 18:05:31 +0000 (+0100) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~268^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6ba53085c00c1f416b28fd505e6611c154f0cc71;hp=04cb74ce02214694d967c9927f75fd684d3797ea;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/devel/server-loop.sh b/devel/server-loop.sh index 49d433e5..c77258fc 100755 --- a/devel/server-loop.sh +++ b/devel/server-loop.sh @@ -3,8 +3,8 @@ DIRNAME=$(dirname $0) cd $DIRNAME/.. # default port : if hostname starts with z -> use 8080 ; otherwise take 80 -hostname | grep -q '^z' && port=8080 || port=8080 -#hostname | grep -q '^z' && port=8080 || port=80 +#hostname | grep -q '^z' && port=8080 || port=8080 +hostname | grep -q '^z' && port=8080 || port=80 [[ -n "$@" ]] && port=$1 while true; do diff --git a/portal/registrationview.py b/portal/registrationview.py index 7c2ab03a..58567dd8 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -37,7 +37,7 @@ class RegistrationView (FreeAccessView, ThemeView): errors = [] # Using cache manifold-tables to get the list of authorities faster - authorities_query = Query.get('authority').select('name', 'authority_hrn') + authorities_query = Query.get('authority').select('authority_hrn') #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False') #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) diff --git a/portal/templates/institution.html b/portal/templates/institution.html index 771a5e5c..75b4758f 100644 --- a/portal/templates/institution.html +++ b/portal/templates/institution.html @@ -3,9 +3,9 @@ {% block unfold_main %}

Affiliation to an Institution

@@ -70,6 +70,18 @@ $('div.home-panel').hide(); $('div#'+$(this).data('panel')).show(); }); + var url = window.location; + if(url.hash) { + // Fragment exists + tab = url.href.split("#")[1]; + tab_exists = $('div#'+tab).length; + if (tab_exists) { + $('ul.nav-tabs li').removeClass('active'); + $('li#'+tab+'-tab').addClass('active'); + $('div.home-panel').hide(); + $('div#'+tab).show(); + } + } $('button#createslice').click(function() { window.location="/portal/slice_request/"; }) @@ -161,7 +173,7 @@ slice_row = ""; slice_row += ""; - slice_row += "" + val.slice_hrn + ""; + slice_row += "" + val.slice_hrn + ""; slice_row += ""+user_length+""; slice_row += ""+slice_url+""; slice_row += ""+nodes_length+""; diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html index 6fd7e1d9..002fe080 100644 --- a/portal/templates/onelab/onelab_home-view.html +++ b/portal/templates/onelab/onelab_home-view.html @@ -59,7 +59,7 @@ - + diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html index 85ae5a8e..90c9ca2c 100644 --- a/portal/templates/onelab/onelab_slice-view.html +++ b/portal/templates/onelab/onelab_slice-view.html @@ -13,37 +13,51 @@


- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description:this slice is dedicated to debug the myslice software...
url:http://myslice.info
users:3
resources:8
created:2012-06-21 10:00
last update:2014-02-25 14:00
expires:2014-04-01 12:00
+
Loading Slices
+
+ {% endblock unfold_main %} diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html index d59bd68d..36bfa80e 100644 --- a/portal/templates/slicerequest_view.html +++ b/portal/templates/slicerequest_view.html @@ -99,6 +99,7 @@ jQuery(document).ready(function(){ ]; $( "#authority_hrn" ).autocomplete({ source: availableTags, + minLength: 0, select: function( event, ui ) {console.log(jQuery(this))} }); });