Commit Graph

2087 Commits

Author SHA1 Message Date
Mike Bifulco
1dcce2c49d fixed invalid CSS selectors
The surplus ":" in the input selector causes jquery versions past 1.9 to throw an error.
2015-05-22 14:56:42 +00:00
Marco Morales
c9f13eb982 fix for broken course status label on outline page 2015-05-20 11:49:30 -04:00
Sarina Canelake
9eb565ec2f Remove unused css 2015-05-18 16:58:10 -04:00
Sarina Canelake
ca64c665cc Default course license to All Rights Reserved
Clicking on conflicting option box unchecks all conflicts
LMS: Clicking license text should bring to new window
updated styles to reflect html reuse inside of xblock edit modal area.

Add ARIA attributes to license for a11y

Gracefully handle re-selecting of selected license
2015-05-18 14:37:32 -04:00
David Baumgold
a3887e951c Courseware license (Creative Commons): FED
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
2015-05-18 14:36:04 -04:00
David Baumgold
8fbaa66d33 Make courseware licenses show up in Studio XBlock previews 2015-05-18 14:35:40 -04:00
David Baumgold
37ab2fc16a Wrap block with license info in LMS only 2015-05-18 14:35:08 -04: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
Brian Talbot
d09d0a2c36 Studio: renaming Sass/CSS files for consistency and clarity 2015-05-14 13:14:54 -04:00
Brian Talbot
0550e39516 Studio: moving shared/redundant Sass partial calls to _build.scss partial 2015-05-12 22:03:43 -04:00
Brian Talbot
5e27bd229a Studio: removing manual Sass/CSS extend files needed for IE9 and below 2015-05-12 10:36:32 -04:00
muzaffaryousaf
f5de0bbf43 Enable unit preview by default.
TNL-1261
2015-05-06 12:40:44 +05:00
Ahsan Ulhaq
017916fa75 Visually hidden content accessible through keyboard
The "New Course" and "New Library" buttons reveal a form to add course or library.
When not displayed, these forms are still accessible to a keyboard user.
Added display: "none" in css so that contents are visually as well as via
keyboard inaccessible

AC-34
2015-04-23 20:41:46 +05:00
Nimisha Asthagiri
11044ebdf2 MA-614 Mobile Push Notification Studio UI 2015-04-18 15:30:25 -04:00
Nimisha Asthagiri
b124485ed6 MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse 2015-04-18 15:30:19 -04:00
muhammad-ammar
9c2d18710c Jasmine tests for account settings page.
TNL-1499
2015-04-17 17:23:14 -04:00
louyihua
7a45d6e471 i18n fix in studio
1. Fix the broken `gettext()` call in `courde_detail.js`
2. Change the string to avoid Transifex misunderstand the pattern '% o' in `checklist.underscore`.
3. Embed the `{filename}` part inside the string in `transcripts-choose.underscore` to provide better i18n flexibililty.
4. Remove all the call of `gettext()` and `${_()}` inside the `mock` directory to aovid mis-extraction by pybabel. (It seems that the `mock` directory is soly used in test? So the strings in this directory need not to be extracted and translated?)
5. The unicode char `\u2014` will trigger a bug inside pybabel which makes the extracted string untranslatable, so remove this char.
2015-04-13 19:00:52 +08:00
louyihua
297d94a38b Make some strings i18n 2015-04-07 12:56:03 +08:00
louyihua
2d47f80391 Fix i18n breaking in some js and underscore files
1. Spliting strings inside the call to `gettext()` in javascript breaks the string extraction process, so the string should kept in one line.
2. Using escape string inside a string in `gettext()` may cause the extractor to misunderstand the escape string, so that it will escape this escape string.
2015-04-06 01:28:06 +08:00
Sarina Canelake
d66bb883ac Fix footer stylings for RTL 2015-03-26 10:15:51 -04:00
Brian Talbot
67168869f5 Adjust styling for Open edX footer details 2015-03-26 10:15:51 -04:00
David Baumgold
8abfe4a850 Put Open edX logo in CMS footer 2015-03-26 10:14:37 -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
Jonathan Piacenti
568acb56b0 Library setting for show/hide children previews + client-side code to toggle it. 2015-03-18 08:59:58 -05:00
David Baumgold
c6992688ac Merge pull request #7314 from edx/load-tender-js-from-tenderapp-subdomain
Define TENDER_SUBDOMAIN so that we can still use vanity URLs
2015-03-16 10:44:00 -04:00
Waqas Khalid
a8457c4fb4 Merge pull request #6871 from edx/waqas/studio-mathjax-unit-problem
Unit page doesn't load when mathjax is down
2015-03-16 18:47:06 +05:00
Waqas Khalid
729dd24c82 Unit page doesn't load when mathjax is down
When mathjax is down studio page doesn't work as
it wait for mathjax to load. I replaced the hard
dependency with soft dependency now unit page can
load with mathjax.
2015-03-16 15:12:01 +05:00
David Baumgold
cfb1ec115a Define TENDER_SUBDOMAIN to that we can still use vanity URLs 2015-03-11 16:36:55 -04:00
Sarina Canelake
9d9dccdb97 Merge pull request #7299 from edx/sarina/indagation/TNL-1461
Add pointer-events: none for fa-lock and fa-eye
2015-03-11 11:04:26 -04:00
Sarina Canelake
d1543b6156 Add pointer-events: none for fa-lock and fa-eye [TNL-1461] 2015-03-11 10:20:26 -04:00
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04:00
Sarina Canelake
4133740a2f Add default logo to Studio 2015-03-06 13:05:03 -05:00
Xavier Antoviaque
7ac581293d Merge pull request #7059 from open-craft/library-comments
Make UI styling consistent between libraries and courses tabs when empty (SOL-232)
2015-02-26 16:41:05 +01:00
Jonathan Piacenti
f952a33ec3 Make UI styling consistent between libraries and courses tabs when empty. 2015-02-24 20:29:54 +00:00
Dino Cikatic
b597df2e39 Changing search_reindex call to be more inline with DRF convention 2015-02-24 10:58:50 -05:00
Jesse Zoldak
047ca495c6 Disable flakily failing JS tests TNL-559 2015-02-20 10:35:54 -05:00
muzaffaryousaf
a31e38416d Adds content group "Delete" and "Usage" functionality to group configurations page on cms.
TNL-1185
2015-02-20 14:56:22 +05:00
Jesse Zoldak
44ff43ab1f Disable flakily failing JS tests TNL-559 2015-02-19 07:24:27 -05:00
Martyn James
a46b4daf7f Merge pull request #6937 from edx/mjames/SOL-353
Reorganise reindexing operation
2015-02-10 10:58:49 -05:00
Martyn James
181d0e46c5 Reorganise reindexing operation 2015-02-09 22:13:25 -05:00
Braden MacDonald
2982ecd40d Disabled flaky JS tests pending refactor to Backbone 2015-02-09 15:00:17 -08:00
Sarina Canelake
011a5f9410 Merge pull request #6754 from OmarIthawi/edraak/omarithawi/bulk-mail-rtl
TinyMCE RTL in course bulk email
2015-01-30 09:12:56 -05:00
Régis Behmo
c3c35f076c Fix csrf error on studio login
Context: We have witnessed multiple, seemingly random "CSRF verification
failed" errors while signing in (with valid ID) to the Studio.

Explanation: The login form does not initially include a CSRF field.
The CSRF header of the request is appended to the studio login request
headers by intercepting the form validation. This intercept is performed
by the login.js script. Unfortunately, the login.js script is loaded
pretty late (at the end of the template). So if the login form is
validated sufficiently fast, the login.js script has no time to load and
append the X-CSRFToken header to the request.

Proposed solution: the CSRF token is already passed to the template via
the login view, so we just add a hidden field to the login form to
include the csrf token.
2015-01-29 09:10:59 +01:00
Matt Drayer
1c839cc09d Addressed several outstanding issues related to initial entrance exams feature delivery 2015-01-28 23:56:32 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
This reverts commit b8184d188f.
2015-01-28 17:26:46 -05:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms
Add RequireJS to the LMS
2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS
[second attempt which addresses bug building Studio]
2015-01-27 17:56:29 -05:00
Omar Al-Ithawi
38db6e695d Giant fixups for the editors around the studio 2015-01-27 11:11:55 +02:00