Merge branch 'master' into newnames

Conflicts:
	portal/templates/validate_pending.html

diff --combined portal/templates/account-view.html
index f3c731a,60f05bc..4b04246
--- 1/portal/templates/account-view.html
--- 2/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@@ -8,32 -8,8 +8,8 @@@
  <script type="text/javascript" src="{{STATIC_URL}}/js/my_account.register.js"></script>
  {% endblock %}
  
 -{% block unfold1_main %}
 +{% 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 +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 --combined portal/templates/contact.html
index 3aa9f19,8ffbf9c..b256d37
--- 1/portal/templates/contact.html
--- 2/portal/templates/contact.html
+++ b/portal/templates/contact.html
@@@ -4,10 -4,10 +4,10 @@@
  {{ wizard.form.media }}
  {% endblock %}
  
 -{% block unfold1_main %}
 +{% 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 --combined portal/templates/home-view.html
index 1c887a3,446cc31..c5f3bfc
--- 1/portal/templates/home-view.html
--- 2/portal/templates/home-view.html
+++ b/portal/templates/home-view.html
@@@ -1,15 -1,16 +1,15 @@@
 -{% extends 'layout-unfold2.html' %}
 +{# fine for either layout-unfold1.html (logged in) or layout-unfold2.html (needs a login prompt) #}
 +{% extends layout_1_or_2 %}
  
 -{% block unfold2_margin %}
 -{% if not username %}
 +{% block unfold_margin %}
  {% include 'widget-login.html' %}
 -{% endif %}
 -{% endblock unfold2_margin %}
 +{% endblock unfold_margin %}
  
 -{% block unfold2_main %}
 +{% block unfold_main %}
  <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>
@@@ -27,4 -28,4 +27,4 @@@ federated testbeds
  <p>This UI server is connected to the manifold backend running at <code>{{ MANIFOLD_URL }}</code>.</p>
  </div>
  
 -{% endblock unfold2_main %}
 +{% endblock unfold_main %}

diff --combined portal/templates/registration_view.html
index b942b17,b0bb389..52cb402
--- 1/portal/templates/registration_view.html
--- 2/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@@ -1,8 -1,8 +1,8 @@@
  {% extends "layout-unfold1.html" %}
  
 -{% block unfold1_main %}        
 +{% 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 --combined portal/templates/resource.html
index 6346667,d379470..5b59f73
--- 1/portal/templates/resource.html
--- 2/portal/templates/resource.html
+++ b/portal/templates/resource.html
@@@ -4,10 -4,17 +4,17 @@@
  <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/dashboard.css" />
  {% endblock %}
  
 -{% block unfold1_main %}
 +{% 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 --combined portal/templates/slice-request-view.html
index 7c7a53f,b9e0e22..4568864
--- 1/portal/templates/slice-request-view.html
--- 2/portal/templates/slice-request-view.html
+++ b/portal/templates/slice-request-view.html
@@@ -5,13 -5,13 +5,13 @@@
  {{ wizard.form.media }}
  {% endblock %}
  
 -{% block unfold1_main %}
 +{% block unfold_main %}
  
  <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="onelab-title well well-lg">
+ <div class="onelab-title well-lg">
    <h2>Request a Slice</h2>
  </div>
  

diff --combined portal/templates/validate_pending.html
index c46fda3,9ddf01c..0ab0e57
--- 1/portal/templates/validate_pending.html
--- 2/portal/templates/validate_pending.html
+++ b/portal/templates/validate_pending.html
@@@ -45,10 -45,10 +45,10 @@@
  </script>
  {% endblock %}
  
 -{% block unfold1_main %}
 +{% block unfold_main %}
- 
+ <div class="onelab-title well-lg">
  <h1>Pending requests</h1>
- 
+ </div>
  <hr/>
  <h2>My authorities</h2>
  
@@@ -56,7 -56,8 +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 +162,6 @@@
  {% endif %}
  
  <input type='button' id='portal__validate' value='Validate' onclick='on_click_event();'/>
- 
+ </div>
+ <!-- End of the container div -->
  {% endblock %}

diff --combined unfold/static/css/onelab_marko.css
index c1079f2,ab82706..a49457b
--- 1/unfold/static/css/onelab_marko.css
--- 2/unfold/static/css/onelab_marko.css
+++ b/unfold/static/css/onelab_marko.css
@@@ -5,8 -5,14 +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 +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 +170,8 @@@
  /* TOPMENU.CSS */
  
  body {
-     background: #30196d !important;
+       /* background: #30196d !important; */
+       background: black !important;
      padding-top: 60px;
      padding-bottom: 0px;
  }
@@@ -268,9 -283,9 +283,9 @@@ div.dataTables_info 
  
  
  
 -/* HAZELNUT */
 +/* QUERYTABLE */
  
 -div.Hazelnut table.dataTable th {
 +div.QueryTable table.dataTable th {
      font: bold 12px/22px Ubuntu, Arial, sans-serif;
      color: #333 !important;
      border-right: 0px solid #333 !important;
@@@ -284,18 -299,18 +299,18 @@@
      background: url('../img/tablesort-header.jpg') no-repeat !important; 
  }
  
 -div.Hazelnut table.dataTable td, div.Hazelnut table.dataTable textarea, div.Hazelnut table.dataTable input [type="text"] {
 +div.QueryTable table.dataTable td, div.QueryTable table.dataTable textarea, div.QueryTable table.dataTable input [type="text"] {
      font: normal 12px Ubuntu, Arial, Helvetica, sans-serif;
      border-right: 0px solid #fff !important;
      border-bottom: 1px solid #fff !important;
  }
  
 -div.Hazelnut table.dataTable thead { 
 +div.QueryTable table.dataTable thead { 
      background: url('../img/tablesort-header.png') repeat-x !important;
      background-color: #caebea;
  }
  
 -div.Hazelnut table.dataTable tfoot { 
 +div.QueryTable table.dataTable tfoot { 
      background: url('../img/tablesort-header.png') repeat-x !important;
      /* background-color: # !important; */
  }
@@@ -312,7 -327,7 +327,7 @@@ table.query-editor 
  }
  
  .query-editor-spacer,
 -.plugin.ResourcesSelected,
 +.plugin.QueryUpdater,
  .plugin.Tabs {
      margin-top: 60px !important;
  }