git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6af26f3)
fluid layout
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 10 Dec 2012 16:16:23 +0000 (17:16 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 10 Dec 2012 16:16:23 +0000 (17:16 +0100)
static/css/myslice.css patch | blob | history
static/css/topmenu.css [new file with mode: 0644] patch | blob
templates/layout-myslice.html patch | blob | history
templates/widget-login.html [new file with mode: 0644] patch | blob
templates/widget-topmenu.html patch | blob | history

diff --git a/static/css/myslice.css b/static/css/myslice.css
index 2e46904..a6167d2 100644 (file)
--- a/static/css/myslice.css
+++ b/static/css/myslice.css
@@ -1,14 +1,6 @@
 #content-main {
-    margin: 60 200 0 0;
-    padding: 0;
 }
 #content-related {
-    margin-top: 60;
-    padding: 0;
-    width: 200;
-    position: fixed;
-    display: block;
-    right: 0px;
-    top: 0px;
-    background-color: #d0d0f8;
+    padding: 10;
+    background-color: #fff2ff;
 }
diff --git a/static/css/topmenu.css b/static/css/topmenu.css
new file mode 100644 (file)
index 0000000..ac3d29a
--- /dev/null
+++ b/static/css/topmenu.css
@@ -0,0 +1,5 @@
+/* this is to get the content below the navbar */
+body {
+    padding-top: 60px;
+    padding-bottom: 40px;
+}
diff --git a/templates/layout-myslice.html b/templates/layout-myslice.html
index d3a7436..3a9cba2 100644 (file)
--- a/templates/layout-myslice.html
+++ b/templates/layout-myslice.html
@@ -26,25 +26,28 @@
 <body>
 
 {% block container %}
-<div id='container'>
+<div id="container">
 
-    {% block topmenu %}
-    {% include 'widget-topmenu.html' %}
-    {% endblock topmenu %}
+  
+  {% block topmenu %}
+  {% include 'widget-topmenu.html' %}
+  {% endblock topmenu %}
 
-    <div id='content-main'>
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div id="content-main" class="span9 columns">
       {% block content_main %}
-      "The main content area (set block 'content_main')"
+      "The main content area (define block 'content_main')"
       {% endblock content_main %}
-    </div>
-
-    <div id='content-related'>
+    </div><!--span9-->
+    
+    <div id='content-related' class='span3'>
       {% block content_related %}
-      "The related content area (set block 'related_main')"
+      "The related content area (define block 'related_main')"
       {% endblock content_related %}
-    </div>
-
-</div>
+    </div><!--span3-->
+  </div><!--raw-fluid-->
+</div><!--container-fluid-->
 {% endblock container %}
 
 </body>
diff --git a/templates/widget-login.html b/templates/widget-login.html
new file mode 100644 (file)
index 0000000..7f4a3a8
--- /dev/null
+++ b/templates/widget-login.html
@@ -0,0 +1,13 @@
+<p class='login-status'> {{ state }} </p>
+<a href="/" alt="Home"><img class="logo" src="{{ STATIC_URL }}img/myslice-logo.png" alt="MySlice" /></a>
+<form action="/login/" method="post">
+  {% csrf_token %}
+  {% if next %}
+  <input type="hidden" name="next" value="{{ next }}" />
+  {% endif %}
+  username:
+  <input type="text" name="username" value="{{ username}}" /><br />
+  password:
+  <input type="password" name="password" value="" /><br />
+  <input type="submit" value="Log In" />
+</form>
diff --git a/templates/widget-topmenu.html b/templates/widget-topmenu.html
index 70cc149..930cca3 100644 (file)
--- a/templates/widget-topmenu.html
+++ b/templates/widget-topmenu.html
@@ -1,6 +1,6 @@
 {# <a id='menu_logo' href="/"><img class="logo" src="{{ STATIC_URL }}img/myslice-logo.png" alt="MySlice" /></a> #}
 {# {% insert_str prelude "js/mymenu.js" %} #}
-{# {% insert_str prelude "css/mymenu.css" %} #}
+{% insert_str prelude "css/topmenu.css" %}
 
 <div id='topmenu' class="navbar navbar-fixed-top">
   <div class="navbar-inner">
myslice (django)