new style

diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 44cdc4a..434a089 100644 (file)
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -74,34 +74,6 @@ span.label {
 }
 
 
-div#secondary {
-    
-}
-
-div#secondary ul {
-    position:absolute;
-    top:8px;
-    right:0;
-}
-
-div#secondary li {
-    font-size:9pt;
-    float:left;
-    list-style:none;
-    margin-right:30px;
-    color:gray;
-}
-div#secondary li a {
-    color:gray;
-}
-div#secondary li a:hover {
-    color:#270A5A;
-    text-decoration:none;
-}
-div#secondary li:last-child {
-    margin-right:0;
-}
-
 div#navigation {
     background-color:black;
     width:100%;
@@ -153,27 +125,25 @@ div#navigation li.slices {
     position:relative;
     cursor:pointer;
 }
-div#navigation .dropdown-menu {
-    color:white;
+div.navigation .dropdown-menu {
+    color:black;
     padding:0 15px 15px 15px;
     margin-top:5px;
     margin-left:-16px;
-    background-color:black;
 }
-div#navigation .dropdown-menu a {
-    color:white;
+div.navigation .dropdown-menu a {
+    color:black;
 }
 
-div#menu-slice-list{
+div.menu-slice-list {
     display:none;
     position:absolute;
-    background-color:black;
     padding:15px;
     left:-15px;
     z-index:10;
 }
 
-div#navigation .dropdown-menu li:first-child {
+div.navigation .dropdown-menu li:first-child {
     border-bottom:1px solid white;
     padding-bottom:5px;
      
@@ -479,6 +449,13 @@ div.dataTables_filter label{
 }
 
 /**/
+.header {
+  -moz-box-shadow:    0 0 1px rgba(82,82,82,0.6);
+  -webkit-box-shadow: 0 0 1px rgba(82,82,82,0.6);
+  box-shadow:         0 0 1px rgba(82,82,82,0.6);
+  height:61px;
+  background-color:white;
+}
 div.navigation {
     
 }
@@ -493,7 +470,7 @@ div.navigation ul {
 div.navigation li {
     color:#0C0047;
     font-family:open_sansbold, sans-serif;
-    font-size:10pt;
+    font-size:9pt;
     font-weight:normal;
     line-height:0.8em;
     letter-spacing:0.4pt;
@@ -516,6 +493,51 @@ div.navigation li a:hover, div.navigation li a.current {
 div.navigation li:last-child {
     margin-right:0;
 }
+div.secondary {
+    text-align:right;
+}
+
+div.secondary ul {
+   margin:6px 0 0 0;
+   padding:0;
+}
+
+div.secondary li {
+    font-size:9pt;
+    display:inline;
+    list-style:none;
+    margin:0px;
+    padding:0;
+    margin-right:15px;
+    color:#747474;
+    letter-spacing:0.4px;
+}
+div.secondary li:last-child {
+    margin-right:0;
+}
+div.secondary li a {
+    color:#747474;
+}
+div.secondary li a:hover {
+    text-decoration:none;
+}
+div.secondary .button {    
+    width:300px;
+    margin-top:15px;
+}
+div.secondary .account {
+    margin-top:10px;
+    padding:0;
+    font-size:9pt;
+    color:gray;
+    text-align:right;
+}
+div.secondary .account span {
+    font-size:8pt;
+}
+div.secondary .account a {
+    color:black;
+}
 div.home {
     font-size:11pt;
     line-height:1.2em;
@@ -537,6 +559,17 @@ div.home h3 {
     color:white;
     line-height:1.4em;
 }
+div.dashboard {
+    text-align:center;
+}
+div.dashboard div {
+    margin:25px 0;
+}
+div.dashboard ul {
+    text-align:left;
+    margin-left:24px;
+    list-style:none;
+}
 div.registration-form {
     padding-top:150px;
     text-align:center;

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index 5fb5dcf..11fa2ee 100644 (file)
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -5,6 +5,64 @@
 <!-- <div class="row">
 {% widget '_widget-news.html' %}
 </div> -->
+{% if username %}
+<div class="container dashboard">
+       <div class="row">
+               <div class="col-md-3">
+                       <h3>
+                               EXPERIMENT
+                       </h3>
+                       <div>
+                               <a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
+                       </div>
+                       <div>
+                               <button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
+                       </div>
+                       <div>   
+                               <div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
+                       </div>
+               </div>
+               <div class="col-md-3">
+                       <h3>MANAGEMENT</h3>
+                       <div>
+                               <a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color.png" alt="" /></a>
+                       </div>
+                       <div>
+                               <button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
+                       </div>
+               </div>
+               <div class="col-md-3">
+                       <h3>
+                               SUPPORT
+                       </h3>
+                       <div>
+                               <a href="/portal/support"><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>
+               </div>
+               
+               <div class="col-md-3">
+                       <h3>
+                               ACCOUNT
+                       </h3>
+                       <div>
+                               <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></a>
+                       </div>
+                       <div>
+                               <button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
+                       </div>
+                       <div>
+                               {% if person.last_name %}
+                                       {{person.first_name}} {{person.last_name}}<br />
+                               {% endif %}
+                       <span class="label">Email:</span> <a href='/portal/account/'>{{person.email}}</a>
+               </div>
+               </div>
+       </div>
+</div>
+{% else %}
 <div class="container-fluid home">
        <div class="">
                <div class="col-sm-2"></div>
@@ -17,33 +75,15 @@
                        </h3>
                </div>
                <div class="col-sm-5 col-sm-offset-1">
-                       {% if person %}
-                       <div class="logged-in">
-                               <button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
-                               <div>
-                               {% if person.last_name %}
-                                       {{person.first_name}} {{person.last_name}}<br />
-                               {% endif %}
-                               <span class="label">Email:</span> <a href='/portal/account/'>{{person.email}}</a>
-                       </div>
-               </div>
-                       {% else %}
                        <div class="row">
                                {% widget '_widget-login-user.html' %}
                        </div>
-                       {% endif %}
-                       
-                       {% if person %}
-                               <button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
-                               <div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
-                       {% else %}
-                       {% endif %}
-                       
-                               <!-- <button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button> -->
                </div>
                <div class="col-sm-1"></div>
        </div>
 </div>
+{% endif %}
+
 
 <script type="text/javascript">
        $(document).ready(function() {

diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html
index cf9ee7d..e8f84f0 100644 (file)
--- a/portal/templates/onelab/onelab_slice-view.html
+++ b/portal/templates/onelab/onelab_slice-view.html
@@ -18,8 +18,8 @@
   <div class="tab-pane row" id="testbeds">...</div>
   <div class="tab-pane row" id="resources">...</div>
   <div class="tab-pane row" id="users">...</div>
-  <div class="tab-pane row" id="statistics">...</div>
-  <div class="tab-pane row" id="measurements">...</div>
+  <!-- <div class="tab-pane row" id="statistics">...</div> -->
+  <!-- <div class="tab-pane row" id="measurements">...</div> -->
   <div class="tab-pane row" id="experiment">...</div>
 </div>         
 {% endblock %}

diff --git a/portal/templates/onelab/onelab_widget-slice-sections.html b/portal/templates/onelab/onelab_widget-slice-sections.html
index bf64b8d..0d0673f 100644 (file)
--- a/portal/templates/onelab/onelab_widget-slice-sections.html
+++ b/portal/templates/onelab/onelab_widget-slice-sections.html
@@ -1,21 +1,21 @@
 {% 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 }}#testbeds">Testbeds</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">Statistics</a></li> -->
+       <!-- <li><a href="/slice/{{ slice }}#experiment">Measurements</a></li> -->
        <li><a href="/slice/{{ slice }}#experiment" data-toggle="tab">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="testbeds"><a href="#testbeds">Testbeds</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="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>
 </ul>
 <script>

diff --git a/portal/templates/onelab/onelab_widget-topmenu.html b/portal/templates/onelab/onelab_widget-topmenu.html
index eef0516..8ff952e 100644 (file)
--- a/portal/templates/onelab/onelab_widget-topmenu.html
+++ b/portal/templates/onelab/onelab_widget-topmenu.html
@@ -6,9 +6,8 @@
                        <a href="/"><img src="{{ STATIC_URL }}img/onelab-portal.png" alt="OneLab Portal - Future Internet Testbeds" /></a>
                </div>
                {% if username %}
-               <div id="navigation" class="col-sm-4 col-md-5 navigation">
+               <div class="col-sm-5 col-md-5 navigation">
                        <ul>
-                               <li><a href="/portal/account/">{{ username }}</a></li>
                                <li>
                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                                        SLICES <span class="caret"></span>
@@ -19,12 +18,10 @@
                                                                <li><a href="/portal/slice_request/">Request Slice</a></li>
                                                        </ul>
                                        </div>
-                                       </li>
                                </li>
                                <li><a href="/portal/support/">SUPPORT</a></li>
                                <li id="nav-request"><a href="/portal/validate">REQUESTS</a></li>
                                <li id="nav-institution" class=""><a href="/portal/institution">INSTITUTION</a></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>
                </div>
@@ -32,13 +29,17 @@
                <div class="col-sm-5 col-md-5 navigation">
                </div>
                {% endif %}
-               <div class="col-sm-4 col-md-4" id="secondary">
+               <div class="col-sm-4 col-md-4 secondary">
                        <ul>
+                               
                                <li><a href="/news">News</a></li>
                                <li><a href="/portal/about">About</a></li>
                                <li><a target="_blank" href="http://www.onelab.eu">Public Website</a></li>
                                <li><a target="_blank" href="http://intranet.onelab.eu">Intranet</a></li>
                        </ul>
+                       {% if username %}
+                       <div class="account">You are logged in as &nbsp;<a href="/portal/account/">{{ username }}</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a id="logout" style="cursor:pointer;" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</a></div>
+                       {% endif %}
                </div>
        </div>
 </div>

diff --git a/portal/templates/slice-view.html b/portal/templates/slice-view.html
index d9ca050..9238d54 100644 (file)
--- a/portal/templates/slice-view.html
+++ b/portal/templates/slice-view.html
@@ -19,8 +19,8 @@
   <div class="tab-pane row" id="testbeds">...</div>
   <div class="tab-pane row" id="resources">...</div>
   <div class="tab-pane row" id="users">...</div>
-  <div class="tab-pane row" id="statistics">...</div>
-  <div class="tab-pane row" id="measurements">...</div>
+  <!-- <div class="tab-pane row" id="statistics">...</div> -->
+  <!-- <div class="tab-pane row" id="measurements">...</div> -->
   <div class="tab-pane row" id="experiment">...</div>
 </div>         
 {% endblock %}