Victor Shnayder
1903a66bea
Style cleanup in gradebook
...
* don't display thousands of '%' characters
* s/percentage/fraction/, since that's what it is
2012-08-10 11:42:53 -04:00
Calen Pennington
1f1a87d970
Merge pull request #379 from MITx/feature/victor/keep-accordion-state
...
Make accordion remember state
2012-08-10 07:15:57 -07:00
Calen Pennington
e29feb089a
Merge pull request #377 from MITx/feature/tomg/fall-design
...
wayfinding style changes
2012-08-10 05:51:50 -07:00
Victor Shnayder
1c3038ff3a
Make accordion remember state
...
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
2012-08-09 19:47:08 -04:00
Tom Giannattasio
ced521c17d
cleaned up textbook nav styles
2012-08-09 14:44:50 -04:00
David Ormsbee
b78c038bf2
Merge pull request #375 from MITx/dormsbee/new_jobs
...
Dormsbee/new jobs
2012-08-09 10:00:14 -07:00
Tom Giannattasio
3d3ee02e52
started textbook nav styles
2012-08-09 12:16:13 -04:00
David Ormsbee
775ddf6fcc
Add updated jobs descriptions for content related positions
2012-08-09 12:11:37 -04:00
Tom Giannattasio
e82582e329
added course name to global nav bar
2012-08-09 11:17:26 -04:00
Bridger Maxwell
3930dabdc9
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
2012-08-08 16:00:22 -04:00
Matthew Mongeau
bcdcd7341f
include courseware js
2012-08-08 14:13:34 -04:00
Matthew Mongeau
0b03834f51
XML based table of contents for books.
2012-08-08 14:13:20 -04:00
Calen Pennington
7facb262fc
Remove openid link when feature is disabled. https://www.pivotaltracker.com/story/show/34090805
2012-08-08 14:10:05 -04:00
ichuang
9241841195
improve staff_problem_info jquery, so the histogram is also toggled
2012-08-07 18:36:04 -04:00
Bridger Maxwell
735488fa51
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
2012-08-07 14:40:37 -04:00
Calen Pennington
a237322b70
Merge pull request #359 from MITx/ichuang/minor-fix-edit-link
...
change edit link showhide to use <a> instead of <input> type submit
2012-08-07 11:40:31 -07:00
ichuang
9d2b821c26
change edit link showhide to use <a> instead of <input> type submit
...
(fixes issues with edit links in multipart problems and video)
2012-08-07 14:34:28 -04:00
thomasxiii
258b9eb530
Merge pull request #349 from MITx/feature/kfiedler/courseware-style
...
A bunch of various fixes and de-styling
2012-08-07 10:20:10 -07:00
Kyle Fiedler
dd6ec19e80
Make the modal window work in the courseware
2012-08-07 11:59:49 -04:00
ichuang
462d75936a
Merge pull request #357 from MITx/hotfix-registration
...
fix typo in registration button jquery
2012-08-07 07:11:53 -07:00
ichuang
4b2091b173
fix typo in registration button jquery
2012-08-07 10:09:55 -04:00
Calen Pennington
c5fa6bac89
Merge pull request #353 from MITx/ichuang/showhide-staff-debug
...
make the staff debug information appear in a show/hide span
2012-08-07 05:43:14 -07:00
Bridger Maxwell
3dffcaca1c
Fixed capitalization in gradebook css.
2012-08-07 08:42:08 -04:00
ichuang
fa8bf7f371
make the staff debug information appear in a show/hide span
2012-08-06 21:54:29 -04:00
Bridger Maxwell
873f1431ec
Put back dynamic grade cutoffs and final grade rounding (from stable-end-of-course)
2012-08-06 18:51:11 -04:00
Bridger Maxwell
4fedca5bf9
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
2012-08-06 16:49:05 -04:00
Kyle Fiedler
e90103abdf
Reset styles for profile page and some for the info page
2012-08-06 16:08:41 -04:00
Kyle Fiedler
ac960ab9df
Add images for book and fix styles for wiki
2012-08-06 16:08:40 -04:00
Kyle Fiedler
e40c6b3812
Reset some styles for the textbook
2012-08-06 16:08:40 -04:00
ichuang
b1ddff838c
add comment about course start date logic
2012-08-06 14:23:55 -04:00
ichuang
6f894c816c
use jquery for error msg in course_about
2012-08-06 14:19:45 -04:00
Bridger Maxwell
2348f71cc6
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
...
Conflicts:
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/views.py
2012-08-06 11:48:42 -04:00
Bridger Maxwell
cbab4f1006
Fixed some imports on gradebook.html
2012-08-06 11:32:26 -04:00
ichuang
0347eb498c
add MITX_FEATURES flags to enable textbook and discussion,
...
and modify course_navigation correspondingly
2012-08-05 20:24:00 -04:00
ichuang
190f1f8f89
tracking_log template
2012-08-05 16:35:32 -04:00
ichuang
7fe75030cc
fix staff edit link in module content display (goes to github)
2012-08-04 17:52:14 -04:00
ichuang
c20ebd13c4
in course_about.html make "You are registered..." a link to course
2012-08-04 08:22:06 -04:00
ichuang
30922fb449
add ACCESS_REQUIRE_STAFF_FOR_COURSE feature for enrollment check
2012-08-03 21:39:23 -04:00
Bridger Maxwell
6d650d1825
Got the gradebook working again with the new fast grading method.
2012-08-03 17:55:25 -04:00
Calen Pennington
9b322f68b4
Merge pull request #337 from MITx/feature/victor/use-url-names
...
Feature/victor/use url names
2012-08-03 13:23:31 -07:00
Calen Pennington
b1494da02c
Merge pull request #330 from MITx/ExternalAuth
...
External auth
2012-08-03 13:18:55 -07:00
Victor Shnayder
b46172da9b
Rename module.name and descriptor.name to url_name
...
* update templates and code references
* also a display_name property that defaults to cleaned url_name
2012-08-03 11:36:54 -04:00
Victor Shnayder
987b9c11a9
Use url_name for chapters and sections in lms views
...
* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.
2012-08-02 14:28:44 -04:00
Victor Shnayder
95e139f39b
Merge pull request #336 from MITx/feature/victor/xml-verify
...
Feature/victor/xml verify
2012-08-02 11:12:43 -07:00
ichuang
10b2c212b6
fix javascript for signup modal .click() in index.html for safari
2012-08-02 13:52:25 -04:00
ichuang
46bc7bc499
remove unnecessary hidden fields
2012-08-02 13:44:37 -04:00
David Ormsbee
73fb8f5464
Merge branch 'hotfix/1.0.3'
...
Conflicts:
lms/urls.py
2012-08-02 11:51:50 -04:00
Victor Shnayder
fc0f938eae
Responding to comments on pull #326
...
* cleaned up error module:
- only one template
- save error message in xml and reload
* better display of problem definition and metadata to staff
* save error messages as string, not exception objects.
2012-08-02 09:56:01 -04:00
ichuang
938871571b
Merge branch 'master' of github.com:MITx/mitx into ExternalAuth
2012-08-01 23:01:29 -04:00
ichuang
ec78e1a126
add missing trailing slash
2012-08-01 20:19:33 -04:00
