Merge pull request #867 from MITx/feature/tomg/cas-cleanup

various style updates

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;

cms/static/sass/_jquery-ui-calendar.scss

+.ui-datepicker {
+  border-color: $darkGrey;
+  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,
+  .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);
+      }
+    }
+  }
+
+  .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

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 {

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;
   }

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;

cms/static/sass/base-style.scss

@@ -23,6 +23,7 @@
 @import "modal";
 @import "alerts";
 @import "login";
+@import 'jquery-ui-calendar';
 
 @import 'content-types';
 

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>

cms/templates/emails/activation_email.txt

-Thank you for signing up for edX! 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:
 

cms/templates/emails/activation_email_subject.txt

-Your account for edX
+Your account for edX edge

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:

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>

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>

common/static/js/vendor/timepicker/jquery.timepicker.css

 .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 {