diff --git a/lms/static/sass/course/_textbook.scss b/lms/static/sass/course/_textbook.scss index 50986f5dd5f28d50eb4ffb41b508dc04a1663b11..8e88f8befd12771981a2b1956d8b2bdca2059a12 100644 --- a/lms/static/sass/course/_textbook.scss +++ b/lms/static/sass/course/_textbook.scss @@ -9,6 +9,27 @@ div.book-wrapper { ul#booknav { font-size: em(14); + .chapter-number { + + } + + .chapter { + float: left; + width: 87%; + line-height: 1.4em; + } + + .page-number { + float: right; + width: 12%; + font-size: .8em; + line-height: 2.1em; + text-align: right; + color: #9a9a9a; + opacity: 0; + @include transition(opacity .15s); + } + li { background: none; border-bottom: 0; @@ -16,9 +37,14 @@ div.book-wrapper { a { padding: 0; + @include clearfix; &:hover { background-color: transparent; + + .page-number { + opacity: 1; + } } } diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss index 72e2f56bbb915fd64202b84e3ae16d9d6fe6acf5..62a6b2539391d87e5e128ef0dc1724645267f963 100644 --- a/lms/static/sass/course/base/_extends.scss +++ b/lms/static/sass/course/base/_extends.scss @@ -185,3 +185,21 @@ h1.top-header { .tran { @include transition( all, .2s, $ease-in-out-quad); } + +.global { + h2 { + float: left; + font-size: 0.9em; + font-weight: 600; + line-height: 40px; + letter-spacing: 0; + text-transform: none; + text-shadow: 0 1px 0 #fff; + + .provider { + font: inherit; + font-weight: bold; + color: #6d6d6d; + } + } +} \ No newline at end of file diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html index f628e346f2e80f74d81bf461ceea00b6f41597df..f0242f995b87061b85867f1d6cc1c7a28a51db66 100644 --- a/lms/templates/navigation.html +++ b/lms/templates/navigation.html @@ -7,11 +7,16 @@ <header class="global" aria-label="Global Navigation"> <nav> <h1 class="logo"><a href="${reverse('root')}"></a></h1> - <ol class="left"> + + %if course: + <h2><span class="provider">${course.org}:</span> ${course.number} ${course.title}</h2> + %else: + <ol class="left"> <li class="primary"> <a href="${reverse('courses')}">Find Courses</a> </li> </ol> + %endif %if user.is_authenticated(): <ol class="user"> diff --git a/lms/templates/staticbook.html b/lms/templates/staticbook.html index 804676de97b9f12f866e69ae6ba3d18b2eedc11c..2a0a6f03bbd47508b2f54495cff87e40f338fec1 100644 --- a/lms/templates/staticbook.html +++ b/lms/templates/staticbook.html @@ -75,7 +75,14 @@ $("#open_close_accordion a").click(function(){ <%def name="print_entry(entry)"> <li> <a href="javascript:goto_page(${entry.get('page')})"> - ${' '.join(entry.get(attribute, '') for attribute in ['chapter', 'name', 'page_label'])} + <span class="chapter"> + %if entry.get('chapter'): + <span class="chapter-number">${entry.get('chapter')}.</span> ${entry.get('name')} + %else: + ${entry.get('name')} + %endif + </span> + <span class="page-number">${entry.get('page_label')}</span> </a> % if len(entry) > 0: <ul>