From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 13 Nov 2013 07:08:36 +0000 (+0100)
Subject: Merge branch 'master' into newnames
X-Git-Tag: myslice-0.3-0~113^2~7^2~20
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0120bc491b3464f4981270a28ac153fa62f3b08b;hp=5afb541f209f479b009e8305dd2626780cadcff9;p=unfold.git

Merge branch 'master' into newnames

Conflicts:
	portal/templates/validate_pending.html
---

diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index f3c731a9..4b042468 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -10,30 +10,6 @@
 
 {% block unfold_main %}
 
-
-<h2>Platform Access</h2>
-<div id="middle" align="center">
-	<div class="well">
-		<table class="mytable"> 
-			<tr class="odd"> 
-    			<th>Platform</th> 
-        		<th>Account Type</th> 
-        		<th>user_hrn</th>
-        		<th>Pub Key</th>
-    		</tr>   
-			{% for row in data %}         
-   			<tr class="border_bottom">
-    			<td class="odd"> {{ row.platform_name }} </td>
-        		<td class="even"> {{ row.account_type }} </td>
-       			<td class="odd"> {{ row.usr_hrn }}  </td>
-        		<td class="even"> {{ row.usr_pubkey }} </td>
-    		</tr> 
-			{%endfor%}               
-		</table>
-	</div>
-</div>
-
-
 <h2>MySlice  Account</h2>
 
 {% if messages %}
@@ -154,4 +130,28 @@
 	</div>
 </div>
 
+<h2>Platform Access</h2>
+<div id="middle" align="center">
+	<div class="well">
+		<table class="mytable"> 
+			<tr class="odd"> 
+    			<th>Platform</th> 
+        		<th>Account Type</th> 
+        		<th>user_hrn</th>
+        		<th>Pub Key</th>
+    		</tr>   
+			{% for row in data %}         
+   			<tr class="border_bottom">
+    			<td class="odd"> {{ row.platform_name }} </td>
+        		<td class="even"> {{ row.account_type }} </td>
+       			<td class="odd"> {{ row.usr_hrn }}  </td>
+        		<td class="even"> {{ row.usr_pubkey }} </td>
+    		</tr> 
+			{%endfor%}               
+		</table>
+	</div>
+</div>
+
+
+
 {% endblock %}
diff --git a/portal/templates/contact.html b/portal/templates/contact.html
index 3aa9f191..b256d37a 100644
--- a/portal/templates/contact.html
+++ b/portal/templates/contact.html
@@ -7,7 +7,7 @@
 {% block unfold_main %}
 
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
-<div class="onelab-title well well-lg">
+<div class="onelab-title well-lg">
   <h2>Onelab Support</h2>
   <h4>If you have already registered, then please <a href="mailto:support@myslice.info">send an e-mail</a>
   or <a href="http://trac.myslice.info/" >visit us</a></h4>
diff --git a/portal/templates/home-view.html b/portal/templates/home-view.html
index 1c887a3b..c5f3bfc6 100644
--- a/portal/templates/home-view.html
+++ b/portal/templates/home-view.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
 <!-- xxx ideally only onelab.css but ... xxx -->
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
-<div class='well well-lg onelab-title'>
+<div class='well-lg onelab-title'>
   <h2 style="font-weight: bold;">Welcome to the OneLab portal !</h2>
   <h4>New to OneLab? Please <a href="/portal/register">register</a> or learn more about <a href="http://www.onelab.eu/" target="_blank">the project</a>.</h3>
 </div>
diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index b942b171..52cb402d 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -2,7 +2,7 @@
 
 {% block unfold_main %}        
 
-<div class="onelab-title well well-lg">
+<div class="onelab-title well-lg">
   <h2>OneLab Experimenter Registration</h2>
   <h4>For First Line Support please <a href="/portal/contact" >Contact Support</a></h3>
 </div>
diff --git a/portal/templates/resource.html b/portal/templates/resource.html
index 63466674..5b59f73e 100644
--- a/portal/templates/resource.html
+++ b/portal/templates/resource.html
@@ -6,8 +6,15 @@
 
 {% block unfold_main %}
 
+<div align="center">
 <h1>Resource</h1>
+<div style="width:80%;">
 {{resource}}
+</div>
+<div style="width:80%;">
 {{resource_as_map}}
+</div>
+<div style="width:80%;">
 {{resource_stats}}
+</div>
 {% endblock %}
diff --git a/portal/templates/slice-request-view.html b/portal/templates/slice-request-view.html
index 7c7a53f0..4568864a 100644
--- a/portal/templates/slice-request-view.html
+++ b/portal/templates/slice-request-view.html
@@ -11,7 +11,7 @@
 <!-- xxx ideally only onelab.css but ... xxx -->
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
 
-<div class="onelab-title well well-lg">
+<div class="onelab-title well-lg">
   <h2>Request a Slice</h2>
 </div>
 
diff --git a/portal/templates/validate_pending.html b/portal/templates/validate_pending.html
index c46fda39..0ab0e572 100644
--- a/portal/templates/validate_pending.html
+++ b/portal/templates/validate_pending.html
@@ -46,9 +46,9 @@
 {% endblock %}
 
 {% block unfold_main %}
-
+<div class="onelab-title well-lg">
 <h1>Pending requests</h1>
-
+</div>
 <hr/>
 <h2>My authorities</h2>
 
@@ -56,7 +56,8 @@
 
 {% for authority, requests in my_authorities.items %}
 <h3>{{authority}}</h3>
-    <table width=100% border=1>
+<div class="container">
+    <table width=100% border=1 style="color:white;">
       <th>
         <td>type</td>
         <td>id</td>
@@ -161,5 +162,6 @@
 {% endif %}
 
 <input type='button' id='portal__validate' value='Validate' onclick='on_click_event();'/>
-
+</div>
+<!-- End of the container div -->
 {% endblock %}
diff --git a/ui/templates/base.html b/ui/templates/base.html
index 2cf0b0a8..b551df76 100644
--- a/ui/templates/base.html
+++ b/ui/templates/base.html
@@ -5,6 +5,7 @@
 <link rel="shortcut icon" href="/static/img/myslice-icon.png">
 {# This is where insert_str will end up #}{% media_container prelude %}
 {% include 'messages-transient-header.html' %}
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab_marko.css" />
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
 <style type="text/css">{# In case we need to add raw css code #}{% container prelude_css %}</style>
 {{ header_prelude }}
diff --git a/unfold/page.py b/unfold/page.py
index bc44cd1a..7c6d60bd 100644
--- a/unfold/page.py
+++ b/unfold/page.py
@@ -33,8 +33,10 @@ class Page:
         # queue of queries with maybe a domid, see enqueue_query
         self._queue=[]
         # global prelude object
+        self.prelude=Prelude(css_files='css/plugin.css')
+        print "Loading... CSS OneLab"
+        self.prelude=Prelude(css_files='css/onelab_marko.css')
 #        self.prelude=Prelude(css_files=['css/plugin.css','css/onelab_marko.css',])
-        self.prelude=Prelude()
 
     # record known plugins hashed on their domid
     def record_plugin (self, plugin):
diff --git a/unfold/static/css/onelab_marko.css b/unfold/static/css/onelab_marko.css
index c1079f28..a49457b7 100644
--- a/unfold/static/css/onelab_marko.css
+++ b/unfold/static/css/onelab_marko.css
@@ -5,8 +5,14 @@
 /* GENERAL */
 
 .container {
-    padding: 0 !important;
-/*    color: #fff; */
+	padding: 0 !important;
+	color: #fff;
+    background: url(http://new.fit-equipex.fr/images/background.jpg) no-repeat;
+    margin: 0;
+    width: 100%;
+    max-width: 100%;
+    min-height: 100%;
+    height: 100%;
 }
 
 .container h1, .container h2 {
@@ -49,7 +55,15 @@ a.plugin-tooltip:hover {
 
 
 /* LIST VIEW */
-
+div.well-lg {
+    background-color: rgba(168, 32, 202, 0.5) !important;
+}
+div.onelab-title {
+    background-color: rgba(168, 32, 202, 0.5) !important;
+}
+div.well {
+    background-color: rgba(0, 0, 0, 0.5) !important;
+}
 h2.well.well-lg {
     border-radius:0;
     border: 0;
@@ -156,7 +170,8 @@ h2.well.well-lg {
 /* TOPMENU.CSS */
 
 body {
-    background: #30196d !important;
+	/* background: #30196d !important; */
+	background: black !important;
     padding-top: 60px;
     padding-bottom: 0px;
 }