studio - resolved base variable missing issue on lms side

2013-01-22 16:31:42 -05:00
parent fd3ae2c478 731fb209de
commit 023dadd074
161 changed files with 16248 additions and 1903 deletions
--- a/cms/djangoapps/models/settings/course_details.py
+++ b/cms/djangoapps/models/settings/course_details.py
@@ -12,7 +12,7 @@ import re
 import logging


-class CourseDetails:
+class CourseDetails(object):
    def __init__(self, location):
        self.course_location = location    # a Location obj
        self.start_date = None  # 'start'
@@ -79,8 +79,7 @@ class CourseDetails:
        descriptor = get_modulestore(course_location).get_item(course_location)
        
        dirty = False
-        
-        ## ??? Will this comparison work?
+
        if 'start_date' in jsondict:
            converted = jsdate_to_time(jsondict['start_date'])
        else:
--- a/cms/djangoapps/models/settings/course_grading.py
+++ b/cms/djangoapps/models/settings/course_grading.py
@@ -4,7 +4,7 @@ import re
 from util import converters


-class CourseGradingModel:
+class CourseGradingModel(object):
    """
    Basically a DAO and Model combo for CRUD operations pertaining to grading policy. 
    """
--- a/cms/static/css/tiny-mce.css
+++ b/cms/static/css/tiny-mce.css
@@ -1,106 +1,107 @@
@font-face{font-family:'Open Sans';font-style:normal;font-weight:700;src:local("Open Sans Bold"),local("OpenSans-Bold"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzKRDOzjiPcYnFooOUGCOsRk.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:normal;font-weight:300;src:local("Open Sans Light"),local("OpenSans-Light"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTaRDOzjiPcYnFooOUGCOsRk.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:italic;font-weight:700;src:local("Open Sans Bold Italic"),local("OpenSans-BoldItalic"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxhbnBKKEOwRKgsHDreGcocg.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:italic;font-weight:300;src:local("Open Sans Light Italic"),local("OpenSansLight-Italic"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxvR_54zmj3SbGZQh3vCOwvY.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:italic;font-weight:400;src:local("Open Sans Italic"),local("OpenSans-Italic"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBrrIa-7acMAeDBVuclsi6Gc.woff) format("woff")}@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:local("Open Sans"),local("OpenSans"),url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff) format("woff")}

 .mceContentBody {
-  padding: 10px;
-  background-color: #fff;
-  font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif;
-  font-size: 16px;
-  line-height: 1.6;
-  color: #3c3c3c;
-  scrollbar-3dlight-color: #F0F0EE;
-  scrollbar-arrow-color: #676662;
-  scrollbar-base-color: #F0F0EE;
-  scrollbar-darkshadow-color: #DDDDDD;
-  scrollbar-face-color: #E0E0DD;
-  scrollbar-highlight-color: #F0F0EE;
-  scrollbar-shadow-color: #F0F0EE;
-  scrollbar-track-color: #F5F5F5;
+    padding: 10px;
+    background-color: #fff;
+    font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif;
+    font-size: 16px;
+    line-height: 1.6;
+    color: #3c3c3c;
+    scrollbar-3dlight-color: #F0F0EE;
+    scrollbar-arrow-color: #676662;
+    scrollbar-base-color: #F0F0EE;
+    scrollbar-darkshadow-color: #DDDDDD;
+    scrollbar-face-color: #E0E0DD;
+    scrollbar-highlight-color: #F0F0EE;
+    scrollbar-shadow-color: #F0F0EE;
+    scrollbar-track-color: #F5F5F5;
 }

 h1 {
-  color: #3c3c3c;
-  font-weight: normal;
-  font-size: 2em;
-  line-height: 1.4em;
-  letter-spacing: 1px;
-  margin: 0 0 1.416em 0;
+    color: #3c3c3c;
+    font-weight: normal;
+    font-size: 2em;
+    line-height: 1.4em;
+    letter-spacing: 1px;
+    margin: 0 0 1.416em 0;
 }

 h2 {
-  color: #646464;
-  font-weight: normal;
-  font-size: 1.2em;
-  line-height: 1.2em;
-  letter-spacing: 1px;
-  margin-bottom: 15px;
-  text-transform: uppercase;
-  -webkit-font-smoothing: antialiased;
+    color: #646464;
+    font-weight: normal;
+    font-size: 1.2em;
+    line-height: 1.2em;
+    letter-spacing: 1px;
+    margin-bottom: 15px;
+    text-transform: uppercase;
+    -webkit-font-smoothing: antialiased;
 }

 h3, h4, h5, h6 {
-  margin: 0 0 10px 0;
-  font-weight: 600;
+    margin: 0 0 10px 0;
+    font-weight: 600;
 }

 h3 {
-  font-size: 1.2em;
+    font-size: 1.2em;
 }

 h4 {
-  font-size: 1em;
+    font-size: 1em;
 }

 h5 {
-  font-size: .83em;
+    font-size: .83em;
 }

 h6 {
-  font-size: 0.75em;
+    font-size: 0.75em;
 }

 p {
-  margin-bottom: 1.416em;
-  font-size: 1em;
-  line-height: 1.6em !important;
-  color: #3c3c3c;
+    margin-bottom: 1.416em;
+    font-size: 1em;
+    line-height: 1.6em !important;
+    color: #3c3c3c;
 }

 em, i {
-  font-style: italic;
+    font-style: italic;
 }

 strong, b {
-  font-style: bold;
+    font-style: bold;
 }

 p + p, ul + p, ol + p {
-  margin-top: 20px;
+    margin-top: 20px;
 }

 ol, ul {
-  margin: 1em 0;
-  padding: 0 0 0 1em;
-  color: #3c3c3c;
+    margin: 1em 0;
+    padding: 0 0 0 1em;
+    color: #3c3c3c;
+
 }

 ol li, ul li {
-  margin-bottom: 0.708em;
+    margin-bottom: 0.708em;
 }

 ol {
-  list-style: decimal outside none;
+    list-style: decimal outside none;
 }

 ul {
-  list-style: disc outside none;
+    list-style: disc outside none;
 }

 a, a:link, a:visited, a:hover, a:active {
-  color: #1d9dd9;
-} 
+    color: #1d9dd9;
+}

 img {
-  max-width: 100%;
+    max-width: 100%;
 }

 pre {
@@ -113,26 +114,26 @@ pre {
 }

 code {
-  font-family: monospace, serif;
-  background: none;
-  color: #3c3c3c;
+    font-family: monospace, serif;
+    background: none;
+    color: #3c3c3c;
 }

 table {
-  width: 100%; 
-  border-collapse: collapse;
-  font-size: 16px;
+    width: 100%;
+    border-collapse: collapse;
+    font-size: 16px;
 }

-th { 
-  background: #eee; 
-  font-weight: bold; 
+th {
+    background: #eee;
+    font-weight: bold;
 }

-table td, th { 
-  margin: 20px 0;
-  padding: 10px; 
-  border: 1px solid #ccc !important; 
-  text-align: left;
-  font-size: 14px;
-}
+table td, th {
+    margin: 20px 0;
+    padding: 10px;
+    border: 1px solid #ccc !important;
+    text-align: left;
+    font-size: 14px;
+}
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -51,6 +51,7 @@
  }

  .components {
+
    > li {
      position: relative;
      z-index: 10;
@@ -118,6 +119,24 @@
          }
        }

+        .new-component-templates {
+          display: none;
+          padding: 20px;
+          @include clearfix;
+
+          .cancel-button {
+            @include white-button;
+          }
+
+          // specific menu types
+          &.new-component-problem {
+
+            .ss-icon, .editor-indicator {
+              display: inline-block;
+            }
+          }
+        }
+
        .new-component-type,
        .new-component-template {
          @include clearfix;
@@ -177,7 +196,11 @@
              position: relative;
              top: 3px;
              font-size: 12px;
-              opacity: 0.1;
+              opacity: 0.3;
+            }
+
+            .ss-icon, .editor-indicator {
+              display: none;
            }

            &:hover {
@@ -214,16 +237,6 @@
          }
          
        }
-        
-        .new-component-templates {
-          display: none;
-          padding: 20px;
-          @include clearfix;
-
-          .cancel-button {
-            @include white-button;
-          }
-        }
      }
    }
  }
@@ -553,4 +566,4 @@ body.unit {
      padding-top: 0;
    }
  }
-}
+}