Skip to content

D
django-wiki
Commit 68e6c329 by Michael Farrell
Options

added text editor backup files to gitignore; fix url tags so they are django… 

added text editor backup files to gitignore; fix url tags so they are django 1.3-style, so it works properly with django 1.5 (which requires it)
parent 35009996
Showing with 28 additions and 20 deletions
.gitignore
...@@ -27,3 +27,7 @@ virtualenv ...@@ -27,3 +27,7 @@ virtualenv
#Mr Developer #Mr Developer
.mr.developer.cfg .mr.developer.cfg
# text editors
*~
*.swp
wiki/templates/wiki/base.html
{% load sekizai_tags %}<!DOCTYPE html> {% load sekizai_tags %}{% load url from future %}<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="{% url wiki:root %}">django-wiki</a> <a class="brand" href="{% url 'wiki:root' %}">django-wiki</a>
<div class="nav-collapse"> <div class="nav-collapse">
<ul class="nav"> <ul class="nav">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
......
wiki/templates/wiki/create.html
{% extends "wiki/base.html" %} {% extends "wiki/base.html" %}
{% load wiki_tags i18n sekizai_tags %} {% load wiki_tags i18n sekizai_tags %}
{% load url from future %}
{% block pagetitle %}{% trans "Add new article" %}{% endblock %} {% block pagetitle %}{% trans "Add new article" %}{% endblock %}
...@@ -10,7 +11,7 @@ ...@@ -10,7 +11,7 @@
<form method="POST" class="form-horizontal"> <form method="POST" class="form-horizontal">
{% wiki_form create_form %} {% wiki_form create_form %}
<div class="form-actions"> <div class="form-actions">
<a href="{% url wiki:get_url parent_urlpath.path %}" class="btn btn-large"> <a href="{% url 'wiki:get_url' parent_urlpath.path %}" class="btn btn-large">
<span class="icon-circle-arrow-left"></span> <span class="icon-circle-arrow-left"></span>
{% trans "Go back" %} {% trans "Go back" %}
</a> </a>
......
wiki/templates/wiki/edit.html
{% extends "wiki/base.html" %} {% extends "wiki/base.html" %}
{% load wiki_tags i18n %} {% load wiki_tags i18n %}
{% load url from future %}
{% block pagetitle %}{% trans "Edit" %}: {% article_for_object urlpath as article %}{{ article.current_revision.title }}{% endblock %} {% block pagetitle %}{% trans "Edit" %}: {% article_for_object urlpath as article %}{{ article.current_revision.title }}{% endblock %}
...@@ -28,11 +29,11 @@ ...@@ -28,11 +29,11 @@
<form method="POST" class="form-horizontal"> <form method="POST" class="form-horizontal">
{% include "wiki/includes/editor.html" %} {% include "wiki/includes/editor.html" %}
<div class="form-actions"> <div class="form-actions">
<button type="submit" name="preview" value="1" class="btn btn-large" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.action='{% url wiki:preview_url urlpath.path %}'"> <button type="submit" name="preview" value="1" class="btn btn-large" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.action='{% url 'wiki:preview_url' urlpath.path %}'">
<span class="icon-eye-open"></span> <span class="icon-eye-open"></span>
{% trans "Preview" %} {% trans "Preview" %}
</button> </button>
<button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url wiki:edit_url urlpath.path %}'"> <button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit_url' urlpath.path %}'">
<span class="icon-ok"></span> <span class="icon-ok"></span>
{% trans "Save changes" %} {% trans "Save changes" %}
</button> </button>
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
<span class="icon-circle-arrow-left"></span> <span class="icon-circle-arrow-left"></span>
{% trans "Back to editor" %} {% trans "Back to editor" %}
</a> </a>
<button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url wiki:edit_url urlpath.path %}'"> <button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit_url' urlpath.path %}'">
<span class="icon-ok"></span> <span class="icon-ok"></span>
{% trans "Save changes" %} {% trans "Save changes" %}
</button> </button>
......
wiki/templates/wiki/history.html
{% extends "wiki/base.html" %} {% extends "wiki/base.html" %}
{% load wiki_tags i18n sekizai_tags %} {% load wiki_tags i18n sekizai_tags %}
{% load url from future %}
{% block pagetitle %}{% trans "History" %}: {% article_for_object urlpath as article %}{{ article.current_revision.title }}{% endblock %} {% block pagetitle %}{% trans "History" %}: {% article_for_object urlpath as article %}{{ article.current_revision.title }}{% endblock %}
...@@ -76,7 +77,7 @@ ...@@ -76,7 +77,7 @@
<div class="accordion" id="accordion{{ revision.revision_number }}"> <div class="accordion" id="accordion{{ revision.revision_number }}">
<div class="accordion-group"> <div class="accordion-group">
<div class="accordion-heading"> <div class="accordion-heading">
<a class="accordion-toggle" style="float: left;" href="#collapse{{ revision.revision_number }}" onclick="get_diff_json('{% url wiki:diff revision.id %}', $('#collapse{{ revision.revision_number }}'))"> <a class="accordion-toggle" style="float: left;" href="#collapse{{ revision.revision_number }}" onclick="get_diff_json('{% url 'wiki:diff' revision.id %}', $('#collapse{{ revision.revision_number }}'))">
{{ revision.created }} (#{{ revision.revision_number }}) by {% if revision.user %}{{ revision.user }}{% else %}{% if user.is_superuser %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %} {{ revision.created }} (#{{ revision.revision_number }}) by {% if revision.user %}{{ revision.user }}{% else %}{% if user.is_superuser %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %}
{% if revision == article.current_revision %} {% if revision == article.current_revision %}
<strong>*</strong> <strong>*</strong>
...@@ -92,17 +93,17 @@ ...@@ -92,17 +93,17 @@
{% trans "Preview this version" %} {% trans "Preview this version" %}
</a> </a>
{% else %} {% else %}
<button type="submit" class="btn" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.action='{% url wiki:preview_revision article.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url wiki:change_revision_url urlpath.path revision.id %}')"> <button type="submit" class="btn" onclick="$('#previewModal').modal('show'); this.form.target='previewWindow'; this.form.action='{% url 'wiki:preview_revision' article.id %}'; $('#previewModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision_url' urlpath.path revision.id %}')">
<span class="icon-eye-open"></span> <span class="icon-eye-open"></span>
{% trans "Preview this version" %} {% trans "Preview this version" %}
</button> </button>
{% endif %} {% endif %}
<a class="btn btn-info" href="#collapse{{ revision.revision_number }}" onclick="get_diff_json('{% url wiki:diff revision.id %}', $('#collapse{{ revision.revision_number }}'))"> <a class="btn btn-info" href="#collapse{{ revision.revision_number }}" onclick="get_diff_json('{% url 'wiki:diff' revision.id %}', $('#collapse{{ revision.revision_number }}'))">
<span class="icon-list-alt"></span> <span class="icon-list-alt"></span>
{% trans "Show changes" %} {% trans "Show changes" %}
</a> </a>
<input type="radio"{% if revision == article.current_revision %} disabled="true"{% endif %} style="margin: 0 10px;" value="{{ revision.id }}" name="revision_id" switch-button-href="{% url wiki:change_revision_url urlpath.path revision.id %}" merge-button-href="{% url wiki:merge_revision_preview article.id revision.id %}" merge-button-commit-href="{% url wiki:merge_revision_url urlpath.path revision.id %}" /> <input type="radio"{% if revision == article.current_revision %} disabled="true"{% endif %} style="margin: 0 10px;" value="{{ revision.id }}" name="revision_id" switch-button-href="{% url 'wiki:change_revision_url' urlpath.path revision.id %}" merge-button-href="{% url 'wiki:merge_revision_preview' article.id revision.id %}" merge-button-commit-href="{% url 'wiki:merge_revision_url' urlpath.path revision.id %}" />
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
......
wiki/templates/wiki/includes/article_menu.html
{% load i18n wiki_tags %} {% load i18n wiki_tags %}{% load url from future %}
<li class="pull-right{% if selected == "settings" %} active{% endif %}"> <li class="pull-right{% if selected == "settings" %} active{% endif %}">
{% if not user.is_anonymous %} {% if not user.is_anonymous %}
<a href="{% url wiki:settings_url urlpath.path %}"> <a href="{% url 'wiki:settings_url' urlpath.path %}">
<span class="icon-wrench"></span> <span class="icon-wrench"></span>
{% trans "Settings" %} {% trans "Settings" %}
</a> </a>
{% endif %} {% endif %}
</li> </li>
<li class="pull-right{% if selected == "history" %} active{% endif %}"> <li class="pull-right{% if selected == "history" %} active{% endif %}">
<a href="{% url wiki:history_url urlpath.path %}"> <a href="{% url 'wiki:history_url' urlpath.path %}">
<span class="icon-time"></span> <span class="icon-time"></span>
{% trans "Changes" %} {% trans "Changes" %}
</a> </a>
</li> </li>
<li class="pull-right{% if selected == "edit" %} active{% endif %}"> <li class="pull-right{% if selected == "edit" %} active{% endif %}">
<a href="{% url wiki:edit_url urlpath.path %}"> <a href="{% url 'wiki:edit_url' urlpath.path %}">
<span class="icon-edit"></span> <span class="icon-edit"></span>
{% trans "Edit" %} {% trans "Edit" %}
</a> </a>
</li> </li>
<li class="pull-right{% if selected == "view" %} active{% endif %}"> <li class="pull-right{% if selected == "view" %} active{% endif %}">
<a href="{% url wiki:get_url urlpath.path %}"> <a href="{% url 'wiki:get_url' urlpath.path %}">
<span class="icon-home"></span> <span class="icon-home"></span>
{% trans "View" %} {% trans "View" %}
</a> </a>
......
wiki/templates/wiki/includes/breadcrumbs.html
{% load i18n %}<ul class="breadcrumb"> {% load i18n %}{% load url from future %}<ul class="breadcrumb">
{% for ancestor in urlpath.get_ancestors.all %} {% for ancestor in urlpath.get_ancestors.all %}
<span class="divider">/</span> <span class="divider">/</span>
<a href="{% url wiki:get_url ancestor.path %}"><li>{{ ancestor.article.current_revision.title }}</li></a> <a href="{% url 'wiki:get_url' ancestor.path %}"><li>{{ ancestor.article.current_revision.title }}</li></a>
{% endfor %} {% endfor %}
<span class="divider">/</span> <span class="divider">/</span>
<li class="active"><a href="{% url wiki:get_url urlpath.path %}">{{ urlpath.article.current_revision.title }}</a></li> <li class="active"><a href="{% url 'wiki:get_url' urlpath.path %}">{{ urlpath.article.current_revision.title }}</a></li>
<span class="divider">/</span> <span class="divider">/</span>
<li><a href="{% url wiki:create_url urlpath.path %}">{% trans "+ Add article" %}</a></li> <li><a href="{% url 'wiki:create_url' urlpath.path %}">{% trans "+ Add article" %}</a></li>
</ul> </ul>
wiki/templates/wiki/settings.html
{% extends "wiki/base.html" %} {% extends "wiki/base.html" %}
{% load wiki_tags i18n %} {% load wiki_tags i18n %}
{% load url from future %}
{% block pagetitle %}{% trans "Settings" %}: {% article_for_object urlpath as article %}{{ article.current_revision.title }}{% endblock %} {% block pagetitle %}{% trans "Settings" %}: {% article_for_object urlpath as article %}{{ article.current_revision.title }}{% endblock %}
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
{% wiki_form form %} {% wiki_form form %}
</div> </div>
<div class="form-actions"> <div class="form-actions">
<button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url wiki:edit_url urlpath.path %}'"> <button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit_url' urlpath.path %}'">
<span class="icon-ok"></span> <span class="icon-ok"></span>
{% trans "Save changes" %} {% trans "Save changes" %}
</button> </button>
......
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