Commit Graph

91 Commits

Author SHA1 Message Date
Navin Karkera
61b8961cdf fix: auto enroll users when added as staff (#32561)
The course team management section under Instructor > Membership tab
allows users to be added a role even if are not enrolled in the course.
This is behaviour does not match the help text displayed in the section.

This PR updates modify_access api to enrolls user if they are not enrolled
after adding them to a role as well as changes the help text to reflect
actual changes.
2024-04-26 13:16:32 -04:00
Braden MacDonald
9b9b88df52 chore: remove some usages of six (Python2 compat) (#32554)
* get rid of six.text_type(s)
* get rid of six.b()
* get rid of six.string_types
* get rid of six.PY2/six.PY3
* get rid of six.iteritems() and six.viewvalues()
2023-07-17 12:18:43 -07:00
Jawayria
a1ff38819a fix: replace 'ugettext' with 'gettext' in cms 2021-12-14 19:51:13 +05:00
Ayub khan
da9c71557b -Remove unicode and use six.text_type 2019-09-02 16:14:02 +05:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
2018-06-05 13:59:09 -04:00
bmedx
9099f0dc23 CMS urls cleanup for Django 1.11
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
2017-11-02 14:29:48 -04:00
ssemenova
c1f793172f change icon tags from i to span
TNL-4692
2016-06-07 10:52:00 -04:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
2016-02-03 17:13:21 -05:00
Robert Raposa
3682fac832 Add json escaping to Studio
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
2015-11-04 13:34:42 -05:00
Carol Tong
40d1a63343 TNL-3697/DOC-2372: modify Manage Users template to indicate that course
team not automatically enrolled in course
2015-10-27 11:05:23 -04:00
Alison Hodges
3547821b1a Adds a comment to reduce confusion over remaining role name differences 2015-08-20 16:09:35 -04:00
Alison Hodges
8ef05e0484 Carol's edits 2015-07-02 13:29:35 -04:00
Alison Hodges
f4209803f2 Remove "instructor" label or change to "Admin"
Clarifies what the roles are, makes Studio and LMS naming parallel.
2015-06-29 17:03:18 -04:00
David Baumgold
34addd8fa8 Group imports together in Mako templates 2015-06-03 12:36:47 -04:00
E. Kolpakov
9a56b800ee Unified Course Team and Library Users page. Converted both to Backbone.
Converted lettuce Course Team page tests to bok choy
2015-03-24 12:09:19 +03:00
Carol Tong
e749f4500b Update template and config.ini files for library user help 2015-03-18 17:43:54 -04:00
Ahsan Ulhaq
ed944fdb0e Inaccessible label for the page action Navigation
<nav> elements for the actions a user can perform on a perticular
page contain inaccessible label whic causes screen reader users
confusion regarding to their current navigation.

TNL-1531
2015-02-25 16:40:03 +05:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
2015-01-06 15:24:12 -05:00
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute
TNL-997
2015-01-06 17:21:49 +05:00
David Baumgold
34c6415527 Use STUDIO_SHORT_NAME for Studio
STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
2014-12-23 11:14:58 -05:00
David Baumgold
7366d2b1a2 Replace "edX Studio" with "{studio_name}"
For theming and internationalization
2014-12-19 13:58:42 -05:00
Greg Price
067e270a84 Fix spelling of complementary role 2014-11-05 15:48:51 -05:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
Sarina Canelake
e57a1551c3 Make Studio and LMS register pages use the same language 2014-08-22 14:23:07 -04:00
Mathew Peterson
9f8f64cffe Course Reruns UI
Studio: adding course re-run-centric static template rendering

* initial HTML for dashboard states
* initial HTML for new course re-run view/form
* initial HTML placeholder for outline alert UI

Conflicts:
	cms/templates/index.html

Studio: adding styling for course re-run-centric views

* adding new view/page mast-wizard type
* refactoring create course/element form styling
* adding course re-run view specific styling
* adding courses processing styling (w/ alerts and status)

Course rerun server-side updates: support display_name and DuplicateCourseError.

Studio: further design revisions and tweaks from feedback

* removing new window attribute from re-run control
* removing links from processing courses
* revising look/feel of dismiss action on dashboard + alert
* correcting font-weight of dashboard processing title
* adding extra space to course rerun action on dashboard
* re-wording secondary cancel action on rerun view

Conflicts:
	cms/templates/index.html

Added interation on unsucceeded courses in dashboard

Studio: removing 'rel=external' property from course re-run actions

Studio: removing hover styles for processing courses

Fixed value bug in split and set course listing to display run

moved task.py for rerun
2014-08-21 12:09:12 -04:00
Calen Pennington
8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/templates/widgets/header.html
2014-05-19 09:20:08 -04:00
Mark Hoeber
8fcbdaed03 Update of all templates
Changed help button to link and removed drop-down items
2014-05-16 20:38:09 -04:00
Calen Pennington
0d88379eeb Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds all of cms.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:56:43 -04:00
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones
STUD-1006
2014-01-14 17:04:44 -05:00
Mark Hoeber
f5ae957a91 Studio: Review all panel help copy
Reviewed and updated all on-page panel help text in Studio for clarity,
consistency, and brevity.  Updated template HTML files to change text

STUD-924
2013-11-19 10:35:17 -05:00
cahrens
355ebd62e3 Convert course team management to new URL scheme.
Move RESTful URLs into our "done" section.
2013-10-24 14:01:24 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Brian Talbot
c2507ddc21 Studio: revises class naming conventions applied to the <body> element and used for view specific styling 2013-10-01 16:53:41 -04:00
David Baumgold
53ae177178 Curly quotes around course name 2013-08-01 13:46:40 -04:00
David Baumgold
16e2ee8011 Abstract out the unknown error message and i18n 2013-08-01 13:43:40 -04:00
David Baumgold
1eae675952 Create a dedicated CMS.Models.Course Backbone model
Initialize on every page that has a context_course set
2013-08-01 13:39:47 -04:00
Brian Talbot
a1f43fa6fd Studio: revises prompt messages for team roles UI 2013-08-01 09:58:32 -04:00
David Baumgold
21318d142d Add confirmation prompt when deleting a user from a course team 2013-08-01 09:58:32 -04:00
David Baumgold
2617b478c0 Add error messaging to course team page
Hitting "Add User" with no email address, or trying to add a user to the course
team multiple times
2013-08-01 09:58:32 -04:00
Brian Talbot
16187462b3 Studio: syncs up visual and semantic standards b/t create course and user forms 2013-07-30 18:21:07 -04:00
Brian Talbot
7a41855fdb Studio: adds logic to show add new user to team view 2013-07-30 14:00:58 -04:00
David Baumgold
fba50589ff Add a lettuce test for course team admins granting admin status 2013-07-30 13:48:43 -04:00
Brian Talbot
2161961f64 Studio: corrects legend element copy on new user form 2013-07-30 13:18:56 -04:00
Mark L. Chang
8b6c2787f6 copy changes 2013-07-30 00:14:44 -04:00
Brian Talbot
611dab077f Studio: places 'add team member' call to course team view 2013-07-29 17:29:15 -04:00
David Baumgold
36a10876c0 Fix variable scoping issue in Mako template 2013-07-29 13:12:06 -04:00
Brian Talbot
deced24b32 Studio: refactored form-based Sass and revised markup/copy for course team admin mgmt 2013-07-29 13:12:06 -04:00
David Baumgold
e5ef5ef1a0 Show disabled trash icon instead of not showing it at all 2013-07-29 13:12:06 -04:00
David Baumgold
41832744d7 Correct course team admin badging logic 2013-07-29 13:12:06 -04:00