Commit Graph

13659 Commits

Author SHA1 Message Date
David Baumgold
8e384a73be Remove proof-of-concept page 2013-05-22 15:55:51 -04:00
David Baumgold
4af3325976 Move display logic into view
Model shouldn't know about things like close buttons, visibility, and so on
2013-05-22 15:55:51 -04:00
David Baumgold
528987342a Add tests for primary and secondary CSS classes 2013-05-22 15:55:51 -04:00
David Baumgold
fedfe8627f Add tests for click events on views 2013-05-22 15:55:51 -04:00
David Baumgold
070d24cf61 Jasmine doesn't like asserting on the <body> element :( 2013-05-22 15:55:51 -04:00
David Baumgold
10ec604630 Got jasmine tests working with fixtures properly 2013-05-22 15:55:50 -04:00
David Baumgold
0c368011da Move underscore templates into separate files, included in Mako templates 2013-05-22 15:55:50 -04:00
David Baumgold
5275e41e4a Adding new feedback view tests 2013-05-22 15:55:50 -04:00
David Baumgold
39f81df476 Added a few more tests for feedback models 2013-05-22 15:55:50 -04:00
David Baumgold
e440580c79 Started writing Backbone tests
Hacking the Python, because our JS dependency management is borked.
2013-05-22 15:55:50 -04:00
David Baumgold
69a6ec0c97 Don't fall over if a model doesn't have actions defined
It appears that one notification stealing focus from another causes some weirdness:
both clicking on a button on one view triggers the event on both views (the original
and the new view that stole the div). As long as the first view does *not* define
any click events, everything is fine -- this is the case for the saving notification.
I'll worry about the reason for this later; it has something to do with views
listening to models even after they no longer should be.
2013-05-22 15:55:50 -04:00
David Baumgold
1333717871 Message action callbacks have model set to this 2013-05-22 15:55:50 -04:00
David Baumgold
f5f7cf705f Subclass CMS.Models.SystemFeedback
To create handy WarningMessage, ErrorMessage, and ConfirmationMessage classes
2013-05-22 15:55:50 -04:00
David Baumgold
4e41c8060b Changed validation error to use new messaging framework 2013-05-22 15:55:50 -04:00
David Baumgold
c6c5e50d86 Hook up notification framework to default AJAX error callback
And delete `CMS.ServerError`
2013-05-22 15:55:49 -04:00
David Baumgold
e2f5acef46 Turn course sections into Backbone models
Hook up course name edit interaction, with notification framework
2013-05-22 15:55:49 -04:00
David Baumgold
772be3b8b3 Make the system feedback template more generic
Not that it really matters, since the changes are invisible :)
2013-05-22 15:55:49 -04:00
David Baumgold
cd2f67afa4 Clone the attributes object
So that modifications don't affect the model
2013-05-22 15:55:49 -04:00
David Baumgold
355162c7f6 Handle fleeting notifications 2013-05-22 15:55:49 -04:00
David Baumgold
0dc3446523 Handle saving popup 2013-05-22 15:55:49 -04:00
David Baumgold
91cdb1e3df Use "class" instead of "cls"
Matching docstring in feedback.js models
2013-05-22 15:55:49 -04:00
David Baumgold
5746121f5c Set up Notification and Prompt 2013-05-22 15:55:49 -04:00
David Baumgold
5c2116a4b3 Make abstract view, make Alert inherit from it 2013-05-22 15:55:49 -04:00
David Baumgold
5ff2adb882 Rename alert model to SystemFeedback 2013-05-22 15:55:48 -04:00
David Baumgold
56a92bff51 Hook up CMS.ServerError to new alerting system 2013-05-22 15:55:48 -04:00
David Baumgold
40000a3ac5 Make close tab on alerts close the alert 2013-05-22 15:55:48 -04:00
David Baumgold
c0d69022cb Set up Backbone model/view for alerts 2013-05-22 15:55:48 -04:00
David Baumgold
7e22278fcb Simplify Youtube API script link 2013-05-22 15:55:48 -04:00
Frances Botsford
9effdc57b1 removed symbolset, replaced with fontawesome for settings 2013-05-22 15:55:48 -04:00
Frances Botsford
571ebb1fcd removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons 2013-05-22 15:55:48 -04:00
Frances Botsford
88dd9244f3 removed symbolset, replaced with fontawesome for sock and static pages 2013-05-22 15:55:48 -04:00
Frances Botsford
81cb921e32 removed symbolset, replaced with fontawesome throughout for new buttons; updated old code for new button at bottom of grading to also use the FA style 2013-05-22 15:55:48 -04:00
Frances Botsford
9a62433797 removed symbolset, replaced with fontawesome for asset upload 2013-05-22 15:55:47 -04:00
Frances Botsford
118a8884b2 removed symbolset, replaced with fontawesome for checklists 2013-05-22 15:55:47 -04:00
Frances Botsford
67df257d40 cleaned up some test styles for fontawesome deployment 2013-05-22 15:55:47 -04:00
Brian Talbot
2be2e2f20d studio - plumbs in Font Awesome icons into header dropdown menus and user nav 2013-05-22 15:55:47 -04:00
Brian Talbot
033826746b studio - adding in perset type sizes for icons (future/general use) 2013-05-22 15:55:47 -04:00
Brian Talbot
cbe8f0d303 studio - removes extraneous symbolset font files saved in FED file architecture 2013-05-22 15:55:47 -04:00
Brian Talbot
45b9155e4b studio - adds in Font Awesome typeface, styling, and Sass import reference 2013-05-22 15:55:46 -04:00
Jason Bau
ce2cbb74a1 Merge pull request #2104 from edx/edx-West/enable-django-admin-site
add MITX Feature setting to enable django admin site
2013-05-22 12:43:45 -07:00
Ned Batchelder
d7105ddf24 Merge branch 'master' of github.com:edx/edx-platform 2013-05-22 15:32:57 -04:00
Ned Batchelder
b9d134e3d1 Merge pull request #2101 from edx/ned/fix-code-import-for-check-functions
Check functions need access to course-local code also, so we need to sav...
2013-05-22 12:32:43 -07:00
Nate Hardison
8d69b10c8c Merge pull request #1907 from edx/feature/nate/custom-header-footer
Add theming settings and simple base Sass preprocessing.
2013-05-22 12:26:15 -07:00
Nate Hardison
185ab4c35c Make Mako preprocessing a Rake task
Per feedback from @cpennington. This way we'll only preprocess once,
even if the Sass compilation is invoked multiple times.
2013-05-22 12:22:28 -07:00
Nate Hardison
ea3506d2b9 Add general theming capabilities
This commit adds the requisite settings and startup features to
enable integration of themes into the edX platform. It does not
yet provide hooks in any of the templates, but it does cause the
main `lms/static/sass/application.scss` file to `@import` a theme's
base Sass. Template hooks will come down the road.

CHANGELOG
---------
Define a new `MITX_FEATURE`, `USE_CUSTOM_THEME`, that when enabled,
can be used in templates to determine whether or not custom theme
templates should be used instead of the defaults.

Also define a new setting, `THEME_NAME`, which will be used to
locate theme-specific files. Establish the convention that themes
will be stored outside of the `REPO_ROOT`, inside the `ENV_ROOT`,
in a directory named `themes/`. `themes/<THEME_NAME>` will store
the files for a particular theme.

Provide a function, `enable_theme`, that modifies the template and
static asset load paths appropriately to include the theme's files.

Move the main LMS Sass file to a Mako template that conditionally
`@import`s the theme's base Sass file when a theme is enabled.

Add logic to the assets Rakefile to properly preprocess any Sass/
Mako templates before compiling them.
2013-05-22 12:22:27 -07:00
Jason Bau
5fc8469a81 add example in lms/envs/common.py 2013-05-22 11:49:58 -07:00
Greg Price
0843306731 Merge pull request #2103 from edx/fix/gprice/datadog-tags
Reviewed by cpennington: https://rbcommons.com/s/edx/r/2/
2013-05-22 11:35:16 -07:00
Greg Price
787366fe02 Remove tags for comment client request time histogram in Datadog
According to someone from Datadog, this was generating tags like "knowledgeable_
people_who_put_this_course_together._this_is_harvard._you_can_t_tell_us_there_s_
a_shortage_of_editorial_talent." They say that they can handle tens or hundreds
of unique tags but not thousands. Given that we have a unique URL for each
thread, we can't even use that as a tag. Thus, all tags are removed for now
until we can determine whether there is a useful set of tags with small enough
cardinality. In light of this, I did not investigate why the long tag mentioned
above was being generated.
2013-05-22 14:12:25 -04:00
Greg Price
d724223a4c Merge pull request #2053 from edx/fix/gprice/modulestore-500-errors
Handle ItemNotFoundError from the modulestore to avoid 500 errors
2013-05-22 10:58:06 -07:00
Jason Bau
70c4af40f0 add MITX Feature setting to enable django admin site 2013-05-22 10:55:21 -07:00