4 files changed, 94 insertions(+), 75 deletions(-)

A wiki/static/wiki/css/all.css
A wiki/static/wiki/css/print.css
M wiki/templates/wiki/article.html
M wiki/templates/wiki/base.html

@@ 0,0 1,70 @@
+#div_id_title .asteriskField{display:none}
+#id_title {font-size: 20px; height: 30px; padding: 6px; width: 98%;}
+#id_summary {width: 98%; padding: 6px;}
+
+h1#article-title {font-size: 2em; margin-top: -5px;}
+
+#article_edit_form label {max-width: 100px;}
+#article_edit_form .controls {margin-left: 120px;}
+
+.form-horizontal label { font-size: 16px; font-weight: normal; color: #777;}
+
+.settings-form label {min-width: 250px; font-size: inherit; font-weight: normal;}
+.settings-form .controls {margin-left: 270px;}
+.settings-form select {}
+.settings-form .form-actions { padding-left: 270px; }
+
+#attachment_form #id_description
+{ width: 95% }
+
+#edit_sidebar .accordion {margin-bottom: 5px;}
+
+.wiki-article div.toc,
+.wiki-article div.article-list {
+  margin: 10px 0;
+  background: #f9f9f9;
+  padding: 10px;
+  width: 300px;
+  border: 1px solid #CCC;
+}
+      
+.wiki-article a.linknotfound {color: #C87;}
+
+.wiki-article pre {
+  max-width: 700px;
+}
+
+input[type=file] {float: none; width: auto;}
+.asteriskField { font-size: 20px; margin-left: 5px;}
+
+.notification-list .since {
+  font-size: 80%;
+  color: #CCC;
+}
+
+.directory-toolbar .filter-clear { margin-right: 10px; position: relative; top: 5px; }
+
+.accordion-heading h3 {margin: 0;}
+
+.breadcrumb .icon-bar {
+    display: block;
+    width: 18px;
+    height: 2px;
+    background-color: rgb(245, 245, 245);
+    border-radius: 1px 1px 1px 1px;
+    box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.25);
+    margin-top: 3px;
+}
+.breadcrumb .icon-bar:first-child{margin-top: 0;}
+
+#navbar_wiki_search input.search-query {width: 80px;}
+
+#article-menu
+{
+  border-bottom: 1px solid #EEE;
+}
+
+#article-container
+{
+  margin-top: 20px;
+}

@@ 0,0 1,15 @@
+.navbar,
+.nav-tabs li a,
+#article-breadcrumbs
+{display: none;}
+
+#article-menu li
+{
+  display: none;
+}
+
+#article-title-li
+{
+  display: block !important;
+}
+

@@ 10,9 10,9 @@
 
 {% block wiki_contents %}
 
-  <div class="" style="margin-top: 20px;">
-    <ul class="nav nav-pills" style="border-bottom: 1px solid #EEE;">
-      <li class="pull-left">
+  <div id="article-container">
+    <ul class="nav nav-pills" id="article-menu">
+      <li class="pull-left" id="article-title-li">
         <h1 id="article-title">
           {{ article.current_revision.title }}
           <small style="font-size: 14px;">

@@ 11,76 11,8 @@
     <link href="{{ STATIC_URL }}wiki/bootstrap/css/bootstrap.css" rel="stylesheet">
     <link href="{{ STATIC_URL }}wiki/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
     
-    <!-- TODO: Put all this stuff in Less -->
-    <style media="print">
-      .navbar,
-      .nav-tabs li a,
-      #article-breadcrumbs
-      {display: none;}
-    </style>
-    <style media="all">
-      #div_id_title .asteriskField{display:none}
-      #id_title {font-size: 20px; height: 30px; padding: 6px; width: 98%;}
-      #id_summary {width: 98%; padding: 6px;}
-      
-      h1#article-title {font-size: 2em; margin-top: -5px;}
-      
-      #article_edit_form label {max-width: 100px;}
-      #article_edit_form .controls {margin-left: 120px;}
-      
-      .form-horizontal label { font-size: 16px; font-weight: normal; color: #777;}
-  
-      .settings-form label {min-width: 250px; font-size: inherit; font-weight: normal;}
-      .settings-form .controls {margin-left: 270px;}
-      .settings-form select {}
-      .settings-form .form-actions { padding-left: 270px; }
-      
-      #attachment_form #id_description
-      { width: 95% }
-      
-      #edit_sidebar .accordion {margin-bottom: 5px;}
-      
-      .wiki-article div.toc,
-      .wiki-article div.article-list {
-        margin: 10px 0;
-        background: #f9f9f9;
-        padding: 10px;
-        width: 300px;
-        border: 1px solid #CCC;
-      }
-            
-      .wiki-article a.linknotfound {color: #C87;}
-      
-      .wiki-article pre {
-        max-width: 700px;
-      }
-      
-      input[type=file] {float: none; width: auto;}
-      .asteriskField { font-size: 20px; margin-left: 5px;}
-      
-      .notification-list .since {
-        font-size: 80%;
-        color: #CCC;
-      }
-      
-      .directory-toolbar .filter-clear { margin-right: 10px; position: relative; top: 5px; }
-      
-      .accordion-heading h3 {margin: 0;}
-      
-      .breadcrumb .icon-bar {
-          display: block;
-          width: 18px;
-          height: 2px;
-          background-color: rgb(245, 245, 245);
-          border-radius: 1px 1px 1px 1px;
-          box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.25);
-          margin-top: 3px;
-      }
-      .breadcrumb .icon-bar:first-child{margin-top: 0;}
-      
-      #navbar_wiki_search input.search-query {width: 80px;}
-      
-    </style>
+    <link href="{{ STATIC_URL }}wiki/css/all.css" rel="stylesheet" media="all">
+    <link href="{{ STATIC_URL }}wiki/css/print.css" rel="stylesheet" media="print">
     
     {% render_block "css" %}
     


@@ 104,7 36,9 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </a>
+          {% block wiki_header_branding %}
           <a class="brand" href="{% url 'wiki:root' %}">django-wiki</a>
+          {% endblock %}
           <form class="navbar-search pull-right" id="navbar_wiki_search" method="GET" action="{% url 'wiki:search' %}">
             <span class="icon-search"></span>
             <input type="text" name="query" class="search-query" placeholder="{% trans "Search..." %}" />


@@ 176,10 110,10 @@
       <div style="padding: 30px 0;" class="clearfix">
       <footer>
         <hr />
-        {% block footer_logo %}
+        {% block wiki_footer_logo %}
         <a href="https://github.com/benjaoming/django-wiki" class="pull-right"><img src="{{ STATIC_URL }}wiki/img/github_icon.png" /></a>
         {% endblock %}
-        {% block footer_prepend %}
+        {% block wiki_footer_prepend %}
         {% endblock %}
         <p>Powered by <a href="http://www.django-wiki.org">django-wiki</a>, an open source application under the <a href="http://www.gnu.org/licenses/quick-guide-gplv3.html">GPLv3</a> license. Let knowledge be the cure.</p>
         <div style="clear: both"></div>