Skip to content

E
edx-platform
Commit 27ff0db5 by Mark Hoeber Committed by Nimisha Asthagiri
Options

Added new context sensitive link and updated text 

Sock template changes
parent 84d8fcf1
Showing with 41 additions and 26 deletions
cms/djangoapps/contentstore/features/help.feature
...@@ -14,6 +14,12 @@ Feature: CMS.Help ...@@ -14,6 +14,12 @@ Feature: CMS.Help
And I click the course link in My Courses And I click the course link in My Courses
Then I should see online help for "organizing_course" 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 And I go to the course updates page
Then I should see online help for "updates" Then I should see online help for "updates"
......
cms/templates/edit_subsection.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%def name="online_help_token()"><% return "subsection" %></%def>
<%! <%!
import logging import logging
from util.date_utils import get_default_time_display, almost_same_datetime from util.date_utils import get_default_time_display, almost_same_datetime
......
cms/templates/index.html
...@@ -275,18 +275,21 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) { ...@@ -275,18 +275,21 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) {
% endif % endif
</article> </article>
<%
help_doc_urls = get_online_help_info(online_help_token())
%>
<aside class="content-supplementary" role="complimentary"> <aside class="content-supplementary" role="complimentary">
<div class="bit"> <div class="bit">
<h3 class="title title-3">${_('Need help?')}</h3> <h3 class="title title-3">${_('New to edX Studio?')}</h3>
<p>${_('If you are new to Studio and having trouble getting started, there are a few things that may be of help:')}</p> <p>${_('Click Help in the upper-right corner to get more more information about the Studio page you are viewing. You can also use the links at the bottom of the page to access our continously updated documentation and other Studio resources.')}</p>
<ol class="list-actions"> <ol class="list-actions">
<li class="action-item"> <li class="action-item">
<a href="http://files.edx.org/Getting_Started_with_Studio.pdf" title="This is a PDF Document">${_('Get started by reading Studio\'s Documentation')}</a>
<a href="${help_doc_urls['doc_url']}" target="_blank">${_("Getting Started with edX Studio")}</a>
</li> </li>
<li class="action-item"> <li class="action-item">
<a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to request help">${_('Request help with Studio')}</a> <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to request help">${_('Request help with edX Studio')}</a>
</li> </li>
</ol> </ol>
</div> </div>
......
cms/templates/textbooks.html
...@@ -78,7 +78,7 @@ require(["js/models/section", "js/collections/textbook", "js/views/list_textbook ...@@ -78,7 +78,7 @@ require(["js/models/section", "js/collections/textbook", "js/views/list_textbook
<% <%
help_doc_urls = get_online_help_info(online_help_token()) help_doc_urls = get_online_help_info(online_help_token())
%> %>
<p><a href="${help_doc_urls['doc_url']}" target="_blank">${_("Read More")}</a></p> <p><a href="${help_doc_urls['doc_url']}" target="_blank">${_("Learn More")}</a></p>
</div> </div>
</aside> </aside>
</section> </section>
......
cms/templates/unit.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%def name="online_help_token()"><% return "unit" %></%def>
<%! <%!
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from contentstore.views.helpers import EDITING_TEMPLATES from contentstore.views.helpers import EDITING_TEMPLATES
......
cms/templates/widgets/header.html
...@@ -128,9 +128,6 @@ ...@@ -128,9 +128,6 @@
<% <%
help_doc_urls = get_online_help_info(online_help_token) help_doc_urls = get_online_help_info(online_help_token)
%> %>
<ol> <ol>
<li class="nav-item nav-account-help"> <li class="nav-item nav-account-help">
<h3 class="title"><span class="label"><a href="${help_doc_urls['doc_url']}" title="${_("Contextual Online Help")}" target="${_("_blank")}">${_("Help")}</a></span></h3> <h3 class="title"><span class="label"><a href="${help_doc_urls['doc_url']}" title="${_("Contextual Online Help")}" target="${_("_blank")}">${_("Help")}</a></span></h3>
......
cms/templates/widgets/sock.html
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%def name="online_help_token()"><% return "default" %></%def>
<div class="wrapper-sock wrapper"> <div class="wrapper-sock wrapper">
<ul class="list-actions list-cta"> <ul class="list-actions list-cta">
<li class="action-item"> <li class="action-item">
<a href="#sock" class="cta cta-show-sock"><i class="icon-question-sign"></i> <span class="copy">${_("Looking for Help with Studio?")}</span></a> <a href="#sock" class="cta cta-show-sock"><i class="icon-question-sign"></i> <span class="copy">${_("Looking for help with Studio?")}</span></a>
</li> </li>
</ul> </ul>
<div class="wrapper-inner wrapper"> <div class="wrapper-inner wrapper">
<section class="sock" id="sock"> <section class="sock" id="sock">
<header> <header>
<h2 class="title sr">${_("edX Studio Help")}</h2> <h2 class="title sr">${_("edX Studio Documentation")}</h2>
</header> </header>
<div class="support"> <div class="support">
<h3 class="title">${_("Studio Support")}</h3> <h3 class="title">${_("edX Studio Documentation")}</h3>
<div class="copy"> <div class="copy">
<p>${_("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.")}</p> <p>${_("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.")}</p>
</div> </div>
<ul class="list-actions"> <ul class="list-actions">
<%
help_doc_urls = get_online_help_info(online_help_token())
%>
<li class="action-item">
<a href="${help_doc_urls['pdf_url']}" target="_blank" rel="external" class="action action-primary">${_("Building and Running an edX Course PDF")}</a>
</li>
<li class="action-item"> <li class="action-item">
<a href="http://files.edx.org/Getting_Started_with_Studio.pdf" class="action action-primary" title="${_("This is a PDF Document")}">${_("Download Studio Documentation")}</a> <a href="http://help.edge.edx.org/" rel="external" class="action action-primary">${_("edX Studio Author Support")}</a>
<span class="tip">${_("How to use Studio to build your course")}</span> <span class="tip">${_("edX Studio Author Support")}</span>
</li>
<li class="action-item">
<a href="http://help.edge.edx.org/" rel="external" class="action action-primary">${_("Studio Help Center")}</a>
<span class="tip">${_("Studio Help Center")}</span>
</li> </li>
<li class="action-item"> <li class="action-item">
<a href="https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about" rel="external" class="action action-primary">${_("Enroll in edX101")}</a> <a href="https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about" rel="external" class="action action-primary">${_("Enroll in edX101")}</a>
<span class="tip">${_("How to use Studio to build your course")}</span> <span class="tip">${_("How to use edX Studio to build your course")}</span>
</li> </li>
</ul> </ul>
</div> </div>
<div class="feedback"> <div class="feedback">
<h3 class="title">${_("Contact us about Studio")}</h3> <h3 class="title">${_("Request help with edX Studio")}</h3>
<div class="copy"> <div class="copy">
<p>${_("Have problems, questions, or suggestions about Studio? We're also here to listen to any feedback you want to share.")}</p> <p>${_("Have problems, questions, or suggestions about edX Studio?")}</p>
</div> </div>
<ul class="list-actions"> <ul class="list-actions">
......
docs/config.ini
...@@ -17,6 +17,8 @@ pdf_file = edx-partner-course-staff.pdf ...@@ -17,6 +17,8 @@ pdf_file = edx-partner-course-staff.pdf
default = index.html default = index.html
home = getting_started/get_started.html home = getting_started/get_started.html
outline = creating_content/organizing_course.html outline = creating_content/organizing_course.html
subsection = creating_content/organizing_course.html#subsections
unit = creating_content/organizing_course.html#units
updates = creating_content/handouts_updates.html updates = creating_content/handouts_updates.html
pages = creating_content/pages.html pages = creating_content/pages.html
files = creating_content/course_files.html files = creating_content/course_files.html
...@@ -26,12 +28,11 @@ grading = building_course/establish_grading_policy.html ...@@ -26,12 +28,11 @@ grading = building_course/establish_grading_policy.html
team = building_course/creating_new_course.html#add-course-team-members team = building_course/creating_new_course.html#add-course-team-members
advanced = index.html advanced = index.html
checklist = building_course/creating_new_course.html#use-the-course-checklist checklist = building_course/creating_new_course.html#use-the-course-checklist
import = building_course/export_import_course.html import = building_course/export_import_course.html#import-a-course
export = building_course/export_import_course.html export = building_course/export_import_course.html#export-a-course
# below are the language directory names for the different locales # below are the language directory names for the different locales
[locales] [locales]
default = en default = en
en = en en = en
en_us = en en_us = en
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment