diff --git a/cms/djangoapps/contentstore/features/help.feature b/cms/djangoapps/contentstore/features/help.feature index 7904fdafc2..c829647565 100644 --- a/cms/djangoapps/contentstore/features/help.feature +++ b/cms/djangoapps/contentstore/features/help.feature @@ -14,6 +14,12 @@ Feature: CMS.Help And I click the course link in My Courses Then I should see online help for "organizing_course" + And I click a subsection in the outline + Then I should see the online help for "subsection" + + And I click a unit + Then I should see the online help for "unit" + And I go to the course updates page Then I should see online help for "updates" diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index 4103c0752b..161ffac8d4 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "subsection" %> <%! import logging from util.date_utils import get_default_time_display, almost_same_datetime diff --git a/cms/templates/index.html b/cms/templates/index.html index 9664805a46..fba662735d 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -275,18 +275,21 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) { % endif - + <% + help_doc_urls = get_online_help_info(online_help_token()) + %> diff --git a/cms/templates/unit.html b/cms/templates/unit.html index 921e1af0a1..c9bf7707d5 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "unit" %> <%! from django.core.urlresolvers import reverse from contentstore.views.helpers import EDITING_TEMPLATES diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index d9f9c1bf87..1d97df3916 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -128,9 +128,6 @@ <% help_doc_urls = get_online_help_info(online_help_token) %> - - -

  1. ${_("Help")}

    diff --git a/cms/templates/widgets/sock.html b/cms/templates/widgets/sock.html index 4ab954c363..060fbb6b36 100644 --- a/cms/templates/widgets/sock.html +++ b/cms/templates/widgets/sock.html @@ -1,46 +1,51 @@ <%! from django.utils.translation import ugettext as _ %> <%! from django.core.urlresolvers import reverse %> +<%def name="online_help_token()"><% return "default" %>
    -

    ${_("edX Studio Help")}

    +

    ${_("edX Studio Documentation")}

    -

    ${_("Studio Support")}

    +

    ${_("edX Studio Documentation")}

    -

    ${_("Need help with Studio? Creating a course is complex, so we're here to help. Take advantage of our documentation, help center, as well as our edX101 introduction course for course authors.")}

    +

    ${_("You can click Help in the upper right corner of any page to get more information about the page you're on. You can also use the links below to download the Building and Running an edX Course PDF file, to go to the edX Author Support site, or to enroll in edX101.")}