From: Ciro Scognamiglio Date: Thu, 27 Feb 2014 18:34:49 +0000 (+0100) Subject: layout and style changes X-Git-Tag: myslice-1.1~268 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=2f89f2e81c44a63d6d90746a1f3c126603280b66;hp=5b66e750805a71fee70b0f8c0c4b5e4d71174673 layout and style changes --- diff --git a/devel/server-loop.sh b/devel/server-loop.sh index 49d433e5..c77258fc 100755 --- a/devel/server-loop.sh +++ b/devel/server-loop.sh @@ -3,8 +3,8 @@ DIRNAME=$(dirname $0) cd $DIRNAME/.. # default port : if hostname starts with z -> use 8080 ; otherwise take 80 -hostname | grep -q '^z' && port=8080 || port=8080 -#hostname | grep -q '^z' && port=8080 || port=80 +#hostname | grep -q '^z' && port=8080 || port=8080 +hostname | grep -q '^z' && port=8080 || port=80 [[ -n "$@" ]] && port=$1 while true; do diff --git a/myslice/urls.py b/myslice/urls.py index 21dd9526..d4e298c0 100644 --- a/myslice/urls.py +++ b/myslice/urls.py @@ -65,6 +65,7 @@ urls = [ (r'^rest/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.dispatch'), (r'^table/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.dispatch'), (r'^datatable/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.dispatch'), + (r'^update/(?P[^/]+)/(?P[^/]+)?/?$', 'rest.update.dispatch'), # # #(r'^view/?', include('view.urls')), diff --git a/portal/homeview.py b/portal/homeview.py index 8bd2c27a..14487c96 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -43,7 +43,6 @@ class HomeView (FreeAccessView, ThemeView): manifoldresult = auth_result # let's use ManifoldResult.__repr__ env['state']="%s"%manifoldresult - env['layout_1_or_2']="layout-unfold2.html" return render_to_response(self.template,env, context_instance=RequestContext(request)) # user was authenticated at the backend @@ -55,6 +54,7 @@ class HomeView (FreeAccessView, ThemeView): if request.user.is_authenticated(): env['person'] = self.request.user + env['username'] = self.request.user else: env['person'] = None return render_to_response(self.template,env, context_instance=RequestContext(request)) @@ -66,7 +66,6 @@ class HomeView (FreeAccessView, ThemeView): # otherwise else: env['state'] = "Your username and/or password were incorrect." - env['layout_1_or_2']="layout-unfold2.html" return render_to_response(self.template, env, context_instance=RequestContext(request)) @@ -86,7 +85,6 @@ class HomeView (FreeAccessView, ThemeView): if state: env['state'] = state elif not env['username']: env['state'] = None # use one or two columns for the layout - not logged in users will see the login prompt - env['layout_1_or_2']="layout-unfold2.html" if not env['username'] else "layout-unfold1.html" return render_to_response(self.template, env, context_instance=RequestContext(request)) diff --git a/portal/registrationview.py b/portal/registrationview.py index 7c2ab03a..58567dd8 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -37,7 +37,7 @@ class RegistrationView (FreeAccessView, ThemeView): errors = [] # Using cache manifold-tables to get the list of authorities faster - authorities_query = Query.get('authority').select('name', 'authority_hrn') + authorities_query = Query.get('authority').select('authority_hrn') #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False') #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) diff --git a/portal/static/css/account_view.css b/portal/static/css/account_view.css index 859b4a93..cfdf4326 100644 --- a/portal/static/css/account_view.css +++ b/portal/static/css/account_view.css @@ -1,198 +1,3 @@ -/***************************************************************** -Motivated from Geni clearing house -********************/ - -* { - margin: 0; - padding: 0; -} - -fieldset, img { - border: 0; -} - - - -/************************ -* GENERAL -************************/ - -body { - background-color: #fff; - /* font-family: "Segoe UI", "Lucida Grande", "Helvetica" , sans-serif; - font-size: 12pt; */ - min-width: 1000px; /* ADDED July 2012 */ - margin: 0px auto; /* ADDED Aug 14, 2012 */ -} - -ol { - list-style-position: inside; -} - -a { - text-decoration: none; - color: #0066FF; -} - -code { - font-family: "Consolas", "Lucida Console", "Monaco", "Courier New"; -} - -.odd { - background-color: #fff; -} - -.even { - background-color: #eee; -} - - -/************************ -* LAYOUT -************************/ - -/***** Header *****/ - -#header { - width: 900px; /* Edited Aug 14, 2012 prev width:70%*/ - margin: 30px auto 20px auto; -} - -#header #logo { - font-size: 42px; /* Edited Sept 28, 2012 prev value :36pt*/ - font-weight: bold; -} - -#header #logo a { - color: #000; -} - -#header #caption { - margin-left: 20px; - font-size: 13.3333px; -} - -#header #caption a { - color: #0066FF; -} - - -/***** Navigator *****/ - -#navigator { - border-bottom: 3px solid #222; - width: 100%; - margin: 0 auto; /* ADDED Aug 14, 2012 */ -} - -#tabs { - margin: 0 auto; - width: 900px; /* Editied Aug 14, 2012 prev width: 70% */ -} - -#meta { - float: right; - font-size: 13pt; - margin: 5px 0; -} - -#meta a.logout { - color: red; -} - -#tabs table { - border-collapse: collapse; - border-spacing: 0; -} - -#tabs table tr td { - padding: 5px 15px; - font-size: 14pt; - border-top: 1px solid #222; - border-right: 2px solid #222; - border-left: 2px solid #222; -} - -#tabs table tr td a { - color: #000; -} - -#tabs table tr td.active { - background-color: #222; - color: #fff; -} - -#tabs table tr td.active a { - color: #fff; -} - - -/***** Main *****/ - -#main { - width: 100%; - height: 400px; - padding: 40px 0; - background-image: url(../images/bg.png); - background-repeat: repeat-x; -} - -#middle { - margin: 0 auto; - width: 900px; /* Edited Aug 14, 2012 prev width:70% */ - padding-bottom: 60px; -} - - -/***** Notifications *****/ - -.warning2 { - border: 1px solid red; - margin: 20px 60px; - padding: 10px 20px; - color: red; - background-color: #f2dbdb; - text-align: center; -} -.message { - border: 1px solid green; - max-width : 682px; /* ADDED July 2012 */ - margin: 20px 60px; - padding: 10px 20px; - color: green; - font-weight: normal; - background-color: #CCFFCC; - text-align: center; -} - -.tooltip { - background-color: #efefef; - color: #333; - font-size: 10pt; - padding: 3px; - border: solid 1px #333; - z-index:100; -} - -ul.errorlist li { - color: red; - font-weight: normal; - font-size: 10pt; - background-color: #f2dbdb; - padding: 3px; - list-style-position: inside; -} - -#learn-about-seattle { - /* max-width : 70%;*/ - text-align : center; - background-color : #ded; - border : 1px solid #0a0; - padding : 1em; - margin-top : 1em; - margin-bottom : 1em; - font-size : 1.3em; -} @@ -208,12 +13,6 @@ tr.border_bottom td {border-bottom:1pt solid green;} * STYLE FOR PERSONAL DETAILS TABLE *******************************/ -h1 { - font-size: 1.8em; - border-bottom: 1px solid #bbb; - width: 70%; - min-width: 688px; -} #info { background-color : #839E99; diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css index 160cac20..8147e1c9 100644 --- a/portal/static/css/onelab.css +++ b/portal/static/css/onelab.css @@ -1,12 +1,3 @@ -/* @override unfold/static/css/plugin.css */ - -/*-------------------------------- MARKO'S STYLES -----*/ - - - - -/*** NEW CSS STYLES FOR ONLEAB ***/ - body { background-color:white; color:black; @@ -19,17 +10,35 @@ a, a:active, a:focus { h1 { border-bottom:1px solid #DDDDDD; - padding:0 0 15px 0; + padding:0 0 5px 0; margin:0 0 15px 0; + font-size:18pt; } h1 img { - vertical-align:top; + vertical-align:middle; + margin-bottom:4px; +} +h2 { + font-size:14pt; + color:#333333; +} +h3 { + font-size:13pt; + color:#201E62; } div.wrapper { width:980px; margin:0 auto; position:relative; } +div.container { + width:980px; + margin:25px auto; +} +div.wide { + margin:25px auto; + padding:0 25px; +} span.label { font-size:11pt; @@ -48,7 +57,7 @@ span.label { } /* HEADER */ div#header { - height:85px; + height:100px; background-color:white; } @@ -121,7 +130,7 @@ div#navigation li:last-child { /* HOME DASHBOARD */ div#home-dashboard { color:black; - margin:25px auto; + margin:0 auto 25px auto; } div#home-dashboard table { margin:25px; @@ -214,6 +223,7 @@ div#home-dashboard div#home-slice-list li { /* NAV TABS */ .nav.nav-tabs { + margin-bottom:25px; } .nav.nav-tabs li.active a { @@ -259,7 +269,6 @@ table.table td { /* INSTITUTION */ div#institution { color:black; - margin:25px auto; } .form-hint { font-size:11pt; @@ -267,11 +276,7 @@ div#institution { color:gray; } -/* SLICE REQUEST */ -div#slice-request { - color:black; - margin:25px auto; -} + .form-hint { font-size:11pt; font-style:italic; @@ -283,7 +288,6 @@ div#slice-request { /* TICKET REQUEST */ div#ticket-request { color:black; - margin:25px auto; } .form-hint { font-size:11pt; @@ -296,25 +300,24 @@ div#ticket-request p { /* SLICE VIEW */ div#slice-view { - width:100%; - margin:25px auto; + margin:0; } -div#slice-view div.list-group-item { +div.list-group-item { border:0; background-color:white; font-weight:bold; padding-left:0; } -div#slice-view a.list-group-item { +a.list-group-item { border:0; background-color:white; padding:3px 0 3px 10px; border-left:2pt white solid; } -div#slice-view a.list-group-item.active, div#slice-view a.list-group-item:hover { +a.list-group-item.active, a.list-group-item:hover { border-left:2pt blue solid; } -div#slice-view a.list-group-item p.list-group-item-text { +a.list-group-item p.list-group-item-text { font-size:9pt; font-style:italic; } @@ -344,7 +347,6 @@ div#slice-view a.list-group-item p.list-group-item-text { font-size:14px; color:black; padding:0; - margin-top:10px; } .slice-sections li.active a, .slice-pending li.active a { color:#201E62; @@ -378,18 +380,10 @@ div#slice-view a.list-group-item p.list-group-item-text { } .slice-pending button { font-size:9pt; - margin:8px 0 0 0; + margin:-2px 0 0 0; padding:3px 5px; } .slice-pending button.apply { } .slice-pending button.clear { } - -/* */ - -/* TESTBED LIST */ -div#testbed-list { - margin:25px auto; -} - diff --git a/portal/static/js/myslice-ui.js b/portal/static/js/myslice-ui.js index b6b7ca53..04199868 100644 --- a/portal/static/js/myslice-ui.js +++ b/portal/static/js/myslice-ui.js @@ -34,8 +34,8 @@ $(document).ready(function() { }); }); - - oTable.load("/table/resource/", {'columns' : ['hostname','country','type'], 'filters' : { 'country' : 'France' } }, function(data) { + //{'columns' : ['hostname','country','type'], 'filters' : { 'country' : 'France' } } + oTable.load("/table/resource/", {'columns' : ['hostname','country','type'] }, function(data) { $(this).dataTable( { "sScrollY": window.innerHeight - 275, "sDom": "frtiS", diff --git a/portal/supportview.py b/portal/supportview.py index 11d74766..bbb5b495 100644 --- a/portal/supportview.py +++ b/portal/supportview.py @@ -17,19 +17,15 @@ from theme import ThemeView class SupportView (FreeAccessView, ThemeView): template_name = 'supportview.html' - # expose this so we can mention the backend URL on the welcome page - def default_env (self): - return { - 'MANIFOLD_URL':ConfigEngine().manifold_url(), - } + def post (self,request): - env = self.default_env() + env = {} env['theme'] = self.theme return render_to_response(self.template, env, context_instance=RequestContext(request)) def get (self, request, state=None): - env = self.default_env() + env = {} if request.user.is_authenticated(): env['person'] = self.request.user @@ -40,12 +36,10 @@ class SupportView (FreeAccessView, ThemeView): env['username']=the_user(request) - env['topmenu_items'] = topmenu_items(None, request) + if state: env['state'] = state elif not env['username']: env['state'] = None # use one or two columns for the layout - not logged in users will see the login prompt - env['layout_1_or_2']="layout-unfold2.html" if not env['username'] else "layout-unfold1.html" - - + return render_to_response(self.template, env, context_instance=RequestContext(request)) diff --git a/portal/templates/about.html b/portal/templates/about.html index 375946cb..bddeb7e5 100644 --- a/portal/templates/about.html +++ b/portal/templates/about.html @@ -1,10 +1,41 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} -{% block unfold_main %} -
+{% block content %} +
+

About MySlice About

-

This portal is powered by MySlice

-More info +
+

A ready-made and easily customisable user interface for your testbed.

+ +

+ MySlice is an ambitious project aiming to support researchers throughout the lifecycle of experiments that can run on a variety + of testbeds spanning different administrative domains and networking technologies. Its basic principle is to bring together + available resources with useful information (characteristics, performance, network measurements). +

+

+ MySlice inititiave started in Janury 2011 by offering annotation services for the first ederated experimental resources. Today, + MySlice has taken a big step toward becoming a tand-alone web framework, which will present all available resources from testbeds + across the world, interconnected through the Slice-based Facility Architecture (SFA) and annotated by the TopHat measurement system. +

+

+ Our framework is built with standard programming tools (php and javascript for the front-end and python for the back-end) + and has a modular structure based on the concept of plugins for implementing different core functionalities (query editing, + data display, and resource allocation). +

+

+ The goal is to enable developers with expertise on different testbed technologies and different experimental + practices to work in parallel for optimizing the tools presented to the users allowing them for a wide range of choices + according to their own requirements. Opening in this way the development of web-based user tools for experimentation and + sharing effort and information can increase significantly the chances for the achievement of our challenging objective. +

+

+ You can access the code at git.myslice.info. If you need write access to the git repository you need first to send + your public key to support@myslice.info. +

+

+ Go to the MySlice web site or the OneLab public web site +

+
{% endblock %} diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html index d3f724e7..228ee558 100644 --- a/portal/templates/account-view.html +++ b/portal/templates/account-view.html @@ -1,5 +1,5 @@ -{% extends "layout-unfold1.html" %} -{% block unfold_main %} +{% extends "layout.html" %} +{% block content %} {% if messages %} @@ -10,29 +10,32 @@ {% endif %} -
+
+

User Account

+
+ +
-
-

-
-
-
+ + -
-
- + {%endif%} -
diff --git a/portal/templates/contact.html b/portal/templates/contact.html index 9f2e30ee..56609126 100644 --- a/portal/templates/contact.html +++ b/portal/templates/contact.html @@ -1,21 +1,21 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} {% block head %} {{ wizard.form.media }} {% endblock %} -{% block unfold_main %} - - -
-

Open a Ticket OneLab Support

- -

+{% block content %} +

+

Open a Ticket OneLab Support

+
+
+

If you have any diffculties using the portal, please contact us by filling this form below.
- You can also e-mail us directly or consult to our documentation -

+ You can also e-mail us directly or consult to our documentation +

+
-
+
{% csrf_token %}
{% for field in form %} diff --git a/portal/templates/contact_sent.html b/portal/templates/contact_sent.html index 62a2ab98..c1d0d7d1 100644 --- a/portal/templates/contact_sent.html +++ b/portal/templates/contact_sent.html @@ -1,9 +1,14 @@ -{% extends "layout-unfold1.html" %} - -{% block unfold_main %} - -

Query Received !

- -We will study your problem and get back to you as soon as possible. +{% extends "layout.html" %} + +{% block content %} +
+

Open a Ticket OneLab Support

+
+
+

Query Received !

+

+ We will study your problem and get back to you as soon as possible. +

+
{% endblock %} diff --git a/portal/templates/documentationview.html b/portal/templates/documentationview.html index 2ecfdb78..5c838d0a 100644 --- a/portal/templates/documentationview.html +++ b/portal/templates/documentationview.html @@ -1,13 +1,10 @@ -{% extends "layout-unfold1.html" %} - -{% block head %} -{{ wizard.form.media }} -{% endblock %} - -{% block unfold_main %} - -

OneLab Portal Documentation

+{% extends "layout.html" %} +{% block content %} +
+

Open a Ticket OneLab Portal Documentation

+
+

Portal Components

Myslice (Web Frontend)

@@ -32,6 +29,6 @@ Manifold is the backend that is running behind the portal.

FAQ

Users

Managers

- +
{% endblock %} diff --git a/portal/templates/experimentview.html b/portal/templates/experimentview.html index 0aebd03e..1c7ba2a2 100644 --- a/portal/templates/experimentview.html +++ b/portal/templates/experimentview.html @@ -1,13 +1,11 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} -{% block head %} -{{ wizard.form.media }} -{% endblock %} - -{% block unfold_main %} +{% block content %} - -

Experiment Tools

+
+

Experiment Tools Experiment Tools

+
+

Secure Shell (SSH)

@@ -31,5 +29,5 @@ OMF was originally developed for the ORBIT wireless testbed at Winlab, Rutgers U

More Info: http://mytestbed.net/projects/omf

- +
{% endblock %} diff --git a/portal/templates/home-view.html b/portal/templates/home-view.html index 4a44ce1f..c88902d2 100644 --- a/portal/templates/home-view.html +++ b/portal/templates/home-view.html @@ -1,6 +1,6 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} -{% block unfold_main %} +{% block content %}
    @@ -60,4 +60,4 @@
-{% endblock unfold_main %} +{% endblock %} diff --git a/portal/templates/institution.html b/portal/templates/institution.html index abde7441..575a1f0f 100644 --- a/portal/templates/institution.html +++ b/portal/templates/institution.html @@ -6,9 +6,9 @@
Loading Authority
@@ -71,6 +71,18 @@ $('div.home-panel').hide(); $('div#'+$(this).data('panel')).show(); }); + var url = window.location; + if(url.hash) { + // Fragment exists + tab = url.href.split("#")[1]; + tab_exists = $('div#'+tab).length; + if (tab_exists) { + $('ul.nav-tabs li').removeClass('active'); + $('li#'+tab+'-tab').addClass('active'); + $('div.home-panel').hide(); + $('div#'+tab).show(); + } + } $('button#createslice').click(function() { window.location="/portal/slice_request/"; }) @@ -162,7 +174,7 @@ slice_row = ""; slice_row += ""; - slice_row += "" + val.slice_hrn + ""; + slice_row += "" + val.slice_hrn + ""; slice_row += ""+user_length+""; slice_row += ""+slice_url+""; slice_row += ""+nodes_length+""; diff --git a/portal/templates/join_view.html b/portal/templates/join_view.html index 201c91be..576458ad 100644 --- a/portal/templates/join_view.html +++ b/portal/templates/join_view.html @@ -1,22 +1,24 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} -{% block unfold_main %} +{% block content %} -
-

Join the OneLab Federation

-
-
-OneLab welcomes companies, universities, and research laboratories to join the OneLab Federation of Testbeds.
-We are supported by the European Commision through its 7th Framework Programs and FIRE initiative (Future Internet Research and Experimentation), as well as by other national and international funding initiatives. -
-
-If you wish to become a new member of OneLab Federation, you should first consult the Membership Agreement. -
+
+

Join Federation Join the OneLab Federation

+
+
+ +

+ OneLab welcomes companies, universities, and research laboratories to join the OneLab Federation of Testbeds.
+ We are supported by the European Commision through its 7th Framework Programs and FIRE initiative (Future Internet Research and Experimentation), as well as by other national and international funding initiatives. +

+

+ If you wish to become a new member of OneLab Federation, you should first consult the Membership Agreement. +

{% if errors %} -
+
    {% for error in errors %}
  • {{ error }}
    • @@ -25,7 +27,7 @@ If you wish to become a new member of OneLab Federation, you should first consul
{% endif %} -
+
{% csrf_token %}
@@ -137,12 +139,12 @@ If you wish to become a new member of OneLab Federation, you should first consul
-
+
+

A membership agreement document will be sent to your email address as a PDF file. -
+

Please print and sign a copy of the agreement and send it to: -
-
+

Ciro Scognamiglio
UPMC - LIP6
Campus Jussieu
@@ -150,10 +152,11 @@ Couloir 26-00, bureau 102
Boite courrier 169
4 place Jussieu
F-75252 PARIS cedex 05 - FRANCE
-
+

Once your membership has been processed we will contact you to welcome you as a member. -
+

If you have any questions about membership, contact the OneLab Support team. +

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html index 9bf7cb3b..7a3f7199 100644 --- a/portal/templates/onelab/onelab_home-view.html +++ b/portal/templates/onelab/onelab_home-view.html @@ -59,7 +59,7 @@ - + diff --git a/portal/templates/onelab/onelab_slice-resource-view.html b/portal/templates/onelab/onelab_slice-resource-view.html index 7db76a9d..5432be77 100644 --- a/portal/templates/onelab/onelab_slice-resource-view.html +++ b/portal/templates/onelab/onelab_slice-resource-view.html @@ -1,10 +1,9 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout_wide.html" %} -{% block unfold_main %} -
+{% block content %}
-
-
+
+
  • Filter: CPU
    • @@ -13,8 +12,8 @@
  • ...
  • ...
- -
+ +
{% include theme|add:"_widget-slice-sections.html" %} @@ -39,5 +38,4 @@
-
-{% endblock unfold_main %} \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html index 623bf890..a67d34b2 100644 --- a/portal/templates/onelab/onelab_slice-view.html +++ b/portal/templates/onelab/onelab_slice-view.html @@ -12,36 +12,50 @@


- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description:this slice is dedicated to debug the myslice software...
url:http://myslice.info
users:3
resources:8
created:2012-06-21 10:00
last update:2014-02-25 14:00
expires:2014-04-01 12:00
+
Loading Slices
+
- + + {% endblock %} diff --git a/portal/templates/onelab/onelab_testbed-list.html b/portal/templates/onelab/onelab_testbed-list.html index 546fd889..a0872bf6 100644 --- a/portal/templates/onelab/onelab_testbed-list.html +++ b/portal/templates/onelab/onelab_testbed-list.html @@ -1,7 +1,6 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout_wide.html" %} -{% block unfold_main %} -
+{% block content %}
@@ -16,5 +15,4 @@
-
-{% endblock unfold_main %} \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/portal/templates/password_reset_complete.html b/portal/templates/password_reset_complete.html index 63ce14e6..eee3d20e 100644 --- a/portal/templates/password_reset_complete.html +++ b/portal/templates/password_reset_complete.html @@ -1,18 +1,18 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} {% load i18n %} -{% block unfold_main %} - - {% block content %} -

{% trans 'OneLab secured Password reset wizard' %}

-

{% trans 'Password reset successful' %}

+
+

Password reset Password reset

+
+
+

Onelab secured Password reset wizard

+

Password reset successful

-

{% trans "Your password has been set. You may go ahead and log in now." %}

+

Your password has been set. You may go ahead and log in now.

-

{% trans 'Log in' %}

- -{% endblock %} +

Log in

+
{% endblock %} diff --git a/portal/templates/password_reset_confirm.html b/portal/templates/password_reset_confirm.html index 0ea6867e..8f9d2f77 100644 --- a/portal/templates/password_reset_confirm.html +++ b/portal/templates/password_reset_confirm.html @@ -1,36 +1,33 @@ -{% extends "layout-unfold1.html" %} -{% load i18n %} - -{% block unfold_main %} - - +{% extends "layout.html" %} {% block content %} {% if validlink %} -

{% trans 'OneLab secured Password reset wizard' %}

-

{% trans 'Enter new password' %}

- -

{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

- -
{% csrf_token %} -{{ form.new_password1.errors }} -

{{ form.new_password1 }}

-{{ form.new_password2.errors }} -

{{ form.new_password2 }}

-

-
+
+

Password reset Password reset

+
+
+

Onelab secured Password reset wizard

+ +

Please enter your new password twice so we can verify you typed it in correctly.

+ +
{% csrf_token %} + {{ form.new_password1.errors }} +

{{ form.new_password1 }}

+ {{ form.new_password2.errors }} +

{{ form.new_password2 }}

+

+
{% else %} + +

Onelab secured Password reset wizard

-

{% trans 'OneLab secured Password reset wizard' %}

-

{% trans 'Password reset unsuccessful!' %}

- -

The password reset link was invalid, possibly because it has already been used. Please request a new password reset.

+

The password reset link was invalid, possibly because it has already been used. Please request a new password reset.

-

If you still encounter problem please Contact Support for password recovery.

+

If you still encounter problem please Contact Support for password recovery.

+
{% endif %} {% endblock %} -{% endblock %} diff --git a/portal/templates/password_reset_done.html b/portal/templates/password_reset_done.html index caeb4ebd..5efdfb2e 100644 --- a/portal/templates/password_reset_done.html +++ b/portal/templates/password_reset_done.html @@ -1,14 +1,12 @@ -{% extends "layout-unfold1.html" %} -{% load i18n %} - -{% block unfold_main %} - +{% extends "layout.html" %} {% block content %} - -

{% trans 'Onelab secured Password reset wizard' %}

- -

{% trans "We've emailed you instructions for setting your password to the email address you submitted. You should be receiving it shortly." %}

- -{% endblock %} +
+

Password reset Password reset

+
+
+

Onelab secured Password reset wizard

+ +

We've emailed you instructions for setting your password to the email address you submitted. You should be receiving it shortly.

+
{% endblock %} diff --git a/portal/templates/password_reset_form.html b/portal/templates/password_reset_form.html index 8fba3201..427c4fe1 100644 --- a/portal/templates/password_reset_form.html +++ b/portal/templates/password_reset_form.html @@ -1,21 +1,17 @@ -{% extends "layout-unfold1.html" %} -{% load i18n %} - -{% block unfold_main %} - - - +{% extends "layout.html" %} {% block content %} - -

{% trans "Welcome to Onelab secured Password reset wizard" %}

- -

{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}

- -
{% csrf_token %} -{{ form.email.errors }} -

{{ form.email }}

-
- -{% endblock %} +
+

Password reset Password reset

+
+
+

Welcome to Onelab secured Password reset wizard

+ +

Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one.

+ +
{% csrf_token %} + {{ form.email.errors }} +

{{ form.email }}

+
+
{% endblock %} diff --git a/portal/templates/platform.html b/portal/templates/platform.html index 136a8bfe..499eb742 100644 --- a/portal/templates/platform.html +++ b/portal/templates/platform.html @@ -1,10 +1,10 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} {% block head %} {% endblock %} -{% block unfold_main %} +{% block content %}

Platform

{{networks}}
diff --git a/portal/templates/register_user_wizard.html b/portal/templates/register_user_wizard.html index 1f480a1b..740d7c9d 100644 --- a/portal/templates/register_user_wizard.html +++ b/portal/templates/register_user_wizard.html @@ -1,14 +1,12 @@ -{% extends "layout-unfold1.html" %} -{% load i18n %} +{% extends "layout.html" %} {% load crispy_forms_tags %} - {% block head %} {{ wizard.form.media }} {% endblock %} -{% block unfold_main %} +{% block content %}

User registration

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html index 1f27d418..10381a33 100644 --- a/portal/templates/registration_view.html +++ b/portal/templates/registration_view.html @@ -1,11 +1,13 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} -{% block unfold_main %} +{% block content %} -
-

OneLab Experimenter Registration

-

For First Line Support please Contact Support

+
+

User Registration OneLab Experimenter Registration

+
+ +

For First Line Support please Contact Support

{% if errors %}
    @@ -15,7 +17,6 @@
{% endif %} -
{% csrf_token %} @@ -99,7 +100,6 @@
-
diff --git a/portal/templates/slice-request-ack-view.html b/portal/templates/slice-request-ack-view.html index dc98c27a..c101b060 100644 --- a/portal/templates/slice-request-ack-view.html +++ b/portal/templates/slice-request-ack-view.html @@ -1,6 +1,6 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} -{% block unfold_main %} +{% block content %}

Slice request Received !

diff --git a/portal/templates/slice-request-view.html b/portal/templates/slice-request-view.html index 4568864a..838b9b4d 100644 --- a/portal/templates/slice-request-view.html +++ b/portal/templates/slice-request-view.html @@ -1,11 +1,11 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} {% load i18n %} {% block head %} {{ wizard.form.media }} {% endblock %} -{% block unfold_main %} +{% block content %} diff --git a/portal/templates/slicerequest_view.html b/portal/templates/slicerequest_view.html index c99ca4df..1f57bcec 100644 --- a/portal/templates/slicerequest_view.html +++ b/portal/templates/slicerequest_view.html @@ -94,6 +94,7 @@ jQuery(document).ready(function(){ ]; $( "#authority_hrn" ).autocomplete({ source: availableTags, + minLength: 0, select: function( event, ui ) {console.log(jQuery(this))} }); }); diff --git a/portal/templates/supportview.html b/portal/templates/supportview.html index 18b5a935..3b4c2ef0 100644 --- a/portal/templates/supportview.html +++ b/portal/templates/supportview.html @@ -1,72 +1,69 @@ -{% extends "layout-unfold1.html" %} - -{% block head %} -{{ wizard.form.media }} -{% endblock %} - -{% block unfold_main %} - -

OneLab Portal Support

- -

Report a Bug

-

If you have found a bug or having difficulties accesing some features or found some anomalies, please report it using our ticketing system.

- -

Unresolved Tickets

- - -
-
- - - +{% extends "layout.html" %} + +{% block content %} +
+

Request a Slice OneLab Portal Support

+
+ + +
+

Report a Bug

+

If you have found a bug or having difficulties accesing some features or found some anomalies, please report it using our ticketing system.

+ +

Unresolved Tickets

+
+ +
+
Ticket No
+ + - - - - + + + + - + - + - - + + - -
Ticket No Reported By DescriptionStatus
1Status
1 yasin.upmc@gmail.com Slice_request page is not working Unresolved
22 azerty@lip6.frUnable to RegisterUnresolvedUnable to RegisterUnresolved
-
-
-
- - - - - -

FAQ

-

Contact Us

- -

Mailing List

-

You can subscribe to our mailing list by sending a request to: support AT myslice DOT info

-

Also you can adress any issues in the same email address.

- -

Mailing Address

-

-UPMC - LIP6
-Boîte courrier 16
-Couloir 26-00, Etage 01, Bureau 102
-4 place Jussieu
-75252 PARIS CEDEX 05
-France
-

+ + +
+ + + +
+ +

FAQ

+

Contact Us

+ +

Mailing List

+

You can subscribe to our mailing list by sending a request to: support AT myslice DOT info

+

Also you can adress any issues in the same email address.

+ +

Mailing Address

+

+ UPMC - LIP6
+ Boîte courrier 16
+ Couloir 26-00, Etage 01, Bureau 102
+ 4 place Jussieu
+ 75252 PARIS CEDEX 05
+ France
+

+
diff --git a/portal/templates/user_register.html b/portal/templates/user_register.html index bfb08f12..a1295c13 100644 --- a/portal/templates/user_register.html +++ b/portal/templates/user_register.html @@ -1,21 +1,25 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} {% block head %} {{ wizard.form.media }} {% endblock %} -{% block unfold_main %} +{% block content %} -

User registration

+
+

User Registration OneLab Experimenter Registration

+
+
-{% if envoi %}Your registration message has been sent !{% endif %} - -
-
{% csrf_token %} -{{ form.as_p }} - -
+{% if envoi %} +

Your registration message has been sent !

+{% endif %} + +
{% csrf_token %} + {{ form.as_p }} + +
{% endblock %} diff --git a/portal/templates/user_register_complete.html b/portal/templates/user_register_complete.html index 35b252e8..9c613956 100644 --- a/portal/templates/user_register_complete.html +++ b/portal/templates/user_register_complete.html @@ -1,8 +1,15 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} -{% block unfold_main %} +{% block content %} -

User registration complete !

+
+

User Registration OneLab Experimenter Registration

+
+
+

User registration complete !

+

+ You will receive an email with further instructions. +

+
-You will receive an email with further instructions. {% endblock %} diff --git a/portal/templates/validate_pending.html b/portal/templates/validate_pending.html index cef58ea9..447c9318 100644 --- a/portal/templates/validate_pending.html +++ b/portal/templates/validate_pending.html @@ -1,7 +1,6 @@ -{% extends "layout-unfold1.html" %} +{% extends "layout.html" %} {% block head %} - {% endblock %} -{% block unfold_main %} -
-

Pending requests

-
-
-

My authorities

- -{% if my_authorities %} - -{% for authority, requests in my_authorities.items %} -

{{authority}}

-
- - - - - - - - {% for request in requests %} - - - + + + + + + + + + + + {% endfor %} +
- typeiddetailstimestampstatus
- {% if request.allowed == 'allowed' %} - - {% else %} - {% if request.allowed == 'expired' %} - expired - {% else %} {# denied #} - denied +{% block content %} +
+

Pending requests

+
+ + {% if my_authorities %} + + {% for authority, requests in my_authorities.items %} + +
+

{{authority}}

+ + + + + + + + {% for request in requests %} + + + - - - - - - - - - - - {% endfor %} -
+ typeiddetailstimestampstatus
+ {% if request.allowed == 'allowed' %} + + {% else %} + {% if request.allowed == 'expired' %} + expired + {% else %} {# denied #} + denied + {% endif %} {% endif %} - {% endif %} - {{ request.type }}{{ request.id }} - {% if request.type == 'user' %} - Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} - {% else %} - {% if request.type == 'slice' %} - Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} - {% else %} {# authority #} - Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}} - {% endif %} - {% endif %} - {{ request.timestamp }}
-{% endfor %} +
{{ request.type }}{{ request.id }} + {% if request.type == 'user' %} + Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} + {% else %} + {% if request.type == 'slice' %} + Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} + {% else %} {# authority #} + Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}} + {% endif %} + {% endif %} + {{ request.timestamp }}
+
+ {% endfor %} {% else %} -There is no pending request waiting for validation. +
+ There is no pending request waiting for validation. +
{% endif %} {% if sub_authorities %} -
-

Sub-Authorities

- -{% for authority, requests in sub_authorities.items %} -

{{authority}}

- - - - - - - - {% for request in requests %} - - + + + + + + + + + + {% endfor %} +
- typeiddetailstimestampstatus
- {% if request.allowed == 'allowed' %} - - {% else %} - {% if request.allowed == 'expired' %} - expired - {% else %} {# denied #} - denied +
+

Sub-Authorities

+
+ {% for authority, requests in sub_authorities.items %} +
+

{{authority}}

+ + + + + + + + {% for request in requests %} + + - - - - - - - - - - {% endfor %} -
+ typeiddetailstimestampstatus
+ {% if request.allowed == 'allowed' %} + + {% else %} + {% if request.allowed == 'expired' %} + expired + {% else %} {# denied #} + denied + {% endif %} {% endif %} - {% endif %} - {{ request.type }}{{ request.id }} - {% if request.type == 'user' %} - Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} - {% else %} - {% if request.type == 'slice' %} - Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} - {% else %} {# authority #} - Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}} - {% endif %} - {% endif %} - {{ request.timestamp }}
-{% endfor %} -
+
{{ request.type }}{{ request.id }} + {% if request.type == 'user' %} + Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} + {% else %} + {% if request.type == 'slice' %} + Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} + {% else %} {# authority #} + Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}} + {% endif %} + {% endif %} + {{ request.timestamp }}
+
+ {% endfor %} {% endif %} {% if delegation_authorities %} -
-

Authorities with delegation

- -{% for authority, requests in delegation_authorities.items %} -

{{authority}}

- - - - - - - - {% for request in requests %} - - - - - - +
+

Authorities with delegation

+
+ {% for authority, requests in delegation_authorities.items %} +
+

{{authority}}

+
- typeiddetailstimestampstatus
- {% if request.allowed == 'allowed' %} - - {% else %} - {% if request.allowed == 'expired' %} - expired - {% else %} {# denied #} - denied - {% endif %} - {% endif %} - {{ request.type }}{{ request.id }} - {% if request.type == 'user' %} - Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} - {% else %} - {% if request.type == 'slice' %} - Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} - {% else %} {# authority #} - Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}} - {% endif %} - {% endif %} - {{ request.timestamp }}
+ + + + + + + {% for request in requests %} + + + + + + + + - - - - - {% endfor %} -
+ typeiddetailstimestampstatus
+ {% if request.allowed == 'allowed' %} + + {% else %} + {% if request.allowed == 'expired' %} + expired + {% else %} {# denied #} + denied + {% endif %} + {% endif %} + {{ request.type }}{{ request.id }} + {% if request.type == 'user' %} + Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}} + {% else %} + {% if request.type == 'slice' %} + Slice name: {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} + {% else %} {# authority #} + Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}} + {% endif %} + {% endif %} + {{ request.timestamp }}
-{% endfor %} -
+ + + {% endfor %} + +
+ {% endfor %} {% endif %} - - -
- +
+ +
{% endblock %} diff --git a/ui/templates/base.html b/ui/templates/base.html index d11babfe..8b4e8271 100644 --- a/ui/templates/base.html +++ b/ui/templates/base.html @@ -1,6 +1,6 @@ {# This is required by insert_above #}{% insert_handler %} -MySlice - {{ section }} +OneLab - {{ section }} {# This is where insert_str will end up #}{% media_container prelude %}