added styles for main article, sidebar and breadcrumb

This commit is contained in:
Tom Giannattasio
2012-08-15 15:59:46 -04:00
parent 8daea9c465
commit 13c2bb588e
4 changed files with 165 additions and 17 deletions

View File

@@ -10,17 +10,20 @@
{% block wiki_contents %}
<div class="tabbable tabs-top" style="margin-top: 20px;">
<div class="article-wrapper">
<article class="main-article">
<h1 style="margin-top: -10px;">{{ article.current_revision.title }}</h1>
<div class="tab-content">
<h1>{{ article.current_revision.title }}</h1>
{% block wiki_contents_tab %}
{% wiki_render article %}
{% endblock %}
</div>
{% endblock %}
</article>
<div class="article-functions">
<div class="timestamp">
<span class="label">{% trans "Last modified:" %}</span><br />
<span class="date">{{ article.current_revision.modified }}</span>
</div>
<ul class="nav nav-tabs">
{% include "wiki/includes/article_menu.html" %}
</ul>
@@ -32,5 +35,5 @@
{% endblock %}
{% block footer_prepend %}
<p style="margin-bottom: 10px;"><em>{% trans "This article was last modified:" %} {{ article.current_revision.modified }}</em></p>
<p><em>{% trans "This article was last modified:" %} {{ article.current_revision.modified }}</em></p>
{% endblock %}

View File

@@ -10,26 +10,26 @@
<li class="{% if selected == "view" %} active{% endif %}">
<a href="{% url 'wiki:get' article_id=article.id path=urlpath.path %}">
<span class="icon-home"></span>
<span class="icon icon-view"></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>
<span class="icon 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>
<span class="icon icon-changes"></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>
<span class="icon icon-attachments {{ plugin.article_tab.1 }}"></span>
{{ plugin.article_tab.0 }}
</a>
</li>
@@ -38,7 +38,7 @@
<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>
<span class="icon icon-settings"></span>
{% trans "Settings" %}
</a>
{% endif %}