David Ormsbee
34d0fe1554
Merge pull request #890 from edx/ormsbee/verifyuser3
...
User verification / validated certificates feature
2013-09-09 11:30:09 -07:00
Brian Talbot
422c6282e4
LMS: adds in pseudo-state styling for disabled buttons/links (by attribute or standard class names)
2013-09-09 11:43:55 -04:00
David Ormsbee
48f867bd6b
Merge branch 'master' into ormsbee/verifyuser3
...
Conflicts:
lms/envs/common.py
2013-09-09 10:18:25 -04:00
Brian Talbot
79a9c8677a
Verification: revises presentation of customized certificate receipt ciew
2013-09-06 17:23:43 -04:00
Brian Talbot
0c552141f2
LMS: revises right justification space of verified indicator on Student Dashboard
2013-09-06 12:12:58 -04:00
Frances Botsford
af2424daf1
adjustments to choose and contribution for vcerts
2013-09-06 10:23:46 -04:00
Diana Huang
20d72ea703
Clean up views and start work on edit name modal.
2013-09-05 15:20:48 -04:00
Brian Talbot
f4bdd73839
Verification: adds in verified/enrollment status into dashboard course listings
2013-09-05 14:29:11 -04:00
Brian Talbot
f686990b02
LMS: adds in additional abstract border-variables with logical scale
2013-09-05 14:29:10 -04:00
Brian Talbot
f2e55a3d6a
Verification: abstracting out specific color-based Sass variables to be *somewhat* friendly to theming
2013-09-05 14:29:10 -04:00
David Ormsbee
22480b821a
Fix reset button for photo capture
2013-09-05 14:15:13 -04:00
Frances Botsford
a8989f2fe6
adjusting go to course button for vcert receipt
2013-09-05 12:40:37 -04:00
Frances Botsford
304a329b08
initial receipt html and styling for vcert
2013-09-05 12:24:03 -04:00
Brian Talbot
9c96fcf4cd
edx.org: ensures that the iframe-based register button has a transparent background
2013-09-05 10:00:34 -04:00
Brian Talbot
70cdc9a705
edx.org: addresses vertical scrollbar on course register button when placed in iframe
2013-09-05 08:49:02 -04:00
Brian Talbot
5c8e7337a8
edx.org: revises course register button background for all cases (verified, riught column, and bottom of page)
2013-09-04 16:06:44 -04:00
Brian Talbot
d4e849d2b2
edx.org: adds custom styling for register button in case of verified option/content displayed
2013-09-04 15:30:10 -04:00
Brian Talbot
732ac1783f
edx.org: adds background to register button's html body element for visual blending in course detail view
2013-09-04 14:40:53 -04:00
Frances Botsford
db57118f7d
i18n and updated secondary action buttons on the photo page
2013-09-04 14:35:48 -04:00
Jason Bau
ec989e4999
Address review comments for lms_link_to_cms
...
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
2013-09-04 11:29:22 -07:00
Frances Botsford
b2ddea7a80
updated copy for vcert flow
2013-09-04 13:46:38 -04:00
Diana Huang
18a497e150
Fix merge conflict in sass
2013-09-04 11:22:52 -04:00
David Ormsbee
e7c07d4e43
Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3
2013-09-04 10:59:18 -04:00
David Ormsbee
78acd083be
Merge branch 'master' into ormsbee/verifyuser3
...
Conflicts:
common/djangoapps/course_modes/models.py
lms/djangoapps/shoppingcart/models.py
lms/djangoapps/shoppingcart/processors/CyberSource.py
lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
lms/djangoapps/shoppingcart/tests/test_models.py
lms/djangoapps/shoppingcart/tests/test_views.py
lms/djangoapps/shoppingcart/urls.py
lms/djangoapps/shoppingcart/views.py
lms/envs/common.py
lms/envs/dev.py
lms/static/sass/base/_variables.scss
2013-09-04 10:58:30 -04:00
Diana Huang
f4c1a8f27b
Update the carousel with which step the user is on
2013-09-04 09:21:07 -04:00
Brian Talbot
b75398b0df
Verification: moves common page elements/copy into central templates w/ supportive styling
2013-09-03 17:17:13 -04:00
Brian Talbot
70ba52b4fa
Verification: syncing all submit button-type styling (including newly used element on verified view)
2013-09-03 16:37:34 -04:00
Brian Talbot
dc850370b2
Verification: resolves layout issue with progress nav in diff screen widths
2013-09-03 16:33:25 -04:00
Brian Talbot
4b3918c7e5
Verification: adds styling for already verified view and refactors html/styling for shared elements
2013-09-03 16:30:42 -04:00
Diana Huang
0c3af96792
Add the javascript to control payment button back in.
2013-09-03 14:35:38 -04:00
Brian Talbot
47a9f8fc5f
Verification: added in supporting disabled/not ready styling for wizard nav + expandable height fix
2013-09-03 12:55:17 -04:00
Diana Huang
98f80c36c1
Fix Javascript bugs that arose during refactoring.
2013-09-03 10:57:49 -04:00
David Ormsbee
aecaff2097
Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3
...
Conflicts:
lms/templates/verify_student/photo_verification.html
2013-09-02 22:39:52 -04:00
David Ormsbee
a643e25591
Image capture support for non WebRTC compliant browsers, via Flash.
2013-09-02 22:16:51 -04:00
Brian Talbot
c77deeecff
Verification: removes physical sizes from HTML templates and adds placeholder hooks
2013-09-02 21:42:51 -04:00
Brian Talbot
39d7534246
Verification: adds in progress styling support based on body classes
2013-09-02 21:20:02 -04:00
Brian Talbot
822caca3f7
Verified: revises styling/presentation of alerts/errors for intro state
2013-08-30 16:03:49 -04:00
Brian Talbot
248b5a9411
Verified: visually cleans up - UI spacing, error styling, registering for badge
2013-08-30 14:27:44 -04:00
Brian Talbot
e9a0755e5d
revises and transfers verification-only typography Sass extends
2013-08-30 14:27:44 -04:00
David Ormsbee
94def0aab5
Base assets for flash camera capture
2013-08-30 11:27:51 -04:00
Brian Talbot
992b36e771
Verified: adds initial registration choice error styling
2013-08-29 16:57:54 -04:00
Brian Talbot
db8a810009
Verified: cleans up extraneous reg selection markup and expandable UI
2013-08-29 16:45:23 -04:00
Brian Talbot
81a56a35ab
Verified: revising template UI, styling, and infrastructure
2013-08-29 14:07:51 -04:00
Brian Talbot
638fb79a16
Verification: adding in more Sass variable/mixin/extend scaffolding
2013-08-29 13:44:48 -04:00
Brian Wilson
8f93051d30
Add editable templates for bulk email
...
Adds the edX Marketing-approved template as html default.
2013-08-29 12:40:34 -04:00
Sarina Canelake
65f7b098dd
Bulk Email: Add design styling
...
Switch to using decorators; refactor and cleanup tests.
2013-08-29 12:40:32 -04:00
Kevin Luo
3b32d4216c
Add delay to course bulk email task and use SITE_NAME for site url
...
Delay for possible race condition with fetching course email object.
Use settings.SITE_NAME for host name to generate email footer url.
2013-08-29 12:40:32 -04:00
Kevin Luo
3ea2b24b98
Add HTML editor for authoring bulk email message (adopted from CMS)
2013-08-29 12:40:32 -04:00
Kevin Luo
907bf6e1b7
Add bulk email feature for instructors, with optout option
...
Adds a new Email link to the instructor dashboard for frontend interface to send
email to course members. Adds a feature flag ENABLE_INSTRUCTOR_EMAIL to toggle this.
Creates a new djangoapp bulk_email that handles this action by getting the recipient
list and batching the emails to different celery tasks to do the actual sending.
Requires lynx package to convert HTML email to plaintext. Handles SMTP errors by
retrying or falling through to the next email. Adds the option to opt out of course
specific emails in the user dashboard with an Email Settings link for each course.
Uses severable configurable settings with defaults. DEFAULT_BULK_FROM_EMAIL
specifies the from address for email. EMAILS_PER_TASK specifies the number of emails
each celery task takes on. EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER,
EMAIL_HOST_PASSWORD, and EMAIL_USE_TLS for the SMTP email backend settings.
Co-authored-by: Akshay Jagadeesh <akjags@gmail.com >
2013-08-29 12:40:31 -04:00
Frances Botsford
e6bfb887c4
more cleanup on photos for vcerts
2013-08-27 11:04:34 -04:00
