From 8976818c78e4bae4e49d265795fefcc11ce24fb2 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 12 Feb 2013 09:16:24 -0500 Subject: [PATCH 01/19] studio - header UI: in progress markup changes WIP --- cms/static/sass/_base.scss | 34 ++++++++++++++++++++++ cms/templates/settings.html | 11 ++++--- cms/templates/settings_graders.html | 11 ++++--- cms/templates/unit.html | 45 +++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 8 deletions(-) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index bd889cef50..64a89244ca 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -50,6 +50,40 @@ h1 { // ==================== // layout - basic +.wrapper-mast { + margin: 0; + padding: 0 $baseline; + position: relative; + + .mast { + @include clearfix(); + @include font-size(16); + position: relative; + max-width: $fg-max-width; + min-width: $fg-min-width; + width: flex-grid(12); + margin: 0 auto $baseline auto; + border-bottom: 1px solid $gray-l4; + padding-bottom: ($baseline/2); + color: $gray-d2; + + .title-sub { + @include font-size(14); + display: block; + margin: 0; + color: $gray-l2; + } + + .title, .title-1 { + @include font-size(32); + margin: 0; + padding: 0; + font-weight: 600; + color: $gray-d3; + } + } +} + .wrapper-content { margin: 0; padding: 0 $baseline; diff --git a/cms/templates/settings.html b/cms/templates/settings.html index cec27693dc..c838641e52 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -41,12 +41,15 @@ from contentstore import utils <%block name="content"> +
+
+ Settings +

Schedule & Details

+
+
+
-
- Settings -

Schedule & Details

-
diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index b8a7f6679e..45b418dcdc 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -15,6 +15,27 @@ <%block name="content"> +
+
+
+ Course Content +

Static Pages

+
+ + +
+
+
@@ -22,12 +43,6 @@

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.

- -
- - New Page - -
    diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index 7d20d449ff..ae5555b607 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -16,6 +16,34 @@ <%namespace name='datetime' module='datetime'/> <%block name="content"> +
    +
    +
    + + +

    Subsection Name

    +
    + + +
    +
    +
    diff --git a/cms/templates/export.html b/cms/templates/export.html index 0f68548a84..febdf2c50a 100644 --- a/cms/templates/export.html +++ b/cms/templates/export.html @@ -6,6 +6,15 @@ <%block name="bodyclass">is-signedin course tools export <%block name="content"> +
    +
    +
    + Tools +

    Course Export

    +
    +
    +
    +
    diff --git a/cms/templates/import.html b/cms/templates/import.html index ab06f17787..70c081c3bc 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -6,6 +6,15 @@ <%block name="bodyclass">is-signedin course tools import <%block name="content"> +
    +
    +
    + Tools +

    Course Import

    +
    +
    +
    +
    diff --git a/cms/templates/index.html b/cms/templates/index.html index 1172078893..b4c1daff69 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -33,21 +33,32 @@ <%block name="content"> +
    +
    +
    +

    My Courses

    +
    + + +
    +
    +
    -

    My Courses

    % if user.is_active: - New Course
      %for course, url in courses:
    • ${course} -
      • %endfor diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index 49d4bf5ea1..d18ff0df60 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -4,15 +4,28 @@ <%block name="content"> +
      +
      +
      + Tools +

      Course Export

      +
      + + +
      +
      +
      -
      - %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.

      diff --git a/cms/templates/overview.html b/cms/templates/overview.html index ca53c456a2..b0ff667cfd 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -120,12 +120,29 @@
      +
      +
      +
      + Course Content +

      Course Outline

      +
      + + +
      +
      +
      -
      - New Section - up Collapse All Sections -
      % for section in sections:
      diff --git a/cms/templates/settings.html b/cms/templates/settings.html index c838641e52..03c02b282a 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -43,8 +43,10 @@ from contentstore import utils <%block name="content">
      - Settings -

      Schedule & Details

      +
      + Settings +

      Schedule & Details

      +
      diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html index e5ff7a4ce4..869cf76a5c 100644 --- a/cms/templates/settings_graders.html +++ b/cms/templates/settings_graders.html @@ -41,8 +41,10 @@ from contentstore import utils <%block name="content">
      - Settings -

      Grading

      +
      + Settings +

      Grading

      +
      diff --git a/cms/templates/unit.html b/cms/templates/unit.html index afd4ac9f35..bc77ab0325 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -24,22 +24,48 @@ <%block name="content"> -
      -
      - @@ -54,9 +54,6 @@
      - - Upload New Asset -
      diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html index 8fd53cca21..fa0b19d954 100644 --- a/cms/templates/course_info.html +++ b/cms/templates/course_info.html @@ -53,7 +53,7 @@

      Page Actions

      diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 45b418dcdc..d0c5db0265 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -26,24 +26,25 @@

      Page Actions

      +
      +
      +
      +

      On this page, 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.

      +
      +
      +
      +
      -
      -

      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.

      -
      - +
        % for id in components: diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index 48ad0a2ee9..2a8dea4c88 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -7,8 +7,8 @@
        - Tools -

        Course Export

        + Course Settings +

        Course Team

    From c250bc8b59e3fa52f5a372076b66e15cc92f6b2d Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 13 Feb 2013 16:59:56 -0500 Subject: [PATCH 04/19] studio - page headers: setting up needed future CSS --- cms/static/sass/_base.scss | 46 +++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 5eecbea6db..3ecbbb81e1 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -56,7 +56,7 @@ h1 { padding: 0 $baseline; position: relative; - .mast { + .mast, .metadata { @include clearfix(); @include font-size(16); position: relative; @@ -64,9 +64,12 @@ h1 { min-width: $fg-min-width; width: flex-grid(12); margin: 0 auto $baseline auto; + color: $gray-d2; + } + + .mast { border-bottom: 1px solid $gray-l4; padding-bottom: ($baseline/2); - color: $gray-d2; .title-sub { @include font-size(14); @@ -86,6 +89,33 @@ h1 { color: $gray-d3; } + .nav-hierarchy { + @include font-size(14); + display: block; + margin: 0; + color: $gray-l2; + font-weight: 400; + + .nav-item { + display: inline; + vertical-align: middle; + margin-right: ($baseline/4); + + &:after { + content: ">>"; + margin-left: ($baseline/4); + } + + &:last-child { + margin-right: 0; + + &:after { + content: none; + } + } + } + } + // layout with actions .title { width: flex-grid(12); @@ -120,7 +150,12 @@ h1 { // buttons .button { - padding: ($baseline/4) ($baseline/2) ($baseline/3) ($baseline/2); + padding: ($baseline/4) ($baseline/2) ($baseline/3) ($baseline/2) !important; + font-weight: 400 !important; + } + + .new-button { + font-weight: 700 !important; } .upload-button .icon-create { @@ -130,6 +165,11 @@ h1 { } } } + + // page metadata/action bar + .metadata { + + } } // layout - basic page content From d571c7791a234cd54dafd9f74533e844f05d880c Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 13 Feb 2013 17:01:45 -0500 Subject: [PATCH 05/19] studio - resetting Unit UI HTML back to prev version for now --- cms/templates/unit.html | 87 +++++------------------------------------ 1 file changed, 9 insertions(+), 78 deletions(-) diff --git a/cms/templates/unit.html b/cms/templates/unit.html index bc77ab0325..212ff69d0d 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -24,85 +24,16 @@ <%block name="content"> - -
    -
    - -
    -

    You are editing a draft.

    -

    - % if published_date: - This unit was originally published on ${published_date}. - % endif

    -
    - - -
    -
    - -
    -
    -
    - - -

    Unit Name

    -
    - - - -
    -
    - - -
    - -
    -

    Will be Released:

    -

    to students on February 06, 2013 at 12:00 PM within "Introduction to the Course"

    -
    - -
    -

    Unit URL Title:

    -

    /courseware/db0cfa58100f4ca48c614cfb618030d1/7317287782624b9b924bd70ce5ca7b2d

    -
    -
    -
    -
    -
    +
    +

    You are editing a draft. + % if published_date: + This unit was originally published on ${published_date}. + % endif +

    + Preview the published version +

    @@ -219,4 +150,4 @@
    - + \ No newline at end of file From 557beea31f5d5c2a88c9cfad78748decd04bf19f Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 14 Feb 2013 09:00:57 -0500 Subject: [PATCH 06/19] studio - hiding mast area for subsections --- cms/templates/edit_subsection.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index 044b2966ad..fc605b4692 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -16,7 +16,7 @@ <%namespace name='datetime' module='datetime'/> <%block name="content"> -
    +
    From 1a1be106aea7af5470d48950c9a9e7b19cbb2ab7 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 14 Feb 2013 10:14:10 -0500 Subject: [PATCH 09/19] studio - page headers: added in view live links to course dashboard --- cms/static/sass/_base.scss | 1 - cms/static/sass/_dashboard.scss | 37 ++++++++++++++++++++++++++------- cms/templates/index.html | 3 ++- cms/templates/overview.html | 2 +- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 350604a076..52fa481cb7 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -651,7 +651,6 @@ hr.divide { .view-button { @include blue-button; @include font-size(13); - padding: 8px 20px 10px; text-align: center; &.big { diff --git a/cms/static/sass/_dashboard.scss b/cms/static/sass/_dashboard.scss index 0a9e992650..68b147d370 100644 --- a/cms/static/sass/_dashboard.scss +++ b/cms/static/sass/_dashboard.scss @@ -6,19 +6,27 @@ @include box-shadow(0 1px 2px rgba(0, 0, 0, .1)); li { + position: relative; border-bottom: 1px solid $mediumGrey; &:last-child { border-bottom: none; } - } - a { - padding: 20px 25px; - line-height: 1.3; - - &:hover { - background: $paleYellow; + .class-link { + z-index: 100; + display: block; + padding: 20px 25px; + line-height: 1.3; + + &:hover { + background: $paleYellow; + + + .view-live-button { + opacity: 1.0; + pointer-events: auto; + } + } } } @@ -34,6 +42,21 @@ margin-right: 20px; color: #3c3c3c; } + + .view-live-button { + z-index: 10000; + position: absolute; + top: 15px; + right: $baseline; + padding: ($baseline/4) ($baseline/2); + opacity: 0; + pointer-events: none; + + &:hover { + opacity: 1.0; + pointer-events: auto; + } + } } .new-course { diff --git a/cms/templates/index.html b/cms/templates/index.html index 50d8933484..a968ff06ee 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -61,9 +61,10 @@ diff --git a/cms/templates/overview.html b/cms/templates/overview.html index c28cd74427..9bb43da6d4 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -137,7 +137,7 @@ + New Section
  1. - View Course + View Live
    2. From 47c117bf039ec43a2236e69f5f758f20cb9a2224 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 14 Feb 2013 10:52:25 -0500 Subject: [PATCH 10/19] studio - page headers: resolved new course update creation JS issue caused by new markup --- cms/static/js/views/course_info_edit.js | 8 ++++---- cms/templates/index.html | 2 +- cms/templates/overview.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cms/static/js/views/course_info_edit.js b/cms/static/js/views/course_info_edit.js index cb396b2a7f..56bf278726 100644 --- a/cms/static/js/views/course_info_edit.js +++ b/cms/static/js/views/course_info_edit.js @@ -10,7 +10,7 @@ CMS.Views.CourseInfoEdit = Backbone.View.extend({ render: function() { // instantiate the ClassInfoUpdateView and delegate the proper dom to it new CMS.Views.ClassInfoUpdateView({ - el: this.$('#course-update-view'), + el: $('body.updates'), collection: this.model.get('updates') }); @@ -27,9 +27,9 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ // collection is CourseUpdateCollection events: { "click .new-update-button" : "onNew", - "click .save-button" : "onSave", - "click .cancel-button" : "onCancel", - "click .edit-button" : "onEdit", + "click #course-update-view .save-button" : "onSave", + "click #course-update-view .cancel-button" : "onCancel", + "click .post-actions > .edit-button" : "onEdit", "click .delete-button" : "onDelete" }, diff --git a/cms/templates/index.html b/cms/templates/index.html index a968ff06ee..60318f1dbc 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -64,7 +64,7 @@ ${course} - View Live + View Live %endfor diff --git a/cms/templates/overview.html b/cms/templates/overview.html index 9bb43da6d4..07834af687 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -137,7 +137,7 @@ + New Section
  2. - View Live + View Live
    3. From 9b09d043bd02d323565a74eb96f7bc93dfabc5de Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 14 Feb 2013 12:49:58 -0500 Subject: [PATCH 11/19] studio - adding introduction areas to all templates and infrastructure for its contnet --- cms/static/js/base.js | 6 ++ cms/static/sass/_base.scss | 89 +++++++++++++++++++++++++++++ cms/static/sass/_dashboard.scss | 1 + cms/static/sass/_index.scss | 65 +-------------------- cms/templates/course_info.html | 8 +++ cms/templates/edit-tabs.html | 26 ++++++++- cms/templates/howitworks.html | 14 ----- cms/templates/index.html | 8 +++ cms/templates/settings.html | 2 +- cms/templates/settings_graders.html | 2 +- cms/templates/widgets/header.html | 2 +- 11 files changed, 139 insertions(+), 84 deletions(-) diff --git a/cms/static/js/base.js b/cms/static/js/base.js index caf6df940e..2b0efd370d 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -41,6 +41,12 @@ $(document).ready(function() { $('body').addClass('js'); + // lean/simple modal + $('a[rel*=modal]').leanModal({overlay : 0.80, closeButton: '.action-modal-close' }); + $('a.action-modal-close').click(function(e){ + (e).preventDefault(); + }); + // nav - dropdown related $body.click(function(e){ $('.nav-dropdown .nav-item .wrapper-nav-sub').removeClass('is-shown'); diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 52fa481cb7..4462109b88 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -225,7 +225,30 @@ h1 { .introduction { @include font-size(14); + width: flex-grid(12); margin: 0 0 $baseline 0; + + .copy strong { + font-weight: 600; + } + + &.has-links { + @include clearfix(); + + .copy { + float: left; + width: flex-grid(8,12); + margin-right: flex-gutter(); + } + + .nav-introduction-supplementary { + @include font-size(13); + float: right; + width: flex-grid(4,12); + display: block; + text-align: right; + } + } } } @@ -743,6 +766,72 @@ hr.divide { // ==================== +// js dependant +body.js { + + // lean/simple modal window + .content-modal { + @include border-bottom-radius(2px); + @include box-sizing(border-box); + @include box-shadow(0 2px 4px $shadow-d1); + position: relative; + display: none; + width: 700px; + overflow: hidden; + border: 1px solid $gray-d1; + padding: ($baseline); + background: $white; + + .action-modal-close { + @include transition(top .25s ease-in-out); + @include border-bottom-radius(3px); + position: absolute; + top: -3px; + right: $baseline; + padding: ($baseline/4) ($baseline/2) 0 ($baseline/2); + background: $gray-l3; + text-align: center; + + .label { + @include text-sr(); + } + + .ss-icon { + @include font-size(18); + color: $white; + } + + &:hover { + background: $blue; + top: 0; + } + } + + img { + @include box-sizing(border-box); + width: 100%; + overflow-y: scroll; + padding: ($baseline/10); + border: 1px solid $gray-l4; + } + + .title { + @include font-size(18); + margin: 0 0 ($baseline/2) 0; + font-weight: 600; + color: $gray-d3; + } + + .description { + @include font-size(13); + margin-top: ($baseline/2); + color: $gray-l1; + } + } +} + +// ==================== + // works in progress body.hide-wip { diff --git a/cms/static/sass/_dashboard.scss b/cms/static/sass/_dashboard.scss index 68b147d370..0d4d046e57 100644 --- a/cms/static/sass/_dashboard.scss +++ b/cms/static/sass/_dashboard.scss @@ -43,6 +43,7 @@ color: #3c3c3c; } + // view live button .view-live-button { z-index: 10000; position: absolute; diff --git a/cms/static/sass/_index.scss b/cms/static/sass/_index.scss index b5d042b5cc..e0f6d0f2b7 100644 --- a/cms/static/sass/_index.scss +++ b/cms/static/sass/_index.scss @@ -350,67 +350,4 @@ } } } - - // js dependant - &.js { - - .content-modal { - @include border-bottom-radius(2px); - @include box-sizing(border-box); - @include box-shadow(0 2px 4px $shadow-d1); - position: relative; - display: none; - width: 700px; - overflow: hidden; - border: 1px solid $gray-d1; - padding: ($baseline); - background: $white; - - .action-modal-close { - @include transition(top .25s ease-in-out); - @include border-bottom-radius(3px); - position: absolute; - top: -3px; - right: $baseline; - padding: ($baseline/4) ($baseline/2) 0 ($baseline/2); - background: $gray-l3; - text-align: center; - - .label { - @include text-sr(); - } - - .ss-icon { - @include font-size(18); - color: $white; - } - - &:hover { - background: $blue; - top: 0; - } - } - - img { - @include box-sizing(border-box); - width: 100%; - overflow-y: scroll; - padding: ($baseline/10); - border: 1px solid $gray-l4; - } - - .title { - @include font-size(18); - margin: 0 0 ($baseline/2) 0; - font-weight: 600; - color: $gray-d3; - } - - .description { - @include font-size(13); - margin-top: ($baseline/2); - color: $gray-l1; - } - } - } -} +} \ No newline at end of file diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html index 203173f724..b838876f4e 100644 --- a/cms/templates/course_info.html +++ b/cms/templates/course_info.html @@ -60,6 +60,14 @@
    +
    +
    +
    +

    Course updates are announcements or notifications you want to share with your class. Other course authors have used them for important exam/date reminders, change in schedules, and to call out any important step students need to take while enrolled in the course.

    +
    +
    +
    +
    diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 5cb633b053..a3d4f43dca 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -35,8 +35,15 @@
    -
    -

    On this page, 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.

    +
    +

    Static Pages are additional pages that supplment your Courseware. Other course authors have used them to share a syllabus, external resources, and additional reading.

    +
    @@ -44,7 +51,7 @@
    - +
      % for id in components: @@ -59,4 +66,17 @@
    + +
    +

    How Static Pages are Used in Your Course

    +
    + Preview of how Static Pages are used in your course +
    These pages will be presented in your course's main navigation alongside Courseware, Course Info, Discussion, etc.
    +
    + + + ␡ + close modal + +
    \ No newline at end of file diff --git a/cms/templates/howitworks.html b/cms/templates/howitworks.html index a090381203..d9f94ef992 100644 --- a/cms/templates/howitworks.html +++ b/cms/templates/howitworks.html @@ -182,18 +182,4 @@ close modal
    - - -<%block name="jsextra"> - \ No newline at end of file diff --git a/cms/templates/index.html b/cms/templates/index.html index 60318f1dbc..a70ef16a6c 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -54,6 +54,14 @@
    +
    +
    +
    +

    Welcome, ${ user.username }. Here are all of the courses you are currently authoring in Studio:

    +
    +
    +
    +
    diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 92d5d5d99a..47cb315d21 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -55,7 +55,7 @@ from contentstore import utils
    diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html index c53a7af834..759a6340ec 100644 --- a/cms/templates/settings_graders.html +++ b/cms/templates/settings_graders.html @@ -52,7 +52,7 @@ from contentstore import utils
    diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 53c5193f3d..7b516ececd 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -17,7 +17,7 @@
    + +
    From 9feb810006e1043a897cc3018f6a2919f167f1da Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 14 Feb 2013 13:16:10 -0500 Subject: [PATCH 13/19] studio - final prep of introduction areas (with fix for current page content margins) --- cms/static/img/preview-lms-staticpages.png | Bin 0 -> 9501 bytes cms/static/sass/_base.scss | 1 - cms/templates/edit-tabs.html | 2 +- 3 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 cms/static/img/preview-lms-staticpages.png diff --git a/cms/static/img/preview-lms-staticpages.png b/cms/static/img/preview-lms-staticpages.png new file mode 100644 index 0000000000000000000000000000000000000000..05a62f7c7fdf81ecfb8a8734709a88845d86eb4d GIT binary patch literal 9501 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 G`2PUh^29Fy literal 0 HcmV?d00001 diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index bd4631b66c..e6f834bdee 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -228,7 +228,6 @@ h1 { @include font-size(14); width: flex-grid(12); margin: 0 0 $baseline 0; - padding: 0 $baseline; .copy strong { font-weight: 600; diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index a3d4f43dca..7f28c46457 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -36,7 +36,7 @@
    -

    Static Pages are additional pages that supplment your Courseware. Other course authors have used them to share a syllabus, external resources, and additional reading.

    +

    Static Pages are additional pages that supplment your Courseware. Other course authors have used them to share a syllabus, calendar, handouts, and more.

    diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 95b14fd5cf..cb935e8e69 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -27,7 +27,7 @@

    Page Actions

    @@ -41,7 +41,7 @@ @@ -76,7 +76,7 @@ - ␡ + ␡ close modal
    diff --git a/cms/templates/howitworks.html b/cms/templates/howitworks.html index 2a92218163..1cf9b17710 100644 --- a/cms/templates/howitworks.html +++ b/cms/templates/howitworks.html @@ -28,7 +28,7 @@ Studio Helps You Keep Your Courses Organized
    Studio Helps You Keep Your Courses Organized
    - + @@ -62,7 +62,7 @@ Learning is More than Just Lectures
    Learning is More than Just Lectures
    - + @@ -96,7 +96,7 @@ Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.
    Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.
    - + @@ -152,7 +152,7 @@ - ␡ + ␡ close modal
    @@ -165,7 +165,7 @@ - ␡ + ␡ close modal
    @@ -178,7 +178,7 @@ - ␡ + ␡ close modal
    diff --git a/cms/templates/overview.html b/cms/templates/overview.html index 67ae85aff5..91a1107726 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -131,7 +131,7 @@

    Page Actions

    • - up Collapse All Sections + up Collapse All Sections
    • + New Section From 301d58d648eb63a98a9150072dade7e073d0347e Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Tue, 19 Feb 2013 13:31:11 -0500 Subject: [PATCH 17/19] Update lettuce test with new button name for add new section. --- cms/djangoapps/contentstore/features/courses.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/features/courses.py b/cms/djangoapps/contentstore/features/courses.py index db8e20722a..e394165f08 100644 --- a/cms/djangoapps/contentstore/features/courses.py +++ b/cms/djangoapps/contentstore/features/courses.py @@ -59,4 +59,4 @@ def i_am_on_tab(step, tab_name): @step('I see a link for adding a new section$') def i_see_new_section_link(step): link_css = 'a.new-courseware-section-button' - assert_css_with_text(link_css, 'New Section') + assert_css_with_text(link_css, '+ New Section') From 8c423da6dbaa059d264f50ba3386cf2e6604c005 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Tue, 19 Feb 2013 13:50:40 -0500 Subject: [PATCH 18/19] Updated test to reflect new class name for course titles. --- cms/djangoapps/contentstore/tests/test_contentstore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py index a4ce54f950..b79d86b52f 100644 --- a/cms/djangoapps/contentstore/tests/test_contentstore.py +++ b/cms/djangoapps/contentstore/tests/test_contentstore.py @@ -342,7 +342,7 @@ class ContentStoreTest(ModuleStoreTestCase): # Create a course so there is something to view resp = self.client.get(reverse('index')) self.assertContains(resp, - '

      My Courses

      ', + '

      My Courses

      ', status_code=200, html=True) From 266e8951a402cb05e6eea1cb3dc531af860edf14 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 19 Feb 2013 17:18:09 -0500 Subject: [PATCH 19/19] made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750 --- cms/static/js/views/course_info_edit.js | 2 +- cms/templates/course_info.html | 2 +- cms/templates/edit-tabs.html | 2 +- cms/templates/edit_subsection.html | 28 ------------------------- cms/templates/index.html | 2 +- cms/templates/manage_users.html | 8 ------- cms/templates/settings.html | 5 ----- cms/templates/settings_graders.html | 5 ----- 8 files changed, 4 insertions(+), 50 deletions(-) diff --git a/cms/static/js/views/course_info_edit.js b/cms/static/js/views/course_info_edit.js index 56bf278726..277a15b57c 100644 --- a/cms/static/js/views/course_info_edit.js +++ b/cms/static/js/views/course_info_edit.js @@ -30,7 +30,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ "click #course-update-view .save-button" : "onSave", "click #course-update-view .cancel-button" : "onCancel", "click .post-actions > .edit-button" : "onEdit", - "click .delete-button" : "onDelete" + "click .post-actions > .delete-button" : "onDelete" }, initialize: function() { diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html index a91e83027b..a68a0da76a 100644 --- a/cms/templates/course_info.html +++ b/cms/templates/course_info.html @@ -63,7 +63,7 @@
      -

      Course updates are announcements or notifications you want to share with your class. Other course authors have used them for important exam/date reminders, change in schedules, and to call out any important step students need to take while enrolled in the course.

      +

      Course updates are announcements or notifications you want to share with your class. Other course authors have used them for important exam/date reminders, change in schedules, and to call out any important steps students need to be aware of.

      diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index cb935e8e69..1a44de60c1 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -41,7 +41,7 @@ diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index fc605b4692..00780eab3b 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -16,34 +16,6 @@ <%namespace name='datetime' module='datetime'/> <%block name="content"> -
      -
      -
      - - -

      Subsection Name

      -
      - - -
      -
      -
      diff --git a/cms/templates/index.html b/cms/templates/index.html index 3912347897..fdb46612a0 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -79,7 +79,7 @@ % else:

      - In order to start authoring courses using edX studio, please click on the activation link in your email. + In order to start authoring courses using edX Studio, please click on the activation link in your email.

      % endif diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index ae61b7c945..722e756203 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -24,14 +24,6 @@
      - -
      diff --git a/cms/templates/settings.html b/cms/templates/settings.html index 47cb315d21..32d24b77e6 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -53,11 +53,6 @@ from contentstore import utils
      - - -
      diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html index 759a6340ec..61cb59e995 100644 --- a/cms/templates/settings_graders.html +++ b/cms/templates/settings_graders.html @@ -50,11 +50,6 @@ from contentstore import utils
      - - -