not too bad

[unfold.git] / myslice / templates / myslice.html

diff --git a/myslice/templates/myslice.html b/myslice/templates/myslice.html
index bfc7e23..f316c6e 100644 (file)
--- a/myslice/templates/myslice.html
+++ b/myslice/templates/myslice.html
@@ -6,14 +6,15 @@
 {# This is where insert_str will end up #}
 {% media_container prelude %}
 {% insert_str prelude "jquery/jquery.js" %}
+{% insert_str prelude "bootstrap/js/bootstrap.js" %}
 {% insert_str prelude "bootstrap/css/bootstrap.css" %}
 <script type="text/javascript">
-{# In case we need to add raw js code #}
-{% container raw_js %}
+{# In case we need to add raw js code - use {% insert prelude_js %} ... {% endinsert %} #}
+{% container prelude_js %}
 </script>
 <style type="text/css">
 {# In case we need to add raw css code #}
-{% container raw_css %}
+{% container prelude_css %}
 </style>
 </head>
 
@@ -28,12 +29,11 @@
 
     <div id='header'>
     {% block header %}
+      <a id='menu_logo' href="/"><img class="logo" src="{{ STATIC_URL }}img/myslice-logo.png" alt="MySlice" /></a>
       {% include 'mymenu.html' %}
     {% endblock header %}
     </div>
 
-    {% block column_wrap %}
-    <div id='column-wrap'>
     <div id='content-main'>
       {% block content_main %}
       "The main content area (set block 'content_main')"
@@ -45,8 +45,6 @@
       "The related content area (set block 'related_main')"
       {% endblock content_related %}
     </div>
-    </div>
-    {% endblock column_wrap %}
 
 </div>
 {% endblock container %}