Merge branch 'master' into newnames

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

diff --git a/portal/templates/home-view.html b/portal/templates/home-view.html
index 123bc28..c5f3bfc 100644 (file)
--- a/portal/templates/home-view.html
+++ b/portal/templates/home-view.html
@@ -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>
@@ -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 %}