Merge pull request #803 from MITx/feature/tomg/cms-editing

code mirror styling and a few small tweaks

cms/static/sass/_cms_mixins.scss

@@ -157,7 +157,8 @@
 		}
 
 		.draft-item,
-		.hidden-item {
+		.hidden-item,
+		.private-item {
 			color: #a4aab7;
 		}
 

cms/static/sass/_dashboard.scss

@@ -24,7 +24,7 @@
 
 	.class-name {
 		display: block;
-		font-size: 22px;
+		font-size: 19px;
 		font-weight: 300;
 	}
 

cms/static/sass/_graphics.scss

@@ -111,6 +111,7 @@
 
 .draft-tag,
 .hidden-tag,
+.private-tag,
 .has-new-draft-tag {
 	margin-left: 3px;
 	font-size: 9px;

cms/static/sass/_unit.scss

@@ -226,9 +226,20 @@
     padding: 20px;
     border-radius: 0 0 3px 3px;
     background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)) $blue;
+    color: #fff;
 
-    .module-editor {
-      background: white;
+    .metadata_edit {
+      margin-bottom: 20px;
+      font-size: 13px;
+    }
+
+    .CodeMirror {
+      border: 1px solid #3c3c3c;
+    }
+
+    h3 {
+      font-size: 18px;
+      font-weight: 700;
     }
 
     h5 {
@@ -238,7 +249,8 @@
     }
 
     .save-button {
-      margin-right: 8px;
+      margin-top: 10px;
+      margin: 15px 8px 0 0;
     }
   }
 }
@@ -266,19 +278,8 @@
     }
   }
 
-  .visibility-options .option {
-    margin-right: 10px;
-    padding: 3px 13px 6px;
-    border-radius: 3px;
-    background: #edf1f5;
-
-    &.checked {
-      background: #d1dae3;
-    }
-
-    input[type="radio"] {
+  input[type="radio"] {
       margin-right: 7px;
-    }
   }
 
   .status {

cms/templates/overview.html

@@ -49,12 +49,11 @@
                   % for unit in subsection.get_children():
                   <li class="leaf">
                     <div class="section-item">
-                      <a href="${reverse('edit_unit', args=[unit.location])}" class="hidden-item">
-                        <span class="${unit.category}-icon"></span>${unit.display_name} <span class="hidden-tag">– hidden</span>
+                      <a href="${reverse('edit_unit', args=[unit.location])}" class="private-item">
+                        <span class="${unit.category}-icon"></span>${unit.display_name} <span class="private-tag">– private</span>
                       </a>
                       <div class="item-actions">
-                        <a href="${reverse('delete_unit', args=[unit.location])}" class="edit-button wip"><span class="delete-icon"></span></a>
-                        <a href="#" class="visibility-toggle hidden wip"><span class="toggle-icon"></span></a>
+                        <a href="${reverse('delete_unit', args=[unit.location])}" class="edit-button wip"><span class="delete-icon"></span></a>                        
                         <a href="#" class="drag-handle wip"></a>
                       </div>
                     </div>

common/lib/xmodule/xmodule/css/codemirror/codemirror.scss

+.CodeMirror {
+  background: #fff;
+  font-size: 13px;
+  color: #3c3c3c;
+}
\ No newline at end of file

common/lib/xmodule/xmodule/editing_module.py

@@ -30,6 +30,8 @@ class XMLEditingDescriptor(EditingDescriptor):
     any validation of its definition
     """
 
+    css = {'scss': [resource_string(__name__, 'css/codemirror/codemirror.scss')]}
+
     js = {'coffee': [resource_string(__name__, 'js/src/raw/edit/xml.coffee')]}
     js_module_name = "XMLEditingDescriptor"
 
@@ -40,5 +42,7 @@ class JSONEditingDescriptor(EditingDescriptor):
     any validation of its definition
     """
 
+    css = {'scss': [resource_string(__name__, 'css/codemirror/codemirror.scss')]}
+
     js = {'coffee': [resource_string(__name__, 'js/src/raw/edit/json.coffee')]}
     js_module_name = "JSONEditingDescriptor"