Commit Graph

2083 Commits

Author SHA1 Message Date
cahrens
f4b06b2e96 Beginnings of is-set work. 2013-05-10 16:41:07 -04:00
cahrens
fd52980a2d Option view, changes getting persisted. 2013-05-10 16:02:22 -04:00
marco
04bb7335e7 removed extra section heading in settings DOM, placed settings after editor 2013-05-10 13:18:43 -04:00
marco
004018c1eb Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui 2013-05-09 14:59:01 -04:00
marco
6dbfa7499b removed metadata-edit styling 2013-05-09 14:58:54 -04:00
cahrens
b314b5ce59 Renaming of some files. 2013-05-09 14:51:16 -04:00
cahrens
4a7f7d6537 Update the other templates that include metadata-edit.html. 2013-05-09 14:34:52 -04:00
marco
cad8ae1b9b merged in new data requirements for html 2013-05-09 14:19:31 -04:00
cahrens
60f41eb108 Cleanup. 2013-05-09 11:49:09 -04:00
cahrens
cf491b1184 Remove component.html changes. 2013-05-09 11:46:47 -04:00
cahrens
7e42512bfa Merge branch 'ux/marco/studio-componentsettings' into feature/christina/metadata-ui 2013-05-09 11:20:04 -04:00
cahrens
bfdbcc2f32 Beginnings of Backbone views/models. 2013-05-09 11:16:12 -04:00
marco
3ebd5de744 added rest of settings list 2013-05-09 10:54:10 -04:00
marco
3284247905 restyling of the input fields, partway through adding in examples of all settings 2013-05-09 09:35:31 -04:00
marco
977d0d76c2 cleaning up styles to use list-input, field, group, label, input, tip, etc standards. also opted to try out initial pass at hierarchy splitting of css classes on items that repeat (li, for example) 2013-05-07 16:40:21 -04:00
marco
d28c0b5f91 cleaned up styling, synced up partially to existing standards for forms, fonts, colors, etc; currently open select box issue on chrome 2013-05-07 08:59:28 -04:00
cahrens
594d28a653 Pass default value through. 2013-05-06 16:03:41 -04:00
cahrens
84ff2a0941 Merge branch 'master' into feature/christina/fields 2013-05-06 12:42:18 -04:00
marco
38abc0167d label on top of input field move 2013-05-06 07:37:14 -07:00
marco
6b4ab20d02 styled modes header, added inactive and active mode visibility as well as is-set mode styling. no js behavior in yet. adds overscoll fix for webkit 2013-05-05 14:09:59 -07:00
marco
ad0909dfbd style input boxes 2013-05-04 23:19:49 -07:00
marco
d1595892fd starting settings 2013-05-04 12:23:40 -07:00
David Baumgold
b344976fe7 Making linters happier 2013-05-03 15:08:28 -04:00
Steve Strassmann
dea1198d75 Merge pull request #1925 from edx/bug/straz/date
Bug/straz/date - fix date interpolation
2013-05-03 09:32:00 -07:00
marco
018a3d8a38 branch now runs, but none of the styles are there yet. pushing this mostly to view component.html 2013-05-03 09:20:43 -07:00
marco
370df65d89 Merge branch 'master' into ux/marco/studio-componentsettings 2013-05-03 09:04:03 -07:00
marco
b9da0ffb0a reverting all variables in attempt to properly load unit pages 2013-05-03 09:02:32 -07:00
marco
110a51b74e removing variable names to get it to run again 2013-05-03 08:40:35 -07:00
marco
036991dce8 moved bad variable name 2013-05-03 08:10:37 -07:00
marco
c842a5fc7c plugged in more pseudo code for various css class states necessary as well as examples for dropdown case and extra logic required there 2013-05-03 00:33:58 -07:00
marco
fbaed2e28b added shell of css and html organization 2013-05-03 00:00:10 -07:00
cahrens
0a1902e7da Merge branch 'master' into feature/christina/fields 2013-05-02 16:29:03 -04:00
cahrens
e0ebe6dacb Remove TODO. 2013-05-02 13:53:17 -04:00
cahrens
c01410626f Jasmine test for changedMetadata method. 2013-05-02 13:39:20 -04:00
Jay Zoldak
fc1a22de55 Merge pull request #1921 from edx/fix/zoldak/cms-jasmine-tests
Remove localization middleware from jasmine test execution
2013-05-02 09:45:58 -07:00
cahrens
c7713b6211 Merge branch 'master' into feature/christina/fields 2013-05-02 12:32:56 -04:00
cahrens
46100fd258 Cleanup. 2013-05-02 12:32:32 -04:00
cahrens
93f10ae8a0 Only save changed metadata fields. 2013-05-02 11:41:38 -04:00
Steve Strassmann
c9a80ded25 formatted using sublime/formatjs 2013-05-02 10:59:02 -04:00
cahrens
01ede40b03 Switching branches 2013-05-02 09:43:03 -04:00
Steve Strassmann
485d07a722 tabbing 2013-05-02 09:31:53 -04:00
Steve Strassmann
7c972ebf6e fix date interpolation 2013-05-02 09:29:27 -04:00
marco
d55527b693 changes with aria 2013-05-01 17:22:09 -04:00
marco
e697e495ca Merge branch 'master' into ux/marco/studio-componentsettings 2013-05-01 17:21:16 -04:00
brianhw
3650316ff5 Merge pull request #1922 from MITx/fix/cdodge/jsi18n-include
add leading slash to the jsi18n include
2013-05-01 13:06:38 -07:00
Chris Dodge
d807b955f7 add leading slash to the jsi18n include 2013-05-01 15:27:36 -04:00
Jay Zoldak
bdfe1cff39 Remove localization middleware from jasmine test execution 2013-05-01 11:34:28 -04:00
Jay Zoldak
f2fd90bc61 Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests
Fix/cale/lms jasmine tests
2013-05-01 08:23:41 -07:00
cahrens
13fe9c11cb Merged with master. 2013-05-01 09:33:35 -04:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo
Fix/btalbot/studio courseinfo
2013-04-30 13:34:52 -07:00