fixes

cms/static/sass/assets/_fonts.scss

@@ -3,42 +3,9 @@
 // ====================
 
 // Open Sans - http://www.google.com/fonts/specimen/Open+Sans
-@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');
-}
+@import "web-fonts";
+
+@include web-font((Open Sans), (italic bolditalic bold, i), (latin, cyrillic), (), (), true);
 
 // Bree Serif - http://www.google.com/fonts/specimen/Bree+Serif
 @font-face {

common/static/sass/web-fonts.scss

+/*
+ * This is a fairly big mixin.
+ * The reason for this is that at the time of writing (09/01/2013),
+ * Sass does not include functions for substring or find/replace in string.
+ * Chris Eppstein sent a Pull Request to Sass with the str-extract (substring) function back in June,
+ * but it still has not been merged, due to lack of minor comments.
+ * That was five months ago.
+ */
+
+@mixin web-font($fonts, $variants: (), $subsets: (), $text: '', $effects: (), $secure: false) {
+
+  //The $secure var defaults to false, the $url var is inited to use http
+  $url: "http://fonts.googleapis.com/css?family=";
+
+  //If flagged secure, import fonts using https
+  @if $secure {
+    $url: "https://fonts.googleapis.com/css?family=";
+  }
+
+  $i: 0;
+  
+  // Add the family argument to the URL string.
+  // We can assume that the user will always specify at least one font.
+  @each $font in $fonts {
+    $i: $i + 1;
+  
+    // Add the name of the font.
+    $j: 0;
+    @each $word in $font {
+      $j: $j + 1;
+      $url: $url + $word;
+      
+      // Add a plus symbol between words.
+      @if $j < length($font) {
+        $url: $url + "+";
+      }
+    }
+    
+    // If there is/are font variant(s) for this font, add them.
+    @if $i <= length($variants) {
+      $url: $url + ':';
+    
+      $k: 0;
+      @each $variant in nth($variants, $i) {
+        $k: $k + 1;
+        
+        $url: $url + $variant;
+        
+        // Add a comma between variants.
+        // For some reason length($variant) doesn't work. Weird!
+        @if ($k < length(nth($variants, $i))) {
+          $url: $url + ',';
+        }
+      }
+    }
+    
+    // Add a pipe between words.
+    // It would seem that a pipe isn't a valid URL character in its unescaped form,
+    // but Google reccommend using it anyway.
+    @if $i < length($fonts) {
+      $url: $url + "|";
+    }
+  }
+  
+  // Add the subset argument to the URL string, if it exists.
+  @if length($subsets) > 0 {
+    $url: $url + "&subset=";
+    $i: 0;
+    @each $subset in $subsets {
+      $i: $i + 1;
+      $url: $url + $subset;
+      
+      // Add a comma between subsets.
+      @if $i < length($subsets) {
+        $url: $url + ',';
+      }
+    }
+  }
+  
+  // Add the text argument to the URL string, if it exists.
+  // $text does not actually need to be enclosed in brackets.
+  @if length($text) > 0 and $text != '' {
+    
+    // To save the user the hassle of adding a space character every time they want
+    // to use a web font, we add one automatically.
+    $url: $url + "&text=%20#{$text}";
+  }
+  
+  // Add the effect argument to the URL string, if it exists.
+  @if length($effects) > 0 {
+    $url: $url + "&effect=";
+    $i: 0;
+    @each $effect in $effects {
+      $i: $i + 1;
+    
+      // Add the name of the font.
+      $j: 0;
+      @each $word in $effect {
+        $j: $j + 1;
+        $url: $url + $word;
+        
+        // Add a hyphen between words.
+        // A hyphen can actually be used to seperate words instead of a space,
+        // in which case the words will be counted as one and no extra hyphens will be added.
+        // Again, a string replacement function would make this a lot easier…
+        @if $j < length($effect) {
+          $url: $url + "-";
+        }
+      }
+      
+      // Add a pipe between effects.
+      @if $i < length($effects) {
+        $url: $url + "|";
+      }
+    }
+  }
+  
+  // Finally!
+  @import url(#{$url});
+}

lms/djangoapps/branding/__init__.py

@@ -33,11 +33,12 @@ def get_university(domain=None):
     Return the university name specified for the domain, or None
     if no university was specified
     """
-    if not settings.MITX_FEATURES['SUBDOMAIN_BRANDING'] or domain is None:
-        return None
+#    if not settings.MITX_FEATURES['SUBDOMAIN_BRANDING'] or domain is None:
+#        return None
 
     subdomain = pick_subdomain(domain, settings.SUBDOMAIN_BRANDING.keys())
-    return settings.SUBDOMAIN_BRANDING.get(subdomain)
+#    return settings.SUBDOMAIN_BRANDING.get(subdomain)
+    return 'edge'
 
 
 def get_logo_url(domain=None):

lms/djangoapps/course_wiki/views.py

@@ -96,7 +96,7 @@ def course_wiki_redirect(request, course_id):
             root,
             course_slug,
             title=course_slug,
-            content=cgi.escape("This is the wiki for **{0}**'s _{1}_.".format(course.display_org_with_default, course.display_name_with_default)),
+            content="This is text",
             user_message="Course page automatically created.",
             user=None,
             ip_address=None,

lms/envs/common.py

@@ -32,7 +32,7 @@ from .discussionsettings import *
 
 ################################### FEATURES ###################################
 # The display name of the platform to be used in templates/emails/etc.
-PLATFORM_NAME = "edX"
+PLATFORM_NAME = "edU"
 
 COURSEWARE_ENABLED = True
 ENABLE_JASMINE = False
@@ -77,7 +77,7 @@ MITX_FEATURES = {
 
     'ENABLE_PSYCHOMETRICS': False,  # real-time psychometrics (eg item response theory analysis in instructor dashboard)
 
-    'ENABLE_DJANGO_ADMIN_SITE': False,  # set true to enable django's admin site, even on prod (e.g. for course ops)
+    'ENABLE_DJANGO_ADMIN_SITE': True,  # set true to enable django's admin site, even on prod (e.g. for course ops)
     'ENABLE_SQL_TRACKING_LOGS': False,
     'ENABLE_LMS_MIGRATION': False,
     'ENABLE_MANUAL_GIT_RELOAD': False,
@@ -124,7 +124,7 @@ MITX_FEATURES = {
     'ENABLE_STUDENT_NOTES': True,
 
     # Provide a UI to allow users to submit feedback from the LMS
-    'ENABLE_FEEDBACK_SUBMISSION': False,
+    'ENABLE_FEEDBACK_SUBMISSION': True,
 
     # Turn on a page that lets staff enter Python code to be run in the
     # sandbox, for testing whether it's enabled properly.
@@ -153,7 +153,7 @@ MITX_FEATURES = {
 
     # Toggle to enable chat availability (configured on a per-course
     # basis in Studio)
-    'ENABLE_CHAT': False,
+    'ENABLE_CHAT': True,
 
     # Toggle the availability of the shopping cart page
     'ENABLE_SHOPPING_CART': False
@@ -380,7 +380,7 @@ FAVICON_PATH = 'images/favicon.ico'
 
 # Locale/Internationalization
 TIME_ZONE = 'Europe/Moscow'  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-LANGUAGE_CODE = 'en'  # http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'ru'  # http://www.i18nguy.com/unicode/language-identifiers.html
 USE_I18N = True
 USE_L10N = True
 

lms/static/sass/base/_font_face.scss

 /* Generated by Font Squirrel (http://www.fontsquirrel.com) on January 25, 2012 05:06:34 PM America/New_York */
 
-@font-face {
-    font-family: 'Open Sans';
-    src: url('../fonts/OpenSans-Light-webfont.eot');
-    src: url('../fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/OpenSans-Light-webfont.woff') format('woff'),
-         url('../fonts/OpenSans-Light-webfont.ttf') format('truetype'),
-         url('../fonts/OpenSans-Light-webfont.svg#OpenSansLight') format('svg');
-    font-weight: 300;
-    font-style: normal;
+@import "web-fonts";
 
-}
+@include web-font((Open Sans, a), (300italic 400italic 600italic 700italic 800italic 300 400 600 700 800, a), (latin, cyrillic));
 
-@font-face {
-    font-family: 'Open Sans';
-    src: url('../fonts/OpenSans-LightItalic-webfont.eot');
-    src: url('../fonts/OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/OpenSans-LightItalic-webfont.woff') format('woff'),
-         url('../fonts/OpenSans-LightItalic-webfont.ttf') format('truetype'),
-         url('../fonts/OpenSans-LightItalic-webfont.svg#OpenSansLightItalic') format('svg');
-    font-weight: 300;
-    font-style: italic;
-
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('../fonts/OpenSans-Regular-webfont.eot');
-    src: url('../fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/OpenSans-Regular-webfont.woff') format('woff'),
-         url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'),
-         url('../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg');
-    font-weight: 400;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('../fonts/OpenSans-Italic-webfont.eot');
-    src: url('../fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/OpenSans-Italic-webfont.woff') format('woff'),
-         url('../fonts/OpenSans-Italic-webfont.ttf') format('truetype'),
-         url('../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg');
-    font-weight: 400;
-    font-style: italic;
-
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('../fonts/OpenSans-Bold-webfont.eot');
-    src: url('../fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/OpenSans-Bold-webfont.woff') format('woff'),
-         url('../fonts/OpenSans-Bold-webfont.ttf') format('truetype'),
-         url('../fonts/OpenSans-Bold-webfont.svg#OpenSansBold') format('svg');
-    font-weight: 700;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('../fonts/OpenSans-BoldItalic-webfont.eot');
-    src: url('../fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/OpenSans-BoldItalic-webfont.woff') format('woff'),
-         url('../fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'),
-         url('../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg');
-    font-weight: 700;
-    font-style: italic;
-
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('../fonts/OpenSans-ExtraBold-webfont.eot');
-    src: url('../fonts/OpenSans-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/OpenSans-ExtraBold-webfont.woff') format('woff'),
-         url('../fonts/OpenSans-ExtraBold-webfont.ttf') format('truetype'),
-         url('../fonts/OpenSans-ExtraBold-webfont.svg#OpenSansExtrabold') format('svg');
-    font-weight: 800;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url('../fonts/OpenSans-ExtraBoldItalic-webfont.eot');
-    src: url('../fonts/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/OpenSans-ExtraBoldItalic-webfont.woff') format('woff'),
-         url('../fonts/OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'),
-         url('../fonts/OpenSans-ExtraBoldItalic-webfont.svg#OpenSansExtraboldItalic') format('svg');
-    font-weight: 800;
-    font-style: italic;
-
-}