From 8fcbdaed03a044b27524ae6a75bb2bb38676a547 Mon Sep 17 00:00:00 2001 From: Mark Hoeber Date: Tue, 13 May 2014 13:41:19 -0400 Subject: [PATCH] Update of all templates Changed help button to link and removed drop-down items --- cms/templates/asset_index.html | 1 + cms/templates/checklists.html | 1 + cms/templates/course_info.html | 1 + cms/templates/export.html | 1 + cms/templates/import.html | 1 + cms/templates/index.html | 2 +- cms/templates/manage_users.html | 1 + cms/templates/overview.html | 1 + cms/templates/settings.html | 1 + cms/templates/settings_advanced.html | 1 + cms/templates/settings_graders.html | 1 + cms/templates/textbooks.html | 4 ++++ cms/templates/widgets/header.html | 25 +++---------------------- docs/config.ini | 1 - 14 files changed, 18 insertions(+), 24 deletions(-) diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 3cb6b34a07..04f6cef0bb 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "files" %> <%! from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _ diff --git a/cms/templates/checklists.html b/cms/templates/checklists.html index 90f77683d8..ad75fe3518 100644 --- a/cms/templates/checklists.html +++ b/cms/templates/checklists.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "checklist" %> <%! from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _ diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html index 8cddb8a8c5..7a44f142e3 100644 --- a/cms/templates/course_info.html +++ b/cms/templates/course_info.html @@ -2,6 +2,7 @@ from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "updates" %> <%namespace name='static' file='static_content.html'/> diff --git a/cms/templates/export.html b/cms/templates/export.html index 2a19a13af4..7af1661459 100644 --- a/cms/templates/export.html +++ b/cms/templates/export.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "export" %> <%namespace name='static' file='static_content.html'/> <%! diff --git a/cms/templates/import.html b/cms/templates/import.html index 2c4fdd17d6..af5987f08e 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "import" %> <%namespace name='static' file='static_content.html'/> <%! from django.utils.translation import ugettext as _ diff --git a/cms/templates/index.html b/cms/templates/index.html index 4c5a7518a8..9664805a46 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -1,7 +1,7 @@ <%! from django.utils.translation import ugettext as _ %> <%inherit file="base.html" /> - +<%def name="online_help_token()"><% return "home" %> <%block name="title">${_("My Courses")} <%block name="bodyclass">is-signedin index view-dashboard diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index bac136ab04..95e5ee1bc5 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -4,6 +4,7 @@ <%! from student.roles import CourseInstructorRole %> <%! from xmodule.modulestore.django import loc_mapper %> <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "team" %> <%block name="title">${_("Course Team Settings")} <%block name="bodyclass">is-signedin course users view-team diff --git a/cms/templates/overview.html b/cms/templates/overview.html index 7e9fa5f8c5..9cf0ced5ec 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "outline" %> <%! import logging from util.date_utils import get_default_time_display diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 0cc770adfa..b0fd4be65c 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "schedule" %> <%block name="title">${_("Schedule & Details Settings")} <%block name="bodyclass">is-signedin course schedule view-settings feature-upload diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html index 30bdec161c..eff03f86cc 100644 --- a/cms/templates/settings_advanced.html +++ b/cms/templates/settings_advanced.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "advanced" %> <%namespace name='static' file='static_content.html'/> <%! from django.utils.translation import ugettext as _ diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html index a892dca473..1c50c88146 100644 --- a/cms/templates/settings_graders.html +++ b/cms/templates/settings_graders.html @@ -1,4 +1,5 @@ <%inherit file="base.html" /> +<%def name="online_help_token()"><% return "grading" %> <%block name="title">${_("Grading Settings")} <%block name="bodyclass">is-signedin course grading view-settings diff --git a/cms/templates/textbooks.html b/cms/templates/textbooks.html index 12c40ef6cd..b444c28ae8 100644 --- a/cms/templates/textbooks.html +++ b/cms/templates/textbooks.html @@ -75,6 +75,10 @@ require(["js/models/section", "js/collections/textbook", "js/views/list_textbook

${_("What if my book isn't divided into chapters?")}

${_("If your textbook doesn't have individual chapters, you can upload the entire text as a single chapter and enter a name of your choice in the Chapter Name field.")}

+ <% + help_doc_urls = get_online_help_info(online_help_token) + %> +

Read More

diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 0e87a63c48..d9f9c1bf87 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -129,30 +129,11 @@ help_doc_urls = get_online_help_info(online_help_token) %> + +