Merge

fixtures/anonymize_fixtures.py

+#! /usr/bin/env python
+
 import sys
 import json
 import random
 import copy
 from collections import defaultdict
 from argparse import ArgumentParser, FileType
+from datetime import datetime
 
 def generate_user(user_number):
   return {
@@ -51,7 +54,6 @@ def generate_user(user_number):
   }
 
 
-
 def parse_args(args=sys.argv[1:]):
     parser = ArgumentParser()
     parser.add_argument('-d', '--data', type=FileType('r'), default=sys.stdin)
@@ -59,6 +61,7 @@ def parse_args(args=sys.argv[1:]):
     parser.add_argument('count', type=int)
     return parser.parse_args(args)
 
+
 def main(args=sys.argv[1:]):
     args = parse_args(args)
 
@@ -79,6 +82,8 @@ def main(args=sys.argv[1:]):
             sample = random.choice(answers)
             data = copy.deepcopy(sample)
             data["fields"]["student"] = student_id + 1
+            data["fields"]["created"] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            data["fields"]["modified"] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
             data["pk"] = out_pk
             out_pk += 1
             out_data.append(data)

templates/6002x-faq.html

@@ -18,6 +18,14 @@ This set of questions and answers accompanies MIT’s February 13,
 6.002x: Circuits and Electronics.
 </p>
 
+<h2> How do I register?  </h2>
+
+<p> We will have a link to a form where you can sign up for our database and mailing list shortly.  Please check back in the next two weeks to this website for further instruction.  </p>
+
+<h2> Where can I find a list of courses available?  When do the next classes begin? </h2>
+
+<p> Courses will begin again in the Fall Semester (September).  We anticipate offering 4-5 courses this Fall, one of which will be 6.002x again.  The additional classes will be announced in early summer. </p>
+
 <h2> I tried to register for the course, but it says the username
 is already taken.</h2>
 

templates/sass/courseware/_amplifier.scss

@@ -84,84 +84,83 @@ section.tool-wrapper {
     width: flex-grid(4.5, 9);
 
     div.graph-controls {
-      padding: 0 0 lh();
-      margin-bottom: lh();
-      border-bottom: 1px solid darken(#073642, 5%);
-      @include box-shadow(0 1px 0 lighten(#073642, 2%));
-      @extend .clearfix;
 
       div.music-wrapper {
-        margin-right: flex-gutter(4.5);
-        width: flex-grid(1.5, 4.5);
-        float: left;
+        padding: 0 0 lh();
+        margin-bottom: lh();
+        border-bottom: 1px solid darken(#073642, 10%);
+        @include box-shadow(0 1px 0 lighten(#073642, 2%));
+        @extend .clearfix;
+
+        input#playButton {
+          display: block;
+          @include button(simple, lighten( #586e75, 5% ));
+          font: bold 14px $body-font-family;
+          border-color: darken(#002b36, 6%);
+          float: right;
+
+          &:active {
+            @include box-shadow(none);
+          }
+
+          &[value="Stop"] {
+            @include button(simple, darken(#268bd2, 30%));
+            font: bold 14px $body-font-family;
+
+            &:active {
+              @include box-shadow(none);
+            }
+          }
+        }
       }
 
       div.inputs-wrapper {
-        padding-top: lh(.5);
-        width: flex-grid(3, 4.5);
-        float: left;
+        @include clearfix;
+        margin-bottom: lh();
+        padding: 0 0 lh();
+        margin-bottom: lh();
+        border-bottom: 1px solid darken(#073642, 10%);
+        @include box-shadow(0 1px 0 lighten(#073642, 2%));
+        @extend .clearfix;
       }
 
-      select#musicTypeSelect {
-        display: block;
-        margin-bottom: lh(.5);
-        font: 16px $body-font-family;
-        width: 100%;
+      p {
+        @include inline-block();
+        margin: 0;
+        -webkit-font-smoothing: antialiased;
+        font-weight: bold;
+        text-shadow: 0 -1px 0 darken(#073642, 10%);
       }
 
-      div#graph-output, div#graph-listen {
-        display: block;
-        margin-bottom: lh(.5);
-        text-align: right;
-
-        p {
-          @include inline-block();
-          margin: 0;
-        }
+      ul {
+        @include inline-block();
+        margin-bottom: 0;
 
-        ul {
+        li {
           @include inline-block();
           margin-bottom: 0;
 
-          li {
-            @include inline-block();
-            margin-bottom: 0;
-
-            input {
-              margin-right: 5px;
-            }
+          input {
+            margin-right: 5px;
           }
         }
       }
 
-      input#playButton {
+      div#graph-listen {
+        margin-top: 8px;
+        margin-right: 20px;
         display: block;
-        @include button(simple, #dc322f);
-        font: bold 14px $body-font-family;
-        color: #47221a;
-        text-shadow: 0 1px 0 lighten(#dc322f, 5%);
-        @include box-shadow(inset 0 1px 0 lighten(#dc322f, 10%));
-
-        &:active {
-          @include box-shadow(none);
-        }
-
-        &[value="Stop"] {
-          @include button(simple, darken(#268bd2, 30%));
-          font: bold 14px $body-font-family;
-
-          &:active {
-            @include box-shadow(none);
-          }
-        }
+        text-align: right;
+        float: left;
+        margin-bottom: 0;
       }
     }
 
     label {
       @include border-radius(2px);
       font-weight: bold;
-      padding: 3px;
       color: #fff;
+      padding: 3px;
       -webkit-font-smoothing: antialiased;
     }
 
@@ -190,6 +189,29 @@ section.tool-wrapper {
 
     div.schematic-sliders {
 
+      div.top-sliders {
+        padding: 0 0 lh();
+        margin-bottom: lh();
+        border-bottom: 1px solid darken(#073642, 10%);
+        @include box-shadow(0 1px 0 lighten(#073642, 2%));
+        @extend .clearfix;
+
+      select#musicTypeSelect {
+        @include inline-block();
+        font: 16px $body-font-family;
+        margin-bottom: 0;
+      }
+
+      p {
+        @include inline-block();
+        -webkit-font-smoothing: antialiased;
+        text-shadow: 0 -1px 0 darken(#073642, 10%);
+        margin: 0 lh(.5) lh() 0;
+        font-weight: bold;
+      }
+
+      }
+
       div.slider-label {
         margin-bottom: lh(0.5);
         font-weight: bold;
@@ -208,11 +230,13 @@ section.tool-wrapper {
         }
 
         .ui-slider-handle {
-          background-color: #dc322f;
+          background: lighten( #586e75, 5% ) url('/static/images/amplifier-slider-handle.png') center no-repeat;
+          border: 1px solid darken(#002b36, 8%);
+          @include box-shadow(inset 0 1px 0 lighten( #586e75, 20% ));
           margin-top: -.3em;
 
           &:hover, &:active {
-            background-color: lighten(#dc322f, 5%);
+            background-color: lighten( #586e75, 10% );
           }
         }
       }

templates/sass/discussion/_answers.scss

@@ -42,16 +42,6 @@ div.answer-block {
   padding-top: 20px;
   width: 100%;
 
-  div.official-stamp {
-    background: $mit-red;
-    color: #fff;
-    font-size: 12px;
-    margin-top: 10px;
-    padding: 2px 5px;
-    text-align: center;
-    margin-left: -1px;
-  }
-
   img.answer-img-accept {
     margin: 10px 0px 10px 16px;
   }

templates/sass/discussion/_question-view.scss

 div.question-header {
+
+  div.official-stamp {
+    background: $mit-red;
+    color: #fff;
+    font-size: 12px;
+    margin-top: 10px;
+    padding: 2px 5px;
+    text-align: center;
+    margin-left: -1px;
+  }
+
   div.vote-buttons {
     display: inline-block;
     float: left;