Merge pull request #5941 from edx/studio-images

Moved Studio images from img/ directory to images/ directory

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;
 }

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;
       }
     }
 

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;

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

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

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

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

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

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

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';

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;
           }

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 {

cms/templates/edit-tabs.html

@@ -158,7 +158,7 @@
 <div class="content-modal" id="preview-lms-staticpages">
   <h3 class="title">${_("Pages in Your Course")}</h3>
   <figure>
-    <img src="${static.url("img/preview-lms-staticpages.png")}" alt="${_('Preview of Pages in your course')}" />
+    <img src="${static.url("images/preview-lms-staticpages.png")}" alt="${_('Preview of Pages in your course')}" />
     <figcaption class="description">${_("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.")}</figcaption>
   </figure>
 

cms/templates/howitworks.html

@@ -31,7 +31,7 @@
       <li class="feature">
         <figure class="img zoom">
           <a rel="modal" href="#hiw-feature1">
-            <img src="${static.url("img/thumb-hiw-feature1.png")}" alt="${_('Studio Helps You Keep Your Courses Organized')}" />
+            <img src="${static.url("images/thumb-hiw-feature1.png")}" alt="${_('Studio Helps You Keep Your Courses Organized')}" />
             <figcaption class="sr">${_("Studio Helps You Keep Your Courses Organized")}</figcaption>
             <span class="action-zoom">
               <i class="icon-zoom-in"></i>
@@ -65,7 +65,7 @@
       <li class="feature">
         <figure class="img zoom">
         <a rel="modal" href="#hiw-feature2">
-          <img src="${static.url("img/thumb-hiw-feature2.png")}" alt="${_('Learning is More than Just Lectures')}" />
+          <img src="${static.url("images/thumb-hiw-feature2.png")}" alt="${_('Learning is More than Just Lectures')}" />
           <figcaption class="sr">${_("Learning is More than Just Lectures")}</figcaption>
           <span class="action-zoom">
             <i class="icon-zoom-in"></i>
@@ -99,7 +99,7 @@
       <li class="feature">
         <figure class="img zoom">
           <a rel="modal" href="#hiw-feature3">
-            <img src="${static.url("img/thumb-hiw-feature3.png")}" alt="${_('Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.')}" />
+            <img src="${static.url("images/thumb-hiw-feature3.png")}" alt="${_('Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.')}" />
             <figcaption class="sr">${_("Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.")}</figcaption>
             <span class="action-zoom">
               <i class="icon-zoom-in"></i>
@@ -153,7 +153,7 @@
 <div class="content-modal" id="hiw-feature1">
   <h3 class="title">${_("Outlining Your Course")}</h3>
   <figure>
-    <img src="${static.url("img/hiw-feature1.png")}" alt="" />
+    <img src="${static.url("images/hiw-feature1.png")}" alt="" />
     <figcaption class="description">${_("Simple two-level outline to organize your couse. Drag and drop, and see your course at a glance.")}</figcaption>
   </figure>
 
@@ -166,7 +166,7 @@
 <div class="content-modal" id="hiw-feature2">
   <h3 class="title">${_("More than Just Lectures")}</h3>
   <figure>
-    <img src="${static.url("img/hiw-feature2.png")}" alt="" />
+    <img src="${static.url("images/hiw-feature2.png")}" alt="" />
     <figcaption class="description">${_("Quickly create videos, text snippets, inline discussions, and a variety of problem types.")}</figcaption>
   </figure>
 
@@ -179,7 +179,7 @@
 <div class="content-modal" id="hiw-feature3">
   <h3 class="title">${_("Publishing on Date")}</h3>
   <figure>
-    <img src="${static.url("img/hiw-feature3.png")}" alt="" />
+    <img src="${static.url("images/hiw-feature3.png")}" alt="" />
     <figcaption class="description">${_("Simply set the date of a section or subsection, and Studio will publish it to your students for you.")}</figcaption>
   </figure>
 

cms/templates/widgets/header.html

@@ -11,7 +11,7 @@
 
     <div class="wrapper wrapper-l">
       ## "edX Studio" should not be translated
-      <h1 class="branding"><a href="/"><img src="${static.url("img/edx-studio-logo.png")}" alt="edX Studio" /></a></h1>
+      <h1 class="branding"><a href="/"><img src="${static.url("images/edx-studio-logo.png")}" alt="edX Studio" /></a></h1>
 
       % if context_course:
       <%

cms/templates/widgets/problem-edit.html

@@ -45,7 +45,7 @@
             <div class="row">
                 <h6>${_("Heading 1")}</h6>
                 <div class="col sample heading-1">
-                    <img src="${static.url("img/header-example.png")}" />
+                    <img src="${static.url("images/header-example.png")}" />
                 </div>
                 <div class="col">
 <pre><code>H1
@@ -56,7 +56,7 @@
             <div class="row">
                 <h6>${_("Multiple Choice")}</h6>
                 <div class="col sample multiple-choice">
-                    <img src="${static.url("img/choice-example.png")}" />
+                    <img src="${static.url("images/choice-example.png")}" />
                 </div>
                 <div class="col">
 <pre><code>( ) red
@@ -67,7 +67,7 @@
             <div class="row">
                 <h6>${_("Checkboxes")}</h6>
                 <div class="col sample check-multiple">
-                    <img src="${static.url("img/multi-example.png")}" />
+                    <img src="${static.url("images/multi-example.png")}" />
                 </div>
                 <div class="col">
 <pre><code>[x] earth
@@ -78,7 +78,7 @@
             <div class="row">
                 <h6>${_("Text Input")}</h6>
                 <div class="col sample string-response">
-                    <img src="${static.url("img/string-example.png")}" />
+                    <img src="${static.url("images/string-example.png")}" />
                 </div>
                 <div class="col">
                     <pre><code>= dog
@@ -89,7 +89,7 @@ or= mouse</code></pre>
             <div class="row">
                 <h6>${_("Numerical Input")}</h6>
                 <div class="col sample numerical-response">
-                    <img src="${static.url("img/number-example.png")}" />
+                    <img src="${static.url("images/number-example.png")}" />
                 </div>
                 <div class="col">
                     <pre><code>= 3.14 +- 2%</code></pre>
@@ -99,7 +99,7 @@ or= mouse</code></pre>
             <div class="row">
                 <h6>${_("Dropdown")}</h6>
                 <div class="col sample option-reponse">
-                    <img src="${static.url("img/select-example.png")}" />
+                    <img src="${static.url("images/select-example.png")}" />
                 </div>
                 <div class="col">
                     <pre><code>[[wrong, (right)]]</code></pre>
@@ -114,7 +114,7 @@ or= mouse</code></pre>
             <div class="row">
                 <h6>${_("Explanation")}</h6>
                 <div class="col sample explanation">
-                    <img src="${static.url("img/explanation-example.png")}" />
+                    <img src="${static.url("images/explanation-example.png")}" />
                 </div>
                 <div class="col">
                     <pre><code>[explanation] A short explanation of the answer. [explanation]</code></pre>