Skip to content

E
edx-platform
Commit abf26dce by Tom Giannattasio
Options

started styles

parent 9f770ef9
Showing with 263 additions and 114 deletions
lms/static/sass/course/wiki/_wiki.scss
div.wiki-wrapper { section.wiki {
display: table; padding-top: 25px;
width: 100%;
section.wiki-body {
@extend .clearfix;
@extend .content;
@include border-radius(0 4px 4px 0);
position: relative;
header { header {
@extend .topbar; height: 33px;
@include border-radius(0 4px 0 0); margin-bottom: 50px;
height:46px; padding-bottom: 26px;
overflow: hidden; border-bottom: 1px solid $light-gray;
&:empty {
border-bottom: 0;
display: none !important;
} }
a { .pull-left {
@extend .block-link;
}
p {
float: left; float: left;
line-height: 46px;
margin-bottom: 0;
padding-left: lh();
} }
ul { .pull-right {
float: right; float: right;
}
/*-----------------
Breadcrumbs
-----------------*/
.breadcrumb {
list-style: none; list-style: none;
padding-left: 0;
margin: 0;
li { li {
float: left; float: left;
margin-right: 10px;
font-size: 0.9em;
line-height: 31px;
input[type="button"] { &:after {
@extend .block-link; content: '›';
background-position: 12px center; display: inline-block;
background-repeat: no-repeat; margin-left: 10px;
border: 0; color: $base-font-color;
border-left: 1px solid darken(#f6efd4, 20%); }
@include border-radius(0); }
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); }
display: block;
font-size: 12px;
font-weight: normal;
letter-spacing: 1px;
line-height: 46px;
margin: 0;
padding: 0 lh() 0 38px;
text-shadow: none;
text-transform: uppercase;
@include transition();
&.view { .dropdown-menu {
background-image: url('../images/sequence-nav/view.png'); display: none;
} }
&.history {
background-image: url('../images/sequence-nav/history.png');
/*-----------------
Global Functions
-----------------*/
.global-functions {
display: block;
width: auto;
} }
&.edit { .add-article-btn {
background-image: url('../images/sequence-nav/edit.png'); @include button(simple, #eee);
margin-left: 25px;
padding: 7px 15px !important;
font-size: 0.72em;
font-weight: 600;
} }
&:hover { .search-wiki {
background-color: transparent; margin-top: 3px;
input {
width: 180px;
height: 27px;
padding: 0 15px 0 35px;
background: url(../images/search-icon.png) no-repeat 9px center #f6f6f6;
border: 1px solid #c8c8c8;
border-radius: 14px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.12) inset;
font-family: $sans-serif;
font-size: 12px;
outline: none;
@include transition(border-color .1s);
&:-webkit-input-placholder {
font-style: italic;
} }
&:focus {
border-color: $blue;
} }
} }
} }
/*-----------------
Article
-----------------*/
h1 {
font-weight: bold;
letter-spacing: 0;
} }
h2.wiki-title { .main-article {
@include box-sizing(border-box);
display: inline-block;
float: left; float: left;
margin-bottom: 15px; width: flex-grid(9);
margin-top: 0;
padding-right: flex-gutter(9);
vertical-align: top;
width: flex-grid(2.5, 9);
@media screen and (max-width:900px) {
border-right: 0;
display: block;
width: auto;
}
@media print { h2 {
border-right: 0; font-weight: bold;
display: block; text-transform: none;
width: auto; letter-spacing: 0;
font-size: 1.33em;
} }
} }
p { .article-functions {
line-height: 1.6em;
}
section.results {
border-left: 1px dashed #ddd;
@include box-sizing(border-box);
display: inline-block;
float: left; float: left;
padding-left: 10px; width: flex-grid(2);
width: flex-grid(6.5, 9); margin-left: flex-grid(1);
@media screen and (max-width:900px) {
border: 0;
display: block;
padding-left: 0;
width: 100%;
width: auto;
} }
@media print { .nav-tabs {
display: block; list-style: none;
padding: 0; padding: 0;
width: auto; margin: 0;
canvas, img { li {
page-break-inside: avoid; margin-left: 20px;
} }
} }
ul.article-list {
margin-left: 15px;
width: 100%;
@media screen and (max-width:900px) {
margin-left: 0px;
}
li { /*-----------------
border-bottom: 1px solid #eee;
list-style: none;
margin: 0;
padding: 10px 0;
&:last-child { Alerts
border-bottom: 0;
}
h3 { -----------------*/
font-size: 18px;
font-weight: normal; .alert {
} position: relative;
} top: -35px;
} margin-bottom: 24px;
padding: 8px 12px;
border: 1px solid #EBE8BF;
border-radius: 3px;
background: $yellow;
font-size: 0.9em;
.close {
position: absolute;
right: 12px;
font-size: 1.3em;
top: 6px;
color: #999;
text-decoration: none;
} }
} }
} }
\ No newline at end of file
lms/templates/wiki/article.html 0 → 100644
{% extends "wiki/base.html" %}
{% load wiki_tags i18n %}
{% load url from future %}
{% block pagetitle %}{{ article.current_revision.title }}{% endblock %}
{% block wiki_breadcrumbs %}
{% include "wiki/includes/breadcrumbs.html" %}
{% endblock %}
{% block wiki_contents %}
<div class="tabbable tabs-top" style="margin-top: 20px;">
<article class="main-article">
<h1 style="margin-top: -10px;">{{ article.current_revision.title }}</h1>
<div class="tab-content">
{% block wiki_contents_tab %}
{% wiki_render article %}
{% endblock %}
</div>
</article>
<div class="article-functions">
<ul class="nav nav-tabs">
{% include "wiki/includes/article_menu.html" %}
</ul>
</div>
</div>
{% endblock %}
{% block footer_prepend %}
<p style="margin-bottom: 10px;"><em>{% trans "This article was last modified:" %} {{ article.current_revision.modified }}</em></p>
{% endblock %}
lms/templates/wiki/base.html
...@@ -12,8 +12,12 @@ ...@@ -12,8 +12,12 @@
{% include "course_navigation.html" with active_page_context="wiki" %} {% include "course_navigation.html" with active_page_context="wiki" %}
{% endif %} {% endif %}
<section class="container wiki">
{% block wiki_body %} {% block wiki_body %}
{% block wiki_breadcrumbs %}{% endblock %}
{% if messages %} {% if messages %}
{% for message in messages %} {% for message in messages %}
<div class="alert alert-{{ message.tags }}"> <div class="alert alert-{{ message.tags }}">
...@@ -23,9 +27,10 @@ ...@@ -23,9 +27,10 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% block wiki_breadcrumbs %}{% endblock %}
{% block wiki_contents %}{% endblock %} {% block wiki_contents %}{% endblock %}
{% endblock %} {% endblock %}
</section>
{% endblock %} {% endblock %}
lms/templates/wiki/includes/article_menu.html 0 → 100644
{% load i18n wiki_tags %}{% load url from future %}
{% with selected_tab as selected %}
<li class="{% if selected == "view" %} active{% endif %}">
<a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}">
<span class="icon-home"></span>
{% trans "View" %}
</a>
</li>
<li class="{% if selected == "edit" %} active{% endif %}">
<a href="{% url 'wiki:edit' article_id=article.id path=urlpath.path %}">
<span class="icon-edit"></span>
{% trans "Edit" %}
</a>
</li>
<li class="{% if selected == "history" %} active{% endif %}">
<a href="{% url 'wiki:history' article_id=article.id path=urlpath.path %}">
<span class="icon-time"></span>
{% trans "Changes" %}
</a>
</li>
{% for plugin in article_tabs %}
<li class="{% if selected == plugin.slug %} active{% endif %}">
<a href="{% url 'wiki:plugin' slug=plugin.slug article_id=article.id path=urlpath.path %}">
<span class="{{ plugin.article_tab.1 }}"></span>
{{ plugin.article_tab.0 }}
</a>
</li>
{% endfor %}
<li class="{% if selected == "settings" %} active{% endif %}">
{% if not user.is_anonymous %}
<a href="{% url 'wiki:settings' article_id=article.id path=urlpath.path %}">
<span class="icon-wrench"></span>
{% trans "Settings" %}
</a>
{% endif %}
</li>
{% endwith %}
lms/templates/wiki/includes/breadcrumbs.html 0 → 100644
{% load i18n %}{% load url from future %}
{% if urlpath %}
<header>
<ul class="breadcrumb pull-left" class="">
{% for ancestor in urlpath.get_ancestors.all %}
<li><a href="{% url 'wiki:get' path=ancestor.path %}">{{ ancestor.article.current_revision.title }}</a></li>
{% endfor %}
<li class="active"><a href="{% url 'wiki:get' path=urlpath.path %}">{{ article.current_revision.title }}</a></li>
</ul>
<div class="pull-left" style="margin-left: 10px;">
<div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#" style="padding: 7px;" title="{% trans "Sub-articles for" %} {{ article.current_revision.title }}">
<span class="icon-list"></span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
{% for child in children_slice %}
<li>
<a href="{% url 'wiki:get' path=child.path %}">
{{ child.article.current_revision.title }}
</a>
</li>
{% empty %}
<li><a href="#"><em>{% trans "No sub-articles" %}</em></a></li>
{% endfor %}
{% if children_slice_more %}
<li><a href="#"><em>{% trans "...and more" %}</em></a></li>
{% endif %}
<li class="divider"></li>
<li>
<a href="" onclick="alert('TODO')">{% trans "List sub-pages" %} &raquo;</a>
</li>
</ul>
</div>
</div>
<div class="global-functions pull-right">
<form class="search-wiki pull-left">
<input type="search" placeholder="search wiki" />
</form>
<a class="add-article-btn btn pull-left" href="{% url 'wiki:create' path=urlpath.path %}" style="padding: 7px;">
<span class="icon-plus"></span>
{% trans "Add article" %}
</a>
</div>
</header>
{% endif %}
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