f4f changes

diff --git a/plugins/queryupdater/static/js/queryupdater.js b/plugins/queryupdater/static/js/queryupdater.js
index 0e80118..3057cf5 100644 (file)
--- a/plugins/queryupdater/static/js/queryupdater.js
+++ b/plugins/queryupdater/static/js/queryupdater.js
@@ -209,6 +209,7 @@
                             
                                 manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
                             }
+                            $('#modal-body').empty();
                         }); 
                     
                         $("#dismiss_sla_wilab2").click(function(){

diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 71f110e..5b0fc20 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -22,14 +22,15 @@
                                <div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
                        </div>
                         <div>
-                       <button id="jfed" type="button" class="btn btn-default" title="Some tools do their own slice creation and management.">
-                               <span class="glyphicon glyphicon-globe"></span>Experiment now</button>
+                <h3 title="Some tools do their own slice creation and management.">Experiment now</h3>
                         </div>
                        <div>
                                <ul><li>
-                                       <a class="button2" href='http://jfed.iminds.be/releases/r1389/webstart/experimenter/jfed-experimenter.jnlp'
+                                       <a class="btn btn-primary" style="width: 150px;" 
+                    href='http://jfed.iminds.be/releases/r1389/webstart/experimenter/jfed-experimenter.jnlp'
                                        title="Click here to start your experiment with jFed" 
-                                       onclick="return  launchApplication('http://jfed.iminds.be/releases/r1389/webstart/experimenter/jfed-experimenter.jnlp');">jFed</a>
+                                       onclick="return  launchApplication('http://jfed.iminds.be/releases/r1389/webstart/experimenter/jfed-experimenter.jnlp');">
+                    <span class="glyphicon glyphicon-cloud"></span> jFed</a>
                                </li></ul>
                        </div>
                </div>

diff --git a/portal/templates/fed4fire/fed4fire_registration_view.html b/portal/templates/fed4fire/fed4fire_registration_view.html
index 94d0e3b..29e0895 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_registration_view.html
+++ b/portal/templates/fed4fire/fed4fire_registration_view.html
@@ -122,6 +122,10 @@
 </div>
 <script>
 jQuery(document).ready(function(){
+    //this .load is useless here
+    $("#authority_hrn").load("/rest/user/", {"fields" : ["parent_authority"], "filters": {"user_hrn": "{{ user_hrn }}"}}, function(data) {
+        $(this).attr("value", 'fed4fire.global');
+    });
     var availableTags = [
     {% if authorities %}
         {% for authority in authorities %}

diff --git a/portal/templates/fed4fire/fed4fire_widget-slice-sections.html b/portal/templates/fed4fire/fed4fire_widget-slice-sections.html
index c7bd719..230a14d 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_widget-slice-sections.html
+++ b/portal/templates/fed4fire/fed4fire_widget-slice-sections.html
@@ -4,7 +4,7 @@
 <!--   <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 class="sla"><a href="#sla" data-toggle="tab">SLA</a></li>
+       <li class="sla"><a href="/slice/{{ slice }}#sla">SLA</a></li>
 
 <!--   <li><a href="/slice/{{ slice }}#experiment">Statistics</a></li> 
        <li><a href="/slice/{{ slice }}#measurements">Measurements</a></li>
@@ -21,7 +21,7 @@
        <!-- <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="sla"><a href="#sla" data-toggle="tab">SLA</a></li>
+       <li class="sla"><a href="#sla">SLA</a></li>
 
 </ul>
 <script>

diff --git a/portal/templates/fed4fire/fed4fire_widget-topmenu.html b/portal/templates/fed4fire/fed4fire_widget-topmenu.html
index 16d9553..66a5ce9 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_widget-topmenu.html
+++ b/portal/templates/fed4fire/fed4fire_widget-topmenu.html
@@ -41,7 +41,7 @@
                                </li>
                        <li id="nav-request"><a href="/portal/validate">REQUESTS</a></li>
                        <li id="nav-service"><a href="/portal/servicedirectory">SERVICES</a></li>
-                       <li id="nav-support"><a href="http://doc.fed4fire.eu/support.html" target="_blank">SUPPORT</a></li>
+                       <li id="nav-support"><a href="http://doc.fed4fire.eu/support.html">SUPPORT</a></li>
                        <li>|</li>
                        <li id="nav-logout" style="margin-top: 10px;"><a id="logout" style="cursor:pointer;" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> LOGOUT</a></li>
                </ul>