homeview and platformsview now use layout-unfold1 or layout-unfold2 depending on...

[myslice.git] / portal / templates / home-view.html

diff --git a/portal/templates/home-view.html b/portal/templates/home-view.html
index 42265a5..1c887a3 100644 (file)
--- a/portal/templates/home-view.html
+++ b/portal/templates/home-view.html
@@ -1,20 +1,20 @@
-{% 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 %}
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/register.css" />
-<div style='padding: 20px;'>
-  <div class='OneLabTitle'>
-    <h2 style="font-weight: bold;">Welcome to the OneLab portal !</h2>
-    <h3>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>
-<p/>
-  <p>
+{% 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'>
+  <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>
+<div class='well'>
+<p>
 Experimentally-driven research is key to success in exploring the possible
 futures of the Internet. The OneLab initiative provides an open,
 general-purpose, shared experimental facility, both large-scale and
@@ -23,9 +23,8 @@ the performance of their solutions. Based on the results of several different
 European and national projects, OneLab offers access to a range of  tools and
 testbeds including PlanetLab Europe, the NITOS wireless testbed, and other
 federated testbeds.
-  </p>
-  <div class="item-separator"></div>
-<p>This UI server is connected to the manifold backend running at <code>{{ manifold_url }}</code>.</p>
+</p>
+<p>This UI server is connected to the manifold backend running at <code>{{ MANIFOLD_URL }}</code>.</p>
 </div>
 
-{% endblock unfold2_main %}
+{% endblock unfold_main %}