From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 27 Feb 2014 16:02:24 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~271
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=550fb69fd118f544fb7eb7faa8345654af28a427;hp=cc3925accfc3e466072e77420cb3682d67a67894;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index a1206de1..6fd7e1d9 100644
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -1,7 +1,7 @@
-{% extends "layout-unfold1.html" %}
+{% extends "base.html" %}
 
-{% block unfold_main %}
-<div class="wrapper" id="home-dashboard">
+{% block content %}
+<div class="row" id="home-dashboard">
 	<ul class="nav nav-tabs">
 	  <li class="active"><a class="home-tab" data-panel="user" href="#">USER</a></li>
 	  <li><a class="home-tab" data-panel="manager" href="#">MANAGER</a></li>
@@ -112,4 +112,4 @@
 		{% endif %}
 	});
 </script>
-{% endblock unfold_main %}
+{% endblock %}