Skip to content

D
django-wiki
Commit 45cd25e6 by benjaoming
Options

clean up block tags to be prefixed 'wiki_*'

parent 0911c58b
Showing with 25 additions and 22 deletions
wiki/templates/wiki/accounts/login.html
{% extends "wiki/base.html" %} {% extends "wiki/base.html" %}
{% load i18n wiki_tags sekizai_tags %} {% load i18n wiki_tags sekizai_tags %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "Log in" %}{% endblock %} {% block wiki_pagetitle %}wiki_pagetitle{% trans "Log in" %}{% endblock %}
{% block wiki_contents %} {% block wiki_contents %}
<h1 class="page-header">{% trans "Please log in" %}</h1> <h1 class="page-header">{% trans "Please log in" %}</h1>
......
wiki/templates/wiki/accounts/signup.html
{% extends "wiki/base.html" %} {% extends "wiki/base.html" %}
{% load i18n wiki_tags sekizai_tags %} {% load i18n wiki_tags sekizai_tags %}
{% block pagetitle %}{% trans "Sign up" %}{% endblock %} {% block wiki_pagetitle %}{% trans "Sign up" %}{% endblock %}
{% block wiki_contents %} {% block wiki_contents %}
<h1 class="page-header">{% trans "Sign up" %}</h1> <h1 class="page-header">{% trans "Sign up" %}</h1>
......
wiki/templates/wiki/article.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n sekizai_tags %} {% load wiki_tags i18n sekizai_tags %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{{ article.current_revision.title }}{% endblock %} {% block wiki_pagetitle %}{{ article.current_revision.title }}{% endblock %}
{% block wiki_breadcrumbs %} {% block wiki_breadcrumbs %}
{% include "wiki/includes/breadcrumbs.html" %} {% include "wiki/includes/breadcrumbs.html" %}
......
wiki/templates/wiki/base.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{% block pagetitle %}{% endblock %} - django-\/\/ i K |</title> <title>{% block wiki_pagetitle %}{% endblock %} - django-\/\/ i K |</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content="www.django-wiki.org"> <meta name="author" content="www.django-wiki.org">
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
{% block wiki_body %} {% block wiki_body %}
{% block navbar %} {% block wiki_navbar %}
<div class="navbar navbar-fixed-top navbar-inverse"> <div class="navbar navbar-fixed-top navbar-inverse">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
...@@ -83,14 +83,16 @@ ...@@ -83,14 +83,16 @@
<li class="active"><a href="/">Home</a></li> <li class="active"><a href="/">Home</a></li>
<li><a href="https://github.com/benjaoming/django-wiki" target="_blank">About</a></li> <li><a href="https://github.com/benjaoming/django-wiki" target="_blank">About</a></li>
</ul> </ul>
</div><!--/.nav-collapse --> </div>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
<div class="container" style="margin-top: 60px;"> <div class="container" style="margin-top: 60px;">
{% if messages %} {% if messages %}
<!-- Messages for this instance -->
{% for message in messages %} {% for message in messages %}
<div class="alert alert-{{ message.tags }}"> <div class="alert alert-{{ message.tags }}">
<a class="close" data-dismiss="alert" href="#">&times;</a> <a class="close" data-dismiss="alert" href="#">&times;</a>
...@@ -98,11 +100,12 @@ ...@@ -98,11 +100,12 @@
</div> </div>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<!-- Reserved for breadcrumbs -->
{% block wiki_breadcrumbs %}{% endblock %} {% block wiki_breadcrumbs %}{% endblock %}
{% block wiki_contents %}
<h1>Bootstrap starter template</h1> <!-- Main page contents go here -->
<p>Use this document as a way to quick start any new project.<br> All you get is this message and a barebones HTML document.</p> {% block wiki_contents %}{% endblock %}
{% endblock %}
<footer id="wiki-footer"> <footer id="wiki-footer">
<hr /> <hr />
......
wiki/templates/wiki/create.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n sekizai_tags %} {% load wiki_tags i18n sekizai_tags %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "Add new article" %}{% endblock %} {% block wiki_pagetitle %}{% trans "Add new article" %}{% endblock %}
{% block wiki_contents %} {% block wiki_contents %}
......
wiki/templates/wiki/create_root.html
{% extends "wiki/base.html" %} {% extends "wiki/base.html" %}
{% load wiki_tags i18n sekizai_tags %} {% load wiki_tags i18n sekizai_tags %}
{% block pagetitle %}{% trans "Create root article" %}{% endblock %} {% block wiki_pagetitle %}{% trans "Create root article" %}{% endblock %}
{% block wiki_contents %} {% block wiki_contents %}
......
wiki/templates/wiki/delete.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n sekizai_tags %} {% load wiki_tags i18n sekizai_tags %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "Delete article" %}{% endblock %} {% block wiki_pagetitle %}{% trans "Delete article" %}{% endblock %}
{% block wiki_contents %} {% block wiki_contents %}
<h1 class="page-header">{% trans "Delete" %} "{{ article.current_revision.title }}"</h1> <h1 class="page-header">{% trans "Delete" %} "{{ article.current_revision.title }}"</h1>
......
wiki/templates/wiki/deleted.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n sekizai_tags %} {% load wiki_tags i18n sekizai_tags %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "Article deleted" %}{% endblock %} {% block wiki_pagetitle %}{% trans "Article deleted" %}{% endblock %}
{% block wiki_contents %} {% block wiki_contents %}
<style type="text/css"> <style type="text/css">
......
wiki/templates/wiki/dir.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n humanize %} {% load wiki_tags i18n humanize %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "Listing articles in" %} {{ article.current_revision.title }}{% endblock %} {% block wiki_pagetitle %}{% trans "Listing articles in" %} {{ article.current_revision.title }}{% endblock %}
{% block wiki_contents_tab %} {% block wiki_contents_tab %}
......
wiki/templates/wiki/edit.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n %} {% load wiki_tags i18n %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "Edit" %}: {{ article.current_revision.title }}{% endblock %} {% block wiki_pagetitle %}{% trans "Edit" %}: {{ article.current_revision.title }}{% endblock %}
{% block wiki_contents_tab %} {% block wiki_contents_tab %}
......
wiki/templates/wiki/error.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n %} {% load wiki_tags i18n %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% if article %}{{ article.current_revision.title }}{% else %}{% trans "Error" %}{% endif %}{% endblock %} {% block wiki_pagetitle %}{% if article %}{{ article.current_revision.title }}{% else %}{% trans "Error" %}{% endif %}{% endblock %}
{% block wiki_breadcrumbs %} {% block wiki_breadcrumbs %}
{% include "wiki/includes/breadcrumbs.html" %} {% include "wiki/includes/breadcrumbs.html" %}
......
wiki/templates/wiki/history.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n sekizai_tags %} {% load wiki_tags i18n sekizai_tags %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "History" %}: {{ article.current_revision.title }}{% endblock %} {% block wiki_pagetitle %}{% trans "History" %}: {{ article.current_revision.title }}{% endblock %}
{% block wiki_contents_tab %} {% block wiki_contents_tab %}
......
wiki/templates/wiki/permission_denied.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n %} {% load wiki_tags i18n %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}Permission Denied{% endblock %} {% block wiki_pagetitle %}Permission Denied{% endblock %}
{% block wiki_contents %} {% block wiki_contents %}
<h1 class="page-header">{% trans "Permission Denied" %}</h1> <h1 class="page-header">{% trans "Permission Denied" %}</h1>
......
wiki/templates/wiki/search.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n humanize %} {% load wiki_tags i18n humanize %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "Search results for:" %} {{ search_query }}{% endblock %} {% block wiki_pagetitle %}{% trans "Search results for:" %} {{ search_query }}{% endblock %}
{% block wiki_contents %} {% block wiki_contents %}
......
wiki/templates/wiki/settings.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n %} {% load wiki_tags i18n %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "Settings" %}: {{ article.current_revision.title }}{% endblock %} {% block wiki_pagetitle %}{% trans "Settings" %}: {{ article.current_revision.title }}{% endblock %}
{% block wiki_contents_tab %} {% block wiki_contents_tab %}
......
wiki/templates/wiki/source.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% load wiki_tags i18n humanize %} {% load wiki_tags i18n humanize %}
{% load url from future %} {% load url from future %}
{% block pagetitle %}{% trans "Source of" %} {{ article.current_revision.title }}{% endblock %} {% block wiki_pagetitle %}{% trans "Source of" %} {{ article.current_revision.title }}{% endblock %}
{% block wiki_contents_tab %} {% block wiki_contents_tab %}
......
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