git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 550fb69)
new layouts
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 27 Feb 2014 17:52:35 +0000 (18:52 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 27 Feb 2014 17:52:35 +0000 (18:52 +0100)
portal/templates/layout.html [new file with mode: 0644] patch | blob
portal/templates/layout_wide.html [new file with mode: 0644] patch | blob
ui/static/img/icon_user_small.png [new file with mode: 0644] patch | blob
ui/static/img/icon_users_small.png [new file with mode: 0644] patch | blob
ui/templates/base.html patch | blob | history

diff --git a/portal/templates/layout.html b/portal/templates/layout.html
new file mode 100644 (file)
index 0000000..4172300
--- /dev/null
+++ b/portal/templates/layout.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block base_content %}
+<div class="container">
+  {% block content %}
+  {% endblock %}
+</div>
+{% endblock %}
diff --git a/portal/templates/layout_wide.html b/portal/templates/layout_wide.html
new file mode 100644 (file)
index 0000000..f456a0f
--- /dev/null
+++ b/portal/templates/layout_wide.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block base_content %}
+<div class="wide">
+  {% block content %}
+  {% endblock %}
+</div>
+{% endblock %}
diff --git a/ui/static/img/icon_user_small.png b/ui/static/img/icon_user_small.png
new file mode 100644 (file)
index 0000000..725455e
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 (file)
index 0000000..6cf3888
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 a79c6b4..d11babf 100644 (file)
--- a/ui/templates/base.html
+++ b/ui/templates/base.html
@@ -1,6 +1,6 @@
 {# This is required by insert_above #}{% insert_handler %}<!DOCTYPE html>
 <html lang="en"><head>
-<title>MySlice - {{ title }}</title>
+<title>MySlice - {{ section }}</title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <link rel="shortcut icon" href="/static/img/myslice-icon.png">
 {# 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" %}
-<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/css/{{ theme }}.css">
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
 </head>
 <body>
 {% 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 %}
 </body>
 </html>
myslice (django)