Commit Graph

167 Commits

Author SHA1 Message Date
Brian Talbot
26fb3fc557 LMS: student notes - styling links to appear in highlighted text 2015-01-16 11:07:55 -05:00
Chris
9b85ac1f12 UX for associating content groups with cohorts in the instructor dashboard. 2015-01-15 10:33:46 -05:00
Marco Morales
c4e8673db0 creation of a courseware preview menu to contain staff view toggle. 2015-01-15 10:33:44 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content.
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
2015-01-14 23:34:11 +02:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory
OPEN-307
2015-01-09 10:48:20 -05:00
Sarina Canelake
3a3ab76261 Change Open edX index page bright blue to grey 2015-01-06 18:26:19 -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
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -05:00
Brian Talbot
a5913a4836 LMS: adding in basic is-deprecated visual styling 2014-12-09 13:57:20 -05:00
Will Daly
4a814c24ba Merge pull request #5948 from edx/will/combine-reg-login-form
Combined Login/Registration Form
2014-11-17 16:00:20 -05:00
Sarina Canelake
ab5da97c41 Consistently name edX branded elements within the LMS [OPEN-300] 2014-11-14 10:30:37 -05:00
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
2014-11-13 11:16:16 -05:00
AlasdairSwan
790ac3f3ef Merge pull request #5915 from edx/alasdair/rwd-trackselection
ECOM-574 Updated track selection page to be responsive
2014-11-10 16:41:50 -05:00
AlasdairSwan
23081f076b ECOM-574 Updated track selection page to be responsive 2014-11-10 15:39:17 -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
718e8012db Rename homepage hero video thumbnail image 2014-11-07 11:18:50 -05:00
Sarina Canelake
b69169a690 Remove unused images
Moved images in folders to top level where appropriate, and change references.

OPEN-297
2014-11-07 11:18:47 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form
Conflicts:
	common/djangoapps/course_modes/views.py
2014-11-04 10:50:09 -05:00
AlasdairSwan
e04a3ab32b ECOM-406 Added JS fil that will update DOM to make the header and footer responsive
Made the header and footer responsive
2014-10-29 14:00:54 -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
Will Daly
33f0e92d62 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 2014-10-22 17:13:30 -04:00
AlasdairSwan
00ff10820a ECOM-531 Styling the forms 2014-10-21 16:03:58 -04:00
asadiqbal08
1035d67a25 WL-98
fix typo and add more security on API

fix some bugs and typos

address PR feedback

be sure to send emails when accounts already exist

PR feedback

fix multiple uploads

pep8 fixes

pep8 fix

pylint fixes

fix url mapping

WL-98
- Complete code coverage
- Update code for error and warning messages.
- improve code as per some suggestions

updated the UI of the auto_enroll feature

fixed the errors

PR feedback

add test

add back file filtering

add some more error handling of input

remove unneeded coffeescript code

pylint fixes

add pep8 space

WL-98
- Updated and added test cases.
- Updated membership coffee file for errors display handling.
- fixed minor text issues.

allow for blank lines and add a test

add blank line (pep8)
2014-10-21 14:23:46 -04:00
AlasdairSwan
a5da61b4ab ECOM-408 Added breakpoint variables to _grid-settings.scss 2014-10-21 09:39:32 -04:00
AlasdairSwan
93246db656 ECOM-408 Added grid-settings to override the default global box-sizing style 2014-10-21 09:11:59 -04:00
asadiqbal08
4f7c494922 EX-71 New shopping Cart UI Single person purchase
Ex-74 Registration Code redemption

fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations

Ex-72-added additional billing information

Added a new CSV file in the instructor dashboard sales tab to download all the order sales separated from the invoice sales

fix path to image

updated the failed unit tests and add some minor tweaks in the Shoppingcart.scss

Ex-78 New UI In receipt page

EX-73 Purchasers can buy a course on behalf of a different student

WL-78 updated the receipt page UI.

Wl-72 updated Billing Information UI and removed the Order Address fields

WL-71 Remove Purchase Type Buttons from UI

WL-71 Updated minor UI issues and updated test cases

WL-78 updated the enrollment links in the receipt page

made changes in Order generated sales csv in Instructor Dashboard.
 The total_registration_codes and total_used_codes
  were not correctly stored in the csv file.

1) The total_registration_codes were not filtered with
 course_id.
2) The total_used_codes that a user had redeemed
 were not correctly included in the CSV.

added a fix in the courseware view to let the users visit the courseware if they have enrolled in the course by clicking on the enrollment link

rebase and resolved conflicts with master

WL-97 Bulk Registration Email Confirmation
Below is the commit summary.
- Make email text bold as per requirement.
- Improve email template quality and reorder points.
- Add text in billing details page : "if no additional billing details are populated the payment confirmation will be sent to the user making the purchase"
- Update text on receipt page "You have successfully purchase 3 course registration codes"

WL-100 fixed the bug on the edit/add coupon and set course price.
Ajax requests were duplicating in each callback. fixed this issue by creating the manual ajax request rather than the Lean Modal Ajax requests

allow for better White Label branding in shopping cart purchase emails

fix up typos and text

fix goof

fix

fix

incorporated model changes as suggested by Jason.

updated order sales csv

updated test cases for CourseRegCodeItem model and csv for the order generated sales

updated the migrations history

fixed the lms acceptance tests

Be sure to check for multiple types

address PR feedback

PR feedback

PR feedback

pep8 fix
2014-10-19 21:50:29 -04:00
Brian Talbot
5a31005e96 Merge pull request #5563 from lpil/master
Stop page extending out of viewport width by 40px
2014-10-17 17:14:01 -04:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Omar Al-Ithawi
9b287960e7 LMS RTL fixes 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Louis Pilfold
16ed497497 Use box-sizing SCSS mixin rather than property 2014-10-17 09:09:19 +01:00
Louis Pilfold
a501fbfc2d Stop page extending out of viewport width by 40px
Currently the .container and .wrapper-footer elements are set to 100%,
and also have horizontal padding added to them. This results in a total
width of greater than the full width of the viewport; This causing the
browser to scroll horizonally into empty space, regardless of how wide
the viewport is.

I had added the `box-sizing: border-box` to these elements in order to
resolve this.

Cheers,
Louis
2014-10-13 14:43:16 +01:00
Brian Talbot
21aab92183 LMS: revising .is-hidden utility class to be used at a global level 2014-10-01 09:22:31 -04:00
Brian Talbot
337d6cbc2b LMS: revising markup/styling of edx-specific footer 2014-09-11 07:37:26 -04:00
Brian Talbot
def8b5bf24 LMS: removing breakpoint-centric styling + small comment cleaning on edx-specific footer 2014-09-11 07:37:26 -04:00
Greg Price
988e4e6da5 Update UI for forum actions
The actions are now consolidated in one location for each piece of
content. Primary actions (vote, follow, endorse, mark as answer) are
buttons, and secondary actions (pin, edit, delete, report, close) are in
a menu. This also includes improved front-end error handling for the
actions and significant test cleanup.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
Co-authored-by: Frances Botsford <frances@edx.org>
Co-authored-by: Brian Talbot <btalbot@edx.org>
2014-08-29 15:59:33 -04:00
jmclaus
037abb6d50 Replace reference to Google OpenSans with edX-hosted OpenSans 2014-08-27 10:34:53 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx.
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
2014-08-25 15:33:43 +00:00
Stephen Sanchez
b3f4ce2312 Merge pull request #4879 from edx/sanchez/update-platform-header
Updating the platform header styles to match new site styles.
2014-08-25 09:57:14 -04:00
Stephen Sanchez
033551416b Updating the platform header styles to match new site styles.
Putting the new edx header behind a feature flag.
2014-08-22 18:25:45 +00:00
Bertrand Marron
70f698267a Update password reset views style
Reuse the style from login and register views.
Remove all the specific style.
2014-08-20 14:17:55 +02:00
Brian Talbot
5caaec7b82 LMS: adding rendering/styling support for initial professional ed course types on student dashboard 2014-08-12 18:45:10 +00:00
Waheed Ahmed
7a96faf9a3 Merge pull request #3585 from dragonfi/master
Fix #3347: "Run Code" reloads page in Matlab Problem
2014-05-13 19:06:40 +05:00
dragonfi
8430be3d18 Fix #3347: "Run Code" reloads page in Matlab Problem
Instead of refreshing only the necessary parts,
"Run Code" reloads the whole page.

This commit fixes this behaviour, by refreshing the
specific elements belonging to the Problem instead.

Also tidies up indentation.
2014-05-12 22:26:52 +02:00
Giulio Gratta
ba6b0cf4e7 Changes for Help Modal to work on Stanford Site
- moved zendesk endpoint to new condition
- some help modal styling
2014-05-06 12:06:04 -07:00
Brian Talbot
5365dbe2fb LMS: adding visual reinforcement of a user's enrollment type (per course) to Dashboard UI
LMS-1071
2014-05-05 19:34:23 +05:00
marco
83defda7d4 visual styling adjustments to discussion listing metadata, simplifying the visual representation of votes, increasing the line height of each post while also increasing the size of the icons for following and comments. visual styling adjustments also included for the discussion itself, pushing comments to be full width within a response, and small typography adjustments to the post count metadata and the add response button 2014-04-24 19:33:03 -04:00
Brian Talbot
5940f1ff1a Studio: updating Sass ui-disabled placholder syntax and creating utility is-disabled class
Studio: revising .fake-link utility class to use Sass placeholder and syncing commenting style

LMS: updating Sass ui-disabled placholder syntax and creating utility is-disabled class

Studio: adding in basic action Sass placeholder for use in enabling/disabling UI

Studio: applying action Sass placeholder to publish/create-draft Unit view actions

STUD-1497
2014-04-16 14:44:30 -04:00
Brian Talbot
895bb5e029 LMS: adding language selector to user dashboard (WIP) 2014-02-14 10:32:10 -05:00