From 2441f8960ef1a13546e9cbd6fd727753e5f67229 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 9 Oct 2012 15:26:12 -0400 Subject: [PATCH 1/3] added waiting classes --- cms/static/img/blue-spinner.gif | Bin 0 -> 8181 bytes cms/templates/users.html | 64 ++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 cms/static/img/blue-spinner.gif create mode 100644 cms/templates/users.html diff --git a/cms/static/img/blue-spinner.gif b/cms/static/img/blue-spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..2cee72553af43e9b3c606bc7dbd207b05e8ac94c GIT binary patch literal 8181 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 +<%! from django.core.urlresolvers import reverse %> +<%block name="title">CMS Courseware Overview + +<%namespace name="units" file="widgets/units.html" /> + + +<%block name="content"> +
+
+

Courseware

+
+ +
+ +
+ <%include file="widgets/upload_assets.html"/> +
+
+ From 002f813b7518bd5cce5a248915c3c9b49520d9d6 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 9 Oct 2012 15:28:53 -0400 Subject: [PATCH 2/3] pulled spinner out into its own class in case we need to add it directly --- cms/static/sass/_base.scss | 36 ++++++++++++++++++++++++++++++++++ cms/static/sass/_graphics.scss | 9 +++++++++ 2 files changed, 45 insertions(+) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 27cd5e3a96..fe97c9b975 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -279,4 +279,40 @@ body.show-wip { font-size: 12px; text-align: center; } +} + +.waiting { + position: relative; + + &:before { + content: ''; + display: block; + position: absolute; + top: 0; + left: 0; + z-index: 999998; + width: 100%; + height: 100%; + border-radius: inherit; + background: rgba(255, 255, 255, .9); + } + + &:after { + content: ''; + @extend .spinner-icon; + display: block; + position: absolute; + top: 50%; + left: 50%; + margin-left: -10px; + margin-top: -10px; + z-index: 999999; + } +} + +.waiting-inline { + &:after { + content: ''; + @extend .spinner-icon; + } } \ No newline at end of file diff --git a/cms/static/sass/_graphics.scss b/cms/static/sass/_graphics.scss index 14662c7d42..65c827981a 100644 --- a/cms/static/sass/_graphics.scss +++ b/cms/static/sass/_graphics.scss @@ -236,3 +236,12 @@ margin-right: 5px; background: url(../img/large-video-icon.png) center no-repeat; } + +.spinner-icon { + display: inline-block; + width: 20px; + height: 20px; + margin-left: 10px; + vertical-align: middle; + background: url(../img/blue-spinner.gif) no-repeat; +} \ No newline at end of file From 9cb6331c062ebb88ebf9a868ae1da89d491aa99f Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 9 Oct 2012 15:32:23 -0400 Subject: [PATCH 3/3] removed users template --- cms/templates/users.html | 64 ---------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 cms/templates/users.html diff --git a/cms/templates/users.html b/cms/templates/users.html deleted file mode 100644 index 3282d483bf..0000000000 --- a/cms/templates/users.html +++ /dev/null @@ -1,64 +0,0 @@ -<%inherit file="base.html" /> -<%! from django.core.urlresolvers import reverse %> -<%block name="title">CMS Courseware Overview - -<%namespace name="units" file="widgets/units.html" /> - - -<%block name="content"> -
-
-

Courseware

-
- -
- -
- <%include file="widgets/upload_assets.html"/> -
-
-