From c8b4e8852f25d350d40c939cfc5009db60dd51b2 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 7 Dec 2012 14:31:48 -0500 Subject: [PATCH] added modal cover for editors --- cms/static/coffee/src/views/module_edit.coffee | 3 +++ cms/static/img/upload-icon.png | Bin 0 -> 1122 bytes cms/static/sass/_assets.scss | 8 -------- cms/static/sass/_graphics.scss | 8 ++++++++ cms/static/sass/_header.scss | 1 - cms/static/sass/_static-pages.scss | 3 +++ cms/static/sass/_unit.scss | 1 + cms/static/sass/_users.scss | 10 +++------- cms/templates/asset_index.html | 7 ++++--- cms/templates/edit-tabs.html | 8 ++++---- cms/templates/manage_users.html | 13 +++++++------ 11 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 cms/static/img/upload-icon.png 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 0000000000000000000000000000000000000000..0a78627f8787dd2b4a3f706e6a0039aff5572199 GIT binary patch literal 1122 zcmaJ=TSyd97#>^Gl(x2lz@j>g5eDwgW!I@0cH6a`H8&cO-K7kIoSix9pmS;F*p5PJ zcY6tX47$8@p`b8&DT<=3hp@1umwJej2!fz`2sVoBjJno?HXP>s=kR~u|NWP9vbANK zzj{?QK@k3QvzWpAO3z+Yf&bSpomcQygHmlMYj&W5Y(t_^HS-Xpb-5E}pse=odkUij z;ajie+EAOcLr_dTBzry~SGO>lAfj>Cl9g_VKpu8#MvVM&_W=nsHAe1gkZ8$D!Y-}3 z--g-#mYmYxt?()t-vXkpfC+SnWZ>#Oh9kH!a*9{Lws%dDV9Et`$H-|>ZBi>pnl=Ot zp>R;483u4%h>0|C98(Winqes#FD}SLga%GvH-VXt#L;ZEL&%6tGqLa~Ms^`&2^3W* z6heh?$h12thUa;YgJpx*Bk1%QNOpsUQ(IyXp`+NEg*4Lu9;2K$dr^$UN~crMtyx;b znJE)480E?q#e`@trIMp0{ohsBXT2Sifq(VRN$lkMEJ$UbWA@q#Zd^yL7s?WnHk6TR z=S;JwRK?aV6PZqzX@O*x19g(DXoh#OaS9Sxwx`Y)?rB{arDq&TO71_w<#xO&(DW+*otTzn0g(Hj5*7ifS z$u@N`m9(JEtA$U^uVosm&Y@*G558$$EQQ5TUTgnpb?FMvk7v#fEesIfy;$pRI;_BqLBcBq_wqJXg z{k@{{^6C8W_kr=j;LQrE_T@Vz(Q|UNeIYniIS~K{e_V*ttB1~<_8VmraW@jJ$QQst z@#y;}^pTOOy7HQ93wj6HWyj;kYVMtDPS!NjXV+c)T3>bi(eU!MBLjou+zOv>WOv1m zujNB)4i%U9_FGGb)(jSzm3N*eey#5KSs8u%=wp7*J3cT
-

Asset Library

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 @@

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: