Commit Graph

190 Commits

Author SHA1 Message Date
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
5e69224c32 Deprecate escaping in display_name_with_default
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
2015-12-22 11:52:04 -05:00
Robert Raposa
b76981234d Merge pull request #10484 from edx/robrap/TNL-2646
TNL-2646: Escape json in Studio
2015-11-04 14:28:25 -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
Peter Fogg
b98c89117c Course pacing template changes.
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.

ECOM-2794
ECOM-2800
2015-11-04 09:59:58 -05:00
Peter Fogg
505b2aa4d9 Disable setting course pacing during course run.
Also adds improved styling for course pacing settings, and unit tests
around query counts for self-paced courses.

ECOM-2650
2015-10-28 16:44:36 -04:00
Peter Fogg
5ffa06bed1 Responding to review comments. 2015-10-28 16:44:36 -04:00
Peter Fogg
7f673604fb Allow setting self-paced on schedule & details page.
Currently unstyled.

ECOM-2462
2015-10-28 14:33:11 -04:00
Zia Fazal
80abf159ee removed entrance exam dependency on ENABLE_MKTG_SITE
changes after feedback from Matt D

set default value of entrance_exams feature flags to false
2015-10-21 15:21:26 +05:00
Zia Fazal
0f637fdc95 check MILESTONES_APP when checking prerequisite courses enabled 2015-10-16 12:53:55 +05:00
Bill DeRusha
c6b54aa61f Readonly for enrollment end date/time on edX (for non-global-staff)
TNL-2694

Add accessibility aria-readonly attributes
2015-09-18 09:39:18 -04:00
zubair-arbi
ab74f64e85 update credit eligibility ui text
ECOM-1648
2015-07-08 20:13:42 +05:00
Ahsan Ulhaq
0ae22a3b08 Credit Eligibility display on the CMS accessibility issues
There were some accessibility issues on the cms side which are addressed

ECOM-1594
2015-06-24 19:58:01 +05:00
zubair-arbi
3204c8b3fe show credit eligibility requirements in studio
ECOM-1591
2015-06-12 13:19:57 +05:00
Davorin Sego
176b1c8962 Course Discovery - Language Filtering
Filter by Language:
Designation for course language(s) in Studio
allows for filtering of courses based on their language in the sidebar
Reuses active filter view UI/IA from find courses page on edx.org
view for clearing individual or all filters, as with edx.org filtering
2015-06-01 10:45:51 +02:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -04:00
Ahsan Ulhaq
eba02da233 Merge pull request #7544 from edx/ahsan/tnl-1675-iframe-elements-require-meaningful-title
iframe elements require a meaningful title attribute
2015-04-16 13:54:15 +05:00
David Baumgold
93e7d795f1 Remove nested form elements
This is invalid HTML
2015-04-14 17:01:43 -04:00
louyihua
adc6929b45 Better i18n extraction and translation
1. Extract the full sentence rather than parital of a sentence, so that languages with different word orders than English can benifit from this.
2. Using ngettext instead of gettext with 'xxx(s)', as Transifex treats `()` as special characters so that it enforces the translated string must have the same number of `()` pairs. Such enforcement makes translations difficult, as not every language can use forms like 'xxx(s)' to represent both singular & plural within a single word.
2015-04-08 00:47:47 +08:00
Ahsan Ulhaq
42c42efa3a add translateable title 2015-04-07 14:52:45 +05:00
Ahsan Ulhaq
a96acd2f2f iframe elements require a meaningful title attribute
TNL-1675
2015-04-01 18:29:55 +05:00
Ahsan Ulhaq
2f79948982 Course settings nav accessibility issue Studio
course settings <nav> elements in the studio does not include accessible
label which results into much confusion for the screen reader users.

TNL-1532
2015-02-25 17:47:08 +05:00
Adam Palay
d4fff463d1 fix unicode error on cms settings page 2015-02-11 11:02:26 -05:00
Adam Palay
bfb173507c fix settings page not handling unicode (TNL-1237) 2015-01-28 15:55:45 -05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware
TNL-652
2015-01-15 10:33:45 -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
David Baumgold
609f642059 Placeholder text should be translated 2014-12-31 09:27:52 -05:00
David Baumgold
7366d2b1a2 Replace "edX Studio" with "{studio_name}"
For theming and internationalization
2014-12-19 13:58:42 -05:00
David Baumgold
198e9c7c0e Do a better job translating "Program Manager" 2014-12-18 14:33:12 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations
TNL-649
2014-12-05 09:52:26 -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
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Oleg Marshev
f020d1c584 Show date and time on Schedules and Details in UTC (TNL-85). 2014-10-03 11:17:00 +03:00
Alexander Kryklia
095b07275e Unflag Group Configurations, Render only existing children in staff view of split_test. 2014-08-22 16:43:54 -04:00
louyihua
14cd7d7763 Translation & secure-aware changes to studio's settings page
1. Change the link of course's about page secure aware, which displays 'https' or 'http' prefix according to the current protocol.
2. Make the email in this page translatable.
2014-08-19 01:13:23 +08:00
Tim Babych
453c583714 Hide GroupConfiguration behind feature flag in cms/templates/settings.html. 2014-07-04 08:23:35 +03:00
Tim Babych
a153092cb5 Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. 2014-07-03 15:30:18 +03:00
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
louyihua
5aaae2ebc4 Change 'Course Name' to 'Course Run' in settings.html
The code behind uses course run to fill this field, so maybe the filed's name should be changed as well?
2014-06-28 02:50:09 +08:00
Ben McMorran
d592b7eec1 Removes Conrad's name from the course schedule settings (STUD-1511). 2014-06-03 16:58:05 -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
Andy Armstrong
88d95d119c Rebuild the way modals are constructed to support nesting. 2014-04-09 10:32:13 -04:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
Adam Palay
517ca9329b removes references to specific edx email addresses (STUD-1069) 2013-12-23 16:28:08 -05:00
Don Mitchell
7f91ce40ae Restful api for course advanced settings
STUD-948
2013-11-26 10:17:52 -05:00