From 4d53b370d7f0e1b8135bf9bc40e3b5d255167c44 Mon Sep 17 00:00:00 2001
From: Reda Lemeden <reda@thoughtbot.com>
Date: Thu, 1 Mar 2012 12:25:26 -0500
Subject: [PATCH] Edited the simple wiki templates to allow for more
 flexibility in title markup + changed the layout of search results

---
 sass/wiki/_wiki.scss          | 74 ++++++++++++++++++++++++++++-------
 simplewiki_base.html          |  7 ++--
 simplewiki_create.html        |  2 +-
 simplewiki_edit.html          |  2 +-
 simplewiki_error.html         |  2 +-
 simplewiki_history.html       |  2 +
 simplewiki_searchresults.html |  4 ++
 simplewiki_view.html          |  2 +-
 8 files changed, 73 insertions(+), 22 deletions(-)

diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss
index 60dd559a31..e97e89f1b9 100644
--- a/sass/wiki/_wiki.scss
+++ b/sass/wiki/_wiki.scss
@@ -3,7 +3,10 @@ div.wiki-wrapper {
   width: 100%;
 
   section.wiki-body {
+    @extend .clearfix;
     @extend .content;
+    position: relative;
+
 
     header {
       @extend .topbar;
@@ -74,27 +77,70 @@ div.wiki-wrapper {
       }
     }
 
-    h1.wiki-title {
-      font-weight: bold;
-      padding-bottom: 10px;
-      margin-bottom: 20px;
-      border-bottom: 1px solid #ccc;
-    }
+     h2.wiki-title {
+        margin-top: 0;
+        margin-bottom: 15px;
+        width: flex-grid(4, 9);
+        padding-right: flex-gutter(9);
+        border-right: 1px dashed #ddd;
+        @include box-sizing(border-box);
+        display: table-cell;
+        vertical-align: top;
+
+        @media screen and (max-width:1120px) {
+          display: block;
+          width: auto;
+          border-right: 0;
+        }
+
+        @media print {
+          display: block;
+          width: auto;
+          border-right: 0;
+        }
+      }
 
     p {
       line-height: 1.6em;
     }
 
-    ul.article-list {
-      margin-left: 15px;
+    section.results {
+      display: table-cell;
+      width: flex-grid(5, 9);
+      padding-left: flex-gutter(9);
 
-      li {
-        margin: 10px 0;
-      list-style-image: url('/static/images/bullet-triangle.png');
+      @media screen and (max-width:1120px) {
+        display: block;
+        width: auto;
+        padding: 0;
+      }
 
-        h3 {
-          font-size: 18px;
-          font-weight: normal;
+      @media print {
+        display: block;
+        width: auto;
+        padding: 0;
+
+        canvas, img {
+          page-break-inside: avoid;
+        }
+      }
+
+      ul.article-list {
+        margin-left: 15px;
+
+        li {
+          list-style: none;
+          margin: 0;
+          padding: 10px 0;
+          border-bottom: 1px solid #eee;
+
+          &:last-child {
+            border-bottom: 0;
+          }
+          h3 {
+            font-size: 18px;
+            font-weight: normal;
+          }
         }
       }
     }
diff --git a/simplewiki_base.html b/simplewiki_base.html
index 81b88ec1b9..db1120c15f 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -127,8 +127,8 @@
             <div style="display:none">
               <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
             </div>
-            <input type="text" placeholder="Search" name="value" id="wiki_search_input" style="width: 72%" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/>
-            <input type="submit" id="wiki_search_input_submit" value=Go! style="width: 20%" />
+            <input type="text" placeholder="Search" name="value" id="wiki_search_input" style="width: 71%" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/>
+            <input type="submit" id="wiki_search_input_submit" value="Go!" style="width: 20%" />
           </form>
         </li>
       </ul>
@@ -163,8 +163,7 @@
         %endif
       </header>
 
-      <h1 class="wiki-title"><%block name="wiki_page_title"/></h1>
-
+      <%block name="wiki_page_title"/>
       <%block name="wiki_body"/>
     </section>
   </div>
diff --git a/simplewiki_create.html b/simplewiki_create.html
index a2161a22a7..6903c5ecd2 100644
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
@@ -5,7 +5,7 @@
 <%block name="title"><title>Create Article - MITx 6.002 Wiki</title></%block>
 
 <%block name="wiki_page_title">
-Create article
+<h1>Create article</h1>
 </%block>
 
 <%block name="wiki_body">
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index 54fe13fe24..50cc33d20c 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -5,7 +5,7 @@
 <%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
 
 <%block name="wiki_page_title">
-${ wiki_article.title }
+<h1>${ wiki_article.title }</h1>
 </%block>
 
 <%block name="wiki_head">
diff --git a/simplewiki_error.html b/simplewiki_error.html
index 8b7324a998..73408349eb 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -10,7 +10,7 @@
 
 
 <%block name="wiki_page_title">
-Oops...
+<h1>Oops...</h1>
 </%block>
 
 
diff --git a/simplewiki_history.html b/simplewiki_history.html
index ddee16c1f6..9b7c9e11db 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -9,7 +9,9 @@
 %>
 
 <%block name="wiki_page_title">
+<h1>
 ${ wiki_article.title }
+</h1>
 </%block>
 
 <%block name="wiki_body">
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html
index ee67f365ff..0b47bc08a2 100644
--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
@@ -9,14 +9,17 @@ from django.core.urlresolvers import reverse
 %>
 
 <%block name="wiki_page_title">
+<h2 class="wiki-title">
 %if wiki_search_query:
 Search results for ${wiki_search_query | h}
 %else:
 Displaying all articles
 %endif
+</h2>
 </%block>
 
 <%block name="wiki_body">
+<section class="results">
 <ul class="article-list">
 %for article in wiki_search_results:
 <% article_deleted = not article.current_revision.deleted == 0 %>
@@ -27,4 +30,5 @@ Displaying all articles
 No articles matching <b>${wiki_search_query if wiki_search_query is not UNDEFINED else ""} </b>!
 %endif
 </ul>
+</section>
 </%block>
diff --git a/simplewiki_view.html b/simplewiki_view.html
index ef7b02d6b2..0421214a59 100644
--- a/simplewiki_view.html
+++ b/simplewiki_view.html
@@ -5,7 +5,7 @@
 <%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
 
 <%block name="wiki_page_title">
-  ${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}
+  <h1>${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}</h1>
 </%block>
 
 <%block name="wiki_body">