From: Loic Baron Date: Thu, 27 Feb 2014 18:05:31 +0000 (+0100) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~268^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6ba53085c00c1f416b28fd505e6611c154f0cc71;hp=9a95335d463a2ee2976c5f57a30e68765cf165b0;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/portal/templates/layout.html b/portal/templates/layout.html new file mode 100644 index 00000000..41723005 --- /dev/null +++ b/portal/templates/layout.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block base_content %} +
+ {% block content %} + {% endblock %} +
+{% endblock %} diff --git a/portal/templates/layout_wide.html b/portal/templates/layout_wide.html new file mode 100644 index 00000000..f456a0f4 --- /dev/null +++ b/portal/templates/layout_wide.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block base_content %} +
+ {% block content %} + {% endblock %} +
+{% endblock %} diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html index 511ac5a3..002fe080 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 %} -
+{% block content %} +
  • USER
  • MANAGER
    • @@ -112,4 +112,4 @@ {% endif %} }); -{% endblock unfold_main %} +{% endblock %} diff --git a/ui/static/img/icon_user_small.png b/ui/static/img/icon_user_small.png new file mode 100644 index 00000000..725455ef Binary files /dev/null and b/ui/static/img/icon_user_small.png differ diff --git a/ui/static/img/icon_users_small.png b/ui/static/img/icon_users_small.png new file mode 100644 index 00000000..6cf3888b Binary files /dev/null and b/ui/static/img/icon_users_small.png differ diff --git a/ui/templates/base.html b/ui/templates/base.html index a79c6b49..d11babfe 100644 --- a/ui/templates/base.html +++ b/ui/templates/base.html @@ -1,6 +1,6 @@ {# This is required by insert_above #}{% insert_handler %} -MySlice - {{ title }} +MySlice - {{ section }} {# This is where insert_str will end up #}{% media_container prelude %} @@ -21,19 +21,18 @@ {% insert_str prelude "js/mustache.js" %} {% insert_str prelude "js/plugin.js" %} {% insert_str prelude "js/manifold.js" %} -{% insert_str prelude "js/topmenu.js" %} -{% insert_str prelude "css/layout-unfold.css" %} {% insert_str prelude "css/manifold.css" %} {% insert_str prelude "css/plugin.css" %} - + {% block container %} {% block topmenu %} {% include theme|add:"__widget-topmenu.html" %} {% endblock topmenu %} -{% include 'messages-transient.html' %} - {% block base_content%}{% endblock %} + {% include 'messages-transient.html' %} + {% block base_content %} + {% endblock %} {% endblock container %}