Added wiki basic html and search styles

2012-01-26 21:51:18 -05:00
parent 0708f8d03f
commit 1a04693e63
10 changed files with 220 additions and 58 deletions
--- a/.hgignore
+++ b/.hgignore
@@ -4,3 +4,4 @@ syntax: glob
 *.scssc
 *.swp
 *.orig
+*.DS_Store
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
    <section class="course">
      <section>
        <h1>Circuits &amp; Electronics</h1>
-        <h2>6.002</h2>
+        <h2>6.002x</h2>
        <a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002 Circuits <span>&amp;</span> Electronics</a>
      </section>
      <p> Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002x Circuits and Electronics&rdquo; is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide  from February 21, 2012 through June&nbsp;10,&nbsp;2012.</p>
@@ -16,7 +16,7 @@
  <section class="about-course">

    <section class="about-info">
-      <h1>About 6.002</h1>
+      <h1>About 6.002x</h1>

      <p>6.002x is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.</p>

@@ -26,7 +26,7 @@
    </section>

    <section class="on-mitx">
-      <h1>6.002 on <em>MITx</em></h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->
+      <h1>6.002x on <em>MITx</em></h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->

      <p>Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Since this is an experimental version of the course, the certificate will be marked as Beta.</p>

--- a/navigation.html
+++ b/navigation.html
@@ -4,8 +4,8 @@

    <nav>
      <ul class="coursenav">
+        <li><a href="/info">Course Info</a></li>
        <li><a href="/courseware">Courseware</a></li>
-        <li><a href="/info">Info</a></li>
        <li><a href="/book">Textbook</a></li>
        <li><a href="/discussion">Discussion</a></li>
        <li><a href="/wiki">Wiki</a></li>
--- a/sass/_courseware.scss
+++ b/sass/_courseware.scss
@@ -8,16 +8,16 @@ div.course-wrapper {
  div#accordion {
    @extend .sidebar;

-		div#open_close_accordion {
-			position: absolute;
-			right: 0px;
-			width: 20px;
-			height: 20px;
-			background: #ccc;
-			border: 1px solid black;
-			right: -22px;
-			top: 5px;
-		}
+    div#open_close_accordion {
+      position: absolute;
+      right: 0px;
+      width: 20px;
+      height: 20px;
+      background: #ccc;
+      border: 1px solid black;
+      right: -22px;
+      top: 5px;
+    }
 		
    h3 {
      overflow: hidden;
@@ -63,7 +63,7 @@ div.course-wrapper {

        a {
          text-decoration: none;
-          margin-bottom: $body-line-height;
+          margin-bottom: lh(.5);
          display: block;

          &:hover {
@@ -86,12 +86,15 @@ div.course-wrapper {
    @extend .content;

    ol.vert-mod {
-      li {
+     > li {
        @extend .clearfix;
-        border-top: 1px solid #eee;
        border-bottom: 1px solid #eee;
        padding: 15px 0;

+        &:last-child {
+          border-bottom: none;
+        }
+
        h2 {
          margin-top: 0;
          margin-bottom: 15px;
--- a/sass/_index.scss
+++ b/sass/_index.scss
@@ -162,6 +162,17 @@ header.announcement {

    div {
      padding: lh(10) lh() lh(3);
+
+      //hide login link for homepage
+      nav {
+        h1 {
+          margin-right: 0;
+        }
+
+        a.login {
+          display: none;
+        }
+      }
    }
  }

@@ -204,7 +215,7 @@ header.announcement {
          text-decoration: none;

          &:hover, &:focus {
-            color: $mit-red;
+            color: #999;
          }
        }
      }
@@ -217,7 +228,7 @@ header.announcement {
        font-family: $header-font-family;

        &:hover, &:focus {
-          color: $mit-red;
+          color: #999;
        }
      }
    }
--- a/sass/_wiki-basic-html.scss
+++ b/sass/_wiki-basic-html.scss
@@ -0,0 +1,151 @@
+section.wiki-body {
+  div#wiki_article {
+    html, address,
+    blockquote,
+    body, dd, div,
+    dl, dt, fieldset, form,
+    frame, frameset,
+    h1, h2, h3, h4,
+    h5, h6, noframes,
+    ol, p, ul, center,
+    dir, hr, menu, pre   { 
+      display: block; 
+      unicode-bidi: embed 
+    }
+
+    li {
+      display: list-item 
+    }
+
+    head { 
+      display: none 
+    }
+
+    table { 
+      display: table 
+    }
+
+    tr { 
+      display: table-row 
+    }
+
+    thead { 
+      display: table-header-group 
+    }
+
+    tbody {
+      display: table-row-group 
+    }
+
+    tfoot {
+      display: table-footer-group 
+    }
+
+    col             { display: table-column }
+
+    colgroup        { display: table-column-group }
+
+    td, th          { display: table-cell }
+
+    caption         { 
+      display: table-caption 
+    }
+
+    th              { 
+      font-weight: bolder; 
+      text-align: center 
+    }
+
+    caption         { 
+      text-align: center 
+    }
+
+    h1 {
+      font-size: 2.4em;
+      margin: .67em 0;
+      letter-spacing: 0px;
+    }
+
+    h2 {
+      text-transform: none;
+      font-size: 2em;
+      margin: .75em 0;
+      letter-spacing: 0px;
+    }
+
+    h3 {
+      font-size: 1.75em;
+      margin: .83em 0;
+    }
+
+    h4 {
+      font-size: 1.25em;
+    }
+
+    h4, p,
+    blockquote, ul,
+    fieldset, form,
+    ol, dl, dir,
+    menu            { margin: 1.12em 0 }
+
+    h5              { font-size: 1.25em; margin: 1.5em 0 }
+
+    h6              { font-size: 1em; margin: 1.67em 0 }
+
+    h1, h2, h3, h4,
+    h5, h6, b,
+    strong          { font-weight: bolder }
+
+    blockquote      { 
+      padding: 10px 20px;
+      background: #e3e3e3;
+      border-left: 4px solid;
+    }
+
+    i, cite, em,
+    var, address    { font-style: italic }
+
+    pre, tt, code,
+    kbd, samp       { 
+      font-family: monospace; 
+    }
+
+    pre             { white-space: pre }
+
+    button, textarea,
+    input, select   { display: inline-block }
+
+    big             { font-size: 1.17em }
+
+    small, sub, sup { font-size: .83em }
+
+    sub             { vertical-align: sub }
+
+    sup             { vertical-align: super }
+
+    table           { border-spacing: 2px; }
+
+    thead, tbody,
+    tfoot           { vertical-align: middle }
+
+    td, th, tr      { vertical-align: inherit }
+
+    s, strike, del  { text-decoration: line-through }
+
+    hr              { height: 1px; background: #999; border: none;}
+
+    ol, ul, dir,
+    menu, dd        { margin-left: 40px }
+
+    ol              { list-style-type: decimal }
+
+    ol ul, ul ol,
+    ul ul, ol ol    { margin-top: 0; margin-bottom: 0 }
+
+    u, ins          { text-decoration: underline }
+
+    br:before       { content: "\A"; white-space: pre-line }
+
+    center          { text-align: center }
+  }
+}
--- a/sass/_wiki-create.scss
+++ b/sass/_wiki-create.scss
@@ -1,15 +1,13 @@
 form#wiki_revision {
  float: left;
-  width: flex-grid(7, 9);
+  width: flex-grid(6, 9);
  margin-right: flex-gutter(9);
 	
-	
  label {
    display: block;
    margin-bottom: 7px ;
  }

-
  textarea {
    @include box-sizing(border-box);
    margin-bottom: 20px;
@@ -33,8 +31,8 @@ form#wiki_revision {

 #wiki_edit_instructions {
  float: left;
-  width: flex-grid(2, 9);
-      
+  width: flex-grid(3, 9);
+
  .markdown-example {
    background-color: $light-gray;
    padding-top: 5px;
--- a/sass/_wiki.scss
+++ b/sass/_wiki.scss
@@ -12,7 +12,7 @@ div.wiki-wrapper {
      color: lighten($text-color, 10%);
      font-size: $body-font-size;
      margin: 0  !important;
-      padding: 7px 7px 7px 30px;
+      padding: 7px lh();
      text-align: left;
      width: 100%;

@@ -24,31 +24,26 @@ div.wiki-wrapper {

    ul {
      li {
+        &.search {
+          @include box-shadow(0 1px 0 #eee);
+          border-bottom: 1px solid #d3d3d3;
+          padding: 7px lh();
+
+          label {
+            display: none;
+          }
+        }
+
        &.create-article {
-          position: relative;
-
          h3 {
-            position: relative;
-
-            &:before {
-              background: blue  url(images/ui-icons_454545_256x240.png) -32px -16px no-repeat;
-              display: block;
-              position: absolute;
-              top: 0;
-              right: 0;
-              width: 16px;
-              height: 16px;
-            }
-
-            &:hover {
-              &:before {
-                background-image: url(images/ui-icons_454545_256x240.png) -64px -16px no-repeat;
-              }
+            a {
+              padding: 7px lh();
            }
          }
        }
      }
    }
+
    div#wiki_create_form {
      @extend .clearfix;
      padding: 15px;
@@ -63,6 +58,8 @@ div.wiki-wrapper {
      }

      ul {
+        list-style: none;
+
        li {
          float: left;

@@ -130,7 +127,7 @@ div.wiki-wrapper {
    p {
      line-height: 1.6em;
    }
-    
+
    #wiki_history_table {
      tr.dark {
        background-color: $light-gray;
--- a/sass/application.scss
+++ b/sass/application.scss
@@ -11,7 +11,7 @@
@import "courseware", "courseware-video";
@import "textbook";
@import "profile";
-@import "wiki-create", "wiki";
+@import "wiki-basic-html", "wiki-create", "wiki";
@import "activation";
@import "help";
@import "discussion", "discussion-questions", "askbot-original";
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -88,19 +88,9 @@
    %>

      <ul class="action">
-        <li>
-    	        <div class="wiki_box_title">Search</div>
-    	        <form method="POST" action='${reverse("wiki_search_articles", args=[])}'>
-    	            <div style="display:none">
-                	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
-                	</div>
-    	            <input type="text" 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%" />
-    	        </form>
-        </li>
-        <li>
-          <input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=[])}'" value="Random article" class="button" />
-        </li>
+        <!-- <li> -->
+        <!--   <input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=[])}'" value="Random article" class="button" /> -->
+        <!-- </li> -->
        <li>
          <input type="button" onclick="javascript:location.href='${reverse("wiki_list_articles", args=[])}'" value="All articles" class="button" />
        </li>
@@ -139,6 +129,17 @@
            </form>
          </div>
        </li>
+
+        <li class="search">
+    	        <form method="POST" action='${reverse("wiki_search_articles", args=[])}'>
+                <label class="wiki_box_title">Search</label>
+    	            <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%" />
+    	        </form>
+        </li>
      </ul>

    </div>