From df09990a0a678cf1963e5ca750c3961d444406d9 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 11 Oct 2012 11:41:46 -0400
Subject: [PATCH 1/9] removed dropdown in header

---
 cms/templates/widgets/header.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index 0805354b85..fb436ddde2 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -3,10 +3,10 @@
 <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>
+      <a href="/"><span class="home-icon"></span></a>
+      <a href="#" class="class-name wip-box">6.002x Circuits and Electronics</a>
       <ul class="class-nav">
-        <li><a href="overview-full.html" class="active">Courseware</a></li>
+        <li><a href="#" class="active">Courseware</a></li>
         <li><a href="#" class="wip-box">Pages</a></li>
         <li><a href="#" class="wip-box">Assets</a></li>
         <li><a href="#" class="wip-box">Users</a></li>

From 093d8385f7cece69e6d30aad335b34c874eb4e5d Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 11 Oct 2012 11:58:32 -0400
Subject: [PATCH 2/9] removed search

---
 cms/templates/overview.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index 93a4ff2678..d31e1e4823 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -45,9 +45,7 @@
   <div class="main-wrapper">
     <div class="inner-wrapper">
       <h1>Courseware</h1>
-      <div class="page-actions">
-        <input type="text" class="courseware-unit-search-input search wip-box" placeholder="search units" />
-      </div>
+      <div class="page-actions"></div>
       <article class="courseware-overview">
         <a href="#" class="new-courseware-section-button"><span class="plus-icon"></span> New Section</a>
         % for section in sections:

From 427462348db4429ddadd43a91d64e5882525e58c Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 11 Oct 2012 13:04:59 -0400
Subject: [PATCH 3/9] tweaked published messaging styles

---
 cms/static/sass/_unit.scss | 15 ++++++++++++---
 cms/templates/unit.html    |  6 ++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 91e5d52026..5eeefaecaa 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -285,6 +285,7 @@
   }
 
   .published-alert {
+    display: none;
     padding: 10px;
     border: 1px solid #edbd3c;
     border-radius: 3px;
@@ -430,7 +431,11 @@
     display: none;
   }
 
-  #create-draft {
+  .published-alert {
+    display: block;
+  }
+
+  .edit-draft-message {
     display: none;
   }
 }
@@ -438,13 +443,17 @@
 .edit-state-public {
   #save-draft,
   #delete-draft,
-  #publish-draft,
   .component-actions,
   .new-component-item,
-  #published-alert {
+  #published-alert,
+  .publish-draft-message {
     display: none;
   }
 
+  .published-alert {
+    display: block;
+  }
+
   .drag-handle {
     display: none !important;
   }
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index bef3695a8d..1348072d4c 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -80,8 +80,10 @@
                 <option value="private">Private</option>
               </select>
             </div>
-            <a id="create-draft" href="#">This unit has been published. Click here to edit it.</a>
-            <a id="publish-draft" href="#">This unit has already been published. Click here to release your changes to it</a>
+            <div class="row published-alert">
+              <p class="edit-draft-message">This unit has been published. To make changes, you must <a href="#" id="create-draft">edit a draft</a>.</p>
+              <p class="publish-draft-message">This is a draft of the published unit. To update the live version, you must <a href="#" id="publish-draft">replace it with this draft</a>.</p>
+            </div>            
             <div class="row status">
               <p>This unit is scheduled to be released to <strong>students</strong> on <strong>${subsection.start}</strong> with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name}"</a></p>
             </div>

From b685af44ebb15f35a411b1734fc54fe5c91a2cf8 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 11 Oct 2012 13:24:43 -0400
Subject: [PATCH 4/9] started calendar styles

---
 cms/static/sass/_jquery-ui-calendar.scss | 24 ++++++++++++++++++++++++
 cms/static/sass/base-style.scss          |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 cms/static/sass/_jquery-ui-calendar.scss

diff --git a/cms/static/sass/_jquery-ui-calendar.scss b/cms/static/sass/_jquery-ui-calendar.scss
new file mode 100644
index 0000000000..93738369fe
--- /dev/null
+++ b/cms/static/sass/_jquery-ui-calendar.scss
@@ -0,0 +1,24 @@
+.ui-datepicker {
+  font-family: $sans-serif;
+  font-size: 12px;
+
+  .ui-widget-header {
+    background: $darkGrey;
+    border: none;
+  }
+
+  .ui-datepicker-next,
+  .ui-datepicker-prev {
+    @include transition(none);
+
+    &.ui-state-hover {
+      border-color: transparent;
+      background: $mediumGrey;
+
+      .ui-icon-circle-triangle-e,
+      .ui-icon-circle-triangle-w {
+        background-image: url(/static/css/vendor/ui-lightness/images/ui-icons_ffffff_256x240.png);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss
index fd3881a371..ec5ece2338 100644
--- a/cms/static/sass/base-style.scss
+++ b/cms/static/sass/base-style.scss
@@ -23,6 +23,7 @@
 @import "modal";
 @import "alerts";
 @import "login";
+@import 'jquery-ui-calendar';
 
 @import 'content-types';
 

From fcc725e76dc1e836c450cc34c7a78d0de10bc73a Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 11 Oct 2012 14:18:32 -0400
Subject: [PATCH 5/9] finished calendar styles

---
 cms/static/sass/_jquery-ui-calendar.scss | 26 ++++++++++++++++++++++++
 cms/static/sass/_variables.scss          |  1 +
 2 files changed, 27 insertions(+)

diff --git a/cms/static/sass/_jquery-ui-calendar.scss b/cms/static/sass/_jquery-ui-calendar.scss
index 93738369fe..102272ac5a 100644
--- a/cms/static/sass/_jquery-ui-calendar.scss
+++ b/cms/static/sass/_jquery-ui-calendar.scss
@@ -1,4 +1,6 @@
 .ui-datepicker {
+  border-color: $darkGrey;
+  background: $lightGrey;
   font-family: $sans-serif;
   font-size: 12px;
 
@@ -21,4 +23,28 @@
       }
     }
   }
+
+  .ui-state-default {
+    border-color: $mediumGrey;
+    color: $blue;
+    @include transition(none);
+
+    &.ui-state-hover {
+      background: $orange;
+      border-color: $orange;
+      color: #fff;
+    }
+  }
+
+  .ui-state-highlight {
+    background: $blue;
+    border-color: $blue;
+    color: #fff;
+  }
+
+  .ui-state-active {
+    background: $orange;
+    border-color: $orange;
+    color: #fff;
+  }
 }
\ No newline at end of file
diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss
index 5d1a9ebd46..fec65e4e11 100644
--- a/cms/static/sass/_variables.scss
+++ b/cms/static/sass/_variables.scss
@@ -14,6 +14,7 @@ $pink: rgb(182,37,104);
 $error-red: rgb(253, 87, 87);
 
 $blue: #5597dd;
+$orange: #edbd3c;
 $lightGrey: #edf1f5;
 $mediumGrey: #ced2db;
 $darkGrey: #8891a1;

From c3e2a544da3a66974d13de9ea84daaa64596bfc2 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 11 Oct 2012 14:34:13 -0400
Subject: [PATCH 6/9] tweaks to datepicker and calendar

---
 cms/static/sass/_jquery-ui-calendar.scss              |  5 ++++-
 .../static/js/vendor/timepicker/jquery.timepicker.css | 11 ++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cms/static/sass/_jquery-ui-calendar.scss b/cms/static/sass/_jquery-ui-calendar.scss
index 102272ac5a..e153750a49 100644
--- a/cms/static/sass/_jquery-ui-calendar.scss
+++ b/cms/static/sass/_jquery-ui-calendar.scss
@@ -1,12 +1,15 @@
 .ui-datepicker {
   border-color: $darkGrey;
-  background: $lightGrey;
+  border-radius: 2px;
+  background: #fff;
   font-family: $sans-serif;
   font-size: 12px;
+  @include box-shadow(0 5px 10px rgba(0, 0, 0, 0.1));
 
   .ui-widget-header {
     background: $darkGrey;
     border: none;
+    border-radius: 2px;
   }
 
   .ui-datepicker-next,
diff --git a/common/static/js/vendor/timepicker/jquery.timepicker.css b/common/static/js/vendor/timepicker/jquery.timepicker.css
index 0586ef16c3..045751cc06 100755
--- a/common/static/js/vendor/timepicker/jquery.timepicker.css
+++ b/common/static/js/vendor/timepicker/jquery.timepicker.css
@@ -1,17 +1,18 @@
 .ui-timepicker-list {
 	overflow-y: auto;
 	height: 150px;
-	width: 6.5em;
+	width: 7.5em;
 	background: #fff;
-	border: 1px solid #ddd;
+	border: 1px solid #8891a1;
 	margin: 0;
 	padding: 0;
 	list-style: none;
-	-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
-	box-shadow:0 5px 10px rgba(0,0,0,0.2);
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.1);
 	outline: none;
 	z-index: 10001;
+	font-size: 12px;
 }
 
 .ui-timepicker-list.ui-timepicker-with-duration {

From 8da5087de86b696cf97750fd2b926d256f9cebba Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 11 Oct 2012 14:50:43 -0400
Subject: [PATCH 7/9] polished policy styles

---
 cms/static/img/plus-icon-small.png | Bin 0 -> 947 bytes
 cms/static/sass/_graphics.scss     |   8 ++++++++
 cms/static/sass/_subsection.scss   |  24 ++++++++++++++++++++++++
 cms/templates/edit_subsection.html |   9 ++++-----
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 cms/static/img/plus-icon-small.png

diff --git a/cms/static/img/plus-icon-small.png b/cms/static/img/plus-icon-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..1abb12b6da58b83cf9308337a94ed68150012190
GIT binary patch
literal 947
zcmaJ=J#W)M7&byws8R>S1QOE81qo2&uf|So#Z;*s6H7P>sU<RUu`h|0+Gp$waUurP
zjg^sKz=XuY!hjf&x-hUXRZMK<AHZE2rwjzk_T9aDp6C6%SDp65t<9U89LH_BExSwC
z4fb7S|I?GR7F}+TW{(`=0hz)Kag7l75pZKTL|p{K*|RUG&T*G-M}Cj=yhlcWV*xUZ
zP{b)^b6kDDNMSHW1oY7`N=*Lj<0l?Op~*i{J;_TgG>TgD3?0tfelQ;gddTlT0QJJ4
z0x=>G6!B4#8->X)bPc*^W|0RA2pOCFc~CvC11y{&pbEQ{K$2ykX@Xo;HBH_DiX<zd
zL|?5UR}ED&lp0t*JoT1^1EXs@OJDS4@*_f0LlmdesW9CYa5fZWUDuh0qEslNlFt$X
zi%ODjmkKt@gDgr(gcHCNVINP3$<s*BQ;5@*Y?3d_L<=SsFcoD%VkwnC&-*_#j#ucM
zbkRk;{}j&sS&GCi%JC!%XyXRk%vEYw8G;07KE_976+0tLa6ZB*unskF*MmWnFvGnC
z!}AO`$q7sX<k}`rHH0V%4OMk&O~=ushNj4JQ)$>v^I*@?b!AVrs*P&NwQ(?sQ9?>?
zc)_i$<+5RjQ|j49S@ax*PKIN!NZN?j$5LIZx8#QFV^P;~MH-CATKiY4OB0<Rwp|S_
zJ*-9_C3N01I@pQ-)ufl=j%zpk;(Pz(?N9Xb_;=^cHCvKTxt-Si$K=Pi&#l+DxJw&c
W?fsP(-t`Z^*fnySZTsE9)8jwRw<TBr

literal 0
HcmV?d00001

diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss
index 1f07f4433c..994372504e 100644
--- a/cms/static/sass/_graphics.scss
+++ b/cms/static/sass/_graphics.scss
@@ -139,6 +139,14 @@
 	background: url(../img/plus-icon.png) no-repeat;
 }
 
+.plus-icon-small {
+	display: inline-block;
+	width: 6px;
+	height: 6px;
+	margin-right: 8px;
+	background: url(../img/plus-icon-small.png) no-repeat center;
+}
+
 .folder-icon {
 	display: inline-block;
 	width: 15px;
diff --git a/cms/static/sass/_subsection.scss b/cms/static/sass/_subsection.scss
index b45d7d4af6..9b2ee5169f 100644
--- a/cms/static/sass/_subsection.scss
+++ b/cms/static/sass/_subsection.scss
@@ -20,6 +20,30 @@
 			@include tree-view;
 		}
 	}
+
+	.policy-list {
+		.policy-list-name {
+			margin-right: 5px;
+		}
+
+		.policy-list-value {
+			margin-right: 10px;
+		}
+
+		li {
+			margin-bottom: 10px;
+		}
+	}
+
+	.new-policy-item {
+		margin: 10px 0;
+
+		.plus-icon-small {
+			position: relative;
+			top: -1px;
+			vertical-align: middle;
+		}
+	}
 }
 
 .subsection-name-input {
diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html
index e6eeed0963..ec5adc770a 100644
--- a/cms/templates/edit_subsection.html
+++ b/cms/templates/edit_subsection.html
@@ -38,11 +38,10 @@
 		  	<li class="policy-list-element">
 		  		<input type="text" class="policy-list-name" name="${policy_name}" value="${policy_name}" disabled size="15"/>:&nbsp;<input type="text" class="policy-list-value" name="${policy_metadata[policy_name]}" value="${policy_metadata[policy_name]}" size="40"/><a href="#" class="delete-icon remove-policy-data"></a>
 		  	</li>
-		  	% endfor 
-
-		    <a href="#" class="new-policy-item add-policy-data" >
-		      <span class="new-policy-icon"></span>New Policy Data
-		    </a>
+		  	% endfor
+        <a href="#" class="new-policy-item add-policy-data">
+          <span class="plus-icon-small"></span>New Policy Data
+        </a>
 		  </ol>
 		</div>					
       </article>

From 5f66be503c5285727088976a179a15d7b52ccf58 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 11 Oct 2012 14:52:44 -0400
Subject: [PATCH 8/9] changed edx to edx studio in email templates (hopefully
 this is right)

---
 cms/templates/emails/activation_email.txt         | 2 +-
 cms/templates/emails/activation_email_subject.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms/templates/emails/activation_email.txt b/cms/templates/emails/activation_email.txt
index 209ff98335..6007f1e67b 100644
--- a/cms/templates/emails/activation_email.txt
+++ b/cms/templates/emails/activation_email.txt
@@ -1,4 +1,4 @@
-Thank you for signing up for edX! To activate your account, 
+Thank you for signing up for edX studio! To activate your account, 
 please copy and paste this address into your web browser's
 address bar:
 
diff --git a/cms/templates/emails/activation_email_subject.txt b/cms/templates/emails/activation_email_subject.txt
index 495e0b5fad..07e5ea74db 100644
--- a/cms/templates/emails/activation_email_subject.txt
+++ b/cms/templates/emails/activation_email_subject.txt
@@ -1 +1 @@
-Your account for edX
+Your account for edX studio

From 648792b7d329b60575d8f70c0db06b2f2a061808 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Thu, 11 Oct 2012 16:25:39 -0400
Subject: [PATCH 9/9] changed studio to edge in emails

---
 cms/templates/emails/activation_email.txt         | 2 +-
 cms/templates/emails/activation_email_subject.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms/templates/emails/activation_email.txt b/cms/templates/emails/activation_email.txt
index 6007f1e67b..5a1d63b670 100644
--- a/cms/templates/emails/activation_email.txt
+++ b/cms/templates/emails/activation_email.txt
@@ -1,4 +1,4 @@
-Thank you for signing up for edX studio! To activate your account, 
+Thank you for signing up for edX edge! To activate your account, 
 please copy and paste this address into your web browser's
 address bar:
 
diff --git a/cms/templates/emails/activation_email_subject.txt b/cms/templates/emails/activation_email_subject.txt
index 07e5ea74db..0b0fb2ffe9 100644
--- a/cms/templates/emails/activation_email_subject.txt
+++ b/cms/templates/emails/activation_email_subject.txt
@@ -1 +1 @@
-Your account for edX studio
+Your account for edX edge