Commit b725dc0d by Chris Committed by GitHub

Merge pull request #12744 from edx/clrux/ac-455

AC-455 adding main to PDF books; styling chapters
parents d5c0e25a 079b2df4
...@@ -27,20 +27,15 @@ div.book-wrapper { ...@@ -27,20 +27,15 @@ div.book-wrapper {
border-right: none; border-right: none;
width: 180px; width: 180px;
ul#booknav { #booknav {
font-size: em(14); list-style: none;
.chapter-number {
}
.chapter { .chapter {
float: left;
width: 87%;
line-height: 1.4em; line-height: 1.4em;
} }
.page-number { .page-number {
float: right; @include float(right);
width: 12%; width: 12%;
font-size: .8em; font-size: .8em;
line-height: 2.1em; line-height: 2.1em;
...@@ -59,7 +54,6 @@ div.book-wrapper { ...@@ -59,7 +54,6 @@ div.book-wrapper {
@include clearfix(); @include clearfix();
padding: 0; padding: 0;
color: $link-color; color: $link-color;
cursor: pointer;
&:hover, &:focus { &:hover, &:focus {
background-color: transparent; background-color: transparent;
...@@ -231,6 +225,3 @@ div.book-wrapper { ...@@ -231,6 +225,3 @@ div.book-wrapper {
} }
} }
} }
...@@ -118,6 +118,7 @@ from openedx.core.djangolib.js_utils import ( ...@@ -118,6 +118,7 @@ from openedx.core.djangolib.js_utils import (
<%include file="/courseware/course_navigation.html" args="active_page='htmltextbook/{0}'.format(book_index)" /> <%include file="/courseware/course_navigation.html" args="active_page='htmltextbook/{0}'.format(book_index)" />
<div id="outerContainer"> <div id="outerContainer">
<main id="main" aria-label="${_('Content')}" tabindex="-1">
<div id="mainContainer" class="book-wrapper"> <div id="mainContainer" class="book-wrapper">
%if 'chapters' in textbook: %if 'chapters' in textbook:
...@@ -146,5 +147,5 @@ from openedx.core.djangolib.js_utils import ( ...@@ -146,5 +147,5 @@ from openedx.core.djangolib.js_utils import (
<span class="idU" style="display:none">${student.id}</span> <span class="idU" style="display:none">${student.id}</span>
<span class="idDU" style="display:none">${student.username}</span> <span class="idDU" style="display:none">${student.username}</span>
</div> </div>
</main>
</div> </div>
...@@ -26,7 +26,8 @@ $(function(){ ...@@ -26,7 +26,8 @@ $(function(){
}); });
</script> </script>
<div class="book-wrapper"> <main id="main" aria-label="${_('Content')}" tabindex="-1">
<div class="book-wrapper">
%if 'chapters' in textbook: %if 'chapters' in textbook:
<section class="book-sidebar" aria-label="${_('Textbook Navigation')}"> <section class="book-sidebar" aria-label="${_('Textbook Navigation')}">
<ul id="booknav"> <ul id="booknav">
...@@ -39,8 +40,8 @@ $(function(){ ...@@ -39,8 +40,8 @@ $(function(){
</section> </section>
%endif %endif
<div class="book"> <div class="book">
<iframe <iframe
title="${current_chapter['title']|h}" title="${current_chapter['title']|h}"
id="viewer-frame" id="viewer-frame"
src="${request.path}?viewer=true${viewer_params}" src="${request.path}?viewer=true${viewer_params}"
...@@ -48,5 +49,6 @@ $(function(){ ...@@ -48,5 +49,6 @@ $(function(){
height="1108" height="1108"
frameborder="0" frameborder="0"
seamless></iframe> seamless></iframe>
</div> </div>
</div> </div>
</main>
...@@ -76,6 +76,7 @@ $("#open_close_accordion a").click(function(){ ...@@ -76,6 +76,7 @@ $("#open_close_accordion a").click(function(){
<%include file="/courseware/course_navigation.html" args="active_page='textbook/{0}'.format(book_index)" /> <%include file="/courseware/course_navigation.html" args="active_page='textbook/{0}'.format(book_index)" />
<section class="container"> <section class="container">
<main id="main" aria-label="${_('Content')}" tabindex="-1">
<div class="book-wrapper"> <div class="book-wrapper">
<section aria-label="${_('Textbook Navigation')}" class="book-sidebar"> <section aria-label="${_('Textbook Navigation')}" class="book-sidebar">
...@@ -130,4 +131,5 @@ $("#open_close_accordion a").click(function(){ ...@@ -130,4 +131,5 @@ $("#open_close_accordion a").click(function(){
</section> </section>
</section> </section>
</div> </div>
</main>
</section> </section>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment