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 5072e52..1c887a3 100644 (file)
--- a/portal/templates/home-view.html
+++ b/portal/templates/home-view.html
@@ -1,12 +1,11 @@
-{% 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" />
@@ -25,7 +24,7 @@ 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>
-<p>This UI server is connected to the manifold backend running at <code>{{ manifold_url }}</code>.</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 %}