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;p=myslice.git
Merge branch 'master' into newnames
Conflicts:
portal/templates/validate_pending.html
---
0120bc491b3464f4981270a28ac153fa62f3b08b
diff --cc portal/templates/account-view.html
index f3c731a9,60f05bcf..4b042468
--- a/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 3aa9f191,8ffbf9c9..b256d37a
--- a/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/registration_view.html
index b942b171,b0bb3896..52cb402d
--- a/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 63466674,d379470a..5b59f73e
--- a/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/validate_pending.html
index c46fda39,9ddf01c9..0ab0e572
--- a/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>