From f4209803f2985c06e1b6cc5d815986360cd02d71 Mon Sep 17 00:00:00 2001 From: Alison Hodges Date: Mon, 29 Jun 2015 13:25:18 -0400 Subject: [PATCH] Remove "instructor" label or change to "Admin" Clarifies what the roles are, makes Studio and LMS naming parallel. --- cms/templates/manage_users.html | 7 ++- cms/templates/manage_users_lib.html | 6 +- .../instructor_dashboard/student_admin.html | 6 +- .../instructor_dashboard_2/course_info.html | 4 +- .../instructor_dashboard_2/data_download.html | 2 +- .../instructor_dashboard_2/e-commerce.html | 2 +- .../instructor_dashboard_2/membership.html | 56 +++++++++++-------- .../instructor_dashboard_2/send_email.html | 10 ++-- .../instructor_dashboard_2/student_admin.html | 6 +- lms/templates/peer_grading/peer_grading.html | 2 +- 10 files changed, 55 insertions(+), 46 deletions(-) diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index 2a898fc9b9..df48b9670a 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -53,7 +53,7 @@ from django.core.urlresolvers import reverse
  • - ${_("Please provide the email address of the course staff member you'd like to add")} + ${_("Provide an email address to add the user as Staff")}
    • @@ -94,14 +94,15 @@ from django.core.urlresolvers import reverse diff --git a/cms/templates/manage_users_lib.html b/cms/templates/manage_users_lib.html index 7c8ed187a1..e4dd12d3cf 100644 --- a/cms/templates/manage_users_lib.html +++ b/cms/templates/manage_users_lib.html @@ -95,9 +95,9 @@ from django.core.urlresolvers import reverse

    ${_("Library Access Roles")}

    ${_("There are three access roles for libraries: User, Staff, and Admin.")}

    -

    ${_("Users can view library content and can reference or use library components in their courses, but they cannot edit the contents of a library.")}

    -

    ${_("Staff are content co-authors. They have full editing privileges on the contents of a library.")}

    -

    ${_("Admins have full editing privileges and can also add and remove other team members. There must be at least one user with Admin privileges in a library.")}

    +

    ${_("Library Users can view library content and can reference or use library components in their courses, but they cannot edit the contents of a library.")}

    +

    ${_("Library Staff are content co-authors. They have full editing privileges on the contents of a library.")}

    +

    ${_("Library Admins have full editing privileges and can also add and remove other team members. There must be at least one user with the Admin role in a library.")}

    diff --git a/lms/static/js/fixtures/instructor_dashboard/student_admin.html b/lms/static/js/fixtures/instructor_dashboard/student_admin.html index cbf94bb0dc..c724191d2c 100644 --- a/lms/static/js/fixtures/instructor_dashboard/student_admin.html +++ b/lms/static/js/fixtures/instructor_dashboard/student_admin.html @@ -70,7 +70,7 @@

    - Rescoring runs in the background, and status for active tasks will appear in the 'Pending Instructor Tasks' table. To see status for all tasks submitted for this problem and student, click on this button: + Rescoring runs in the background, and status for active tasks will appear in the 'Pending Tasks' table. To see status for all tasks submitted for this problem and student, click on this button:

    @@ -103,7 +103,7 @@

    - Rescoring runs in the background, and status for active tasks will appear in the 'Pending Instructor Tasks' table. To see status for all tasks submitted for this problem and student, click on this button: + Rescoring runs in the background, and status for active tasks will appear in the 'Pending Tasks' table. To see status for all tasks submitted for this problem and student, click on this button:

    @@ -137,7 +137,7 @@
    -

    Pending Instructor Tasks

    +

    Pending Tasks

    The status for any active tasks appears in a table below.


    diff --git a/lms/templates/instructor/instructor_dashboard_2/course_info.html b/lms/templates/instructor/instructor_dashboard_2/course_info.html index 22cce25f6f..db19bc1d0e 100644 --- a/lms/templates/instructor/instructor_dashboard_2/course_info.html +++ b/lms/templates/instructor/instructor_dashboard_2/course_info.html @@ -7,7 +7,7 @@ %if settings.FEATURES.get('DISPLAY_ANALYTICS_ENROLLMENTS'): ## Translators: 'track' refers to the enrollment type ('honor', 'verified', or 'audit') - ${_("Number of enrollees (instructors, staff members, and students) by track")} + ${_("Number of enrollees (admins, staff, and students) by track")}instructors

    <% modes = section_data['enrollment_count'] %> @@ -94,7 +94,7 @@ %if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
    -

    ${_("Pending Instructor Tasks")}

    +

    ${_("Pending Tasks")}

    ${_("The status for any active tasks appears in a table below.")}


    diff --git a/lms/templates/instructor/instructor_dashboard_2/data_download.html b/lms/templates/instructor/instructor_dashboard_2/data_download.html index a7110098fa..f3e1327e15 100644 --- a/lms/templates/instructor/instructor_dashboard_2/data_download.html +++ b/lms/templates/instructor/instructor_dashboard_2/data_download.html @@ -74,7 +74,7 @@ %if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
    -

    ${_("Pending Instructor Tasks")}

    +

    ${_("Pending Tasks")}

    ${_("The status for any active tasks appears in a table below.")}


    diff --git a/lms/templates/instructor/instructor_dashboard_2/e-commerce.html b/lms/templates/instructor/instructor_dashboard_2/e-commerce.html index e7cc2f2987..5a0daee732 100644 --- a/lms/templates/instructor/instructor_dashboard_2/e-commerce.html +++ b/lms/templates/instructor/instructor_dashboard_2/e-commerce.html @@ -126,7 +126,7 @@ import pytz %if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
    -

    ${_("Pending Instructor Tasks")}

    +

    ${_("Pending Tasks")}

    ${_("The status for any active tasks appears in a table below.")}


    diff --git a/lms/templates/instructor/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html index 755cf70663..153bf4d137 100644 --- a/lms/templates/instructor/instructor_dashboard_2/membership.html +++ b/lms/templates/instructor/instructor_dashboard_2/membership.html @@ -114,7 +114,7 @@ from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_

    @@ -156,13 +156,13 @@ from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_

    ## Translators: an "Administration List" is a list, such as Course Staff, that users can be added to. -

    ${_("Administration List Management")}

    +

    ${_("Course Team Management")}

    ## Translators: an "Administrator Group" is a group, such as Course Staff, that users can be added to. - + @@ -172,21 +172,21 @@ from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_ %if not section_data['access']['instructor']:

    - ${_("Staff cannot modify staff or beta tester lists. To modify these lists, " - "contact your instructor and ask them to add you as an instructor for staff " - "and beta lists, or a discussion admin for discussion management.")} + ${_("Staff cannot modify these lists. To manage course team membership, " + "a course Admin must give you the Admin role to add Staff or Beta Testers, " + "or the Discussion Admin role to add discussion moderators and TAs.")}

    %endif %if section_data['access']['instructor']:
    %if to_option == "staff": - + %else: - + %endif %if to_option == "all": - + %else: - + %endif @@ -58,7 +58,7 @@ %if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
    -

    ${_("Pending Instructor Tasks")}

    +

    ${_("Pending Tasks")}

    ${_("Email actions run in the background. The status for any active tasks - including email tasks - appears in a table below.")}


    diff --git a/lms/templates/instructor/instructor_dashboard_2/student_admin.html b/lms/templates/instructor/instructor_dashboard_2/student_admin.html index 4081aa359d..a7d3b92279 100644 --- a/lms/templates/instructor/instructor_dashboard_2/student_admin.html +++ b/lms/templates/instructor/instructor_dashboard_2/student_admin.html @@ -78,7 +78,7 @@ %if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS') and section_data['access']['instructor']:

    - ${_("Rescoring runs in the background, and status for active tasks will appear in the 'Pending Instructor Tasks' table. " + ${_("Rescoring runs in the background, and status for active tasks will appear in the 'Pending Tasks' table. " "To see status for all tasks submitted for this problem and student, click on this button:")}

    @@ -119,7 +119,7 @@ %if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS') and section_data['access']['instructor']:

    - ${_("Rescoring runs in the background, and status for active tasks will appear in the 'Pending Instructor Tasks' table. " + ${_("Rescoring runs in the background, and status for active tasks will appear in the 'Pending Tasks' table. " "To see status for all tasks submitted for this problem and student, click on this button:")}

    @@ -161,7 +161,7 @@ %if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
    -

    ${_("Pending Instructor Tasks")}

    +

    ${_("Pending Tasks")}

    ${_("The status for any active tasks appears in a table below.")}


    diff --git a/lms/templates/peer_grading/peer_grading.html b/lms/templates/peer_grading/peer_grading.html index d868347445..c03b61aee9 100644 --- a/lms/templates/peer_grading/peer_grading.html +++ b/lms/templates/peer_grading/peer_grading.html @@ -5,7 +5,7 @@ nothing_to_grade_message = _( {p_tag}You currently do not have any peer grading to do. In order to have peer grading to do: {ul_tag} {li_tag}You need to have submitted a response to a peer grading problem.{end_li_tag} -{li_tag}The instructor needs to score the essays that are used to help you better understand the grading +{li_tag}The course team needs to score the essays that are used to help you better understand the grading criteria.{end_li_tag} {li_tag}There must be submissions that are waiting for grading.{end_li_tag} {end_ul_tag}