From c7cdaf8080d04a7546c505f1772b3455c8e7beff Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Fri, 12 Oct 2012 10:36:02 -0400 Subject: [PATCH] styled import page --- cms/static/js/base.js | 14 +++++++ cms/static/sass/_base.scss | 7 ++++ cms/static/sass/_import.scss | 70 +++++++++++++++++++++++++++++++++ cms/static/sass/base-style.scss | 1 + cms/templates/import.html | 25 +++++++----- 5 files changed, 108 insertions(+), 9 deletions(-) create mode 100644 cms/static/sass/_import.scss diff --git a/cms/static/js/base.js b/cms/static/js/base.js index 9cb09d733c..8602770d24 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -51,8 +51,22 @@ $(document).ready(function() { $('.remove-policy-data').bind('click', removePolicyMetadata); $('.sync-date').bind('click', syncReleaseDate); + + // import form setup + $('.import .file-input').bind('change', showImportSubmit); + $('.import .choose-file-button, .import .choose-file-button-inline').bind('click', function(e) { + e.preventDefault(); + $('.import .file-input').click(); + }); }); +function showImportSubmit(e) { + $('.file-name').html($(this).val()) + $('.file-name-block').show(); + $('.import .choose-file-button').hide(); + $('.submit-button').show(); +} + function syncReleaseDate(e) { e.preventDefault(); $("#start_date").val(""); diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 05e40c9483..69b51b727e 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -119,6 +119,13 @@ label { font-size: 12px; } +code { + padding: 0 4px; + border-radius: 3px; + background: #eee; + font-family: Monaco, monospace; +} + .text-editor { width: 100%; min-height: 80px; diff --git a/cms/static/sass/_import.scss b/cms/static/sass/_import.scss new file mode 100644 index 0000000000..f9480a6d46 --- /dev/null +++ b/cms/static/sass/_import.scss @@ -0,0 +1,70 @@ +.import { + .import-overview { + @extend .window; + @include clearfix; + padding: 30px 40px; + } + + .description { + float: left; + width: 62%; + margin-right: 3%; + font-size: 14px; + + h3 { + margin-bottom: 20px; + font-size: 18px; + font-weight: 700; + color: $error-red; + } + + p + p { + margin-top: 20px; + } + } + + .import-form { + float: left; + width: 35%; + padding: 25px 30px 35px; + @include box-sizing(border-box); + border: 1px solid $mediumGrey; + border-radius: 3px; + background: $lightGrey; + text-align: center; + + h2 { + margin-bottom: 30px; + font-size: 26px; + font-weight: 300; + } + + .file-name-block { + display: none; + margin-bottom: 15px; + font-size: 13px; + } + + .choose-file-button { + @include blue-button; + padding: 10px 50px 11px; + font-size: 17px; + } + + .choose-file-button-inline { + display: block; + } + + .file-input { + display: none; + } + + .submit-button { + @include orange-button; + display: none; + max-width: 100%; + padding: 8px 20px 10px; + white-space: normal; + } + } +} \ No newline at end of file diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss index f2256f97ed..0824cc380d 100644 --- a/cms/static/sass/base-style.scss +++ b/cms/static/sass/base-style.scss @@ -16,6 +16,7 @@ @import "assets"; @import "static-pages"; @import "users"; +@import "import"; @import "course-info"; @import "landing"; @import "graphics"; diff --git a/cms/templates/import.html b/cms/templates/import.html index b2385b2baf..dadb02763e 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -7,15 +7,22 @@

Import

-
-

Importing a new course will delete all course content currently associated with your course - and replace it with the contents of the uploaded file.

-

File uploads must be zip files containing, at a minimum, a

course.xml
file.

-

Please note that if your course has any problems with auto-generated

url_name
s, - re-importing your course could cause the loss of student data associated with those problems.

-

Course to import:

- - +
+
+

Importing a new course will delete all course content currently associated with your course + and replace it with the contents of the uploaded file.

+

File uploads must be zip files containing, at a minimum, a course.xml file.

+

Please note that if your course has any problems with auto-generated url_name nodes, + re-importing your course could cause the loss of student data associated with those problems.

+
+
+

Course to import:

+ Choose File +

change

+ + +
+
\ No newline at end of file