diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee index ad875294a1..0617b01bb4 100644 --- a/cms/static/coffee/src/views/module_edit.coffee +++ b/cms/static/coffee/src/views/module_edit.coffee @@ -56,6 +56,7 @@ class CMS.Views.ModuleEdit extends Backbone.View event.preventDefault() data = @module.save() data.metadata = @metadata() + $modalCover.hide() @model.save(data).done( => # # showToastMessage("Your changes have been saved.", null, 3) @module = null @@ -69,9 +70,11 @@ class CMS.Views.ModuleEdit extends Backbone.View event.preventDefault() @$el.removeClass('editing') @$component_editor().slideUp(150) + $modalCover.hide() clickEditButton: (event) -> event.preventDefault() @$el.addClass('editing') + $modalCover.show() @$component_editor().slideDown(150) @loadEdit() diff --git a/cms/static/img/upload-icon.png b/cms/static/img/upload-icon.png new file mode 100644 index 0000000000..0a78627f87 Binary files /dev/null and b/cms/static/img/upload-icon.png differ diff --git a/cms/static/sass/_assets.scss b/cms/static/sass/_assets.scss index 29c3d4000d..23d9ea4d9a 100644 --- a/cms/static/sass/_assets.scss +++ b/cms/static/sass/_assets.scss @@ -5,14 +5,6 @@ background-color: #fff; } - .upload-button { - @include blue-button; - float: left; - margin-right: 20px; - padding: 8px 30px 10px; - font-size: 12px; - } - .asset-library { @include clearfix; diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss index 80599f7bc4..4ed22c570d 100644 --- a/cms/static/sass/_graphics.scss +++ b/cms/static/sass/_graphics.scss @@ -34,6 +34,14 @@ background: url(../img/video-icon.png) no-repeat; } +.upload-icon { + display: inline-block; + width: 22px; + height: 13px; + margin-right: 5px; + background: url(../img/upload-icon.png) no-repeat; +} + .list-icon { display: inline-block; width: 14px; diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss index 8402fa54be..76add36477 100644 --- a/cms/static/sass/_header.scss +++ b/cms/static/sass/_header.scss @@ -5,7 +5,6 @@ body.no-header { } @mixin active { - color: $blue; @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0)); background-color: rgba(255, 255, 255, .3); @include box-shadow(0 -1px 0 rgba(0, 0, 0, .2) inset, 0 1px 0 #fff inset); diff --git a/cms/static/sass/_static-pages.scss b/cms/static/sass/_static-pages.scss index 78d6ba66d7..9f39d2ad53 100644 --- a/cms/static/sass/_static-pages.scss +++ b/cms/static/sass/_static-pages.scss @@ -65,6 +65,9 @@ } .component.editing { + border-left: 1px solid $mediumGrey; + border-right: 1px solid $mediumGrey; + .xmodule_display { display: none; } diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index c7aa86b35c..8f4ec33b7f 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -187,6 +187,7 @@ &.editing { border: 1px solid $lightBluishGrey2; + z-index: 9999; .drag-handle, .component-actions { diff --git a/cms/static/sass/_users.scss b/cms/static/sass/_users.scss index 4daefa55cc..eb48bcd219 100644 --- a/cms/static/sass/_users.scss +++ b/cms/static/sass/_users.scss @@ -4,14 +4,10 @@ padding: 30px 40px; } - .new-user-button { - margin-bottom: 15px; - } - .new-user-form { display: none; padding: 15px 20px; - background: $mediumGrey; + background-color: $lightBluishGrey2; #result { display: none; @@ -41,12 +37,12 @@ .add-button { @include blue-button; - padding: 6px 20px 8px; + padding: 5px 20px 9px; } .cancel-button { @include white-button; - padding: 6px 20px 8px; + padding: 5px 20px 9px; } } diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 900ef3b697..4f60b168df 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -35,10 +35,11 @@
-

Asset Library

- Upload New File - + + Upload New Asset + +
diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 637329f356..a48c683db1 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -18,10 +18,10 @@
- - New Tab - -
+ + New Tab + +

Here you can add and manage additional pages for your course. These pages will be added to the primary navigation menu alongside Courseware, Course Info, Discussion, etc.

diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index 6f33b67d41..d8266f0622 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -5,17 +5,18 @@ <%block name="content">
-

Users

- -
-
-

The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional course staff below, if you are the course instructor. Please note that they must have already registered and verified their account.

-
+
%if allow_actions: New User %endif +
+ +
+
+

The following list of users have been designated as course staff. This means that these users will have permissions to modify course content. You may add additional course staff below, if you are the course instructor. Please note that they must have already registered and verified their account.

+
%if allow_actions: