SmartFIRE templates updates
authorLoic Baron <loic.baron@lip6.fr>
Thu, 21 May 2015 16:21:36 +0000 (18:21 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 21 May 2015 16:21:36 +0000 (18:21 +0200)
32 files changed:
portal/static/css/smartfire.css
portal/static/img/smartfire_favicon.ico [new file with mode: 0644]
portal/templates/_slogan.html
portal/templates/base.html
portal/templates/home-view.html
portal/templates/smartfire/smartfire_account-view.html [deleted file]
portal/templates/smartfire/smartfire_activate_user.html [deleted file]
portal/templates/smartfire/smartfire_activate_user.txt [deleted file]
portal/templates/smartfire/smartfire_authority_request_denied.html [deleted file]
portal/templates/smartfire/smartfire_authority_request_denied.txt [deleted file]
portal/templates/smartfire/smartfire_authority_request_email.html [deleted file]
portal/templates/smartfire/smartfire_authority_request_email.txt [deleted file]
portal/templates/smartfire/smartfire_authority_request_email_subject.txt [deleted file]
portal/templates/smartfire/smartfire_email_activation.html [deleted file]
portal/templates/smartfire/smartfire_email_default_recipients.txt [deleted file]
portal/templates/smartfire/smartfire_email_default_sender.txt [deleted file]
portal/templates/smartfire/smartfire_home-view.html [deleted file]
portal/templates/smartfire/smartfire_management-tab-requests.html [deleted file]
portal/templates/smartfire/smartfire_slice_request_denied.html [deleted file]
portal/templates/smartfire/smartfire_slice_request_denied.txt [deleted file]
portal/templates/smartfire/smartfire_slice_request_email_subject.txt [deleted file]
portal/templates/smartfire/smartfire_slice_request_validated.html [deleted file]
portal/templates/smartfire/smartfire_slice_request_validated.txt [deleted file]
portal/templates/smartfire/smartfire_slicerequest_view.html [deleted file]
portal/templates/smartfire/smartfire_user_request_denied.html [deleted file]
portal/templates/smartfire/smartfire_user_request_denied.txt [deleted file]
portal/templates/smartfire/smartfire_user_request_email.html [deleted file]
portal/templates/smartfire/smartfire_user_request_email.txt [deleted file]
portal/templates/smartfire/smartfire_user_request_email_subject.txt [deleted file]
portal/templates/smartfire/smartfire_user_request_validated.html [deleted file]
portal/templates/smartfire/smartfire_user_request_validated.txt [deleted file]
portal/templates/smartfire/smartfire_widget-topmenu.html

index 4627124..5d17099 100644 (file)
@@ -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 (file)
index 0000000..860043e
Binary files /dev/null and b/portal/static/img/smartfire_favicon.ico differ
index 4424695..299e0ec 100644 (file)
@@ -1,8 +1,4 @@
 <div class="col-sm-4 slogan">
-    <h2>
-        Your Easy Access to Computer Networking Testbeds:
-    </h2>
-    <h3>
-        A wide variety of world class testbeds available through your one account
-    </h3>
+<h1>Welcome!</h1>
+&nbsp;
 </div>
index ceebc5d..8bc204a 100644 (file)
@@ -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();
 });
index 955ab16..55d7403 100644 (file)
@@ -93,7 +93,7 @@
 <div class="container-fluid home">
        <div class="">
         <div class="col-sm-2"></div>
-        {% include theme|add:"_slogan.html" %}
+        {% widget '_slogan.html' %}
         <div class="col-sm-5 col-sm-offset-1">
             <div class="row">
                 {% 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 (file)
index 985974f..0000000
+++ /dev/null
@@ -1,374 +0,0 @@
-{% extends "layout.html" %}
-{% load portal_filters %}
-{% block content %}
-{% widget "_widget-no_credentials.html" %}
-{% widget "_widget-tradeoff.html" %}
-<div class="row">
-       <div class="col-md-12">
-                <div class="breadcrumbs">
-                        Account &nbsp;>&nbsp; <a href="/account">{{ person.email }}</a>
-                </div>
-       </div>
-        {%if 'no_creds' in user_cred %}
-    <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">NO CREDENTIALS</a> are delegated to the portal!</p>
-    {%endif%}
-        {%if 'creds_expired' in user_cred %}
-    <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">EXPIRED CREDENTIALS</a> Please delegate again your credentials to the portal!</p>
-    {%endif%}
-
-</div>
-{% if messages %}
-<ul class="messages">
-    {% for message in messages %}
-    <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-    {% endfor %}
-</ul>
-{% endif %}
-
-<form id="editForm" method="post" action="account_process" enctype="multipart/form-data">
-<input type="hidden" id="button_value"  name="button_value" value="" />
-
-<div class="row">
-       <div class="col-md-12">
-               <ul class="nav nav-tabs nav-section">
-                       <li class="active"><a href="#profile">User Profile</a></li>
-                       <li><a href="#account">Account</a></li>
-                       <li><a href="#access">Testbed Access</a></li>
-               </ul>
-    </div>
-</div>
-<div class="tab-content">
-       <div class="tab-pane active row" id="profile">
-               
-               <div class="col-md-12">
-
-                               {% csrf_token %}
-                                       <table class="profile">          
-                                       <tr>
-                                               <td colspan="2">
-                                                               <div><h3>Platform: Myslice</h3></div>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td class="key">Email</td>
-                                               <td class="value">
-                                                               <span id="emailval" class="value" >{{ person.email }}</span>
-                                                               <button class="btn btn-default" type="button" id="edit_email" onclick="editAlert();"  title="To change your affiliation please contact the administrator">
-                                                               <span class="glyphicon glyphicon-question-sign"></span> Edit
-                                                               </button>
-                                                       </td>
-                                       </tr>
-                                       <tr class="odd">
-                                                       <td class="key">Password</td>
-                                                       <td class="value"> 
-                                                               <button class="btn btn-default btn-xs" type="button" title="Password" name="edit_pass" id="edit_pass">
-                                                                       <span class="glyphicon glyphicon-edit"></span> Edit
-                                                               </button>
-                                                               <span id="passval"class="value">******** </span>
-                                                               <span class="hide_this" id="span_pass">
-                                                               <button type="button" class="btn btn-default btn-xs" title="Cancel" id="cancel_pass_change"> Cancel </button>
-                                                               <div style='display:none;' id="pass_form">
-                                                               <input type='hidden'  value='' /></div>
-                                                               <table id="edit_password">
-                                                                       <tr>
-                                                                                       <td>Enter password: </td>
-                                                                                       <td class="field"> <input type="password" name="password" id="password" /> </td>
-                                                                               </tr>
-                                                                               <tr>
-                                                                                       <td>Confirm password: </td>
-                                                                                       <td class="field"> 
-                                                                                               <input type="password" name="confirmpassword" id="confirmpassword" /> 
-                                                                                               <input type="submit" class="btn btn-default btn-xs" name="submit_pass" value="Save"/> 
-                                                                                       </td>
-                                                                       </tr>
-                                                               </table>
-                                                               </span> 
-                                                       </td>
-                                       </tr>
-                                       <tr class="even">
-                                                       <td class="key">Full Name</td>
-                                                       <td class="value">
-                                                               <span id="nameval" class="value" >{{ fullname }} </span>
-                                                               <span class="hide_this" id="span_name">
-                                                               <button type="button" class="btn btn-default btn-xs" title="Cancel" id="cancel_name_change"> Cancel </button> 
-                                                               <div style='display:none;'><input type='hidden'  name='nameform'  /></div>
-                                                               <input id="fname" type="text" name="fname" class="required"  maxlength="200" value="{{firstname}}" />
-                                                               <input id="lname" type="text" name="lname" class="required"  maxlength="200" value="{{lastname}}" />
-                                                               <input type="submit" class="btn btn-default btn-xs" name="submit_name" value="Save"/>
-                                                               </span>
-                                                               <button class="btn btn-default btn-xs" type="button"title="Full Name" id="edit_name">
-                                                                       <span class="glyphicon glyphicon-edit"></span> Edit
-                                                               </button>
-                                                       </td>
-                                       </tr>
-                                       <tr class="odd">
-                                                       <td class="key">Authority</td>
-                                                       <td class="value">
-                                                               <span id="affval" class="value">{{ authority }}</span>
-                                                                <button class="btn btn-default btn-xs" type="button" id="edit_auth" onclick="editAlert()"  title="To change your authority please contact the administrator">
-                                                               <span class="glyphicon glyphicon-question-sign"></span> Edit
-                                                                </button>
-                                                       </td>
-                                               </tr>
-                                               {%if 'Enabled'  in user_status %}
-                                               <tr class="even">
-                                                       <td class="key">Generate Keys</td>
-                                                       <td>
-                                                               <input type="submit" name="generate" class="btn btn-primary" value="Generate a new Key Pair" id="generate_keypair" 
-                                                                          onclick="return confirm('Are you sure? If you do so, your current credentials will be overwritten.');" 
-                                                                          title="It will generate a new key Pair and your current credentials will be overwritten."/>
-                                               </td> 
-                                       </tr>
-                                       <tr class="odd">
-                                               <td class="key">Public Key</td>
-                                               <td class="value">
-                                                               <span id="keyval" class="value">******** </span>
-                                                               <span class="hide_this" id="span_upload">
-                                                                       <button type="button" class="btn btn-default" title="Cancel" id="cancel_upload"> Cancel </button>
-                                                                       <div style='display:none;'>
-                                                                               <input type='hidden'  name='upload'  /></div>
-                                                                               <input type="file" name="pubkey" class="required" id="pubkey"/>  
-                                                                               <input class="btn btn-default btn-xs" name="upload_key" id="upload_key"  type="submit" title="Upload your public key" value="Upload"
-                                                                                  onclick="return confirm('Are you sure? It will overwrite your current credentials and you have delegate it manually.');"/>
-                                                               </span>
-                                                               <div style='display:none;'> <input type='hidden'  name='dload'  /> </div> 
-                                                               <button type="submit" name="dl_pubkey" class="btn btn-default btn-xs" title="Download your public key" id="dl_pubkey" onclick="javascript:document.getElementById('button_value').value='dl_pubkey';">
-                                                                       <span class="glyphicon glyphicon-download"></span> Download
-                                                               </button>
-                                                               <button class="btn btn-default btn-xs" id="upload_file" type="button" title="Upload a public key">
-                                                                       <span class="glyphicon glyphicon-upload"></span> Upload
-                                                               </button>       
-                                               </td>
-                                       </tr>
-                                       <tr class="even" id="pkey_row">
-                                                {%if 'N/A' not in user_private_key%}
-                                               <td class="key">Private Key </td> <!-- Hide if priv_key doesn't exist in myslice platform   -->
-                                               <td class="value">********<a href="#"></a>
-                                                       <button type="submit" name="dl_pkey" class="btn btn-default" title="Download your privaye key" id="dl_pkey" value="dl_pkey" onclick="javascript:document.getElementById('button_value').value='dl_pkey';">
-                                                                       <span class="glyphicon glyphicon-download"></span> Download     
-                                                               </button>
-                                                       <input class="btn btn-danger btn-xs" id="delete" name="delete" type="submit"  value="Delete" title="Delete your private key"
-                                                                               onclick="javascript:document.getElementById('button_value').value='delete'; return confirm('Are you sure? If you do so, you have to delegate your credentials manually.');"/> 
-                                               </td>
-                                                 {%else%}
-                                                       <td class="key">Private Key </td> <!-- Hide if priv_key doesn't exist in myslice platform   -->
-                                                       <td class="value">********<a href="#"></a>
-                                                       <button type="submit" name="dl_pkey" class="btn btn-default disabled" title="Download your privaye key" id="dl_pkey" value="dl_pkey">
-                                                               <span class="glyphicon glyphicon-download"></span> Download 
-                                                       </button>
-                                                       <input class="btn btn-danger btn-xs disabled" id="delete" name="delete" type="submit" title="Delete your private key" value="Delete" />
-                                                       </td>
-                                                {%endif%}              
-                                               </tr>
-                                       <tr class="even" id="sfi_config_row">
-                                               <td class="key">sfi_config </td>
-                                               <td class="value">use sfi_config file with sfi.py package (pip install sfa)<a href="#"></a>
-                                                       <button type="submit" name="dl_sfi_config" class="btn btn-default btn-xs" title="Download your sfi_config" id="dl_sfi_config" value="dl_sfi_config" onclick="javascript:document.getElementById('button_value').value='dl_sfi_config';">
-                                                                       <span class="glyphicon glyphicon-download"></span> Download
-                                                               </button>
-                                               </td>
-                        </tr>
-                                               <tr class="odd">
-                                                       {%if 'N/A' not in user_private_key%}
-                                                       <td class="key">Identity</td> 
-                                               <td>
-                                                               <button type="submit" name="dl_identity" class="btn btn-default btn-xs" title="You will require it to use jfed" id="dl_identity" onclick="javascript:document.getElementById('button_value').value='dl_identity';">
-                                                               <span class="glyphicon glyphicon-download"></span> Download 
-                                                               </button>
-                                                       </td>
-                                                       {%else%}
-                                                       <td class="key">Identity</td> 
-                                                       <td>
-                                                       <button type="submit" name="dl_identity" class="btn btn-default btn-xs disabled" title="You will require it to use jfed" id="dl_identity">
-                                                               <span class="glyphicon glyphicon-download"></span> Download 
-                                                       </button>
-                                                       </td>
-                                                       {%endif%} 
-                                               </tr>
-
-                                               <tr class="even">
-                                               <td colspan="2">
-                                                               <p class="command">
-                                                                       <a href="#" style="color:green" data-toggle="modal" data-target="#tradeoffmodal">Automatic vs. Manual delegation of credentials:</a>
-                                                                       Trade-off between ease-of-use & security</p>
-                                                               </p>
-                                               </td>
-                                               </tr>
-                                               {%endif%}
-                                       </table>
-                       
-               </div>
-       </div>
-
-       <div class="tab-pane row" id="account">
-               <div class="col-md-12">
-       
-               <h3>Principal Account <small>Account used for delegating credentials</small></h3>
-               <table class="table"> 
-                       <tr class="odd"> 
-                       <th>Platform</th> 
-                       <th>Account Type</th>
-                               <th>Account Delegation</th>
-                       <th>User hrn</th>
-                               <th>User Status</th>
-                       <!--<th>Pub Key</th> -->
-               </tr>   
-                       {% for row in principal_acc %}         
-                       <tr class="border_bottom">
-                       <td class="odd"> {{ row.platform_name }} </td>
-                       <td class="odd"> {{ row.account_type }} </td>
-                               <td class="odd"> {{ row.delegation_type }} </td>
-                               <td class="odd"> {{ row.usr_hrn }}  </td>
-                               <td class="odd"> {{ row.user_status }}  </td>
-               <!--    <td class="even"> {{ row.usr_pubkey }} </td> -->
-               </tr> 
-                       {%endfor%}               
-               </table>
-       
-               </div>
-
-       {%if 'Enabled'  in user_status %}
-               <div class="col-md-12">
-               <h3>Credentials <small>Delegated to Principal Account</small></h3>
-                   <table class="table">
-                               <caption><b>Delegated User Credential</b></caption> 
-                       <tr class="odd"> 
-                           <th>Expiration Date</th>
-                                       <th>Download</th>
-                       </tr>
-                               {% for row in my_users %}         
-                               <tr class="border_bottom">
-                               <td class="odd"> {{ row.cred_exp }} </td>
-                                       <td class="odd">
-                                               <button class="btn btn-default btn-xs" name= "dl_user_cred" type="submit" title="Download User Credential" onclick="javascript:document.getElementById('button_value').value='dl_user_cred';">
-                                                       <span class="glyphicon glyphicon-download"></span> Credential
-                                               </button>
-                                               <button class="btn btn-default btn-xs" name= "dl_user_cert" type="submit" title="Download User Certificate" onclick="javascript:document.getElementById('button_value').value='dl_user_cert';">
-                                                       <span class="glyphicon glyphicon-download"></span> Certificate
-                                               </button>
-                         <button class="btn btn-default btn-xs" name= "dl_user_p12" type="submit" title="Download User PKCS12" onclick="javascript:document.getElementById('button_value').value='dl_user_p12';">
-                             <span class="glyphicon glyphicon-download"></span> PKCS p12
-                         </button>
-                                       </td>
-                               </tr>
-                               {%endfor%}
-                        </table>
-                       <p></p>
-                       <table class="mytable table table-bordered table-hover">
-                               <caption><b>Delegated Slice Credentials</b></caption>  
-                       <tr class="odd"> 
-                                       <th>Slice Name</th> 
-                               <th>Expiration Date</th>
-                                       <th>Download</th>
-                       </tr>
-                               {% for row in my_slices %}     
-                       <tr class="border_bottom">
-                               <td class="odd"> {{ row.slice_name }} </td>
-                                       <td class="odd"> {{ row.cred_exp }} </td>
-                                       <td class="odd"> 
-                                               <button class="btn btn-default btn-xs" name= "dl_{{row.slice_name}}" type="submit" title="Download Slice Credentials" onclick="javascript:document.getElementById('button_value').value='dl_{{row.slice_name}}';">
-                                                       <span class="glyphicon glyphicon-download"></span> Download
-                                               </button> 
-                                       </td>
-                       </tr>
-                       {%endfor%}
-                       </table>
-                       <p></p>
-                       <table class="mytable table table-bordered table-hover">
-                               <caption><b>Delegated Authority Credentials</b></caption>
-                               <tr class="odd"> 
-                               <th>Authority Name</th> 
-                               <th>Expiration Date</th>
-                                       <th>Download</th>
-                               </tr>
-                               {% for row in my_auths %}
-                               <tr class="border_bottom">
-                               <td class="odd"> {{ row.auth_name }} </td>
-                               <td class="odd"> {{ row.cred_exp }} </td>
-                                       <td class="odd">
-                                               <button class="btn btn-default btn-xs" name= "dl_{{row.auth_name}}" type="submit" title="Download Authority Credentials" onclick="javascript:document.getElementById('button_value').value='dl_{{row.auth_name}}';">
-                                                       <span class="glyphicon glyphicon-download"></span> Download
-                                               </button>
-                                       </td>
-                               </tr>
-                               {%endfor%}
-                       </table>
-                       <p></p>
-                        {%if '' not in my_users%}      
-                       <p><button class="btn btn-danger btn-lg btn-block"   name= "clear_cred" type="submit" title="Clear All Credentials" onclick="javascript:document.getElementById('button_value').value='clear_cred';">Clear Credentials</button></p>
-                       {%else%}
-                       <p><button class="btn btn-danger btn-lg btn-block disabled"   name= "clear_cred" type="submit" title="Clear All Credentials">Clear Credentials</button></p>
-                       {%endif%}
-               </div>
-       </div>
-
-
-       <div class="tab-pane row" id="access">
-               <div class="col-md-12">
-       
-               <h3>Testbed Access <small>Reference Accounts in the following testbeds</small></h3>
-        <table class="mytable table table-bordered table-hover"> 
-            <tr class="odd"> 
-                <th>Platform</th> 
-                <th>Account Type</th>
-                               <th>Reference to</th>
-                               <th>Remove Account</th>
-            </tr>   
-            {% for row in ref_acc %}         
-            <tr class="border_bottom">
-                <td class="odd"> {{ row.platform_name }} </td>
-                <td class="odd"> {{ row.account_type }} </td>
-                               <td class="odd"> {{ row.account_reference }} </td>
-                               <td class="odd">
-                               <button class="btn btn-danger" name="delete_{{row.platform_name}}" type="submit" title="Delete account from this platform" onclick="javascript:document.getElementById('button_value').value='delete_{{row.platform_name}}';">
-                                               <span class="glyphicon glyphicon-minus"></span>
-                                       </button>
-                               </td>
-            </tr> 
-            {%endfor%}               
-        </table>               
-               
-               
-               <h3>Add reference account to the following testbeds</h3>
-        <table class="mytable table table-bordered table-hover"> 
-            <tr class="odd"> 
-                <th>Platforms</th> 
-                <th>Add Account</th>
-            </tr>   
-            {% for platform in platform_list %}         
-            <tr class="border_bottom">
-                <td class="odd"> {{ platform.platform_no_access }} </td>
-                <td class="odd">
-                                       <button class="btn btn-success btn-sm" name= "add_{{platform.platform_no_access}}" type="submit" title="Add account to this platform" onclick="javascript:document.getElementById('button_value').value='add_{{platform.platform_no_access}}';">
-                                               <span class="glyphicon glyphicon-plus"></span>
-                                       </button>
-                               </td>
-            </tr> 
-            {%endfor%}               
-        </table>
-       </div>
-{%endif%} 
-</div>
-</div>
-
-</form>
-<script>
-    $(document).ready(function() {
-           {%if 'no_creds' in user_cred or 'creds_expired' in user_cred %}
-        localStorage.clear();
-        $.post("/cache/clear/", function( data ) {
-        });
-        {% endif %}
-       $('.nav-tabs a').click(function (e) {
-                       e.preventDefault();
-                       $(this).tab('show');
-                       id = $(this).attr('href').substr(1);
-               });
-               
-        $('button#createslice').click(function() {
-            window.location="/portal/slice_request/";
-        });
-    });
-</script>
-
-{% endblock %}
diff --git a/portal/templates/smartfire/smartfire_activate_user.html b/portal/templates/smartfire/smartfire_activate_user.html
deleted file mode 100644 (file)
index 04884b0..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<img src="http://eukorea-fire.eu/wp-content/uploads/2014/02/SmartFIRE_logo.png">
-<br>
-<p>We have received a user signup request for your email address at {{current_site}}</p>
-<p>You have the following user details:</p>
-
-Organization: {{organization}}<br>
-First name: {{first_name}}<br>
-Last name: {{last_name}}<br>
-Email: {{email}}<br>
-
-<p></p>
-<p>
-You may now <a href="{{current_site}}">log</a> 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:
-</p>
-
-<ul style="list-style-type:decimal;">
-<li>
-You must confirm that you have indeed made this request by clicking on the following link: <br>
-       <a href={{validation_link}}>{{validation_link}}</a> 
-       <ul><li>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.</li></ul>
-</li>
-<li>
-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.
-</li>
-</ul>
-<p>
-We look forward to welcoming you to SmartFIRE. You will find answers to frequently asked questions <a href="{{current_site}}/support/">here</a>. 
-Please don't hesitate to <a href="{{current_site}}/contact/">contact us</a> with any additional questions that you might have.
-</p>
diff --git a/portal/templates/smartfire/smartfire_activate_user.txt b/portal/templates/smartfire/smartfire_activate_user.txt
deleted file mode 100644 (file)
index ac84bc3..0000000
+++ /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 (file)
index e4da271..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<img src="http://eukorea-fire.eu/wp-content/uploads/2014/02/SmartFIRE_logo.png">
-<br>
-<p>Dear SmartFIRE user,</p>
-<p></p>
-<p>You have recently requested an addition of the following authority in the SmartFIRE portal ({{portal_url}}):</p> 
-<p></p>
-<b>Name of organization:</b> {{site_name}}<br>
-<b>Short name:</b> {{short_name}}<br>
-<b>Url:</b> {{url}}<br>
-<b>City:</b> {{city}}<br>
-<b>Country:</b> {{country}}<br>
-<p></p>
-</p>After verifying your request, we regret to inform you that, we are unable to validate your request.</p>
-<p>For any queries, contact us by replying to this email.</p>
-<br>
-<p>We wish you all the best.</p>
-<br>
-<p>Yours sincerely,</p>
-<p>The SmartFIRE team</p>
-
diff --git a/portal/templates/smartfire/smartfire_authority_request_denied.txt b/portal/templates/smartfire/smartfire_authority_request_denied.txt
deleted file mode 100644 (file)
index 44d522b..0000000
+++ /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 (file)
index 72af5a7..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<img src="http://eukorea-fire.eu/wp-content/uploads/2014/02/SmartFIRE_logo.png">
-<br>
-<h1>NEW AUTHORITY REQUEST</h1>
-<br>
-<p>This email is only for SmartFIRE admins</p>
-<br>
-<h2>{{site_name}}</h2>             
-<b>Authority hrn    :</b> {{authority_hrn}}<br>         
-<b>Abreviated name  :</b> {{site_abbreviated_name}}<br>
-<b>URL              :</b> {{site_url}}<br>              
-<b>City             :</b> {{address_city}}<br>          
-<b>Country          :</b> {{address_country}}<br>  
-
-<br><br>
-
-<h2>PI for this Authority</h2>     
-<b>First Name   :</b> {{first_name}}<br>
-<b>Last Name    :</b> {{last_name}}<br>
-<b>Authority hrn:</b> {{authority_hrn}}<br>
-<b>Public key   :</b> {{public_key}}<br>
-<b>Email        :</b> {{email}}<br>
-<b>User Hrn     :</b> {{user_hrn}}<br>
diff --git a/portal/templates/smartfire/smartfire_authority_request_email.txt b/portal/templates/smartfire/smartfire_authority_request_email.txt
deleted file mode 100644 (file)
index 93daae0..0000000
+++ /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 (file)
index 1366a27..0000000
+++ /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 (file)
index 124f32a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-
-<div class="row">
-       <h1><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="User Registration" />User sign-up</h1>
-</div>
-<div class="row">
-       {% if activation_status == 'success' %}
-               <h3>Signup request confirmed.</h3>
-               <p>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.</p> 
-               <p>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.</p>
-    {% elif activation_status == 'validated' %}
-               <h3>Account validated.</h3>
-               <p>We have identified you as a valid PLE user. Your SmartFIRE account has automatically been approved.</p>
-        <p>You have a full access to SmartFIRE testbeds.</p>
-       {%else%}
-               <h3>Signup confirmation failed.</h3>
-               <p>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.</p>
-               <p>Please <a href="/portal/contact/">contact support</a> so that we may help you complete the signup process.</p>
-       {%endif%}
- </div>
-
-{% 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 (file)
index df7e93a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SmartFIRE Support <support@onelab.eu>
diff --git a/portal/templates/smartfire/smartfire_email_default_sender.txt b/portal/templates/smartfire/smartfire_email_default_sender.txt
deleted file mode 100644 (file)
index df7e93a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SmartFIRE Support <support@onelab.eu>
diff --git a/portal/templates/smartfire/smartfire_home-view.html b/portal/templates/smartfire/smartfire_home-view.html
deleted file mode 100644 (file)
index 89fdf64..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-{% extends "layout_base.html" %}
-{% load portal_filters %}
-
-{% block content %}
-<!-- <div class="row">
-{% widget '_widget-news.html' %}
-</div> -->
-{% if username %}
-{% widget "_widget-no_credentials.html" %}
-<div class="container dashboard">
-       {%if 'no_creds'  in user_cred %}
-        <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">NO CREDENTIALS</a> are delegated to the portal!</p>
-    {%endif%}
-       {%if 'creds_expired'  in user_cred %}
-        <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">EXPIRED CREDENTIALS</a> Please delegate again your credentials to the portal!</p>
-    {%endif%}
-
-       <div class="row">
-               {% if pi %}
-               <div class="col-md-3">
-                       <h3>
-                               EXPERIMENT
-                       </h3>
-                       <div>
-                               <a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create Slice</button>
-                       </div>
-                       <div>
-                               <p><strong>Your slices </strong>
-                                       <span title="A slice is a set of testbed resources on which you can conduct an experiment. 
-                                       Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'." 
-                                       class="glyphicon glyphicon-info-sign">
-                               </span>
-
-                               </p>
-                       </div>
-                       <div>   
-                               <div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
-                       </div>
-               </div>
-               <div class="col-md-3">
-                       <h3>MANAGEMENT</h3>
-                       <div>
-                               <a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
-                       </div>
-               </div>
-               <div class="col-md-3">
-                       <h3>
-                               SUPPORT
-                       </h3>
-                       <div>
-                               <a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button>
-                       </div>
-               </div>
-               
-               <div class="col-md-3">
-                       <h3>
-                               ACCOUNT
-                       </h3>
-                       <div>
-                               <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
-                       </div>
-                       <div>
-                               {% if person.last_name %}
-                                       {{person.first_name}} {{person.last_name}}<br />
-                               {% endif %}
-                       <span class="label">Username:</span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
-               </div>
-               </div>
-       </div>
-       {%else%}
-       <div class="row">
-               <div class="col-md-4">
-                       <h3>
-                               EXPERIMENT
-                       </h3>
-                       <div>
-                               <a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
-                       </div>
-                       <div>
-                               <p><strong>Your slices </strong>
-                               <span title="A slice is a set of testbed resources on which you can conduct an experiment. 
-                                       Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'."
-                                       class="glyphicon glyphicon-info-sign">
-                               </span>
-                               </p>
-                       </div>
-                       <div>   
-                               <div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
-                       </div>
-                       {% if pending_slices %}
-                       <p><strong>Pending slices</strong>
-                       <span title="Slices that you have requested and are pending for validation by the contact person of your organization."
-                               class="glyphicon glyphicon-info-sign">
-                       <ul>
-                       {% for slices in pending_slices %}
-                       <li>{{slices}}</li>
-                       {% endfor %}
-                       </ul>
-                       </span>
-                       </p>
-                       {%endif%}       
-               </div>
-               <div class="col-md-4">
-                       <h3>
-                               SUPPORT
-                       </h3>
-                       <div>
-                               <a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button>
-                       </div>
-               </div>
-               
-               <div class="col-md-4">
-                       <h3>
-                               ACCOUNT
-                       </h3>
-                       <div>
-                               <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
-                       </div>
-                       <div>
-                               {% if person.last_name %}
-                                       {{person.first_name}} {{person.last_name}}<br />
-                               {% endif %}
-                       <span class="label">Username:</span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
-               </div>
-               </div>
-       </div>
-       {%endif%}
-
-</div>
-{% else %}
-<div class="container-fluid home">
-       <div class="">
-               <div class="col-sm-2"></div>
-               <div class="col-sm-4 slogan">
-                       <h2>
-                               Your Easy Access to Computer Networking Testbeds:
-                       </h2>
-                       <h3>
-                               A wide variety of world class testbeds available through your one account
-                       </h3>
-               </div>
-               <div class="col-sm-5 col-sm-offset-1">
-                       <div class="row">
-                               {% widget '_widget-login-user.html' %}
-                       </div>
-               </div>
-               <div class="col-sm-1"></div>
-       </div>
-</div>
-{% endif %}
-
-
-<script type="text/javascript">
-       $(document).ready(function() {
-               $('a.home-tab').click(function() {
-                       $('ul.nav-tabs li').removeClass('active');
-                       $(this).parent().addClass('active');
-                       $('div.home-panel').hide();
-                       $('div#'+$(this).data('panel')).show();
-               });
-               $('button#validaterequestbtn').click(function() {
-                       window.location="/portal/institution#requests";
-               });
-               $('button#ticketbtn').click(function() {
-                       window.location="/portal/contact/";
-               });
-               $('button#signupbtn').click(function() {
-                       window.location="/portal/register/";
-               });
-               $('button#slicerequestbtn').click(function() {
-                       window.location="/portal/slice_request/";
-               });
-
-        myslice.loadSlices();
-        
-});
-</script>
-
-{% 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 (file)
index e255779..0000000
+++ /dev/null
@@ -1,226 +0,0 @@
-<script type="text/javascript">
-       $(document).ready(function() {
-               $("li#nav-request").addClass("active");
-       });
-       function on_click_event() {
-               var ids = []; 
-               $('.portal__validate__checkbox').each(function(i, el) {
-                       if ($(el).prop('checked')) {
-                               // portal__validate__checkbox__slice__2
-                               var id_array = $(el).attr('id').split('__');
-                               // push(slice__2)
-                               ids.push(id_array[3] + '__' + id_array[4]);
-                       }
-               });
-               if (ids.length > 0) {
-                       var id_str = ids.join('/');
-                       // XXX spinner
-                       $.getJSON('/portal/validate_action/' + id_str,
-                               function(status) {
-                                       $.each(status, function(request_type__id, request_status) {
-                                               // request_status: NAME -> dict (status, description)
-                                               var status_str = '';
-                                               $.each(request_status, function(name, result) {
-                                                       if (status_str != '')
-                                                               status_str += ' -- ';
-
-                                                       if (result.status) {
-                                                               status_str += '<font color="green">OK</font>';
-                                                               $('#portal__validate__checkbox__' + request_type__id).hide();
-                                                       } else {
-                                                               status_str += '<font color="red">ERROR: ' + result.description + '</font>';
-                                                       }
-                                               });
-                                               $('#portal__status__' + request_type__id).html(status_str);
-
-
-                                       });
-                               }
-                       );
-               }
-       }
-</script>
-
-<div class="col-md-12">
-       <h2>From your authorities</h2>
-</div>
-{% if my_authorities %}
-       
-       {% for authority, requests in my_authorities.items %}
-       
-       <div class="col-md-12">
-               <h2>{{authority}}</h2>
-       </div>
-       
-    <table class="table">
-      <th>
-        <td>Type</td>
-        <td>Id</td>
-        <td>Details</td>
-        <td>Timestamp</td>
-        <td>Status</td>
-      </th>
-    {% for request in requests %}
-
-         <tr>
-               <td>
-               {% if request.allowed == 'allowed' %}
-               <input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
-               {% else %}
-                       {% if request.allowed == 'expired' %}
-                               expired
-                       {% else %} {# denied #}
-                               denied
-                       {% endif %}
-               {% endif %}
-               </td>
-               <td>{{ request.type }}</td>
-               <td>{{ request.id }}</td>
-               <td>
-        {% if request.type == 'user' %}
-            <b>{{request.first_name}} {{request.last_name}}</b> <a href="mailto:{{request.email}}">{{request.email}}</a>
-        {% else %}
-            {% if request.type == 'slice' %}
-            <b>{{request.slice_name}}</b> -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
-            {% else %} {# authority #}
-            <b>{{request.site_name}}</b> ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}}
-            {% endif %}
-        {% endif %}
-               </td>
-               <td>{{ request.timestamp }}</td>
-               
-               <td><span id='portal__status__{{request.type}}__{{request.id}}'></span></td>
-
-    <!--<div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'> -->
-         </tr>
-
-    {% endfor %}
-       </table>
-       {% endfor %}
-
-{% else %}
-       <div class="col-md-12">
-               <i>There is no pending request waiting for validation.</i>
-       </div>
-{% endif %}
-<div>nnllknjkn<br /><br /></div>
-<div class="col-md-12">
-       <h2>From your sub-authorities</h2>
-</div>
-{% if sub_authorities %}
-       
-       {% for authority, requests in sub_authorities.items %}
-       <div class="col-md-12">
-               <h2>{{authority}}</h2>
-       </div>
-       
-       <table class="table">
-             <th>
-               <td>Type</td>
-               <td>Id</td>
-               <td>Details</td>
-               <td>Timestamp</td>
-               <td>Status</td>
-             </th>
-           {% for request in requests %}
-                 <tr>
-                       <td>
-                       {% if request.allowed == 'allowed' %}
-                       <input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
-                       {% else %}
-                               {% if request.allowed == 'expired' %}
-                                       expired
-                               {% else %} {# denied #}
-                                       denied
-                               {% endif %}
-                       {% endif %}
-                       </td>
-                       <td>{{ request.type }}</td>
-                       <td>{{ request.id }}</td>
-                       <td>
-               {% 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 %}
-                       </td>
-                       <td>{{ request.timestamp }}</td>
-                       
-                       <td><span id='portal__status__{{request.type}}__{{request.id}}'></span></td>
-       
-           <!--<div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'> -->
-                 </tr>
-           {% endfor %}
-       </table>
-       {% endfor %}
-{% else %}
-<div class="col-md-12">
-       <i>There is no pending request waiting for validation.</i>
-</div>
-{% endif %}
-
-<div class="col-md-12">
-       <h2>From your authorities with delegation</h2>
-</div>
-
-{% if delegation_authorities %}
-       
-       {% for authority, requests in delegation_authorities.items %}
-       <div class="col-md-12">
-               <h3>{{authority}}</h3>
-       </div>
-       <table class="table">
-                     <th>
-                       <td>Type</td>
-                       <td>Id</td>
-                       <td>Details</td>
-                       <td>Timestamp</td>
-                       <td>Status</td>
-                     </th>
-                   {% for request in requests %}
-                         <tr>
-                               <td>
-                               {% if request.allowed == 'allowed' %}
-                               <input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
-                               {% else %}
-                                       {% if request.allowed == 'expired' %}
-                                               expired
-                                       {% else %} {# denied #}
-                                               denied
-                                       {% endif %}
-                               {% endif %}
-                               </td>
-                               <td>{{ request.type }}</td>
-                               <td>{{ request.id }}</td>
-                               <td>
-                       {% 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 %}
-                               </td>
-                               <td>{{ request.timestamp }}</td>
-                               
-                               <td><span id='portal__status__{{request.type}}__{{request.id}}'></span></td>
-               
-                   <!--<div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'> -->
-                         </tr>
-                   {% endfor %}
-       </table>
-               {% endfor %}
-{% else %}
-<div class="col-md-12">
-       <i>There is no pending request waiting for validation.</i>
-</div>
-{% endif %}
-<div class="col-md-12">
-       <button class="btn btn-onelab" type="button" id="portal__validate" onclick="on_click_event();"><span class="glyphicon glyphicon-ok"></span> Validate</button>
-</div>
diff --git a/portal/templates/smartfire/smartfire_slice_request_denied.html b/portal/templates/smartfire/smartfire_slice_request_denied.html
deleted file mode 100644 (file)
index 6c7d595..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<img src="http://eukorea-fire.eu/wp-content/uploads/2014/02/SmartFIRE_logo.png">
-<br>
-<p>Dear SmartFIRE user,</p>
-<p></p>
-<p>You have recently requested the following slice on the SmartFIRE portal({{portal_url}}):</p> 
-<br>
-<b>Slice name   :</b> {{slice_name}}<br>
-<b>URL          :</b> {{url}}<br>
-<b>Purpose      :</b> {{purpose}}<br>
-<br>
-<p>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.</p>
-<br>
-<p>We wish you a fruitful user experience on SmartFIRE.</p>
-<br>
-<p>Yours sincerely,</p>
-<p>The SmartFIRE team</p>
diff --git a/portal/templates/smartfire/smartfire_slice_request_denied.txt b/portal/templates/smartfire/smartfire_slice_request_denied.txt
deleted file mode 100644 (file)
index e4b4990..0000000
+++ /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 (file)
index e3988df..0000000
+++ /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 (file)
index 2c96a1d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<img src="http://eukorea-fire.eu/wp-content/uploads/2014/02/SmartFIRE_logo.png">
-<br>
-<p>Dear SmartFIRE user,</p>
-<p></p>
-<p>You have recently requested a slice in the SmartFIRE portal.</p>
-<br>
-<b>Slice name   :</b> {{slice_name}}<br>
-<b>URL          :</b> {{number_of_nodes}}<br>
-<b>Purpose      :</b> {{purpose}}<br>
-<p></p>
-<p>
-       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.
-</p>
-<p></p>
-<p>We wish you a fruitful user experience with the SmartFIRE portal.</p>
-<p></p>
-<p>Yours sincerely,</p>
-<p>The SmartFIRE team</p>
-
-
diff --git a/portal/templates/smartfire/smartfire_slice_request_validated.txt b/portal/templates/smartfire/smartfire_slice_request_validated.txt
deleted file mode 100644 (file)
index 571a3e4..0000000
+++ /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 (file)
index 211f35d..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-{% extends "layout.html" %}
-{% load i18n %}
-
-{% block content %}
-       <div class="row">
-               <div class="col-md-12">
-                        <div class="breadcrumbs">
-                                Experiment &nbsp;>&nbsp; Request a new Slice
-                        </div>
-               </div>
-       </div>
-
-       {% if errors %}
-       <div class="row">
-               <div class="col-md-12">
-               <ul class="error">
-                 {% for error in errors %}
-                 <li>{{ error }}</li>
-                 {% endfor %}
-               </ul>
-               </div>
-       </div>
-       {% endif %}
-       
-       <div class="row">
-               <div class="col-md-8 el">
-                       <form role="form" method="post">
-                       {% csrf_token %}
-                         <div class="form-group" style="display:none">
-                           <input type="email" class="form-control" id="email" style="width:300px" value="{{ email }}" readonly="readonly">
-                         </div>
-                         <div class="form-group">
-                           <input type="text" class="form-control" name="slice_name" id="slice_name" style="width:300px" placeholder="Slice name" value="{{slice_name}}" 
-                               title="Please enter a name for your slice"required="required">
-                         </div>
-                         <div class="form-group">
-                               {%if 'is_pi'  in pi %}
-                               <input type="text" class="form-control" id="authority_hrn" name="org_name" style="width:300px" placeholder="Organization" 
-                               title="An authority responsible for vetting your slice" required="required">
-                               {%else%}
-                           <input type="text" class="form-control" id="authority_hrn" name="org_name" placeholder="Organization" style="width:300px;" 
-                               title="An authority responsible for vetting your slice" required="required" readonly>
-                               {%endif%}
-                         </div>
-                         <div class="form-group">
-                           <input type="text" class="form-control" name="url" id="url" style="width:300px" placeholder="Experiment URL (if one exists)"
-                               title="Please provide the url of your experiment if you have one." value="{{url}}">
-                         </div>
-                         <div class="form-group">
-                               <textarea id="purpose" name="purpose" class="form-control" rows="6" placeholder="Experiment purpose" style="width:300px" 
-                               title="Purpose of your experiment (informative)" required="required">{{ purpose }}</textarea>
-                         </div>
-                         {%if 'is_pi'  in pi %}        
-                         <button type="submit" id=submit_pi class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Create slice</button>
-                         {%else%}
-                         <button type="submit" class="btn btn-onelab"><span class="glyphicon glyphicon-plus"></span> Request slice</button>
-                         {%endif%}     
-                       </form>
-       
-               </div>
-       </div>
-               
-<script>
-jQuery(document).ready(function(){
-       
-       /*$("#authority_hrn").load("/rest/user/", {"fields" : ["parent_authority"], "filters": {"user_hrn": "{{ user_hrn }}"}}, function(data) {
-               var jsonData = JSON.parse(data);
-        $(this).attr("value", jsonData[0]['parent_authority']);
-    });*/
-       $("#authority_hrn").val("{{authority_name}}");
-       var availableTags = [
-    {% if authorities %}
-        {% for authority in authorities %}
-            {% if authority.name %}
-                {value:"{{ authority.name }}",label:"{{authority.name}}"},
-                       // to show only full name
-           // {% else %}
-           //     {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
-            {% endif %}
-        {% endfor %}    
-    {% else %}
-        {value:"",label:"No authority found !!!"}
-    {% endif %}
-    ];
-       // sorting the list
-       availableTags.sort(function(a,b){
-               var nameA=a.value.toLowerCase(), nameB=b.value.toLowerCase();
-               if (nameA < nameB) {
-               return -1;
-               }
-               if (nameA > nameB) {
-               return 1;
-               }
-       return 0;
-       }); 
-    $( "#authority_hrn" ).autocomplete({
-      source: availableTags,
-      minLength: 0,
-      select: function( event, ui ) {console.log(jQuery(this));}
-    });
-
-       $("#submit_pi").click(function() {
-               localStorage.clear();
-       });
-});
-</script>
-{% 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 (file)
index 64678e3..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<img src="http://eukorea-fire.eu/wp-content/uploads/2014/02/SmartFIRE_logo.png">
-<br>
-<p>Dear {{first_name}} {{last_name}},</p>
-<p></p>
-<p>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.</p>
-<p></p>
-<p>We wish you all the best.</p>
-<p></p>
-<p>Yours sincerely,</p>
-<p>The SmartFIRE team</p>
-
diff --git a/portal/templates/smartfire/smartfire_user_request_denied.txt b/portal/templates/smartfire/smartfire_user_request_denied.txt
deleted file mode 100644 (file)
index 29edc21..0000000
+++ /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 (file)
index 92c1cb4..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<img src="http://eukorea-fire.eu/wp-content/uploads/2014/02/SmartFIRE_logo.png">
-<br>
-<h1>NEW USER REQUEST</h1>
-<br>
-<b>First name   :</b> {{first_name}}<br>
-<b>Last name    :</b> {{last_name}}<br>
-<b>Organization :</b> {{organization}}<br>
-<b>Authority hrn:</b> {{authority_hrn}}<br>
-<b>Public key   :</b> {{public_key}}<br>
-<b>Email        :</b> {{email}}<br>
-<b>User hrn     :</b> {{user_hrn}}<br>
-<b>Portal url  :</b> {{ current_site }}<br>
-<p></p>
-<p>You can validate the user <a href="{{current_site}}/portal/institution#requests">here</a>.<p>
-<br>
-<p>Please note that the validation request will only become visible once the user has confirmed his/her email address.</p>
diff --git a/portal/templates/smartfire/smartfire_user_request_email.txt b/portal/templates/smartfire/smartfire_user_request_email.txt
deleted file mode 100644 (file)
index 17ce184..0000000
+++ /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 (file)
index a373b60..0000000
+++ /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 (file)
index 7997a18..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<img src="http://eukorea-fire.eu/wp-content/uploads/2014/02/SmartFIRE_logo.png">
-<br>
-<p>Dear {{first_name}} {{last_name}},</p>
-<p></p>
-<p>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.</p>
-<p></p>
-</p>
-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.
-</p>
-<p></p>
-<p>We wish you a fruitful user experience with the SmartFIRE portal.</p>
-<p></p>
-<p>Yours sincerely,</p>
-<p>The SmartFIRE team</p>
diff --git a/portal/templates/smartfire/smartfire_user_request_validated.txt b/portal/templates/smartfire/smartfire_user_request_validated.txt
deleted file mode 100644 (file)
index b546b19..0000000
+++ /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
index de34e32..63ae581 100644 (file)
@@ -19,7 +19,7 @@
                                                        </ul>
                                        </div>
                                </li>
-                               {%if pi %}      
+                {% if request.session.user.pi %}
                                <li id="nav-institution" class=""><a href="/institution">MANAGEMENT</a></li>
                                 {%endif%}
                                <li><a href="/support/">SUPPORT</a></li>