From abf26dced9b3e6421be15abf82ff3a1a2bf937c0 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Wed, 15 Aug 2012 13:10:47 -0400 Subject: [PATCH] started styles --- common/static/images/search-icon.png | Bin 0 -> 1195 bytes lms/static/sass/course/wiki/_wiki.scss | 294 +++++++++--------- lms/templates/wiki/article.html | 36 +++ lms/templates/wiki/base.html | 37 ++- lms/templates/wiki/includes/article_menu.html | 47 +++ lms/templates/wiki/includes/breadcrumbs.html | 52 ++++ 6 files changed, 307 insertions(+), 159 deletions(-) create mode 100644 common/static/images/search-icon.png create mode 100644 lms/templates/wiki/article.html create mode 100644 lms/templates/wiki/includes/article_menu.html create mode 100644 lms/templates/wiki/includes/breadcrumbs.html diff --git a/common/static/images/search-icon.png b/common/static/images/search-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9ab8b34b7532a9e629701211da4cb8fb253de5c9 GIT binary patch literal 1195 zcmeAS@N?(olHy`uVBq!ia0vp^{2c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvO-#)w?G{Iz=0WwQ z;C71>PQCg-$LNEi7AdM>LcsI`V!{(HkONQpsd>QkUIa|odLHMtF)%R7db&7tKf|4A*593TbK(s3Sxv+(*QI>!_-R_wXY%S6@8|r=bN&|^Y;2rZpVb`R zKEe3f>&L&F=G|X2|1saP2~Quz98fN?{Pssb=dku` +
+

{{ article.current_revision.title }}

+
+ {% block wiki_contents_tab %} + {% wiki_render article %} + {% endblock %} +
+
+ +
+
    + {% include "wiki/includes/article_menu.html" %} +
+
+ + + + +{% endblock %} + +{% block footer_prepend %} +

{% trans "This article was last modified:" %} {{ article.current_revision.modified }}

+{% endblock %} diff --git a/lms/templates/wiki/base.html b/lms/templates/wiki/base.html index 3bfc8cd2aa..3b02690d67 100644 --- a/lms/templates/wiki/base.html +++ b/lms/templates/wiki/base.html @@ -12,20 +12,25 @@ {% include "course_navigation.html" with active_page_context="wiki" %} {% endif %} - {% block wiki_body %} - - {% if messages %} - {% for message in messages %} -
- × - {{ message }} -
- {% endfor %} - {% endif %} - - {% block wiki_breadcrumbs %}{% endblock %} - - {% block wiki_contents %}{% endblock %} - - {% endblock %} +
+ + {% block wiki_body %} + + {% block wiki_breadcrumbs %}{% endblock %} + + {% if messages %} + {% for message in messages %} +
+ × + {{ message }} +
+ {% endfor %} + {% endif %} + + {% block wiki_contents %}{% endblock %} + + {% endblock %} + +
+ {% endblock %} diff --git a/lms/templates/wiki/includes/article_menu.html b/lms/templates/wiki/includes/article_menu.html new file mode 100644 index 0000000000..fb01fd109d --- /dev/null +++ b/lms/templates/wiki/includes/article_menu.html @@ -0,0 +1,47 @@ +{% load i18n wiki_tags %}{% load url from future %} + +{% with selected_tab as selected %} + + + + + + + +
  • + + + {% trans "View" %} + +
    • +
  • + + + {% trans "Edit" %} + +
    • +
  • + + + {% trans "Changes" %} + +
    • +{% for plugin in article_tabs %} +
  • + + + {{ plugin.article_tab.0 }} + +
    • +{% endfor %} + +
  • + {% if not user.is_anonymous %} + + + {% trans "Settings" %} + + {% endif %} +
    • + +{% endwith %} diff --git a/lms/templates/wiki/includes/breadcrumbs.html b/lms/templates/wiki/includes/breadcrumbs.html new file mode 100644 index 0000000000..6afe248a29 --- /dev/null +++ b/lms/templates/wiki/includes/breadcrumbs.html @@ -0,0 +1,52 @@ +{% load i18n %}{% load url from future %} +{% if urlpath %} + +
    + + + +
    +
    + + + + + +
    +
    + + +
    +
    + +
    + + + {% trans "Add article" %} + +
    +
    + +{% endif %}