From 16a4bf955a76fee81209cd60458745040ed3c711 Mon Sep 17 00:00:00 2001 From: Yasin Rahman Date: Thu, 7 May 2015 16:19:34 +0200 Subject: [PATCH] New OneLab dashboard - home-view.html --- portal/static/css/onelab.css | 123 +++++-- portal/templates/onelab/onelab_home-view.html | 310 ++++++++---------- portal/templates/slice-tab-users-view.html | 3 - 3 files changed, 229 insertions(+), 207 deletions(-) diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css index 4023e6c2..ac35d435 100644 --- a/portal/static/css/onelab.css +++ b/portal/static/css/onelab.css @@ -56,11 +56,15 @@ h4 { font-size:12pt; color:#333333; } -ul { - margin:0 0 0 15px; - padding:0; +label { + font-weight:normal; + font-size:13px; + color:#201E62; } -li { +.sublabel { + color:gray; + font-style:italic; + font-weight:normal; } span.subtitle { color:#454545; @@ -127,6 +131,7 @@ div.breadcrumbs a:hover { text-decoration:underline; } .tab-pane { + padding-top:15px; } /* buttons */ button.btn, input.btn { @@ -222,7 +227,17 @@ button.btn-onelab:active, input.btn-onelab:active { background-color: #f2dbdb; text-align: center; } - +div#menu-slice-list{ + display:none; + position:absolute; + background-color:orange; + padding:15px; + left:-15px; + z-index:10; +} +div.dashboard div.projects-tree { + margin-left:49px; +} /* HOME DASHBOARD */ div#home-dashboard { color:black; @@ -394,31 +409,6 @@ div.sl-filter-facilities { div.sl-filter-facilities h4 { margin-bottom:15px; -} -.sl-menu { - padding:0; -} -.sl-menu h4 { - margin:0 0 15px 0; - padding:0; -} -.sl-menu ul { - list-style:none; - margin:0; - padding:0; -} -.sl-menu li { - color:gray; - cursor:pointer; - padding:4px 8px; -} -.sl-menu li img { - vertical-align:top; -} -.sl-menu li.active { - color:black; -} -.sl-menu-item { } img.sl-image { margin:0 5px 5px 0; @@ -781,6 +771,7 @@ div.home h3 { color:white; line-height:1.4em; } +/* div.dashboard { text-align:center; } @@ -792,6 +783,78 @@ div.dashboard ul { margin-left:24px; list-style:none; } +div.home { + padding-top:50px; +} +div.home h1 { + font-size:22pt; + border:0; +} +div.home h3, div.home h4 { + color:#424242; + line-height:1.4em; +} + +div.home h3 a { + color:#FD6D2C; +}*/ +div.dashboard { +} +div.dashboard a { + color:#206090; +} + +div.dashboard a:hover { + text-decoration:underline; +} +div.dashboard div.projects-tree { + margin-left:49px; +} +div.dashboard ul { + list-style-type:disc; + list-style-position:inside; + text-align:left; + margin:0 0 15px 0; + padding:0; + +} +div.dashboard ul ul { + margin:5px 0 15px 25px; + list-style:none; +} +div.dashboard li { + margin:0 0 5px 0; + padding:0; +} +div.dashboard ul ul li { + margin:0; +} +div.dashboard ul ul a { +} +div.dashboard h3 { + border-bottom:1px solid #E0E0E0; + margin-right:15px; + margin-bottom:25px; +} +div.dashboard h3 a { + color:#201E62; +} +div.dashboard h3 img { + margin:15px 15px 15px 0; +} +div.dashboard span.glyphicon { + text-align:center; + width:45px; + height:25px; +} +div.dashboard-create-slice { + display:none; +} + +div.registration-form { + padding-top:150px; + text-align:center; +} 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 d98d1b13..c9be8b6b 100644 --- a/portal/templates/onelab/onelab_home-view.html +++ b/portal/templates/onelab/onelab_home-view.html @@ -6,201 +6,163 @@ {% widget '_widget-news.html' %} --> {% if username %} + +{% block head %} + +{% endblock head %} + {% widget "_widget-no_credentials.html" %}
+
+ +
+
+
+

+ EXPERIMENT +

+
+ Create/Join project +
+
+ Create slice +
+
+ Your projects and slices +   + +
Loading projects
+
+ +
+
+
+
+

+ ACCOUNT +

+ {% if person.last_name %} +

+ {{person.first_name}} {{person.last_name}} +

+ {% endif %} +

+ {{person.email}} +

+
+
+
+
+

+ MANAGEMENT +

+ + +
+
+
+
+
+
+

+ SUPPORT +

+

+ Contact +

+
+
+
+
{% else %}
-
-
-
-

- Your Easy Access to Computer Networking Testbeds: -

-

- A wide variety of world class testbeds available through your one account -

-
-
-
- {% widget '_widget-login-user.html' %} -
-
-
-
+
+
+
+

+ Your Easy Access to Computer Networking Testbeds: +

+

+ A wide variety of world class testbeds available through your one account +

+
+
+
+ {% widget '_widget-login-user.html' %} +
+
+
+
+ + {% endif %} -{% widget "_widget-monitor.html" %} -{# widget "_widget-stats-top-slices.html" #} + + + + +{% widget "_widget-monitor.html" %} {% endblock %} diff --git a/portal/templates/slice-tab-users-view.html b/portal/templates/slice-tab-users-view.html index 6f06c1ff..d64fdee8 100644 --- a/portal/templates/slice-tab-users-view.html +++ b/portal/templates/slice-tab-users-view.html @@ -138,9 +138,6 @@ -- 2.43.0