From 0ba7a93b8243093455dbdb1217e478b813a1ebab Mon Sep 17 00:00:00 2001
From: Loic Baron
Date: Tue, 18 Mar 2014 19:23:17 +0100
Subject: [PATCH] templates: generic and onelab are different
---
portal/templates/_widget-login-manager.html | 26 +++
portal/templates/_widget-login-user.html | 26 +++
portal/templates/_widget-slice-sections.html | 33 +++
portal/templates/about.html | 6 +-
portal/templates/institution.html | 44 +---
.../onelab/onelab__widget-topmenu.html | 2 +-
portal/templates/onelab/onelab_base.html | 43 ++++
.../templates/onelab/onelab_institution.html | 197 ++++++++++++++++++
.../onelab/onelab_slice-resource-view.html | 4 +
portal/templates/slice-resource-view.html | 73 +++++++
portal/templates/slice-user-view.html | 104 +++++++++
portal/templates/slice-view.html | 25 +++
12 files changed, 536 insertions(+), 47 deletions(-)
create mode 100644 portal/templates/_widget-login-manager.html
create mode 100644 portal/templates/_widget-login-user.html
create mode 100644 portal/templates/_widget-slice-sections.html
create mode 100644 portal/templates/onelab/onelab_base.html
create mode 100644 portal/templates/onelab/onelab_institution.html
create mode 100644 portal/templates/slice-resource-view.html
create mode 100644 portal/templates/slice-user-view.html
create mode 100644 portal/templates/slice-view.html
diff --git a/portal/templates/_widget-login-manager.html b/portal/templates/_widget-login-manager.html
new file mode 100644
index 00000000..7c5f170e
--- /dev/null
+++ b/portal/templates/_widget-login-manager.html
@@ -0,0 +1,26 @@
+
+ {% if state %}
+
{{ state }}
+ {% endif %}
+
+
diff --git a/portal/templates/_widget-login-user.html b/portal/templates/_widget-login-user.html
new file mode 100644
index 00000000..9e248875
--- /dev/null
+++ b/portal/templates/_widget-login-user.html
@@ -0,0 +1,26 @@
+
diff --git a/portal/templates/_widget-slice-sections.html b/portal/templates/_widget-slice-sections.html
new file mode 100644
index 00000000..bf64b8d8
--- /dev/null
+++ b/portal/templates/_widget-slice-sections.html
@@ -0,0 +1,33 @@
+{% if section == "resources" %}
+
+{% else %}
+
+
+{% endif %}
\ No newline at end of file
diff --git a/portal/templates/about.html b/portal/templates/about.html
index 578561b5..4736ae66 100644
--- a/portal/templates/about.html
+++ b/portal/templates/about.html
@@ -22,7 +22,7 @@
across the world, interconnected through the Slice-based Facility Architecture (SFA) and annotated by the TopHat measurement system.
- Our framework is built with standard programming tools (php and javascript for the front-end and python for the back-end)
+ Our framework is built with standard programming tools (python and javascript for the front-end and python for the back-end)
and has a modular structure based on the concept of plugins for implementing different core functionalities (query editing,
data display, and resource allocation).
@@ -37,8 +37,8 @@
your public key to support@myslice.info.
- Go to the MySlice web site or the OneLab public web site
-
+ Go to the MySlice web site
+
diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index f7c81876..7a84e9b2 100644
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -21,11 +21,7 @@
-
-
-
-
-
+
@@ -74,44 +70,6 @@
authority_row = "
";
authority_row += "
";
authority_row += "authority: "+val.authority_hrn+"
";
- authority_row += "
";
- authority_row += ""+val.name+"
";
- authority_row += "
";
- authority_row += "Address: "+val.address+"
";
- authority_row += "City: "+val.postcode+" "+val.city+"
";
- authority_row += "
";
- authority_row += "Country: "+val.country+"
";
- authority_row += "
";
- authority_row += "
";
- authority_row += "Contacts
";
- authority_row += "Legal: ";
- /*
-
- TODO: find a way to express JSON correctly given the constrains: CSV / JSON
-
- legal = jQuery.parseJSON(val.legal);
- if($.isArray(legal)){
- $.each(legal, function(k,v){
- authority_row += k+" "+v+"
";
- });
- }else{
- */
- authority_row += val.legal+"
";
- //}
- authority_row += "
";
- authority_row += "Scientific: ";
- /*
- scientific = jQuery.parseJSON(val.scientific);
- if($.isArray(scientific)){
- $.each(scientific, function(v){
- authority_row += v+", ";
- });
- }else{
- */
- authority_row += val.scientific+"
";
- //}
- onelab_membership = "Status: "+val.onelab_membership;
- onelab_data.push(onelab_membership);
authority_data.push(authority_row);
});
$("div#authority-data").html(authority_data.join( "" ));
diff --git a/portal/templates/onelab/onelab__widget-topmenu.html b/portal/templates/onelab/onelab__widget-topmenu.html
index da834ace..4ed429ad 100644
--- a/portal/templates/onelab/onelab__widget-topmenu.html
+++ b/portal/templates/onelab/onelab__widget-topmenu.html
@@ -27,7 +27,7 @@
SLICES
-