Commit Graph

2936 Commits

Author SHA1 Message Date
AlasdairSwan
cc93dcab32 Merge pull request #8247 from edx/alasdair/ECOM-1547-footer-v3-style-update
ECOM-1339 minor CSS tweaks for the footer. It now extends the full wi…
2015-05-29 09:10:30 -04:00
dino-cikatic
0d975674c2 Merge pull request #8186 from edx/dcikatic/SOL-839
SOL-839 label cursor and receipt internationalization
2015-05-29 14:43:22 +02:00
Dino Cikatic
077ea49b58 SOL-839 confirmation and receipt page internationalization 2015-05-29 13:49:19 +02:00
Ahsan Ulhaq
361d82adbb Merge pull request #8021 from edx/ahsan/AC-107-calculator-incompatible-aria-role-attribute
calculator incompatible aria role attribute
2015-05-29 02:11:37 -04:00
AlasdairSwan
0c7abfbe72 ECOM-1339 minor CSS tweaks for the footer. It now extends the full width of the browser and fixes issues with link hover states. 2015-05-28 15:16:03 -04:00
Will Daly
78ea4d55f4 Merge pull request #8175 from edx/will/footer-api-redux
ECOM-1339 Branding API footer
2015-05-28 11:03:06 -04:00
Will Daly
6af5fc1452 ECOM-1339 Branding API footer
Serve branded footer JSON/HTML/CSS/JS from an API endpoint
in the branding app.  Refactor OpenEdX and EdX.org footer templates
to use the Python version of the API, ensuring that the API
values are consistent with the footer included in main.html.

Detailed changes:

* Added footer API end-point to the branding app.
* Footer API allows the language to be set with querystring parameters.
* Footer API allows showing/hiding of the OpenEdX logo using querystring parameters.
* Deprecate ENABLE_FOOTER_V3 in favor of the branding API configuration flag.
* Move no referrer script into main.html from the edx footer template.
* Rename rwd_header_footer.js to rwd_header.js
* Cache API responses.

Authors:
Awais Qureshi, Aamir Khan, Will Daly
2015-05-28 08:30:45 -04:00
Ahsan Ulhaq
9044e48cad Calculator a11y issues
AC-107
2015-05-28 13:23:22 +05:00
Ahsan Ulhaq
0a43ebf191 Merge pull request #8113 from edx/ahsan/ECOM-1302-Continue-Payment-button-not-accessible
Continue to Payment button is not accessible
2015-05-27 02:02:36 -04:00
chrisndodge
99de1c8f48 Merge pull request #7992 from edx/muhhshoaib/SOL-794-generate-detailed-enrollment-report
Muhhshoaib/sol 794 generate detailed enrollment report
2015-05-26 15:57:22 -04:00
frances botsford
c8c83b5c69 Merge pull request #8193 from edx/frances/fix/dashboard-verified-status
fix verification widget layout on dashboard
2015-05-26 14:16:44 -04:00
Marco Morales
dc04f08e10 Merge pull request #7731 from edx/marco/styling/dashboard-modal
Updated shadow styling for Dashboard modal
2015-05-26 13:29:10 -04:00
Frances Botsford
883e9061b2 fix verification widget layout on dashboard 2015-05-26 13:00:41 -04:00
Ahsan Ulhaq
1d5a310f5d Continue to Payment button is not accessible
When a user starts the payment/verification flow.
Tab navigation skips past the "Continue to Payment" button

ECOM-1302
2015-05-25 19:21:03 +05:00
Muhammad Shoaib
b555c869bf SOL-794 Detailed Enrollment Report
- added the abstract and concrete layers of enrollment report provider
- created a celery task.
-added the button in the e-commerce reports section

added the enrollment data backend

added the payment data and start writing the test cases.

updated the code with the feedback suggestions and wrote some test cases.
- all the downloadable reports are now visible in the ecommerce download section.
Pending instructor tasks is also visible in the ecommerce section

added the fields in the user profile information
changed the report store configuration key
added the new http endpoint for financial reports to add more permissions for finance_admin to access.

fix quality issues

added test cases to check csv content data

rebased with master and resolved conflicts

changed the log messages

added the changes as per code clintonb suggestions during code review

updated the test cases for the finance_admin decorator

changes suggested by clinton.

Created and moved Table level filters to the Custom Manager for the CourseEnrollment model.

ecommerce.js file was loaded twice in the instructor_dashboard.js fixed the issues

added the registration code column in the csv

added the full gender in the csv file

Update data sources and add display name translations for the report columns

fix meta name

Make sure the reports section does not appear on non whitelabel courses

pylint fixes

expand out enumerated values
2015-05-22 15:16:57 -04:00
Marko Jevtić
796541af4f Merge pull request #7987 from edx/mjevtic/SOL-837
(SOL-837) Added RTL support to payment page
2015-05-22 18:31:39 +02:00
marjev
f5b166f120 (SOL-837) Added RTL support to payment page 2015-05-22 16:42:01 +02:00
aamir-khan
1323a8e2e8 ECOM-1472: js nitpick fixes 2015-05-22 11:44:24 +05:00
aamir-khan
be5a1a33eb ECOM-1472: js nitpick fixes 2015-05-21 18:53:33 +05:00
aamir-khan
7395e8ab67 ECOM-1472: fixed the tab issue for taking photo 2015-05-21 16:44:09 +05:00
Christina Roberts
cff565060b Merge pull request #8052 from edx/christina/tag-events
Update student notes eventing for tags.
2015-05-19 13:55:57 -04:00
cahrens
0c7af25c79 Update student notes eventing for tags.
TNL-2172
2015-05-19 13:14:10 -04:00
Sarina Canelake
1775dd5365 Merge pull request #7315 from edx/db/creative-commons
Allow custom licensing for course content
2015-05-18 15:36:50 -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
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
AlasdairSwan
f81d88e394 ECOM-1547 created new template and Sass file for new footer. Wrapped it in a feature flag and updated previously named footer-edx-new.html to footer-edx-v2.html to better track/name updates to the footer going forward.
ECOM-1547 removed data-updated attributes from body
ECOM-1548 added JS file that inits analytics event listener and makes ajax call to API to get footer and HTML and add it to the DOM
ECOM-1547 code review cleanup
ECOM-1547 rebase and Sass appraoch update after @talbs the IE9 killer slayed the mighty beast.
ECOM-1547 updated file names and added comments in light of @talbs review of PR
ECOM-1547 update to social media link styles and nav link order
ECOM-1547 updated SOCIAL_MEDIA_FOOTER_NAMES if ENABLE_FOOTER_V3 is true
ECOM-1547 added translations to screenreader text
ECOM-1547 fixed test and renamed files in line with @talbs's pending PR
ECOM-1547 cleaned up file naming
2015-05-18 13:43:07 -04:00
Brian Talbot
11ca11a411 Merge pull request #8035 from edx/talbs/sass+css-file-names
LMS/Studio: Sync Up Sass/CSS/Pipeline Names
2015-05-18 10:43:17 -04:00
Awais Qureshi
41363ead93 Merge pull request #8020 from edx/aamir-khan/ECOM-1471-hidden-text-behind-cam-issue
ECOM-1471 Hiding the text.
2015-05-18 11:40:10 +05:00
Marco Morales
b6164b5702 Merge pull request #7595 from jolyonb/jolyonb/printing_cleanup
Complete Printing Cleanup
2015-05-15 15:42:36 -04:00
muzaffaryousaf
378cf9bb7a Sending preferences and accounts data to template.
Fixing the pencil icon issue.

TNL-2047
2015-05-15 17:06:04 +05:00
muzaffaryousaf
2d08d669ca Learner Profile page tweaks.
TNL-2047
2015-05-15 17:06:02 +05:00
Brian Talbot
c043e8dcf7 LMS: removing now unnecessary IE-specific _ie.scss Sass partial
* since IE9 and below are formally not supported any longer
* since most of the CSS rules are for UI that has been removed or that is supported by modern browsers
2015-05-14 14:04:53 -04:00
Brian Talbot
2899885711 LMS: renaming Sass/CSS files for consistency and clarity 2015-05-14 13:14:54 -04:00
Christina Roberts
161d89a723 Merge pull request #8045 from edx/clrux/new-extend-for-outline
Moving no-outline use to be more global
2015-05-14 12:54:43 -04:00
Christina Roberts
3f2c370d58 Merge pull request #7923 from edx/christina/show-notes
Tags Tab in Student Notes
2015-05-14 12:30:38 -04:00
Brian Talbot
4f9c50e226 Merge pull request #8047 from edx/talbs/fix-lms-dupe-sass-base
LMS: removing redundant Sass base/base partial call in build compile
2015-05-14 12:30:12 -04:00
David Baumgold
930b4f6a7a Remove outdated comment referencing IE9 rule limit 2015-05-14 11:56:14 -04:00
Chris Rodriguez
d5d7fbf786 Moving no-outline use to be more global 2015-05-14 11:48:37 -04:00
cahrens
abd25b8b45 Add a "tags" view in student notes.
TNL-1926
2015-05-14 11:36:48 -04:00
Brian Talbot
8ad01535b5 LMS: removing redundant Sass base/base partial call in build compile 2015-05-14 10:47:05 -04:00
Jolyon Bloomfield
1021151efd Complete printing cleanup, rebased into one 2015-05-13 18:31:38 -04:00
Diana Huang
ac8b75ca7f Merge pull request #7804 from edx/diana/progress-summary-refactor
Implement the Weighted Problem Grade Report
2015-05-13 09:10:02 -04:00
Awais
f31746e76c ECOM-1471 Hiding the text. 2015-05-13 13:44:55 +05:00
Brian Talbot
220b8d1cdb LMS: removing conditional search Sass logic + simplifying _build-*.scss files 2015-05-12 22:13:31 -04:00
Brian Talbot
24673aa128 LMS: moving shared/redundant Sass partial calls to _build-*.scss partials 2015-05-12 22:03:43 -04:00
Daniel Friedman
84f3c33df7 Address doc review 2015-05-12 16:32:01 -04:00
Andy Armstrong
2fafaec053 Implement grade report analytics
TNL-1988
2015-05-12 16:32:01 -04:00
Daniel Friedman
9269ec3b00 Add new instructor task for weighted problems 2015-05-12 16:32:00 -04:00
Brian Talbot
898012518b LMS: removing manual Sass/CSS extend files needed for IE9 and below 2015-05-12 10:36:32 -04:00
Chris Rodriguez
709f86c11b Addressing RTL inconsistencies on Verification process 2015-05-12 07:20:32 -04:00