Merge branch 'master' into newnames

Conflicts:
	portal/templates/validate_pending.html

diff --cc 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 %}

diff --cc 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 --cc portal/templates/home-view.html
Simple merge

diff --cc 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 --cc 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 --cc portal/templates/slice-request-view.html
Simple merge

diff --cc 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>
  

diff --cc unfold/static/css/onelab_marko.css
Simple merge