From 70e11e823cbe82483365aef72a5ece284f45240f Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 12 Feb 2013 15:07:32 -0500 Subject: [PATCH] studio - made all page heading chrome have consistent markup --- cms/static/sass/_base.scss | 53 ++++++++++++------------ cms/templates/asset_index.html | 18 +++++++++ cms/templates/course_info.html | 22 ++++++++-- cms/templates/edit-tabs.html | 27 ++++++++++--- cms/templates/edit_subsection.html | 28 +++++++++++++ cms/templates/export.html | 9 +++++ cms/templates/import.html | 9 +++++ cms/templates/index.html | 23 ++++++++--- cms/templates/manage_users.html | 27 +++++++++---- cms/templates/overview.html | 25 ++++++++++-- cms/templates/settings.html | 6 ++- cms/templates/settings_graders.html | 6 ++- cms/templates/unit.html | 62 ++++++++++++++++++++--------- 13 files changed, 240 insertions(+), 75 deletions(-) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 64a89244ca..e8dab4e066 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -49,41 +49,42 @@ h1 { // ==================== -// layout - basic +// layout - basic page header .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; + @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; - } + .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; + } + } } +// layout - basic page content .wrapper-content { margin: 0; padding: 0 $baseline; @@ -131,6 +132,7 @@ h1 { @include box-sizing(border-box); } +// layout - primary content .content-primary { .title-1, .title-2, .title-3, .title-4, .title-5, .title-5 { @@ -162,6 +164,7 @@ h1 { } } +// layout - supplemental content .content-supplementary { .bit { diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 5213fd25c9..ea24098bca 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -33,6 +33,24 @@ +
+
+
+ Course Content +

Files & Uploads

+
+ + +
+
+
diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html index 32a343c49c..8fd53cca21 100644 --- a/cms/templates/course_info.html +++ b/cms/templates/course_info.html @@ -42,16 +42,30 @@ <%block name="content"> +
+
+
+ Course Content +

Course Updates

+
+ + +
+
+
-

Course Info

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