Merge pull request #8175 from edx/will/footer-api-redux

ECOM-1339 Branding API footer
openedx · May 28, 2015 · 78ea4d5 · 78ea4d5
2 parents a3b4a25 + 6af5fc1
commit 78ea4d5
Show file tree

Hide file tree

Showing 41 changed files with 1,254 additions and 487 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,14 +78,13 @@ lms/static/sass/lms-main.scss
 lms/static/sass/lms-main-rtl.scss
 lms/static/sass/lms-course.scss
 lms/static/sass/lms-course-rtl.scss
-lms/static/sass/lms-footer-edx.scss
-lms/static/sass/lms-footer-edx-rtl.scss
+lms/static/sass/lms-footer.scss
+lms/static/sass/lms-footer-rtl.scss
 cms/static/css/
 cms/static/sass/*.css
 cms/static/sass/*.css.map
 
 
-
 ### Logging artifacts
 log/
 logs

diff --git a/common/static/js/spec_helpers/rwd_header_footer.js b/common/static/js/spec_helpers/rwd_header_footer.js
diff --git a/common/static/js/utils/rwd_header_footer.js → common/static/js/utils/rwd_header.js b/common/static/js/utils/rwd_header_footer.js → common/static/js/utils/rwd_header.js
@@ -10,6 +10,7 @@
         var _fn = {
             header: 'header.global-new',
 
+            // TODO (ECOM-1339): Remove this once the V3 footer is enabled permanently
             footer: '.edx-footer-new',
 
             resultsUrl: 'course-search',
@@ -29,7 +30,7 @@
                 classes: function() {
                     // Add any RWD-specific classes
                     _fn.$header.addClass('rwd');
-                    _fn.$footer.addClass('rwd');
+                    _fn.$footer.addClass('rwd');  // TODO (ECOM-1339): remove once the V3 footer is enabled permanently
                 },
 
                 elements: function() {

diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo