Commit Graph

2422 Commits

Author SHA1 Message Date
Miles Steele
cb7a3ad8eb switch from log_event to Logger.log
keep log_event for compatibility
2013-08-20 16:52:18 -04:00
Chris Dodge
2e1eb1dce5 add escaping 2013-08-19 23:41:49 -04:00
Chris Dodge
f599d4b508 don't put the substitutions in quotes 2013-08-19 23:41:49 -04:00
Adam Palay
cb3429570c set first FAQ link to mktg webiste too 2013-08-19 16:34:17 -04:00
Brian Talbot
fc4eb3786a mktg - revised sass/css for iframed button to match styles/consistency 2013-08-19 10:25:29 -04:00
Frances Botsford
d4ea8388a6 updated styling for marketing side register button to accommodate second line of text - and IE-specific styling 2013-08-16 11:28:07 -04:00
Frances Botsford
445cf39f8b updated styling for marketing side register button to accommodate second line of text 2013-08-16 10:39:45 -04:00
Diana Huang
4946fbcd5b Change registration button based on number of modes. 2013-08-15 16:34:48 -04:00
Jay Zoldak
c65c9eb069 Merge pull request #657 from edx/zoldak/fix-i18n-enroll
The enrollment_action value enroll should not be translated.
2013-08-14 13:18:00 -07:00
Valera Rozuvan
99ae63777e Removed unnecessary tabindex = 0 from <a /> - they get it by default. 2013-08-14 11:51:15 +03:00
Valera Rozuvan
05539b1bbe Removed unnecessary tabindex -1 from Video template. 2013-08-14 10:51:45 +03:00
Adam Palay
307d27db9a fix syntax error in help_modal 2013-08-13 16:13:42 -04:00
Adam Palay
4fc8aaab02 if mktg, redirects faq to mktg. else, to '/help' 2013-08-13 16:13:42 -04:00
Adam Palay
5a7b72667e replace html strings wtih tokens in templates 2013-08-13 11:19:58 -04:00
Jay Zoldak
c09da60fe3 The enrollment_action value enroll should not be translated. 2013-08-13 08:43:09 -04:00
Adam Palay
f9ab433e26 add settings.PLATFORM_NAME to password_reset_confirm context 2013-08-12 17:58:31 -04:00
Adam Palay
18a979bb4d put wiki templates back into Django templating 2013-08-12 16:42:07 -04:00
Adam Palay
13d54c0dd7 fix password reset templates 2013-08-12 15:57:27 -04:00
Adam
0db8ad28dc Merge pull request #640 from edx/adam/i18n-bug-fixes
instructor dash fixes
2013-08-12 11:16:22 -07:00
Lyla Fischer
e817fb4ca1 Merge pull request #637 from edx/vaxxxa/videoalpha_to_video
Migration videoalpha module to one main video module
2013-08-12 10:56:12 -07:00
Miles Steele
e6d44f5ae7 Merge pull request #626 from edx/feature/msteele/instrdash
Enable beta dashboard, add copy, add i18n
2013-08-12 10:38:26 -07:00
Miles Steele
43afb9a940 fix i18n 2013-08-12 13:21:46 -04:00
Adam Palay
b2b574ffb6 instructor dash fixes 2013-08-12 11:36:26 -04:00
Miles Steele
b1074ff1ac add i18n 2013-08-12 11:25:26 -04:00
Anton Stupak
74f3595d54 Add acceptance tests for checking rendering. 2013-08-12 14:32:15 +03:00
Anton Stupak
dad9f26a99 Make VideoAlpha out of Alpha. 2013-08-12 14:31:48 +03:00
Giulio Gratta
464141c72a changing http:// to // on intro video urls to prevent browsers from blocking video embeds 2013-08-09 14:13:41 -07:00
Miles Steele
f6fc1aeed9 hide empty management list selector, add explanation text 2013-08-09 14:22:56 -04:00
Miles Steele
58c6b9bb61 add privilege copy 2013-08-09 14:22:55 -04:00
Miles Steele
8f8d70aeae fix enroll multiple button, fix module_error report 2013-08-09 13:45:27 -04:00
Adam
abd17a2472 Merge pull request #623 from edx/adam/unicode-encode-error
make template string unicode
2013-08-09 10:35:32 -07:00
Miles Steele
25d45b8578 Merge pull request #574 from edx/feature/msteele/instrdash
Add cronjob analytics to instructor dashbaord
2013-08-09 10:26:50 -07:00
Adam Palay
893f05976d make template string unicode 2013-08-09 12:25:14 -04:00
Valera Rozuvan
1efea116f6 Removed unnecessary leading and trailing spaces from heading in template. 2013-08-09 10:26:18 +03:00
Valera Rozuvan
4c7250a000 Improved strings in template.
Only relevant part of string will go through the Python internationalization function.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
f08394ac2c Volume and speeds dialogs are fully extended.
When the controls receive focus not via mouse click or mouse hover, their appropriate
slider and selection menu are fully extended and shown to the user.
2013-08-09 09:22:57 +03:00
Valera Rozuvan
bc503c88c6 Making it possible to tab to captions.
When a VideoAlpha is present on the page, if the user tries to tab through out the entire page, eventually he will land on the VideoAlpha controls. The tab index order has been set up so that all control receive focus eventually in the order from left to right. When a control receives focus, it is hilighted. The last tab focuses the captions dialog. When the captions dialog has focus, the Up and Down arrows can scroll it up and down.
2013-08-09 09:22:56 +03:00
Miles Steele
4afde4dd79 add proxied analytics graphs, refactor analytics 2013-08-08 13:16:48 -04:00
Miles Steele
35ffb1b347 add spacing to student admin section 2013-08-08 13:16:47 -04:00
Adam
08bb13edb4 Merge pull request #595 from edx/adam/i18n-bug-fixes
template fixes on instructor dash
2013-08-06 11:25:36 -07:00
Peter Fogg
9c84440501 PR comment cleanup. 2013-08-06 13:23:33 -04:00
Adam Palay
d894600207 template fixes on instructor dash 2013-08-06 10:16:57 -04:00
Adam Palay
4a99b7bfd6 update edge.html 2013-08-05 18:45:54 -04:00
Adam Palay
cac6a3195d add university_profile/edge.html for edge landing page 2013-08-05 17:26:47 -04:00
Adam
ad73feb7e3 Merge pull request #565 from edx/adam/i18n-bug-fixes
more template fixes for faq, press, and help
2013-08-05 08:25:29 -07:00
Adam Palay
d0a36076c3 more template fixes for faq, press, and help 2013-08-05 11:24:25 -04:00
Vasyl Nakvasiuk
a52964a786 Hotfix world cloud functionality 2013-08-05 17:14:11 +03:00
chrisndodge
85267e6a73 Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum
add display_coursenumber and display_organization fields on the CourseModule
2013-08-04 18:00:29 -07:00
Chris Dodge
18458bd94b wrong accessor 2013-08-02 21:45:51 -04:00
Chris Dodge
eaeaf3a520 fix formatting error 2013-08-02 21:44:48 -04:00