Merge branch 'master' of github.com:Stanford-Online/edx-platform into jrbl/test_release

cms/envs/common.py

@@ -499,7 +499,7 @@ COURSE_UTILITIES = [
          {"short_description": "Bulk view problem settings",
           "long_description": "This utility will allow you to view all section, subsection and problem settings in one page.",
           "action_url": "utility_bulksettings_handler",
-          "action_text": "Check Bulk Settings",
+          "action_text": "View Problem Settings",
           "action_external" : False}
           ]
     }

cms/templates/bulksettings.html

@@ -14,7 +14,7 @@
   <header class="mast has-actions has-subtitle">
     <h1 class="page-header">
       <small class="subtitle">${_("Tools / Course Utilities")}</small>
-      <span class="sr">&gt; </span>${_("Bulk Settings")}
+      <span class="sr">&gt; </span>${_("Problem Settings")}
     </h1>
   </header>
 </div>
@@ -89,9 +89,9 @@
 
     <aside class="content-supplementary" role="complimentary">
       <div class="bit">
-        <h3 class="title title-3">${_("What is bulk settings?")}</h3>
+        <h3 class="title title-3">${_("What is problem settings?")}</h3>
         <p>
-          ${_("The bulk settings page provides a way to view all problem settings of the current course in one page.")}
+          ${_("The problem settings page provides a way to view all problem settings of the current course in one page.")}
         </p>
       </div>
 

common/lib/xmodule/xmodule/js/src/html/imageModal.js

-$(function() {
-  
-  // Set up on page load
+function setupFullScreenImage() {
   $("a.modal-content").each(function() {
     var smallImageObject = $(this).children();
     var largeImageSRC = $(this).attr('href');
@@ -106,4 +104,4 @@ $(function() {
       $(".wrapper-modal-image .image-content .image-controls .modal-ui-icon").toggleClass('is-disabled');
     }
   });
-});
+}
\ No newline at end of file

common/lib/xmodule/xmodule/templates/html/image_modal.yaml

@@ -4,4 +4,9 @@ metadata:
 data: |
         <h2>Full Screen Image</h2>
         <p>Use the full screen image tool to allow students to open the image in the full screen, zoom in on the image, and drag the image within the screen.</p>
-        <a href="http://static.class.stanford.edu/stanford-hills-big.jpg" class="modal-content"><img alt="The Stanford Hills" src="http://static.class.stanford.edu/stanford-hills-small.jpg" /></a>
+        <a href="http://static.class.stanford.edu/stanford-hills-big.jpg" class="modal-content"><img alt="The Stanford Hills" src="http://static.class.stanford.edu/stanford-hills-small.jpg" /></a>
\ No newline at end of file
+        <script type="text/javascript">
+            $(function () {
+                setupFullScreenImage();
+            });
+        </script>

lms/templates/registration/password_reset_confirm.html

@@ -53,7 +53,9 @@
 <header class="global">
   <nav>
     <h1 class="logo">
-      <a href="{{MKTG_URL_ROOT}}"><img src="{% static 'images/header-logo.png' %}"></a>
+      <a href="{{MKTG_URL_ROOT}}">
+          <img src="{% static 'themes/stanford/images/stanford-S-logo.png' %}" height="35" alt="Home Page" />
+      </a>
     </h1>
   </nav>
 </header>
@@ -157,7 +159,7 @@
       <div class="cta cta-help">
         <h3>{% trans "Need Help?" %}</h3>
         <p>
-          {% blocktrans with start_link='<a href="{{MKTG_URL_FAQ}}">' end_link='</a>' %}
+          {% blocktrans with start_link='<a href="https://stanfordonline.zendesk.com/hc">' end_link='</a>' %}
               View our {{ start_link }}help section for contact information and answers to commonly asked questions{{ end_link }}
           {% endblocktrans %}
         </p>