marco
826b070bfa
removed outline focus from tabs and downplayed tab color differentiation to be more like the header
2013-02-13 16:34:12 -05:00
marco
1422f40c62
remove double transition for problem type list
2013-02-13 16:34:11 -05:00
marco
ad3c9a5234
overrode jquery UI styles in reset.scss then reapplied relevant tab styling for problem menu
2013-02-13 16:34:11 -05:00
Don Mitchell
9d2b92c362
Don't show 'empty' metadata field
...
Change logic for when to show simple v advanced editor to use an
explicit flag.
2013-02-13 16:34:11 -05:00
Don Mitchell
18ecd11583
Only tabify the problems submenu.
2013-02-13 16:33:19 -05:00
Don Mitchell
62d389c853
Added empty metadata attribute instead of using name to determine which
...
template is empty (very awkward b/c it's a template descriptor not an
instance one)
Changed display conditionals to get the right things to show in the
right tabs for problems
2013-02-13 16:33:19 -05:00
marco
c238fc3d74
cleaned up css and advanced tab shows proper component list, also using jquery.ui.js
2013-02-13 16:33:19 -05:00
marco
9eb87e1eac
final css tweaks prior to jquery bug resolution
2013-02-13 16:33:19 -05:00
marco
5f31de2de3
finalized styling of dropdown, text, etc
2013-02-13 16:33:19 -05:00
marco
fc0a26ae74
styled header of problem component adding menu and made it only visible when you are in the problem menu
2013-02-13 16:33:19 -05:00
marco
1d63f10757
updating to green brb
2013-02-13 16:33:19 -05:00
marco
ae3e57b504
images back to proper white coloring
2013-02-13 16:33:19 -05:00
marco
2da94f96d2
border css simplifications
2013-02-13 16:33:18 -05:00
marco
a57e91ef47
revision of visual styling per product team feedback round
2013-02-13 16:33:18 -05:00
marco
1bb1fb3156
adding remaining advanced problem modes I left off the first pass
2013-02-13 16:33:18 -05:00
marco
27045de758
adding jquery.tabs file missing previously
2013-02-13 16:33:18 -05:00
marco
b8b2ca0eeb
cleaned up problem type label
2013-02-13 16:33:18 -05:00
marco
3a3e0f6322
removed green entirely, increases size of fonts and buttons for adding of new components
2013-02-13 16:33:18 -05:00
marco
c09a50f54d
draft styles for problem type header closer, need design consistency/standards review to proceed
2013-02-13 16:33:18 -05:00
marco
a147c66257
partial styles for problem type header, still work remains.
2013-02-13 16:33:18 -05:00
marco
60032047d7
added jquery tabs for problem editor, but a bug in rendering is stumping me, will fix tomorrow.
2013-02-13 16:33:17 -05:00
marco
18f2f97eb1
edited problem editor tooltips to have new names and also changed sample problem text to use new names
2013-02-13 16:33:17 -05:00
Calen Pennington
9b6cbd6d11
Merge pull request #1495 from MITx/feature/ned/remove-dogfood
...
Remove dogfood and quickedit.
2013-02-13 10:27:52 -08:00
Ned Batchelder
857edaf6f3
Remove dogfood and quickedit.
2013-02-13 12:23:08 -05:00
Christina Roberts
0b91c1c346
Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates
...
clean up templates that were removed from disk - we need to remove from ...
2013-02-13 06:29:35 -08:00
Chris Dodge
fbe3d29f19
added tests
2013-02-13 09:25:09 -05:00
Carlos Andrés Rocha
dff0c10b7a
Merge pull request #1493 from MITx/bug/dhm/misc
...
Fix broken test and don't pass time units as strings but as ints.
2013-02-12 15:14:37 -08:00
Don Mitchell
c904174bb7
Fix broken test and don't pass time units as strings but as ints.
2013-02-12 17:30:57 -05:00
jkarni
2197bd987f
Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks
...
Feature/julian/multiple choice tweaks
2013-02-12 13:32:15 -08:00
chrisndodge
af364166fe
Merge pull request #1491 from MITx/bug/dhm/misc
...
lms required grace period fields to be in specific order
2013-02-12 12:42:53 -08:00
Don Mitchell
76d675ba16
fix npe for time (bug 185)
2013-02-12 15:20:02 -05:00
Don Mitchell
8e213fb0d7
lms required grace period fields to be in specific order
2013-02-12 13:48:54 -05:00
Ned Batchelder
27e8d699be
On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't.
2013-02-12 13:43:03 -05:00
David Ormsbee
537d6dd18e
Merge pull request #1490 from MITx/bugfix/brian/pearson-timer
...
change timer to calculate relative duration in javascript
2013-02-12 09:26:53 -08:00
Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
Ned Batchelder
baee9f96dc
Merge branch 'master' of github.com:MITx/mitx
2013-02-12 11:28:51 -05:00
Ned Batchelder
78d3d20069
When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons.
...
Conflicts:
common/djangoapps/util/converters.py
2013-02-12 11:25:14 -05:00
David Ormsbee
e07b667c02
Merge pull request #1488 from MITx/bug/btalbot/pearson-ie
...
Resolving an LMS sidebar accordion issue in IE7
2013-02-12 08:01:59 -08:00
Victor Shnayder
7d65c64148
Merge pull request #1485 from MITx/fix/kevin/code_show_lt_and_gt
...
fix showing less than and greater than in code
2013-02-12 07:38:16 -08:00
Brian Talbot
f33f7134fb
lms - pearson: trying to resolve JQUI accordion width bug in IE7 - enforcing width to chapters
2013-02-12 10:34:21 -05:00
Chris Dodge
93d186511f
clean up templates that were removed from disk - we need to remove from DB as well
2013-02-12 10:23:32 -05:00
Calen Pennington
23bb87e0bb
Merge pull request #1486 from MITx/feature/ned/clean_up_tests
...
We no longer need override_settings, Django has a better one.
2013-02-12 07:22:27 -08:00
Calen Pennington
de5b3a2a39
Merge pull request #1483 from MITx/feature/victor/raw-static-files
...
Feature/victor/raw static files
2013-02-12 07:21:01 -08:00
Brian Talbot
83e4dfaacb
lms - pearson: trying to resolve JQUI accordion width bug in IE7
2013-02-12 09:58:16 -05:00
Kevin Chugh
21f4616080
spread less than and greater than fix to responses and comments, and profile view
2013-02-12 09:18:46 -05:00
Kevin Chugh
d57c78f9d9
fix showing less than and greater than in code
2013-02-11 20:01:09 -05:00
Victor Shnayder
3ccb33c8b3
Simplify, make it actually work.
...
- regexp was too complicated, didn't work
2013-02-11 17:50:13 -05:00
Victor Shnayder
2dcdeff4b6
Make replace_static_urls leave alone urls that have '?raw' at the end
...
- needed for GWT'ed modules that rely on the filename to find dependencies
2013-02-11 17:07:15 -05:00
Ned Batchelder
aa2d0ecaf2
We no longer need override_settings, Django has a better one.
2013-02-11 17:06:35 -05:00
Christina Roberts
f18618e35b
Merge pull request #1482 from MITx/bug/dhm/misc
...
bug 155
2013-02-11 13:46:20 -08:00
