From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net> Date: Tue, 1 Jul 2014 09:30:14 +0000 (+0200) Subject: fixed tab switch issue when leaving the resources view X-Git-Tag: myslice-1.1~60^2~20 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=044f1e70a0aa79bf7195c95061f2d92e312d4765;p=unfold.git fixed tab switch issue when leaving the resources view --- diff --git a/portal/templates/onelab/onelab_widget-slice-sections.html b/portal/templates/onelab/onelab_widget-slice-sections.html index 0d0673f7..3a9c1acb 100644 --- a/portal/templates/onelab/onelab_widget-slice-sections.html +++ b/portal/templates/onelab/onelab_widget-slice-sections.html @@ -1,22 +1,22 @@ {% if section == "resources" %} <ul class="nav nav-tabs nav-section"> - <li><a href="/slice/{{ slice }}#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li> + <li><a href="/slice/{{ slice }}#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" /> {{ slice }}</a></li> <!-- <li><a href="/slice/{{ slice }}#testbeds">Testbeds</a></li> --> <li class="active"><a class="link" href="/resources/{{ slice }}">Resources</a></li> <li><a href="/slice/{{ slice }}#users">Users</a></li> <!-- <li><a href="/slice/{{ slice }}#experiment">Statistics</a></li> --> <!-- <li><a href="/slice/{{ slice }}#experiment">Measurements</a></li> --> - <li><a href="/slice/{{ slice }}#experiment" data-toggle="tab">Experiment</a></li> + <li><a href="/slice/{{ slice }}#experiment">Experiment</a></li> </ul> {% else %} <ul class="nav nav-tabs nav-section"> - <li class="active"><a href="#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li> + <li class="active"><a href="#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" /> {{ slice }}</a></li> <!-- <li class="testbeds"><a href="#testbeds">Testbeds</a></li> --> <li><a class="link" href="/resources/{{ slice }}">Resources</a></li> <li class="users"><a href="#users">Users</a></li> <!-- <li class="statistics"><a href="#experiment">Statistics</a></li> --> <!-- <li class="measurements"><a href="#experiment">Measurements</a></li> --> - <li class="experiment"><a href="#experiment" data-toggle="tab">Experiment</a></li> + <li class="experiment"><a href="#experiment">Experiment</a></li> </ul> <script> $(document).ready(function() { @@ -27,7 +27,13 @@ $(document).ready(function() { var id = $(this).attr('href').substr(1); $("#" + id).load('/' + id + '/{{ slice }}/'); }); - $('div#info').load('/info/{{ slice }}/'); + + var hash = window.location.hash; + if (hash) { + $('.nav-tabs a[href='+hash+']').click(); + } else { + $('div#info').load('/info/{{ slice }}/'); + } }); </script> {% endif %} \ No newline at end of file