From 02a8b0acf7a47f0cb740239d0a035a4e53f1af19 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Thu, 21 May 2015 18:21:36 +0200 Subject: [PATCH] SmartFIRE templates updates --- portal/static/css/smartfire.css | 807 +----------------- portal/static/img/smartfire_favicon.ico | Bin 0 -> 4302 bytes portal/templates/_slogan.html | 8 +- portal/templates/base.html | 7 - portal/templates/home-view.html | 2 +- .../smartfire/smartfire_account-view.html | 374 -------- .../smartfire/smartfire_activate_user.html | 29 - .../smartfire/smartfire_activate_user.txt | 24 - .../smartfire_authority_request_denied.html | 20 - .../smartfire_authority_request_denied.txt | 18 - .../smartfire_authority_request_email.html | 22 - .../smartfire_authority_request_email.txt | 22 - ...rtfire_authority_request_email_subject.txt | 1 - .../smartfire/smartfire_email_activation.html | 25 - .../smartfire_email_default_recipients.txt | 1 - .../smartfire_email_default_sender.txt | 1 - .../smartfire/smartfire_home-view.html | 200 ----- .../smartfire_management-tab-requests.html | 226 ----- .../smartfire_slice_request_denied.html | 17 - .../smartfire_slice_request_denied.txt | 14 - .../smartfire_slice_request_email_subject.txt | 1 - .../smartfire_slice_request_validated.html | 21 - .../smartfire_slice_request_validated.txt | 16 - .../smartfire_slicerequest_view.html | 108 --- .../smartfire_user_request_denied.html | 11 - .../smartfire_user_request_denied.txt | 8 - .../smartfire_user_request_email.html | 16 - .../smartfire_user_request_email.txt | 14 - .../smartfire_user_request_email_subject.txt | 1 - .../smartfire_user_request_validated.html | 14 - .../smartfire_user_request_validated.txt | 10 - .../smartfire/smartfire_widget-topmenu.html | 2 +- 32 files changed, 5 insertions(+), 2035 deletions(-) create mode 100644 portal/static/img/smartfire_favicon.ico delete mode 100644 portal/templates/smartfire/smartfire_account-view.html delete mode 100644 portal/templates/smartfire/smartfire_activate_user.html delete mode 100644 portal/templates/smartfire/smartfire_activate_user.txt delete mode 100644 portal/templates/smartfire/smartfire_authority_request_denied.html delete mode 100644 portal/templates/smartfire/smartfire_authority_request_denied.txt delete mode 100644 portal/templates/smartfire/smartfire_authority_request_email.html delete mode 100644 portal/templates/smartfire/smartfire_authority_request_email.txt delete mode 100644 portal/templates/smartfire/smartfire_authority_request_email_subject.txt delete mode 100644 portal/templates/smartfire/smartfire_email_activation.html delete mode 100644 portal/templates/smartfire/smartfire_email_default_recipients.txt delete mode 100644 portal/templates/smartfire/smartfire_email_default_sender.txt delete mode 100644 portal/templates/smartfire/smartfire_home-view.html delete mode 100644 portal/templates/smartfire/smartfire_management-tab-requests.html delete mode 100644 portal/templates/smartfire/smartfire_slice_request_denied.html delete mode 100644 portal/templates/smartfire/smartfire_slice_request_denied.txt delete mode 100644 portal/templates/smartfire/smartfire_slice_request_email_subject.txt delete mode 100644 portal/templates/smartfire/smartfire_slice_request_validated.html delete mode 100644 portal/templates/smartfire/smartfire_slice_request_validated.txt delete mode 100644 portal/templates/smartfire/smartfire_slicerequest_view.html delete mode 100644 portal/templates/smartfire/smartfire_user_request_denied.html delete mode 100644 portal/templates/smartfire/smartfire_user_request_denied.txt delete mode 100644 portal/templates/smartfire/smartfire_user_request_email.html delete mode 100644 portal/templates/smartfire/smartfire_user_request_email.txt delete mode 100644 portal/templates/smartfire/smartfire_user_request_email_subject.txt delete mode 100644 portal/templates/smartfire/smartfire_user_request_validated.html delete mode 100644 portal/templates/smartfire/smartfire_user_request_validated.txt diff --git a/portal/static/css/smartfire.css b/portal/static/css/smartfire.css index 46271241..5d17099a 100644 --- a/portal/static/css/smartfire.css +++ b/portal/static/css/smartfire.css @@ -1,181 +1,6 @@ -@import url("../fonts/opensans_bold_macroman/stylesheet.css"); - -html { height: 100% } - -body { - background-color:white; - color:black; - margin:0; - padding:0; - height: 100%; - letter-spacing:0.3px; -} a, a:active, a:focus { - outline: 0; - text-decoration:none; color:#FF4400; } -a:hover { - color:#0D0049; -} - -a.current { - text-decoration:underline; - color:#333333; -} -p.command { - padding:15px; - margin:15px 0; - color:#890000; - background-color:#E0E0E0; - font-family:Courier, monospace; -} -h1 { - border-bottom:1px solid #DDDDDD; - padding:0 0 0 0; - margin:15px 0 15px 0; - font-size:14pt; -} -h1 img { - vertical-align:middle; - margin-bottom:4px; - margin-right:10px; -} -h2 { - margin:0 0 15px 0; - font-size:14pt; - color:#333333; -} -h3 { - margin:0 0 5px 0; - font-size:13pt; - color:#201E62; -} -h4 { - margin:0 0 5px 0; - font-size:12pt; - color:#333333; -} -span.subtitle { - color:#454545; - font-size:9pt; - font-weight:normal; - text-transform:uppercase; -} -span.small { - font-size:9pt; -} -span.gray { - color:gray; -} -span.type { - color:#201E62; - font-weight:bold; - font-size:9pt; -} -span.htitle { - color:#454545; - font-size:9pt; - font-weight:normal; -} -span.version { - font-size:8pt; - color:#888888; -} -input[type=checkbox] { - min-width:5px !important; - margin-left:0 !important; -} -input[type=text], input[type=password], input[type=email], input[type=tel], input[type=number], select, option { - min-width:260px; - padding:6px; - border:1pt solid #22606D; - vertical-align:bottom; - border-radius:0; -} - -textarea { - padding:6px; - border:1pt solid #22606D !important; - border-radius:0 !important; -} - -span.label { - font-size:11pt; - color:gray; - font-weight:normal; - padding:0; -} -div.el { - padding-bottom:15px; -} -div.breadcrumbs { - margin:15px 0; - color:gray; - font-size:10pt; -} -div.breadcrumbs a { - color:gray; -} -div.breadcrumbs a:hover { - text-decoration:underline; -} -.tab-pane { - padding-top:15px; -} -/* buttons */ -button.btn, input.btn { - padding:6px 10px; - border-radius:5px; - font-size:10pt; - font-weight:normal; -} -button.btn span.glyphicon { - margin-right:6px; -} -button.btn-default { - border-bottom:3px solid #cccccc; -} -button.btn-default:hover { - background-color:white; - border:1px solid #ADADAD; - border-bottom:3px solid #ADADAD; -} -button.btn-default:active { - background-color:white; - border:1px solid #ADADAD; - border-bottom:1px solid #ADADAD; - margin-top:2px; - box-shadow:none; -} -button.btn-primary { - border-bottom:3px solid #3071A9; -} -button.btn-primary:hover { - box-shadow:none; - background-color:#428bca; - border:1px solid #357ebd; - border-bottom:3px solid #3071A9; -} -button.btn-primary:active { - box-shadow:none; - border-bottom:1px solid #3071A9; - margin-top:2px; -} -button.btn-danger { - border-bottom:3px solid #A13F3A; -} -button.btn-danger:hover { - box-shadow:none; - background-color:#d9534f; - border:1px solid #d43f3a; - border-bottom:3px solid #A13F3A; -} -button.btn-danger:active { - border:1px solid #d43f3a; - box-shadow:none; - margin-top:2px; -} button.btn-onelab, input.btn-onelab { border:0; border-bottom:3px solid #FFA315; @@ -193,641 +18,11 @@ button.btn-onelab:active, input.btn-onelab:active { border-bottom:1px solid #760073; margin-top:2px; } - -.container-resource button { - padding:2px 4px; - border-radius:3px; - font-size:9pt; - font-weight:normal; -} -.container-resource select,.container-resource option, .container-resource input { - padding:2px 4px; - font-size:9pt; -} -.badge { - font-size:9pt; - margin-left:4px; -} -/***** Notifications *****/ -.warning { - border: 1px solid red; - margin: 20px 60px; - padding: 10px 20px; - color: red; - background-color: #f2dbdb; - text-align: center; -} - -/* HOME DASHBOARD */ -div#home-dashboard { - color:black; - margin:0 auto 25px auto; -} -div#home-dashboard table { - margin:25px; - width:100%; -} -div#home-dashboard table td { - text-align:center; - padding:15px 0; - width:33%; -} -div#home-dashboard table tr:first-child td { - font-size:12pt; - font-weight:bold; - color:#270A5A; -} -div#home-dashboard table tr:last-child td { - vertical-align:top; - padding:25px 0; -} -div#home-dashboard table tr:last-child td.logged-in { - border-right:1px solid #DDDDDD; - padding:25px; -} -div#home-dashboard table tr:last-child td.support { - border-left:1px solid #DDDDDD; - padding:25px; -} -div#home-dashboard table tr:last-child td:first-child { -} -div#home-dashboard table tr:last-child td:last-child { - border-right:0; -} -div#home-dashboard table tr:last-child td.logged-in div { - text-align:left; - padding:25px 0; -} -div#home-dashboard table tr:last-child td.support div { - text-align:left; - padding:25px 0; -} -div#home-dashboard div.login-widget { - padding:20px; -} -div#home-dashboard table td.support { -} -div#home-dashboard table td.support a { -} -div#home-dashboard table td.support a:hover { - text-decoration:none; -} - -div#home-dashboard div#manager { - display:none; -} - -div#home-dashboard div#home-slice-list { - margin:25px 0; - padding:0 25px; - text-align:left; -} -div#home-dashboard div#home-slice-list ul { - list-style: none; - padding:0; - margin:0; -} -div#home-dashboard div#home-slice-list li { - -} - -/**/ - -/**/ -/* WELL */ -div.well { -} -/**/ -/* TABLE */ -table.table { - margin:0; -} -table.table thead { - padding:0; -} -table.table tbody { - padding:0; -} -table.table tr { - padding:0; -} -table.table td { - padding:0; -} -/* INSTITUTION */ -div#institution { - color:black; -} -.form-hint { - font-size:11pt; - font-style:italic; - color:gray; -} - - -.form-hint { - font-size:11pt; - font-style:italic; - color:gray; -} - - - -/* TICKET REQUEST */ -div#ticket-request { - color:black; -} -.form-hint { - font-size:11pt; - font-style:italic; - color:gray; -} -div#ticket-request p { - margin:20px 0; -} - -ul.nav-tabs { - margin:0 0 15px 0; -} -ul.nav-tabs ul {} -ul.nav-tabs li {} - -ul.nav-section li a { - color:black; - border-bottom:0; -} -ul.nav-section li:first-child { - padding:0; -} -ul.nav-section li:first-child a { -} -ul.nav-section li:first-child.active a { -} - -ul.nav-resources { - margin:15px 0; -} -ul.nav-resources a { - padding: 4px 10px 5px 10px; -} - -/* SLICE VIEW */ -div.container-resource, div.container-slice { - padding-right:15px; - padding-left:15px; -} -.table th { - border-top:0 !important; -} -div#slice-view { - margin:0; -} - -/* FACILITY/TESTBED filters */ -div.sl-filter-facilities { - padding:0 5px; -} -div.sl-filter-facilities h4 { - margin-bottom:15px; - -} -img.sl-image { - margin:0 5px 5px 0; - padding:0; - vertical-align:middle; -} -a.sl-facility { - color:gray; - text-decoration:none; -} -a.sl-facility:hover { - color:#342961; -} -a.sl-facility.active { - color:black; - text-decoration:none; -} -a.sl-facility::before { - content: " "; -} -div.sl-facilities { - border-bottom:#CCCCCC 1px solid; - padding-bottom:15px; - margin-bottom:15px; -} -div.sl-facilities:last-child { - border:0; -} -a.sl-testbed { - color:gray; - text-decoration:none; - margin-left:25px; - margin-bottom:5px; -} -a.sl-testbed:hover { - color:#342961; -} -a.sl-testbed.active { - color:black; -} - -span.sl-resources { - font-size:9pt; - color:gray; -} -a.sl-resources, a.sl-resources:hover { - font-size:9pt; - border:0; - padding:2px 4px; - -moz-border-radius: 4px; - border-radius: 4px; - width:105px; - margin-left:4px; - margin-bottom:8px; - text-align: center; -} -a.sl-resources.active, a.sl-resources.active:hover, a.sl-resources.active:focus { - border:0; - -moz-border-radius: 4px; - border-radius: 4px; -} -a.sl-resources:first-child { - margin-left:12px; -} -button.btn-apply { - font-size:13px; - padding:2px 8px; -} -div#slice-info { - margin-top:25px; -} -div#slice-info table { - width:100%; - margin:0 auto; -} -div#slice-info table td:first-child { - text-align:right; - font-weight:bold; - padding-right:15px; -} -div#slice-info td { - padding:5px; -} - -/* SLICE VIEW sections */ -.slice-sections, .slice-pending { - margin:0; - padding:0; -} -.slice-sections ul, .slice-pending ul { - margin:0; - padding:0; -} -.slice-pending ul { - width:400px; - margin:0 auto 15px auto; -} -.slice-sections li { - text-align:left; - margin:0; - padding:0; -} -.slice-pending li { - padding-right:15px; -} -.slice-sections li a, .slice-pending li a { - font-size:14px; - color:black; - padding:0; -} -.slice-sections li.active a, .slice-pending li.active a { - color:#201E62; - background-color:#EFEFEF; - text-decoration:underline; - padding:0; -} -.slice-sections ul.nav-pills li a:hover, .slice-pending ul.nav-pills li a:hover { - text-decoration:underline; - background-color:#EFEFEF; - color:black; -} -.slice-sections ul.nav-pills li.active, .slice-pending ul.nav-pills li.active { - -} -.slice-sections li:first-child, .slice-sections li:first-child a { - color:#201E62; - font-weight:bold; -} -.slice-experiment { - text-align:right; - padding:0; -} -.slice-experiment button { - margin:3px 0 0 0; - background-color:#CC4125; - color:white; -} - -.slice-pending { -} -.slice-pending button { - font-size:9pt; - margin:-2px 0 0 0; - padding:3px 5px; -} -.slice-pending button.apply { - font-size:14px; - padding:2px 5px; -} -.slice-pending button.clear { -} -tr.active, tr.active td { - background-color:#FFFFCC !important; -} -div.dataTables_filter label{ - float:left; - width:400px; -} - -/* HEADER */ - - -.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 { - -} -div.navigation ul { - margin:26px 0 0 0; - padding:0; - display: inline-block; - list-style-type: none; - white-space: nowrap; -} - -div.navigation li { - color:#0C0047; - font-family:open_sansbold, sans-serif; - font-size:9pt; - font-weight:normal; - line-height:0.8em; - letter-spacing:0.4pt; - list-style:none; - float:left; - padding:0 15px; - margin:0; - text-transform:uppercase; -} -div.navigation li:hover { -} -div.navigation li a { - color:#0C0047; -} div.navigation li a:hover, div.navigation li a.current { color:#FF4400; text-decoration:none; } - -div.navigation li:last-child { - margin-right:0; -} - - -div.navigation .dropdown-menu { - color:black; - -moz-box-shadow: 1px 1px 0px 0 rgba(58, 48, 100,0.8); - -webkit-box-shadow: 1px 1px 0px 0 rgba(58, 48, 100,0.8); - box-shadow: 1px 1px 0px 0 rgba(58, 48, 100,0.8); - border-radius:2px; - padding:0 5px 5px 5px; - margin-top:5px; - margin-left:20px; -} -div.navigation .dropdown-menu ul { - margin:0; - padding:15px 5px 5px 5px; - display:list-item; -} -div.navigation .dropdown-menu li { - margin:0 10px 0 0; - padding:0 0 8px 0; - display:list-item; - float:none; - text-transform: none; -} - -div.navigation .dropdown-menu a { - font-family:Helvetica,sans-serif; - font-size:10pt; - color:black; -} -div.navigation .dropdown-menu li.title { - margin-bottom:10px; -} -div.navigation .dropdown-menu li.title a { - font-family:open_sansbold, sans-serif; -} - - -div.navigation .dropdown-menu li:first-child { - border-bottom:1px solid white; - padding-bottom:5px; - -} - -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:underline; -} -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.footer { - padding-top:15px; -} -div.footer div.bottom { - position:absolute; - bottom:0; -} -div.footer ul { - margin:6px 0 0 0; - padding:0; -} - -div.footer li { - font-size:9pt; - display:inline; - list-style:none; - margin:0px; - padding:0; - margin-right:15px; - color:#747474; - letter-spacing:0.4px; -} - -div.footer li a { - color:#747474; -} -div.footer li a:hover { - text-decoration:underline; -} -div.copy { - font-size:8pt; - color:gray; - padding-top:15px; - padding-bottom:15px; -} - div.home { - font-size:11pt; - line-height:1.2em; - letter-spacing:0.3pt; - min-height:500px; background-image: url('../img/bg-smartfire.png'); - background-repeat:no-repeat; - background-size:cover; - background-position:center top; - background-color:#4FABA3; - padding:100px 0; -} -div.home h2 { - color:white; - line-height:1.2em; - font-size:18pt; -} -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; -} - -.login-form input { - width:320px; -} -.login-form input[type=submit] { - width:108px; -} - -.login-submit { - vertical-align:middle; - padding:0; -} -.lost-password { - font-size:10pt; - color:black; - text-align:right; - padding:0px; -} -.lost-password a { - color:white; - text-shadow:0.5px 0.5px black; -} -.login-signup { - font-size:12pt; - color:white; - text-shadow:0.5px 0.5px black; - margin-top:45px; - padding:5px 0 0 4px; - -} -.login-signup a { - color:white; - text-shadow:0.5px 0.5px black; - padding-bottom:2px; - border-bottom:2pt solid white; -} -.login-signup a:hover { - text-decoration:none; -} -.login-signup button { - padding:8px; - border:0; - border-bottom:2px solid #540086; - background-color:#302562; - color:white; - width:100px; - border-radius:5px; - font-size:12pt; -} -div.slogan { - text-align:center; - color:white; - text-shadow: 1px 1px #013540; -} - -th { - border:0 !important; -} - -div.monitor { - padding:40px 0 25px 0; -} -div.monitor h1 { - margin-bottom:25px; -} -div.s-monitor { - padding-bottom:25px; -} -span#stats-period-txt { - text-transform:lowercase; + background-color:#FFFFFF; } diff --git a/portal/static/img/smartfire_favicon.ico b/portal/static/img/smartfire_favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..860043eb5e1cf208229913144b424c903a7490c3 GIT binary patch literal 4302 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 literal 0 HcmV?d00001 diff --git a/portal/templates/_slogan.html b/portal/templates/_slogan.html index 44246954..299e0eca 100644 --- a/portal/templates/_slogan.html +++ b/portal/templates/_slogan.html @@ -1,8 +1,4 @@
-

- Your Easy Access to Computer Networking Testbeds: -

-

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

+

Welcome!

+ 
diff --git a/portal/templates/base.html b/portal/templates/base.html index ceebc5d7..8bc204ac 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -77,17 +77,12 @@ $(document).ready(function() { slices.push("no slice"); }else{ slices = user.slices; - {% if theme != "fed4fire" or "onelab" in theme %} - drawSlices(slices); - {% endif %} } - {% if theme == "fed4fire" or "onelab" in theme%} p = myslice.get_projects(); if(p != null){ //drawProjects(p); drawProjectsTree(p,slices); } - {% endif %} }); function drawSlices(slices){ @@ -100,7 +95,6 @@ $(document).ready(function() { $("ul#dropdown-slice-list").append(items.join( "" )); } - {% if theme == "fed4fire" or "onelab" in theme%} function drawProjects(projects){ var items = []; @@ -152,7 +146,6 @@ $(document).ready(function() { window.setTimeout(function() { $('.projects-loading').hide(); },20000); - {% endif %} {% endif %} jQuery('[title!=""]').qtip(); }); diff --git a/portal/templates/home-view.html b/portal/templates/home-view.html index 955ab16a..55d74035 100644 --- a/portal/templates/home-view.html +++ b/portal/templates/home-view.html @@ -93,7 +93,7 @@
- {% include theme|add:"_slogan.html" %} + {% widget '_slogan.html' %}
{% widget '_widget-login-user.html' %} diff --git a/portal/templates/smartfire/smartfire_account-view.html b/portal/templates/smartfire/smartfire_account-view.html deleted file mode 100644 index 985974fb..00000000 --- a/portal/templates/smartfire/smartfire_account-view.html +++ /dev/null @@ -1,374 +0,0 @@ -{% extends "layout.html" %} -{% load portal_filters %} -{% block content %} -{% widget "_widget-no_credentials.html" %} -{% widget "_widget-tradeoff.html" %} -
-
-
- Account  >  {{ person.email }} -
-
- {%if 'no_creds' in user_cred %} -

NO CREDENTIALS are delegated to the portal!

- {%endif%} - {%if 'creds_expired' in user_cred %} -

EXPIRED CREDENTIALS Please delegate again your credentials to the portal!

- {%endif%} - -
-{% if messages %} -
    - {% for message in messages %} - {{ message }} - {% endfor %} -
-{% endif %} - -
- - -
-
- -
-
-
-
- -
- - {% csrf_token %} - - - - - - - - - - - - - - - - - - - - - {%if 'Enabled' in user_status %} - - - - - - - - - - {%if 'N/A' not in user_private_key%} - - - {%else%} - - - {%endif%} - - - - - - - {%if 'N/A' not in user_private_key%} - - - {%else%} - - - {%endif%} - - - - - - {%endif%} -
-

Platform: Myslice

-
Email - {{ person.email }} - -
Password - - ******** - - - - - - - - - - - - -
Enter password:
Confirm password: - - -
- -
Full Name - {{ fullname }} - - -
- - - - - -
Authority - {{ authority }} - -
Generate Keys - -
Public Key - ******** - - -
-
- - - -
- - -
Private Key ******** - - - Private Key ******** - - -
sfi_config use sfi_config file with sfi.py package (pip install sfa) - -
Identity - - Identity - -
-

- Automatic vs. Manual delegation of credentials: - Trade-off between ease-of-use & security

-

-
- -
-
- -
-
- -

Principal Account Account used for delegating credentials

- - - - - - - - - - {% for row in principal_acc %} - - - - - - - - - {%endfor%} -
PlatformAccount TypeAccount DelegationUser hrnUser Status
{{ row.platform_name }} {{ row.account_type }} {{ row.delegation_type }} {{ row.usr_hrn }} {{ row.user_status }}
- -
- - {%if 'Enabled' in user_status %} -
-

Credentials Delegated to Principal Account

- - - - - - - {% for row in my_users %} - - - - - {%endfor%} -
Delegated User Credential
Expiration DateDownload
{{ row.cred_exp }} - - - -
-

- - - - - - - - {% for row in my_slices %} - - - - - - {%endfor%} -
Delegated Slice Credentials
Slice NameExpiration DateDownload
{{ row.slice_name }} {{ row.cred_exp }} - -
-

- - - - - - - - {% for row in my_auths %} - - - - - - {%endfor%} -
Delegated Authority Credentials
Authority NameExpiration DateDownload
{{ row.auth_name }} {{ row.cred_exp }} - -
-

- {%if '' not in my_users%} -

- {%else%} -

- {%endif%} -
-
- - -
-
- -

Testbed Access Reference Accounts in the following testbeds

- - - - - - - - {% for row in ref_acc %} - - - - - - - {%endfor%} -
PlatformAccount TypeReference toRemove Account
{{ row.platform_name }} {{ row.account_type }} {{ row.account_reference }} - -
- - -

Add reference account to the following testbeds

- - - - - - {% for platform in platform_list %} - - - - - {%endfor%} -
PlatformsAdd Account
{{ platform.platform_no_access }} - -
-
-{%endif%} -
-
- -
- - -{% endblock %} diff --git a/portal/templates/smartfire/smartfire_activate_user.html b/portal/templates/smartfire/smartfire_activate_user.html deleted file mode 100644 index 04884b0e..00000000 --- a/portal/templates/smartfire/smartfire_activate_user.html +++ /dev/null @@ -1,29 +0,0 @@ - -
-

We have received a user signup request for your email address at {{current_site}}

-

You have the following user details:

- -Organization: {{organization}}
-First name: {{first_name}}
-Last name: {{last_name}}
-Email: {{email}}
- -

-

-You may now log in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required: -

- -
    -
  • -You must confirm that you have indeed made this request by clicking on the following link:
    - {{validation_link}} -
    • If you did not make this request, we apologise. You may disregard this email or you may advise us the error by replying to this email.
    -
    • -
  • -A manager from your organization must also validate your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request. -
    • -
-

-We look forward to welcoming you to SmartFIRE. You will find answers to frequently asked questions here. -Please don't hesitate to contact us with any additional questions that you might have. -

diff --git a/portal/templates/smartfire/smartfire_activate_user.txt b/portal/templates/smartfire/smartfire_activate_user.txt deleted file mode 100644 index ac84bc3d..00000000 --- a/portal/templates/smartfire/smartfire_activate_user.txt +++ /dev/null @@ -1,24 +0,0 @@ -We have received a user signup request for your email address at {{current_site}} - -You have the following user details: - -Organization: {{organization}} -First name: {{first_name}} -Last name: {{last_name}} -Email: {{email}} - -You may now log in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required: - - 1. You must confirm that you have indeed made this request by clicking on the following link: - - {{validation_link}} - - If you did not make this request, we apologise. You may disregard this email or you may advise us the error by replying to this email. - - 2. A manager from your organization must also validate your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request. - -We look forward to welcoming you to SmartFIRE portal. -Please don't hesitate to contact us at support@onelab.eu with any additional questions that you might have. - - - diff --git a/portal/templates/smartfire/smartfire_authority_request_denied.html b/portal/templates/smartfire/smartfire_authority_request_denied.html deleted file mode 100644 index e4da2719..00000000 --- a/portal/templates/smartfire/smartfire_authority_request_denied.html +++ /dev/null @@ -1,20 +0,0 @@ - -
-

Dear SmartFIRE user,

-

-

You have recently requested an addition of the following authority in the SmartFIRE portal ({{portal_url}}):

-

-Name of organization: {{site_name}}
-Short name: {{short_name}}
-Url: {{url}}
-City: {{city}}
-Country: {{country}}
-

-

After verifying your request, we regret to inform you that, we are unable to validate your request.

-

For any queries, contact us by replying to this email.

-
-

We wish you all the best.

-
-

Yours sincerely,

-

The SmartFIRE team

- diff --git a/portal/templates/smartfire/smartfire_authority_request_denied.txt b/portal/templates/smartfire/smartfire_authority_request_denied.txt deleted file mode 100644 index 44d522b7..00000000 --- a/portal/templates/smartfire/smartfire_authority_request_denied.txt +++ /dev/null @@ -1,18 +0,0 @@ -Dear SmartFIRE user, - -You have recently requested an addition of the following authority in the SmartFIRE portal ({{portal_url}}): - -Name of organization: {{site_name}} -Short name: {{short_name}} -Url: {{url}} -City: {{city}} -Country: {{country}} - - -After verifying your request, we regret to inform you that, we are unable to validate your request. -For any queries, contact us by replying to this email. - -We wish you all the best. - -Yours sincerely, -The SmartFIRE team diff --git a/portal/templates/smartfire/smartfire_authority_request_email.html b/portal/templates/smartfire/smartfire_authority_request_email.html deleted file mode 100644 index 72af5a71..00000000 --- a/portal/templates/smartfire/smartfire_authority_request_email.html +++ /dev/null @@ -1,22 +0,0 @@ - -
-

NEW AUTHORITY REQUEST

-
-

This email is only for SmartFIRE admins

-
-

{{site_name}}

-Authority hrn : {{authority_hrn}}
-Abreviated name : {{site_abbreviated_name}}
-URL : {{site_url}}
-City : {{address_city}}
-Country : {{address_country}}
- -

- -

PI for this Authority

-First Name : {{first_name}}
-Last Name : {{last_name}}
-Authority hrn: {{authority_hrn}}
-Public key : {{public_key}}
-Email : {{email}}
-User Hrn : {{user_hrn}}
diff --git a/portal/templates/smartfire/smartfire_authority_request_email.txt b/portal/templates/smartfire/smartfire_authority_request_email.txt deleted file mode 100644 index 93daae0b..00000000 --- a/portal/templates/smartfire/smartfire_authority_request_email.txt +++ /dev/null @@ -1,22 +0,0 @@ -This email is only for SmartFIRE admins. - -NEW AUTHORITY REQUEST - -Site : {{site_name}} - -Authority hrn : {{authority_hrn}} -Abreviated name : {{site_abbreviated_name}} -URL : {{site_url}} - - -City : {{address_city}} -Country : {{address_country}} - - -PI for this Authority -First Name : {{first_name}} -Last Name : {{last_name}} -Authority hrn: {{authority_hrn}} -Public key : {{public_key}} -Email : {{email}} -User Hrn : {{user_hrn}} diff --git a/portal/templates/smartfire/smartfire_authority_request_email_subject.txt b/portal/templates/smartfire/smartfire_authority_request_email_subject.txt deleted file mode 100644 index 1366a277..00000000 --- a/portal/templates/smartfire/smartfire_authority_request_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -SmartFIRE new Authority request submitted diff --git a/portal/templates/smartfire/smartfire_email_activation.html b/portal/templates/smartfire/smartfire_email_activation.html deleted file mode 100644 index 124f32ac..00000000 --- a/portal/templates/smartfire/smartfire_email_activation.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} - -
-

User RegistrationUser sign-up

-
-
- {% if activation_status == 'success' %} -

Signup request confirmed.

-

You are currently able to log in to the portal using your email address and the password that you have provided; however, your access is still limited.

-

You will have full access as soon as your account is validated by a manager at your organization. We have sent an email to your organisation's managers with a validation request.

- {% elif activation_status == 'validated' %} -

Account validated.

-

We have identified you as a valid PLE user. Your SmartFIRE account has automatically been approved.

-

You have a full access to SmartFIRE testbeds.

- {%else%} -

Signup confirmation failed.

-

You have probably arrived at this page by clicking a confirmation link in an email that we have sent to you. - We have been unable to match the link that you have clicked to a signup request in our database.

-

Please contact support so that we may help you complete the signup process.

- {%endif%} -
- -{% endblock %} diff --git a/portal/templates/smartfire/smartfire_email_default_recipients.txt b/portal/templates/smartfire/smartfire_email_default_recipients.txt deleted file mode 100644 index df7e93a1..00000000 --- a/portal/templates/smartfire/smartfire_email_default_recipients.txt +++ /dev/null @@ -1 +0,0 @@ -SmartFIRE Support diff --git a/portal/templates/smartfire/smartfire_email_default_sender.txt b/portal/templates/smartfire/smartfire_email_default_sender.txt deleted file mode 100644 index df7e93a1..00000000 --- a/portal/templates/smartfire/smartfire_email_default_sender.txt +++ /dev/null @@ -1 +0,0 @@ -SmartFIRE Support diff --git a/portal/templates/smartfire/smartfire_home-view.html b/portal/templates/smartfire/smartfire_home-view.html deleted file mode 100644 index 89fdf64b..00000000 --- a/portal/templates/smartfire/smartfire_home-view.html +++ /dev/null @@ -1,200 +0,0 @@ -{% extends "layout_base.html" %} -{% load portal_filters %} - -{% block content %} - -{% if username %} -{% widget "_widget-no_credentials.html" %} -
- {%if 'no_creds' in user_cred %} -

NO CREDENTIALS are delegated to the portal!

- {%endif%} - {%if 'creds_expired' in user_cred %} -

EXPIRED CREDENTIALS Please delegate again your credentials to the portal!

- {%endif%} - -
- {% if pi %} -
-

- EXPERIMENT -

-
- -
-
- -
-
-

Your slices - - - -

-
-
-
Loading Slices
-
-
-
-

MANAGEMENT

-
- -
-
- -
-
-
-

- SUPPORT -

-
- -
-
- -
-
- -
-

- ACCOUNT -

-
- -
-
- -
-
- {% if person.last_name %} - {{person.first_name}} {{person.last_name}}
- {% endif %} - Username: {{person.email}} -
-
-
- {%else%} -
-
-

- EXPERIMENT -

-
- -
-
- -
-
-

Your slices - - -

-
-
-
Loading Slices
-
- {% if pending_slices %} -

Pending slices - -

    - {% for slices in pending_slices %} -
  • {{slices}}
    • - {% endfor %} -
- -

- {%endif%} -
-
-

- SUPPORT -

-
- -
-
- -
-
- -
-

- ACCOUNT -

-
- -
-
- -
-
- {% if person.last_name %} - {{person.first_name}} {{person.last_name}}
- {% endif %} - Username: {{person.email}} -
-
-
- {%endif%} - -
-{% 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' %} -
-
-
-
-
-{% endif %} - - - - -{% endblock %} diff --git a/portal/templates/smartfire/smartfire_management-tab-requests.html b/portal/templates/smartfire/smartfire_management-tab-requests.html deleted file mode 100644 index e2557794..00000000 --- a/portal/templates/smartfire/smartfire_management-tab-requests.html +++ /dev/null @@ -1,226 +0,0 @@ - - -
-

From your 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 - {% endif %} - {% endif %} - {{ request.type }}{{ request.id }} - {% if request.type == 'user' %} - {{request.first_name}} {{request.last_name}} {{request.email}} - {% else %} - {% if request.type == 'slice' %} - {{request.slice_name}} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}} - {% else %} {# authority #} - {{request.site_name}} ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}} - {% endif %} - {% endif %} - {{ request.timestamp }}
- {% endfor %} - -{% else %} -
- There is no pending request waiting for validation. -
-{% endif %} -
nnllknjkn

-
-

From your sub-authorities

-
-{% if 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 %} - {{ 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. -
-{% endif %} - -
-

From your authorities with delegation

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

{{authority}}

-
- - - - - - - - {% 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 %} -{% else %} -
- There is no pending request waiting for validation. -
-{% endif %} -
- -
diff --git a/portal/templates/smartfire/smartfire_slice_request_denied.html b/portal/templates/smartfire/smartfire_slice_request_denied.html deleted file mode 100644 index 6c7d595e..00000000 --- a/portal/templates/smartfire/smartfire_slice_request_denied.html +++ /dev/null @@ -1,17 +0,0 @@ - -
-

Dear SmartFIRE user,

-

-

You have recently requested the following slice on the SmartFIRE portal({{portal_url}}):

-
-Slice name : {{slice_name}}
-URL : {{url}}
-Purpose : {{purpose}}
-
-

We regret to inform you that, a manager of your institution has not confirmed your request. Please contact the manager of your institution for further information. -For any other queries, please contact us by replying to this email.

-
-

We wish you a fruitful user experience on SmartFIRE.

-
-

Yours sincerely,

-

The SmartFIRE team

diff --git a/portal/templates/smartfire/smartfire_slice_request_denied.txt b/portal/templates/smartfire/smartfire_slice_request_denied.txt deleted file mode 100644 index e4b49903..00000000 --- a/portal/templates/smartfire/smartfire_slice_request_denied.txt +++ /dev/null @@ -1,14 +0,0 @@ -Dear SmartFIRE user, - -You have recently requested the following slice on the SmartFIRE portal({{portal_url}}): - -Slice name : {{slice_name}} -URL : {{url}} -Purpose : {{purpose}} - -We regret to inform you that, a manager of your institution has not confirmed your request. Please contact the manager of your institution for further information. For any other queries, please contact us by replying to this email. - -We wish you a fruitful user experience on SmartFIRE. - -Yours sincerely, -The SmartFIRE team diff --git a/portal/templates/smartfire/smartfire_slice_request_email_subject.txt b/portal/templates/smartfire/smartfire_slice_request_email_subject.txt deleted file mode 100644 index e3988dfc..00000000 --- a/portal/templates/smartfire/smartfire_slice_request_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -Slice request submitted diff --git a/portal/templates/smartfire/smartfire_slice_request_validated.html b/portal/templates/smartfire/smartfire_slice_request_validated.html deleted file mode 100644 index 2c96a1db..00000000 --- a/portal/templates/smartfire/smartfire_slice_request_validated.html +++ /dev/null @@ -1,21 +0,0 @@ - -
-

Dear SmartFIRE user,

-

-

You have recently requested a slice in the SmartFIRE portal.

-
-Slice name : {{slice_name}}
-URL : {{number_of_nodes}}
-Purpose : {{purpose}}
-

-

- We are pleased to inform you that a manager from your institution has validated your slice request on the SmartFIRE portal. - You can now add resources to you slice and start experimenting. -

-

-

We wish you a fruitful user experience with the SmartFIRE portal.

-

-

Yours sincerely,

-

The SmartFIRE team

- - diff --git a/portal/templates/smartfire/smartfire_slice_request_validated.txt b/portal/templates/smartfire/smartfire_slice_request_validated.txt deleted file mode 100644 index 571a3e4c..00000000 --- a/portal/templates/smartfire/smartfire_slice_request_validated.txt +++ /dev/null @@ -1,16 +0,0 @@ -Dear SmartFIRE user, - -You have recently requested a slice in the SmartFIRE portal. - -Slice name : {{slice_name}} -URL : {{number_of_nodes}} -Purpose : {{purpose}} - - -We are pleased to inform you that a manager from your institution has validated your slice request on the SmartFIRE portal. You can now add resources to you slice and start experimenting. - -We wish you a fruitful user experience with the SmartFIRE portal. - -Yours sincerely, -The SmartFIRE team - diff --git a/portal/templates/smartfire/smartfire_slicerequest_view.html b/portal/templates/smartfire/smartfire_slicerequest_view.html deleted file mode 100644 index 211f35da..00000000 --- a/portal/templates/smartfire/smartfire_slicerequest_view.html +++ /dev/null @@ -1,108 +0,0 @@ -{% extends "layout.html" %} -{% load i18n %} - -{% block content %} -
-
-
- Experiment  >  Request a new Slice -
-
-
- - {% if errors %} -
-
-
    - {% for error in errors %} -
  • {{ error }}
    • - {% endfor %} -
-
-
- {% endif %} - -
-
-
- {% csrf_token %} - -
- -
-
- {%if 'is_pi' in pi %} - - {%else%} - - {%endif%} -
-
- -
-
- -
- {%if 'is_pi' in pi %} - - {%else%} - - {%endif%} -
- -
-
- - -{% endblock %} - diff --git a/portal/templates/smartfire/smartfire_user_request_denied.html b/portal/templates/smartfire/smartfire_user_request_denied.html deleted file mode 100644 index 64678e3d..00000000 --- a/portal/templates/smartfire/smartfire_user_request_denied.html +++ /dev/null @@ -1,11 +0,0 @@ - -
-

Dear {{first_name}} {{last_name}},

-

-

You have recently registered as a user to SmartFIRE portal. We are sorry to inform you that, a manager of your institution has rejected your request. Please contact the manager of your institution for further information. For any other queries, contact us by replying to this email.

-

-

We wish you all the best.

-

-

Yours sincerely,

-

The SmartFIRE team

- diff --git a/portal/templates/smartfire/smartfire_user_request_denied.txt b/portal/templates/smartfire/smartfire_user_request_denied.txt deleted file mode 100644 index 29edc211..00000000 --- a/portal/templates/smartfire/smartfire_user_request_denied.txt +++ /dev/null @@ -1,8 +0,0 @@ -Dear {{first_name}} {{last_name}}, - -You have recently registered as a user to SmartFIRE portal. We are sorry to inform you that, a manager of your institution has rejected your request. Please contact the manager of your institution for further information. For any other queries, contact us by replying to this email. - -We wish you all the best. - -Yours sincerely, -The SmartFIRE team diff --git a/portal/templates/smartfire/smartfire_user_request_email.html b/portal/templates/smartfire/smartfire_user_request_email.html deleted file mode 100644 index 92c1cb4a..00000000 --- a/portal/templates/smartfire/smartfire_user_request_email.html +++ /dev/null @@ -1,16 +0,0 @@ - -
-

NEW USER REQUEST

-
-First name : {{first_name}}
-Last name : {{last_name}}
-Organization : {{organization}}
-Authority hrn: {{authority_hrn}}
-Public key : {{public_key}}
-Email : {{email}}
-User hrn : {{user_hrn}}
-Portal url : {{ current_site }}
-

-

You can validate the user here.

-
-

Please note that the validation request will only become visible once the user has confirmed his/her email address.

diff --git a/portal/templates/smartfire/smartfire_user_request_email.txt b/portal/templates/smartfire/smartfire_user_request_email.txt deleted file mode 100644 index 17ce1842..00000000 --- a/portal/templates/smartfire/smartfire_user_request_email.txt +++ /dev/null @@ -1,14 +0,0 @@ -NEW USER REQUEST - -First name : {{first_name}} -Last name : {{last_name}} -Organization :{{organization}} -Authority hrn: {{authority_hrn}} -Public key : {{public_key}} -Email : {{email}} -User hrn : {{user_hrn}} -Portal url : {{ current_site }} - -Please note that the validation request will only become visible once the user has confirmed his/her email address. - - diff --git a/portal/templates/smartfire/smartfire_user_request_email_subject.txt b/portal/templates/smartfire/smartfire_user_request_email_subject.txt deleted file mode 100644 index a373b60f..00000000 --- a/portal/templates/smartfire/smartfire_user_request_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -User request submitted diff --git a/portal/templates/smartfire/smartfire_user_request_validated.html b/portal/templates/smartfire/smartfire_user_request_validated.html deleted file mode 100644 index 7997a180..00000000 --- a/portal/templates/smartfire/smartfire_user_request_validated.html +++ /dev/null @@ -1,14 +0,0 @@ - -
-

Dear {{first_name}} {{last_name}},

-

-

It is my pleasure to welcome you as a fully signed-up user of the SmartFIRE experimental facility. SmartFIRE provides you with access to world class computer networking testbeds. Our aim at SmartFIRE is to promote the use of these testbeds for pre-commercial research and development by industry, for scientific research, and for university level laboratory exercises.

-

-

-Your entry point for access to the testbeds is the SmartFIRE portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or individual nodes on the testbed with your SmartFIRE public/private key pair, or you may use an experiment control tool such as as OMF. The SmartFIRE operations team is standing by at support@onelab.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them. -

-

-

We wish you a fruitful user experience with the SmartFIRE portal.

-

-

Yours sincerely,

-

The SmartFIRE team

diff --git a/portal/templates/smartfire/smartfire_user_request_validated.txt b/portal/templates/smartfire/smartfire_user_request_validated.txt deleted file mode 100644 index b546b19d..00000000 --- a/portal/templates/smartfire/smartfire_user_request_validated.txt +++ /dev/null @@ -1,10 +0,0 @@ -Dear {{first_name}} {{last_name}}, - -It is our pleasure to welcome you as a fully signed-up user of the SmartFIRE experimental facility. SmartFIRE provides you with access to world class computer networking testbeds.. Our aim at SmartFIRE is to promote the use of these testbeds for pre-commercial research and development by industry, for scientific research, and for university level laboratory exercises. - -Your entry point for access to the testbeds is the SmartFIRE portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or to individual nodes on the testbed with your SmartFIRE public/private key pair, or you may use an experiment control tool such as as OMF. The SmartFIRE operations team is standing by at support@onelab.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them. - -We wish you a fruitful user experience with the SmartFIRE portal. - -Yours sincerely, -The SmartFIRE team diff --git a/portal/templates/smartfire/smartfire_widget-topmenu.html b/portal/templates/smartfire/smartfire_widget-topmenu.html index de34e320..63ae5814 100644 --- a/portal/templates/smartfire/smartfire_widget-topmenu.html +++ b/portal/templates/smartfire/smartfire_widget-topmenu.html @@ -19,7 +19,7 @@
- {%if pi %} + {% if request.session.user.pi %} {%endif%}
  • SUPPORT
    • -- 2.43.0