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

diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index d2d190e..8b94581 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -47,15 +47,14 @@
                                SUPPORT
                        </h3>
                        <div>
-                               <a href="http://doc.fed4fire.eu/support.html" target="_blank"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
+                               <a href="http://doc.fed4fire.eu/support.html"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
                        </div>
                        <div>
                                <button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button>
                        </div>
+                       <p></p>
                        <div>
-                               <ul><li>
-                               <a href="https://flsmonitor.fed4fire.eu" target="_blank">Status of the testbeds</a>
-                               </li></ul>
+                       <button id="statbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-stats"></span>Testbeds' status</button>
                        </div>
                </div>
                
@@ -84,13 +83,13 @@
                <div class="col-sm-2"></div>
                <div class="col-sm-4 slogan">
                        <h2>
-                               Your Easy Access to Computer Networking Testbeds.
+                               Fed4FIRE Portal
                        </h2>
                        <h3>
-                               A wide variety of world class testbeds available through your one account.
+                               Your easy access to Future Internet Research and Experimentation testbeds belonging to the Fed4FIRE federation.
                        </h3>
                        <h3>
-                                <a href='http://doc.fed4fire.eu' target="_blank">Want to learn more?</a>
+                                <a href='http://doc.fed4fire.eu'>Want to learn more?</a>
                        </h3>
                </div>
                <div class="col-sm-4 col-sm-offset-1" style="width:400px; top:16px; float:left;">
@@ -118,6 +117,9 @@
                $('button#ticketbtn').click(function() {
                        window.location="/portal/contact/";
                });
+               $('button#statbtn').click(function() {
+               window.location="https://flsmonitor.fed4fire.eu";
+               });
                $('button#signupbtn').click(function() {
                        window.location="/portal/register/";
                });

diff --git a/portal/templates/fed4fire/fed4fire_registration_view.html b/portal/templates/fed4fire/fed4fire_registration_view.html
index 3afdae2..94d0e3b 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_registration_view.html
+++ b/portal/templates/fed4fire/fed4fire_registration_view.html
@@ -22,8 +22,11 @@
        <div class="form-group">
                <label for="authority_hrn" class="control-label">Authority</label>
                <p></p>
-               <input id="authority_hrn" name="authority_hrn" class="form-control" style="width:530px" value="{{ authority_hrn }}" placeholder="fed4fire" required>
-               <p class="help-block">If your organization does not deploy a Fed4FIRE authority itself,<br> you can use the default one called "fed4fire".</p> 
+               <input id="authority_hrn" name="authority_hrn" class="form-control" style="width:530px" value="{{ authority_hrn }}" placeholder="fed4fire.global" required>
+               <p class="help-block">If your organization does not deploy a Fed4FIRE authority itself, you can use the<br> default one called "fed4fire.global".
+               If your organization however does provide a<br> Fed4FIRE authority itself, please make sure to select it here. If you start typing<br> your organization's
+                name, it will pop up.
+               </p> 
        </div>
 
        <div class="row">

diff --git a/portal/templates/fed4fire/fed4fire_widget-topmenu.html b/portal/templates/fed4fire/fed4fire_widget-topmenu.html
index 1902cd8..16d9553 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_widget-topmenu.html
+++ b/portal/templates/fed4fire/fed4fire_widget-topmenu.html
@@ -7,9 +7,9 @@
                
                <div id="secondary">
                        <ul>
-                               <li>News</li>
                                <li><a href="/portal/about">About</a></li>
-                               <li><a target="_blank" href="http://www.fed4fire.eu">Project Website</a></li>
+                               <li><a href="http://doc.fed4fire.eu/">Documentation</a></li>
+                               <li><a target="_blank" href="http://www.fed4fire.eu">Project website</a></li>
                        </ul>
                </div>
        </div>
@@ -40,7 +40,7 @@
                                </div>
                                </li>
                        <li id="nav-request"><a href="/portal/validate">REQUESTS</a></li>
-                       <li id="nav-request"><a href="/portal/servicedirectory">SERVICES</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>|</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>