Commit Graph

237 Commits

Author SHA1 Message Date
Brian Talbot
b75f900b22 Merge pull request #8266 from edx/talbs/fix-font-face-calls
LMS/Studio: Reduce font-face file calls
2015-07-22 14:48:44 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
2015-07-17 17:42:03 -04:00
Marco Morales
493200734e Merge pull request #8296 from edx/marco/find-courses-page/styling-changes
Styling improvements to openedX search through Find Courses page
2015-07-14 08:14:35 -04:00
AlasdairSwan
51deec380e ECOM-1661 removed nav links for logged out states
Add context for navigation states
added find course to dashboard sidebar and included check for context that Will adds in PR
removed nav_course_search context due to design change so replaced with nav_hidden
Removed rwd_header.js and all references as no longer being used.

Wrapped Find Courses in dashboard sidebar in if statement
2015-07-13 15:33:00 -04:00
Ahsan Ulhaq
c94f043c2b Credit Payment - Dashboard States
ECOM-1578
2015-07-09 13:33:31 +05:00
Will Daly
e2acf3ab87 Credit eligibility/provider refactor
* Remove m2m relation between credit course and credit providers.
* Separate eligibility and provider APIs into different modules.
* Add API call for retrieving a user's eligibilities.
* Cache credit course list.
* Style the dashboard purchase button.
* Display a link for the credit provider on the dashboard.
* Add analytics events for clicks on the purchase button.
* Expose more credit models to Django admin and add search functionality.
2015-07-02 10:03:52 -07:00
Marco Morales
51e47cf94f fixup! removed css comments from _courses.scss, fixed rebase issue which resulted in having only 1 course on tablet (medium) size layouts 2015-07-01 13:46:56 +02:00
Davorin Sego
2972e9110c search input element styling improvements, test clean up 2015-07-01 13:46:55 +02:00
Marco Morales
b9ed758246 Initial syles cleanup and changes for course discovery on openedx 2015-07-01 13:46:54 +02:00
Davorin Sego
2c22a4d879 Responsive Homepage Hero, Header, Footer 2015-06-29 12:14:55 +02:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Brian Talbot
5c8ef9a92e removing extra bold font-weight (800) from style rules/typeface files 2015-06-25 22:49:54 -04:00
aamir-khan
987889fc37 ECOM-1524: Display credit availability on the dashboard 2015-06-24 16:50:38 +05:00
frances botsford
1885b73fe1 Merge pull request #8343 from edx/frances/fix/dashboard-button-styles
Modernize the dashboard button styles
2015-06-16 20:14:57 -04:00
Frances Botsford
ab985aadbd modernize the dashboard button styles 2015-06-16 10:38:29 -04:00
Chris Dodge
e47c97b465 make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag 2015-06-08 07:46:55 -04:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02:00
Frances Botsford
883e9061b2 fix verification widget layout on dashboard 2015-05-26 13:00:41 -04:00
marjev
8107073c58 (SOL-776)(SOL-740)(SOL-532) Added setting flags for COURSE DISCOVERY feature; Exposed course search input as well as the course result page; Added flag for limiting the number of course cards on the homepage; 2015-05-07 08:57:04 +02:00
muzaffaryousaf
3110cf6bb6 Remove account settings display and editing from dashboard sidebar.
TNL-1516
2015-04-17 17:23:15 -04:00
Chris Rodriguez
e3dba5fb32 Fixed z-index for social action dropdown (TNL-1806) 2015-04-17 12:55:59 -04:00
Chris Rodriguez
766f700b48 Fixed caret position for LTR and RTL (SOL-693) 2015-04-17 12:55:58 -04:00
Frances Botsford
73dd510fd7 remove bad classwrapper for dashboard donate banner layout and sidebar 2015-04-09 17:05:39 -04:00
Marco Morales
e62e6b4c8e Merge pull request #7562 from edx/marco/dashboard/message-styling-fixes
Reverts removed styling rule which broke certificate status message on the course dashboard
2015-04-03 09:39:33 -04:00
Marco Morales
ebdcc3bb6a Add social sharing feature (Twitter, Facebook) to student dashboard 2015-04-02 23:05:13 -04:00
Marco Morales
45b4052860 added clearfix rule back in that was mistakenly removed in earlier styling cleanup 2015-04-02 13:43:27 -04:00
Marco Morales
bd5b0b31a0 Matt - javascript and test changes, Marco - styling feedback from initial reviews 2015-03-31 08:47:17 -04:00
Marco Morales
dfcb3f2b6e Dashboard styling cleanup/changes, including:
- reversing the positions of the sidebar and course listing
- html for new social icons (not currently wired up)
- new actions dropdown for unenrollment and email settings
- partial reorganization of dashboard.scss styles
- text fix for unenrollment
- added missing endif, p/hgroup closures
- reverted la.course-item
- removed extra operator
- fixed broken bok choy test
2015-03-25 10:51:45 -04:00
Mark Sadecki
989a8a0679 new css to go with DOM changes 2015-03-19 17:32:10 -04:00
Mark Sadecki
8a8e1d06e4 this actually drops the element selector from the CSS 2015-03-19 15:32:55 -04:00
Mark Sadecki
1cf7ccc334 dropped element selector in CSS and test file 2015-03-19 15:31:30 -04:00
Will Daly
f854726efc Add tracking code to LinkedIn URL.
Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.
2015-02-23 11:52:47 -05:00
Will Daly
a18e0c6bc7 Rename LinkedIn configuration field to "company_identifier"
Add "source" parameter to LinkedIn add-to-profile URL.

Add platform name to certification name.

Style changes for linked in sharing on dashboard
2015-02-13 12:23:51 -05:00
AlasdairSwan
1562fdbbb4 ECOM-1002 fixed issue of grey background for logistration page. Also fixed focus issue when toggling between forms - as raised by @cptvitamin 2015-01-29 15:29:49 -05:00
Omar Al-Ithawi
a5c0b6e29a RTL margins for 3rd-party auth button icons 2015-01-22 17:49:47 +02:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
Brian Talbot
c93817962e Merge pull request #6515 from edx/talbs/fix-update-font-awesome
FIX: Upgrade Font Awesome - Part III: Revenge of the Glyph
2015-01-09 12:50:14 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory
OPEN-307
2015-01-09 10:48:20 -05:00
Marco Morales
38b7e4cc50 SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions. 2015-01-05 17:30:13 -05:00
Afzal Wali
872dbb874b WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased 2014-12-17 16:19:06 -05:00
AlasdairSwan
9b59e387b5 ECOM-728 updated dashboard course banners so all types of course are now supported as per the new design. Included some other small tweaks to other text on the page in consultation with AndyWaldrop 2014-12-15 15:08:40 -05:00
Giulio Gratta
54b7a578a2 Remove extra prerequisites style and add classes 2014-12-04 14:25:26 -08:00
AlasdairSwan
962dc221d4 ECOM-677 ECOM-678 styled the new messages 2014-12-02 09:43:57 -05:00
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
2014-11-10 15:05:37 -05:00
Sarina Canelake
5cedbc7ee6 Rename branded asset; moved to LMS as that's where it is referenced [OPEN-302] 2014-11-07 09:50:45 -05:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
2014-10-28 15:16:27 -04:00
frances botsford
93425a7c47 Merge pull request #5719 from edx/frances/fix/rtl-dashboard-fixes
small UI fixes on dashboard for RTL
2014-10-24 15:26:42 -04:00
Frances Botsford
13b97e3606 small UI fixes on dashboard for RTL 2014-10-24 14:01:39 -04:00