From 4d985dc0c7e42e5fd5be67595400822fc3395515 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Mon, 1 Oct 2012 15:49:34 -0400
Subject: [PATCH] added release button; cleaned up toggle button

---
 cms/static/img/large-toggles.png  | Bin 3410 -> 3630 bytes
 cms/static/sass/_header.scss      |   8 ++++++--
 cms/static/sass/_unit.scss        |  10 +++++++++-
 cms/templates/unit.html           |  13 +++++++++++--
 cms/templates/widgets/header.html |  20 +++++++++++++-------
 5 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/cms/static/img/large-toggles.png b/cms/static/img/large-toggles.png
index 2251a1fa721d569e0dbffefa8f8c47f24a53405a..8c38a77ba08aaca3344dc845c8f337a796b6c5d7 100644
GIT binary patch
delta 2764
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
SgALjM0000<MNUMnLSTXjB1pOb

delta 2532
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

diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss
index 0518436511..6fe5b2ea32 100644
--- a/cms/static/sass/_header.scss
+++ b/cms/static/sass/_header.scss
@@ -17,13 +17,17 @@
 		line-height: 18px;
 	}
 
-	a {
+	a,
+	.username {
 		float: left;
 		display: inline-block;
 		height: 29px;
 		padding: 7px 15px 0;
 		color: #e4e6ee;
-		box-shadow: 1px 0 0 rgba(255, 255, 255, 0.2) inset, -1px 0 0 rgba(0, 0, 0, 0.3) inset;
+	}
+
+	a {
+		box-shadow: 1px 0 0 #787981 inset, -1px 0 0 #3d3e44 inset, 1px 0 0 #787981, -1px 0 0 #3d3e44;
 
 		&:hover {
 			background: rgba(255, 255, 255, .1);
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 4546835811..027b346f20 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -263,6 +263,10 @@
         }
     }
 
+    .status {
+        display: none;
+    }
+
     .visibility-options .option {
         margin-right: 10px;
         padding: 3px 13px 6px;
@@ -279,7 +283,7 @@
     }
 
     .save-button {
-        @include blue-button;
+        @include white-button;
         margin-top: 10px;
     }
 
@@ -292,6 +296,10 @@
         @include orange-button;
         margin-top: 10px;
     }
+
+    .release-button {
+        @include blue-button;
+    }
 }
 
 .unit-history {
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index e9a31ea82d..7b52424395 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -1,5 +1,6 @@
 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
+<%block name="bodyclass">unit</%block>
 <%block name="title">CMS Unit</%block>
 <%block name="content">
   <div class="main-wrapper">
@@ -62,11 +63,19 @@
             </div>
             <div class="visibility row">
               <label>Visibility:<!-- <span class="description">Shows or hides this subsection and the units within it.</span>--></label>
-              <a href="#" class="toggle-off">hide</a><a href="#" class="large-toggle"></a><a href="#" class="toggle-on">show</a>
+              <a href="#" class="toggle-off">hidden</a><a href="#" class="large-toggle"></a><a href="#" class="toggle-on">shown</a>
+            </div>
+            <div class="status row">
+              <label class="inline-label">Status:</label>
+              <select>
+                <option>Draft</option>
+                <option>Released</option>
+              </select>
             </div>
             <div class="row unit-actions">
-              <a href="#" class="save-button">Save</a>
+              <a href="#" class="save-button">Save Draft</a>
               <a href="preview.html" target="_blank" class="preview-button">Preview</a>
+              <a href="#" class="release-button">Release</a>
             </div>
           </div>
         </div>
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index c21f1f564b..0c4905fbe2 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -1,12 +1,18 @@
 <%! from django.core.urlresolvers import reverse %>
-<header>
-  <nav>
-    <a href="/">Home</a>
-    <h2><a href="#">edX CMS: TODO:-course-name-here</a></h2>
 
-    <ul class="user-nav">
-      <li><a href="#" class="wip">Tasks</a></li>
-      <li><a href="#" class="wip">Settings</a></li>
+<header class="primary-header">
+  <nav class="inner-wrapper">
+    <div class="left">
+      <a href="/"><span class="home-icon"></span></a>
+      <a href="#" class="class-name wip-box">6.002x Circuits and Electronics <span class="drop-icon">▾</span></a>
+      <ul class="class-nav">
+        <li><a href="overview-full.html" class="active">Courseware</a></li>
+        <li><a href="updates.html" class="wip-box">Course Info</a></li>
+        <li><a href="textbook.html" class="wip-box">Textbook</a></li>
+      </ul>
+    </div>
+    <div class="right">
+      <span class="username">${ user.username }</span>
       % if user.is_authenticated():
          <li><a href="${reverse('logout')}">Log out</a></li>
       % else: