diff --git a/cms/static/js/base.js b/cms/static/js/base.js index d77d56d43f..b2e9e328ae 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -63,7 +63,7 @@ $(document).ready(function() { }); // general link management - new window/tab - $('a[rel="external"]').attr('title','This link will open in a new browser/window tab').click(function(e) { + $('a[rel="external"]').attr('title','This link will open in a new browser window/tab').click(function(e) { window.open($(this).attr('href')); e.preventDefault(); }); diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss index 0f2e139455..e9bfa92298 100644 --- a/cms/static/sass/_cms_mixins.scss +++ b/cms/static/sass/_cms_mixins.scss @@ -28,7 +28,7 @@ } } - &:hover { + &:hover, &.active { @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15)); } } @@ -41,7 +41,7 @@ background-color: $blue; color: #fff; - &:hover { + &:hover, &.active { background-color: #62aaf5; color: #fff; } diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss index c619eb8c19..cceb1b7787 100644 --- a/cms/static/sass/_header.scss +++ b/cms/static/sass/_header.scss @@ -63,12 +63,9 @@ nav .nav-item { vertical-align: top; } -.branding, .info-course { - margin: 0 ($baseline*0.75) 0 0; -} - .branding { position: relative; + margin: 0 ($baseline*0.75) 0 0; padding-right: ($baseline*0.75); a { @@ -85,7 +82,7 @@ nav .nav-item { // specific elements - course name/info .info-course { position: relative; - margin-top: -3px; + margin: -3px ($baseline/2) 0 0; padding-right: ($baseline*0.75); @include font-size(14); @@ -172,14 +169,6 @@ nav .nav-item { } } - // current state - &.is-current { - - .title, .icon-expanded { - color: $blue; - } - } - // specific nav items &.nav-course-courseware { } @@ -204,6 +193,13 @@ nav .nav-item { .nav-account-username { width: 100%; + .icon-user { + display: inline-block; + vertical-align: middle; + margin-right: 3px; + @include font-size(12); + } + .account-username { display: inline-block; width: 80%; @@ -473,17 +469,67 @@ nav .nav-item { // ==================== // STATE: active/current nav states + +.nav-item.is-current, body.howitworks .nav-not-signedin-hiw, -body.signin .nav-not-signedin-signin, -body.signup .nav-not-signedin-signup, -body.course.outline .nav-course-courseware + +// dashboard +body.dashboard .nav-account-dashboard, + +// course content +body.course.outline .nav-course-courseware .title, +body.course.updates .nav-course-courseware .title, +body.course.pages .nav-course-courseware .title, +body.course.uploads .nav-course-courseware .title, + +body.course.outline .nav-course-courseware-outline, +body.course.updates .nav-course-courseware-updates, +body.course.pages .nav-course-courseware-pages, +body.course.uploads .nav-course-courseware-uploads, + +// course settings +body.course.schedule .nav-course-settings .title, +body.course.grading .nav-course-settings .title, +body.course.team .nav-course-settings .title, +body.course.advanced .nav-course-settings .title, + +body.course.schedule .nav-course-settings-schedule, +body.course.grading .nav-course-settings-grading, +body.course.team .nav-course-settings-team, +body.course.advanced .nav-course-settings-advanced, + +// course tools +body.course.import .nav-course-tools .title, +body.course.export .nav-course-tools .title, + +body.course.import .nav-course-tools-import, +body.course.export .nav-course-tools-export, + { + color: $blue; + a { color: $blue; } } +body.signup .nav-not-signedin-signin { + + a { + background-color: #d9e3ee; + color: #6d788b; + } +} + +body.signin .nav-not-signedin-signup { + + a { + background-color: #62aaf5; + color: #fff; + } +} + // ==================== // STATE: js enabled diff --git a/cms/static/sass/_static-pages.scss b/cms/static/sass/_static-pages.scss index 1ab3413682..4838fb8a87 100644 --- a/cms/static/sass/_static-pages.scss +++ b/cms/static/sass/_static-pages.scss @@ -29,6 +29,7 @@ &.new-component-item { margin-top: 20px; + background: transparent; } } diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 01766e2dac..5213fd25c9 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -1,7 +1,7 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="bodyclass">assets -<%block name="title">Courseware Assets +<%block name="bodyclass">is-signedin course uploads +<%block name="title">Uploads & Files <%namespace name='static' file='static_content.html'/> diff --git a/cms/templates/base.html b/cms/templates/base.html index dd32286544..498897bd11 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -5,7 +5,14 @@ - <%block name="title"></%block> + + <%block name="title"></%block> | + % if context_course: + <% ctx_loc = context_course.location %> + ${context_course.display_name} | + % endif + edX Studio + diff --git a/cms/templates/course_index.html b/cms/templates/course_index.html index a07801296f..5c8772c1ed 100644 --- a/cms/templates/course_index.html +++ b/cms/templates/course_index.html @@ -1,5 +1,4 @@ <%inherit file="base.html" /> -<%block name="title">Course Manager <%include file="widgets/header.html"/> diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html index 26b268e343..32a343c49c 100644 --- a/cms/templates/course_info.html +++ b/cms/templates/course_info.html @@ -2,7 +2,7 @@ <%namespace name='static' file='static_content.html'/> -<%block name="title">Course Info +<%block name="title">Updates <%block name="bodyclass">is-signedin course course-info updates diff --git a/cms/templates/edit-static-page.html b/cms/templates/edit-static-page.html index 368c4576b0..f1b2374b46 100644 --- a/cms/templates/edit-static-page.html +++ b/cms/templates/edit-static-page.html @@ -1,6 +1,6 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Edit Static Page +<%block name="title">Editing Static Page <%block name="bodyclass">is-signedin course pages edit-static-page <%block name="content"> diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 701d482e19..b8a7f6679e 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -1,6 +1,6 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Tabs +<%block name="title">Static Pages <%block name="bodyclass">is-signedin course pages static-pages <%block name="jsextra"> diff --git a/cms/templates/export.html b/cms/templates/export.html index 37210934f6..0f68548a84 100644 --- a/cms/templates/export.html +++ b/cms/templates/export.html @@ -2,8 +2,8 @@ <%namespace name='static' file='static_content.html'/> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Export -<%block name="bodyclass">is-signedin course export +<%block name="title">Export Course +<%block name="bodyclass">is-signedin course tools export <%block name="content">
diff --git a/cms/templates/howitworks.html b/cms/templates/howitworks.html index b4812e99e6..096a1d2819 100644 --- a/cms/templates/howitworks.html +++ b/cms/templates/howitworks.html @@ -1,7 +1,7 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Welcome to edX Studio +<%block name="title">Welcome <%block name="bodyclass">not-signedin index howitworks <%block name="content"> diff --git a/cms/templates/import.html b/cms/templates/import.html index 17df308d3b..ab06f17787 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -2,8 +2,8 @@ <%namespace name='static' file='static_content.html'/> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Import -<%block name="bodyclass">is-signedin course import +<%block name="title">Import Course +<%block name="bodyclass">is-signedin course tools import <%block name="content">
diff --git a/cms/templates/login.html b/cms/templates/login.html index 079e6cb344..66460fb0ef 100644 --- a/cms/templates/login.html +++ b/cms/templates/login.html @@ -1,6 +1,6 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Sign in +<%block name="title">Sign In <%block name="bodyclass">not-signedin signin <%block name="content"> diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index 3af4a80623..49d4bf5ea1 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -1,6 +1,6 @@ <%inherit file="base.html" /> <%block name="title">Course Staff Manager -<%block name="bodyclass">is-signedin course users team +<%block name="bodyclass">is-signedin course users settings team <%block name="content"> diff --git a/cms/templates/overview.html b/cms/templates/overview.html index f0a32bfda4..ca53c456a2 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -6,7 +6,7 @@ from datetime import datetime %> <%! from django.core.urlresolvers import reverse %> -<%block name="title">CMS Courseware Overview +<%block name="title">Course Outline <%block name="bodyclass">is-signedin course outline <%namespace name='static' file='static_content.html'/> diff --git a/cms/templates/signup.html b/cms/templates/signup.html index caade2efd8..51305a0193 100644 --- a/cms/templates/signup.html +++ b/cms/templates/signup.html @@ -1,7 +1,7 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Sign up +<%block name="title">Sign Up <%block name="bodyclass">not-signedin signup <%block name="content"> diff --git a/cms/templates/unit.html b/cms/templates/unit.html index 968dae2cf0..1b500eab69 100644 --- a/cms/templates/unit.html +++ b/cms/templates/unit.html @@ -1,7 +1,7 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> <%namespace name="units" file="widgets/units.html" /> -<%block name="title">CMS Unit +<%block name="title">Individual Unit <%block name="bodyclass">is-signedin course unit <%block name="jsextra"> diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html index 15313a4bb6..88d56d68df 100644 --- a/cms/templates/widgets/footer.html +++ b/cms/templates/widgets/footer.html @@ -3,7 +3,7 @@