From e00424a091f2dabdeec25a85e224cb6058d33861 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 12 Nov 2014 17:08:13 -0500 Subject: [PATCH] Moved Studio images from img/ directory to images/ directory OPEN-304 --- cms/static/{img => images}/bg-micro-stripes.png | Bin cms/static/{img => images}/choice-example.png | Bin cms/static/{img => images}/drag-handles.png | Bin cms/static/{img => images}/edx-studio-logo.png | Bin .../{img => images}/explanation-example.png | Bin cms/static/{img => images}/header-example.png | Bin cms/static/{img => images}/hiw-feature1.png | Bin cms/static/{img => images}/hiw-feature2.png | Bin cms/static/{img => images}/hiw-feature3.png | Bin .../{img => images}/large-advanced-icon.png | Bin .../{img => images}/large-discussion-icon.png | Bin cms/static/{img => images}/large-html-icon.png | Bin cms/static/{img => images}/large-problem-icon.png | Bin cms/static/{img => images}/large-video-icon.png | Bin cms/static/{img => images}/multi-example.png | Bin cms/static/{img => images}/number-example.png | Bin .../{img => images}/preview-lms-staticpages.png | Bin .../{img => images}/problem-editor-icons.png | Bin cms/static/{img => images}/search-icon.png | Bin cms/static/{img => images}/select-example.png | Bin cms/static/{img => images}/string-example.png | Bin cms/static/{img => images}/thumb-hiw-feature1.png | Bin cms/static/{img => images}/thumb-hiw-feature2.png | Bin cms/static/{img => images}/thumb-hiw-feature3.png | Bin cms/static/sass/assets/_graphics.scss | 12 ++++++------ cms/static/sass/elements/_controls.scss | 4 ++-- cms/static/sass/elements/_forms.scss | 2 +- cms/static/sass/style-app-extend1-rtl.scss | 2 +- cms/static/sass/style-app-extend1.scss | 2 +- cms/static/sass/style-app-rtl.scss | 2 +- cms/static/sass/style-app.scss | 2 +- cms/static/sass/style-xmodule-rtl.scss | 2 +- cms/static/sass/style-xmodule.scss | 2 +- cms/static/sass/vendor/bi-app/_mixins.scss | 2 +- cms/static/sass/views/_assets.scss | 2 +- cms/static/sass/views/_static-pages.scss | 6 +++--- cms/templates/edit-tabs.html | 2 +- cms/templates/howitworks.html | 12 ++++++------ cms/templates/widgets/header.html | 2 +- cms/templates/widgets/problem-edit.html | 14 +++++++------- 40 files changed, 35 insertions(+), 35 deletions(-) rename cms/static/{img => images}/bg-micro-stripes.png (100%) rename cms/static/{img => images}/choice-example.png (100%) rename cms/static/{img => images}/drag-handles.png (100%) rename cms/static/{img => images}/edx-studio-logo.png (100%) rename cms/static/{img => images}/explanation-example.png (100%) rename cms/static/{img => images}/header-example.png (100%) rename cms/static/{img => images}/hiw-feature1.png (100%) rename cms/static/{img => images}/hiw-feature2.png (100%) rename cms/static/{img => images}/hiw-feature3.png (100%) rename cms/static/{img => images}/large-advanced-icon.png (100%) rename cms/static/{img => images}/large-discussion-icon.png (100%) rename cms/static/{img => images}/large-html-icon.png (100%) rename cms/static/{img => images}/large-problem-icon.png (100%) rename cms/static/{img => images}/large-video-icon.png (100%) rename cms/static/{img => images}/multi-example.png (100%) rename cms/static/{img => images}/number-example.png (100%) rename cms/static/{img => images}/preview-lms-staticpages.png (100%) rename cms/static/{img => images}/problem-editor-icons.png (100%) rename cms/static/{img => images}/search-icon.png (100%) rename cms/static/{img => images}/select-example.png (100%) rename cms/static/{img => images}/string-example.png (100%) rename cms/static/{img => images}/thumb-hiw-feature1.png (100%) rename cms/static/{img => images}/thumb-hiw-feature2.png (100%) rename cms/static/{img => images}/thumb-hiw-feature3.png (100%) diff --git a/cms/static/img/bg-micro-stripes.png b/cms/static/images/bg-micro-stripes.png similarity index 100% rename from cms/static/img/bg-micro-stripes.png rename to cms/static/images/bg-micro-stripes.png diff --git a/cms/static/img/choice-example.png b/cms/static/images/choice-example.png similarity index 100% rename from cms/static/img/choice-example.png rename to cms/static/images/choice-example.png diff --git a/cms/static/img/drag-handles.png b/cms/static/images/drag-handles.png similarity index 100% rename from cms/static/img/drag-handles.png rename to cms/static/images/drag-handles.png diff --git a/cms/static/img/edx-studio-logo.png b/cms/static/images/edx-studio-logo.png similarity index 100% rename from cms/static/img/edx-studio-logo.png rename to cms/static/images/edx-studio-logo.png diff --git a/cms/static/img/explanation-example.png b/cms/static/images/explanation-example.png similarity index 100% rename from cms/static/img/explanation-example.png rename to cms/static/images/explanation-example.png diff --git a/cms/static/img/header-example.png b/cms/static/images/header-example.png similarity index 100% rename from cms/static/img/header-example.png rename to cms/static/images/header-example.png diff --git a/cms/static/img/hiw-feature1.png b/cms/static/images/hiw-feature1.png similarity index 100% rename from cms/static/img/hiw-feature1.png rename to cms/static/images/hiw-feature1.png diff --git a/cms/static/img/hiw-feature2.png b/cms/static/images/hiw-feature2.png similarity index 100% rename from cms/static/img/hiw-feature2.png rename to cms/static/images/hiw-feature2.png diff --git a/cms/static/img/hiw-feature3.png b/cms/static/images/hiw-feature3.png similarity index 100% rename from cms/static/img/hiw-feature3.png rename to cms/static/images/hiw-feature3.png diff --git a/cms/static/img/large-advanced-icon.png b/cms/static/images/large-advanced-icon.png similarity index 100% rename from cms/static/img/large-advanced-icon.png rename to cms/static/images/large-advanced-icon.png diff --git a/cms/static/img/large-discussion-icon.png b/cms/static/images/large-discussion-icon.png similarity index 100% rename from cms/static/img/large-discussion-icon.png rename to cms/static/images/large-discussion-icon.png diff --git a/cms/static/img/large-html-icon.png b/cms/static/images/large-html-icon.png similarity index 100% rename from cms/static/img/large-html-icon.png rename to cms/static/images/large-html-icon.png diff --git a/cms/static/img/large-problem-icon.png b/cms/static/images/large-problem-icon.png similarity index 100% rename from cms/static/img/large-problem-icon.png rename to cms/static/images/large-problem-icon.png diff --git a/cms/static/img/large-video-icon.png b/cms/static/images/large-video-icon.png similarity index 100% rename from cms/static/img/large-video-icon.png rename to cms/static/images/large-video-icon.png diff --git a/cms/static/img/multi-example.png b/cms/static/images/multi-example.png similarity index 100% rename from cms/static/img/multi-example.png rename to cms/static/images/multi-example.png diff --git a/cms/static/img/number-example.png b/cms/static/images/number-example.png similarity index 100% rename from cms/static/img/number-example.png rename to cms/static/images/number-example.png diff --git a/cms/static/img/preview-lms-staticpages.png b/cms/static/images/preview-lms-staticpages.png similarity index 100% rename from cms/static/img/preview-lms-staticpages.png rename to cms/static/images/preview-lms-staticpages.png diff --git a/cms/static/img/problem-editor-icons.png b/cms/static/images/problem-editor-icons.png similarity index 100% rename from cms/static/img/problem-editor-icons.png rename to cms/static/images/problem-editor-icons.png diff --git a/cms/static/img/search-icon.png b/cms/static/images/search-icon.png similarity index 100% rename from cms/static/img/search-icon.png rename to cms/static/images/search-icon.png diff --git a/cms/static/img/select-example.png b/cms/static/images/select-example.png similarity index 100% rename from cms/static/img/select-example.png rename to cms/static/images/select-example.png diff --git a/cms/static/img/string-example.png b/cms/static/images/string-example.png similarity index 100% rename from cms/static/img/string-example.png rename to cms/static/images/string-example.png diff --git a/cms/static/img/thumb-hiw-feature1.png b/cms/static/images/thumb-hiw-feature1.png similarity index 100% rename from cms/static/img/thumb-hiw-feature1.png rename to cms/static/images/thumb-hiw-feature1.png diff --git a/cms/static/img/thumb-hiw-feature2.png b/cms/static/images/thumb-hiw-feature2.png similarity index 100% rename from cms/static/img/thumb-hiw-feature2.png rename to cms/static/images/thumb-hiw-feature2.png diff --git a/cms/static/img/thumb-hiw-feature3.png b/cms/static/images/thumb-hiw-feature3.png similarity index 100% rename from cms/static/img/thumb-hiw-feature3.png rename to cms/static/images/thumb-hiw-feature3.png diff --git a/cms/static/sass/assets/_graphics.scss b/cms/static/sass/assets/_graphics.scss index c7647ac12d..ba9dad238c 100644 --- a/cms/static/sass/assets/_graphics.scss +++ b/cms/static/sass/assets/_graphics.scss @@ -4,7 +4,7 @@ width: 7px; height: 22px; margin-left: 10px; - background: url(../img/drag-handles.png) no-repeat; + background: url(../images/drag-handles.png) no-repeat; cursor: move; } @@ -13,7 +13,7 @@ width: 100px; height: 60px; margin-right: 5px; - background: url(../img/large-advanced-icon.png) center no-repeat; + background: url(../images/large-advanced-icon.png) center no-repeat; } .large-discussion-icon { @@ -21,7 +21,7 @@ width: 100px; height: 60px; margin-right: 5px; - background: url(../img/large-discussion-icon.png) center no-repeat; + background: url(../images/large-discussion-icon.png) center no-repeat; } .large-html-icon { @@ -29,7 +29,7 @@ width: 100px; height: 60px; margin-right: 5px; - background: url(../img/large-html-icon.png) center no-repeat; + background: url(../images/large-html-icon.png) center no-repeat; } .large-problem-icon { @@ -37,7 +37,7 @@ width: 100px; height: 60px; margin-right: 5px; - background: url(../img/large-problem-icon.png) center no-repeat; + background: url(../images/large-problem-icon.png) center no-repeat; } .large-video-icon { @@ -45,5 +45,5 @@ width: 100px; height: 60px; margin-right: 5px; - background: url(../img/large-video-icon.png) center no-repeat; + background: url(../images/large-video-icon.png) center no-repeat; } diff --git a/cms/static/sass/elements/_controls.scss b/cms/static/sass/elements/_controls.scss index fa8eeb072c..c91f40707e 100644 --- a/cms/static/sass/elements/_controls.scss +++ b/cms/static/sass/elements/_controls.scss @@ -281,12 +281,12 @@ // CASE: right to left layout @include rtl { - background: transparent url("../img/drag-handles.png") no-repeat left center; + background: transparent url("../images/drag-handles.png") no-repeat left center; } // CASE: left to right layout @include ltr { - background: transparent url("../img/drag-handles.png") no-repeat right center; + background: transparent url("../images/drag-handles.png") no-repeat right center; } } diff --git a/cms/static/sass/elements/_forms.scss b/cms/static/sass/elements/_forms.scss index 9ee9ee3919..5979c92ff7 100644 --- a/cms/static/sass/elements/_forms.scss +++ b/cms/static/sass/elements/_forms.scss @@ -418,7 +418,7 @@ input.search { @include box-sizing(border-box); border: 1px solid $darkGrey; border-radius: 20px; - background: url(../img/search-icon.png) no-repeat 8px 7px #edf1f5; + background: url(../images/search-icon.png) no-repeat 8px 7px #edf1f5; font-family: 'Open Sans', sans-serif; color: $baseFontColor; outline: 0; diff --git a/cms/static/sass/style-app-extend1-rtl.scss b/cms/static/sass/style-app-extend1-rtl.scss index 42a0a41425..8c9a3384be 100644 --- a/cms/static/sass/style-app-extend1-rtl.scss +++ b/cms/static/sass/style-app-extend1-rtl.scss @@ -18,7 +18,7 @@ // base - assets @import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic img/figure/svg styling +@import 'assets/graphics'; // sprites, basic image/figure/svg styling @import 'assets/anims'; // animations // base - starter diff --git a/cms/static/sass/style-app-extend1.scss b/cms/static/sass/style-app-extend1.scss index 7dbb6d2a8d..571f7e25f6 100644 --- a/cms/static/sass/style-app-extend1.scss +++ b/cms/static/sass/style-app-extend1.scss @@ -19,7 +19,7 @@ // base - assets @import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic img/figure/svg styling +@import 'assets/graphics'; // sprites, basic image/figure/svg styling @import 'assets/anims'; // animations // base - starter diff --git a/cms/static/sass/style-app-rtl.scss b/cms/static/sass/style-app-rtl.scss index 91dea8af04..a70eccacd7 100644 --- a/cms/static/sass/style-app-rtl.scss +++ b/cms/static/sass/style-app-rtl.scss @@ -18,7 +18,7 @@ // base - assets @import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic img/figure/svg styling +@import 'assets/graphics'; // sprites, basic image/figure/svg styling @import 'assets/anims'; // animations // base - starter diff --git a/cms/static/sass/style-app.scss b/cms/static/sass/style-app.scss index 7e8f1b0a7f..4df5a61fed 100644 --- a/cms/static/sass/style-app.scss +++ b/cms/static/sass/style-app.scss @@ -19,7 +19,7 @@ // base - assets @import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic img/figure/svg styling +@import 'assets/graphics'; // sprites, basic image/figure/svg styling @import 'assets/anims'; // animations // base - starter diff --git a/cms/static/sass/style-xmodule-rtl.scss b/cms/static/sass/style-xmodule-rtl.scss index 7c09076a5e..9d329f4eda 100644 --- a/cms/static/sass/style-xmodule-rtl.scss +++ b/cms/static/sass/style-xmodule-rtl.scss @@ -18,7 +18,7 @@ // base - assets @import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic img/figure/svg styling +@import 'assets/graphics'; // sprites, basic image/figure/svg styling @import 'assets/anims'; // animations // base - starter diff --git a/cms/static/sass/style-xmodule.scss b/cms/static/sass/style-xmodule.scss index 684ad9ef1d..e7acb0f4cb 100644 --- a/cms/static/sass/style-xmodule.scss +++ b/cms/static/sass/style-xmodule.scss @@ -18,7 +18,7 @@ // base - assets @import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic img/figure/svg styling +@import 'assets/graphics'; // sprites, basic image/figure/svg styling @import 'assets/anims'; // animations // base - starter diff --git a/cms/static/sass/vendor/bi-app/_mixins.scss b/cms/static/sass/vendor/bi-app/_mixins.scss index e02d4d00ac..170120e1b0 100755 --- a/cms/static/sass/vendor/bi-app/_mixins.scss +++ b/cms/static/sass/vendor/bi-app/_mixins.scss @@ -254,7 +254,7 @@ } // Returns "en" or "ar", useful for image suffixes. -// Usage: background-image: url(/img/header-#{lang()}.png); +// Usage: background-image: url(/images/header-#{lang()}.png); @function lang() { @if $bi-app-direction == ltr { @return 'en'; diff --git a/cms/static/sass/views/_assets.scss b/cms/static/sass/views/_assets.scss index 9cc9e1dea6..0a39d1bc62 100644 --- a/cms/static/sass/views/_assets.scss +++ b/cms/static/sass/views/_assets.scss @@ -248,7 +248,7 @@ } &.is-locked { - background-image: url('../img/bg-micro-stripes.png'); + background-image: url('../images/bg-micro-stripes.png'); background-position: 0 0; background-repeat: repeat; } diff --git a/cms/static/sass/views/_static-pages.scss b/cms/static/sass/views/_static-pages.scss index 5b04353791..bc146d9d1e 100644 --- a/cms/static/sass/views/_static-pages.scss +++ b/cms/static/sass/views/_static-pages.scss @@ -195,7 +195,7 @@ } .drag-handle { - background: url(../img/drag-handles.png) center no-repeat #fff; + background: url(../images/drag-handles.png) center no-repeat #fff; } } @@ -208,10 +208,10 @@ width: 35px; height: 100%; border: none; - background: url(../img/drag-handles.png) center no-repeat #fff; + background: url(../images/drag-handles.png) center no-repeat #fff; &:hover { - background: url(../img/drag-handles.png) center no-repeat #fff; + background: url(../images/drag-handles.png) center no-repeat #fff; } &.is-fixed { diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 9223e245ae..4129af1985 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -158,7 +158,7 @@

${_("Pages in Your Course")}

- ${_('Preview of Pages in your course')} + ${_('Preview of Pages in your course')}
${_("Pages appear in your course's top navigation bar. The default pages (Courseware, Course Info, Discussion, Wiki, and Progress) are followed by textbooks and custom pages.")}
diff --git a/cms/templates/howitworks.html b/cms/templates/howitworks.html index b01b90fdd1..418d2c64ae 100644 --- a/cms/templates/howitworks.html +++ b/cms/templates/howitworks.html @@ -31,7 +31,7 @@
  • - ${_('Studio Helps You Keep Your Courses Organized')} + ${_('Studio Helps You Keep Your Courses Organized')}
    ${_("Studio Helps You Keep Your Courses Organized")}
    @@ -65,7 +65,7 @@
  • - ${_('Learning is More than Just Lectures')} + ${_('Learning is More than Just Lectures')}
    ${_("Learning is More than Just Lectures")}
    @@ -99,7 +99,7 @@
  • - ${_('Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.')} + ${_('Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.')}
    ${_("Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.")}
    @@ -153,7 +153,7 @@

    ${_("Outlining Your Course")}

    - +
    ${_("Simple two-level outline to organize your couse. Drag and drop, and see your course at a glance.")}
    @@ -166,7 +166,7 @@

    ${_("More than Just Lectures")}

    - +
    ${_("Quickly create videos, text snippets, inline discussions, and a variety of problem types.")}
    @@ -179,7 +179,7 @@

    ${_("Publishing on Date")}

    - +
    ${_("Simply set the date of a section or subsection, and Studio will publish it to your students for you.")}
    diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index a932fd6f13..266c656b17 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -11,7 +11,7 @@
    ## "edX Studio" should not be translated -

    edX Studio

    +

    edX Studio

    % if context_course: <% diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index 5c3190d0e0..80596193f9 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -45,7 +45,7 @@
    ${_("Heading 1")}
    - + 
    H1
@@ -56,7 +56,7 @@
             
    
                 
    ${_("Multiple Choice")}
    
                 
    
-                    
+                    
                 
    
                 
    
 
    ( ) red
@@ -67,7 +67,7 @@
             
    
                 
    ${_("Checkboxes")}
    
                 
    
-                    
+                    
                 
    
                 
    
 
    [x] earth
@@ -78,7 +78,7 @@
             
    
                 
    ${_("Text Input")}
    
                 
    
-                    
+                    
                 
    
                 
    
                     
    = dog
@@ -89,7 +89,7 @@ or= mouse
    
             
    
                 
    ${_("Numerical Input")}
    
                 
    
-                    
+                    
                 
    
                 
    
                     
    = 3.14 +- 2%
    
@@ -99,7 +99,7 @@ or= mouse
    
             
    
                 
    ${_("Dropdown")}
    
                 
    
-                    
+                    
                 
    
                 
    
                     
    [[wrong, (right)]]
    
@@ -114,7 +114,7 @@ or= mouse
    
             
    
                 
    ${_("Explanation")}
    
                 
    
-                    
+                    
                 
    
                 
    
                     
    [explanation] A short explanation of the answer. [explanation]