Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add images for book and fix styles for wiki

Browse Source
This commit is contained in:
Kyle Fiedler
2012-08-06 13:33:33 -04:00
parent a090d62339
commit ac960ab9df
7 changed files with 63 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lms/static/images/textbook/textbook-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 783 B

BIN
lms/static/images/textbook/textbook-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 822 B

17
lms/static/sass/course/_info.scss
View File

@@ -76,27 +76,14 @@ div.info-wrapper {
h1 {
@extend .bottom-border;
padding: lh(.5) lh(.5);
}
header {
// h1 {
// font-weight: 100;
// font-style: italic;
// }
p {
color: #666;
font-size: 12px;
margin-bottom: 0;
margin-top: 4px;
}
margin-bottom: 0;
}
ol {
background: none;
list-style: none;
padding-left: 0;
margin: 0;
li {
@extend .clearfix;

2
lms/static/sass/course/base/_extends.scss
View File

@@ -74,7 +74,7 @@ h1.top-header {
}
.bottom-border {
border-bottom: 1px solid #d3d3d3;
border-bottom: 1px solid $border-color;
}
@media print {

68
lms/static/sass/course/wiki/_sidebar.scss
View File

@@ -4,78 +4,70 @@ div#wiki_panel {
h2 {
@extend .bottom-border;
font-size: 18px;
margin: 0 ;
padding: lh(.5) lh();
}
input[type="button"] {
background: transparent;
border: none;
@include box-shadow(none);
color: #666;
font-size: 14px;
font-weight: bold;
margin: 0px;
padding: 7px lh();
text-align: left;
@include transition();
width: 100%;
padding: lh(.5) lh() lh(.5) 0;
color: #000;
}
ul {
padding-left: 0;
margin: 0;
li {
@include box-shadow(inset 0 1px 0 0 #eee);
border-top: 1px solid #d3d3d3;
&:hover {
background: #efefef;
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
}
&:first-child {
border: none;
}
@extend .bottom-border;
&.search {
padding: 10px lh();
padding: 10px lh() 10px 0;
label {
display: none;
}
}
&.create-article {
h3 {
}
}
a {
color: #666;
font-size: 14px;
padding: 7px lh();
padding: 7px lh() 7px 0;
&:hover {
background: #efefef;
}
}
}
form {
input[type="submit"]{
@extend .light-button;
text-transform: none;
text-shadow: none;
}
}
}
div#wiki_create_form {
@extend .clearfix;
background: #dadada;
border-bottom: 1px solid #d3d3d3;
padding: 15px;
padding: lh(.5) lh() lh(.5) 0;
label {
font-family: $sans-serif;
margin-bottom: lh(.5);
}
input[type="text"] {
@include box-sizing(border-box);
display: block;
margin-bottom: 6px;
width: 100%;
margin-bottom: lh(.5);
}
ul {
list-style: none;
margin: 0;
li {
float: left;
border-bottom: 0;
&#cancel {
float: right;

2
lms/templates/main.html
View File

@@ -25,9 +25,9 @@
<%include file="navigation.html" />
<section class="content-wrapper">
${self.body()}
<%block name="bodyextra"/>
</section>
<%block name="bodyextra"/>
<%include file="footer.html" />
<%static:js group='application'/>

58
lms/templates/simplewiki/simplewiki_base.html
View File

@@ -71,9 +71,9 @@
});
</script>
<%block name="wiki_head"/>
</%block>
<%block name="bodyextra">
@@ -86,7 +86,7 @@
<div class="wiki-wrapper">
<%block name="wiki_panel">
<div aria-label="Wiki Navigation" id="wiki_panel">
<h2>Course Wiki</h2>
<h2>Course Wiki</h2>
<ul class="action">
<li>
<h3>
@@ -101,12 +101,12 @@
<div id="wiki_create_form">
<%
baseURL = wiki_reverse("wiki_create", course=course, kwargs={"article_path" : namespace + "/" })
baseURL = wiki_reverse("wiki_create", course=course, kwargs={"article_path" : namespace + "/" })
%>
<form method="GET" onsubmit="this.action='${baseURL}' + this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '');">
<div>
<label for="id_wiki_article_name">Title of article</label>
<input type="text" name="wiki_article_name" id="id_wiki_article_name" /><br/>
<input type="text" name="wiki_article_name" id="id_wiki_article_name" />
</div>
<ul>
<li>
@@ -130,31 +130,31 @@
</%block>
<section class="wiki-body">
%if wiki_article is not UNDEFINED:
<header>
%if wiki_article.locked:
<p><strong>This article has been locked</strong></p>
%endif
<p>Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}</p>
%endif
%if wiki_article is not UNDEFINED:
<ul>
<li>
<a href="${ wiki_reverse('wiki_view', wiki_article, course)}" class="view">View</a>
</li>
<li>
<a href="${ wiki_reverse('wiki_edit', wiki_article, course)}" class="edit">Edit</a>
</li>
<li>
<a href="${ wiki_reverse('wiki_history', wiki_article, course)}" class="history">History</a>
</li>
</ul>
</header>
%if wiki_article is not UNDEFINED:
<header>
%if wiki_article.locked:
<p><strong>This article has been locked</strong></p>
%endif
<p>Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}</p>
%endif
%if wiki_article is not UNDEFINED:
<ul>
<li>
<a href="${ wiki_reverse('wiki_view', wiki_article, course)}" class="view">View</a>
</li>
<li>
<a href="${ wiki_reverse('wiki_edit', wiki_article, course)}" class="edit">Edit</a>
</li>
<li>
<a href="${ wiki_reverse('wiki_history', wiki_article, course)}" class="history">History</a>
</li>
</ul>
</header>
%endif
<%block name="wiki_page_title"/>
<%block name="wiki_body"/>