Skip to content

Commit

Permalink
fixed whitespace in wakawaka templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@jtauber
jtauber committed Jun 30, 2010
1 parent 0f7a351 commit d895acf
Show file tree
Hide file tree
Showing 8 changed files with 181 additions and 181 deletions.
52 changes: 26 additions & 26 deletions pinax/templates/default/wakawaka/base.html
View file
Expand Up @@ -2,33 +2,33 @@

<html>
<head>
<title>{% block title %}{% endblock %}</title>
{% block extrahead %}{% endblock %}
<title>{% block title %}{% endblock %}</title>
{% block extrahead %}{% endblock %}
</head>
<body>
{% if messages %}
<ul class="messages">
{% for message in messages %}
<li>{{ message }}</li>
{% endfor %}
</ul>
{% endif %}

{% spaceless %}
<div class="info">
<span>
<a href="{% url wakawaka_index %}">{% trans "Start" %}</a>
</span>
<span>
<a href="{% url wakawaka_revision_list %}">{% trans "Recent revisions" %}</a>
</span>
<span>
<a href="{% url wakawaka_page_list %}">{% trans "All Pages" %}</a>
</span>
</div>
{% endspaceless %}

{% block content %}
{% endblock %}
{% if messages %}
<ul class="messages">
{% for message in messages %}
<li>{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
{% spaceless %}
<div class="info">
<span>
<a href="{% url wakawaka_index %}">{% trans "Start" %}</a>
</span>
<span>
<a href="{% url wakawaka_revision_list %}">{% trans "Recent revisions" %}</a>
</span>
<span>
<a href="{% url wakawaka_page_list %}">{% trans "All Pages" %}</a>
</span>
</div>
{% endspaceless %}
{% block content %}
{% endblock %}
</body>
</html>
22 changes: 11 additions & 11 deletions pinax/templates/default/wakawaka/changes.html
View file
Expand Up @@ -4,21 +4,21 @@
{% load i18n %}

{% block extrahead %}
{{ block.super }}

{# Don't let search engines scan this old revision #}
{% if rev.is_not_current %}
<meta name="robots" content="noindex" />
{% endif %}
{{ block.super }}
{# Don't let search engines scan this old revision #}
{% if rev.is_not_current %}
<meta name="robots" content="noindex" />
{% endif %}
{% endblock %}

{% block title %}
{% blocktrans with page.slug as slug %}Changes for {{ slug }}{% endblocktrans %}
{% blocktrans with page.slug as slug %}Changes for {{ slug }}{% endblocktrans %}
{% endblock %}

{% block content %}
<h1>{{ page.slug }}</h1>

<pre class="changes">{{ diff }}</pre>
{% include "wakawaka/revision_table.html" %}
<h1>{{ page.slug }}</h1>
<pre class="changes">{{ diff }}</pre>
{% include "wakawaka/revision_table.html" %}
{% endblock %}
76 changes: 38 additions & 38 deletions pinax/templates/default/wakawaka/edit.html
View file
Expand Up @@ -11,44 +11,44 @@
{% endblock %}

{% block content %}
<h1>
{% if page.is_initial %}
{% blocktrans with page.slug as slug %}Add {{ slug }}{% endblocktrans %}
{% else %}
{% blocktrans with page.slug as slug %}Edit {{ slug }}{% endblocktrans %}
{% endif %}
</h1>

{% if rev.is_not_current %}
<p class="revert-warning">{% trans "You are editing an revision which is not the latest!" %}</p>
{% endif %}

<form class="wakawaka_edit_form" method="POST" action="">
{% csrf_token %}
{{ form.as_p }}
<p>
<h1>
{% if page.is_initial %}
{% blocktrans with page.slug as slug %}Add {{ slug }}{% endblocktrans %}
{% else %}
{% blocktrans with page.slug as slug %}Edit {{ slug }}{% endblocktrans %}
{% endif %}
</h1>
{% if rev.is_not_current %}
<p class="revert-warning">{% trans "You are editing an revision which is not the latest!" %}</p>
{% endif %}
<form class="wakawaka_edit_form" method="POST" action="">
{% csrf_token %}
{{ form.as_p }}
<p>
<input type="submit" value="{% trans "Save changes" %}" />
{% trans "or" %} <a href="
{% if page.is_initial %}
javascript:window.history.go(-1);
{% else %}
{% url wakawaka_page slug=page.slug %}
{% endif %}
">{% trans "Cancel" %}</a>
</p>
</form>

{% if not page.is_initial and delete_form %}
<form class="wakawaka_delete_form" method="POST" action="" onsubmit="return confirm('{% trans "Please confirm deletion" %}');">
{% csrf_token %}
{{ delete_form.as_p }}
<p>
<input type="submit" value="{% trans "Delete" %}" />
</p>
</form>
{% endif %}

<h2>{% trans "Revisions for this page" %}</h2>

{% include "wakawaka/revision_table.html" %}
{% if page.is_initial %}
javascript:window.history.go(-1);
{% else %}
{% url wakawaka_page slug=page.slug %}
{% endif %}
">{% trans "Cancel" %}</a>
</p>
</form>
{% if not page.is_initial and delete_form %}
<form class="wakawaka_delete_form" method="POST" action="" onsubmit="return confirm('{% trans "Please confirm deletion" %}');">
{% csrf_token %}
{{ delete_form.as_p }}
<p>
<input type="submit" value="{% trans "Delete" %}" />
</p>
</form>
{% endif %}
<h2>{% trans "Revisions for this page" %}</h2>
{% include "wakawaka/revision_table.html" %}
{% endblock %}
82 changes: 41 additions & 41 deletions pinax/templates/default/wakawaka/page.html
View file
Expand Up @@ -4,51 +4,51 @@
{% load i18n %}

{% block extrahead %}
{{ block.super }}

{# Don't let search engines scan this old revision #}
{% if rev.is_not_current %}
<meta name="robots" content="noindex" />
{% endif %}
{{ block.super }}
{# Don't let search engines scan this old revision #}
{% if rev.is_not_current %}
<meta name="robots" content="noindex" />
{% endif %}
{% endblock %}

{% block title %}
{{ page.slug }}
{{ page.slug }}
{% endblock %}

{% block content %}
<h1><a href="{% url wakawaka_page slug=page.slug %}">{{ page.slug }}</a></h1>

{% if rev.is_not_current %}
<p class="revert-warning">
{% trans "You are viewing an older revision!" %}
<a href="{% url wakawaka_page slug=page.slug %}">
{% trans "See the latest version" %}
</a>
</p>
{% endif %}

<div class="page">
{{ rev.content|urlize|wikify|linebreaks }}
</div>

{% spaceless %}
<div class="info">
<span>
<strong>{{ page.slug }}</strong>
</span>
<span>
{% blocktrans with page.current.creator as creator and rev.modified|date:_("DATETIME_FORMAT") as modified %}
Recently modified by <em>{{ creator }}</em>: {{ modified }}
{% endblocktrans %}
(<a href="{% url wakawaka_revision_list slug=page.slug %}">{% trans "History" %}</a>)
</span>
{% if perms.wakawaka.change_wikipage %}
<span>
<a href="{% url wakawaka_edit slug=page.slug %}">{% trans "Edit" %}</a>
</span>
{% endif %}
</div>
{% endspaceless %}
<h1><a href="{% url wakawaka_page slug=page.slug %}">{{ page.slug }}</a></h1>
{% if rev.is_not_current %}
<p class="revert-warning">
{% trans "You are viewing an older revision!" %}
<a href="{% url wakawaka_page slug=page.slug %}">
{% trans "See the latest version" %}
</a>
</p>
{% endif %}
<div class="page">
{{ rev.content|urlize|wikify|linebreaks }}
</div>
{% spaceless %}
<div class="info">
<span>
<strong>{{ page.slug }}</strong>
</span>
<span>
{% blocktrans with page.current.creator as creator and rev.modified|date:_("DATETIME_FORMAT") as modified %}
Recently modified by <em>{{ creator }}</em>: {{ modified }}
{% endblocktrans %}
(<a href="{% url wakawaka_revision_list slug=page.slug %}">{% trans "History" %}</a>)
</span>
{% if perms.wakawaka.change_wikipage %}
<span>
<a href="{% url wakawaka_edit slug=page.slug %}">{% trans "Edit" %}</a>
</span>
{% endif %}
</div>
{% endspaceless %}
{% endblock %}
14 changes: 7 additions & 7 deletions pinax/templates/default/wakawaka/page_list.html
View file
Expand Up @@ -3,14 +3,14 @@
{% load i18n %}

{% block title %}
{% trans "All wiki pages" %}
{% trans "All wiki pages" %}
{% endblock %}

{% block content %}
<h1>{% trans "All wiki pages" %}</h1>
<ul>
{% for page in page_list %}
<li><a href="{% url wakawaka_page slug=page.slug %}">{{ page.slug }}</a>
{% endfor %}
</ul>
<h1>{% trans "All wiki pages" %}</h1>
<ul>
{% for page in page_list %}
<li><a href="{% url wakawaka_page slug=page.slug %}">{{ page.slug }}</a>
{% endfor %}
</ul>
{% endblock %}
46 changes: 23 additions & 23 deletions pinax/templates/default/wakawaka/revision_list.html
View file
Expand Up @@ -3,34 +3,34 @@
{% load i18n %}

{% block title %}
{% trans "List of all revisions" %}
{% trans "List of all revisions" %}
{% endblock %}

{% block content %}
<h1>{% trans "List of all revisions" %}</h1>

<table class="history" border="1">
<tr>
<h1>{% trans "List of all revisions" %}</h1>
<table class="history" border="1">
<tr>
<th>{% trans "Page" %}</th>
<th>{% trans "Changed" %}</th>
<th>{% trans "Message" %}</th>
<th>{% trans "Modified by" %}</th>
<th>&nbsp;</th>
</tr>
{% for rev in revision_list %}
<tr>
<td>{{ rev.page.slug }}</td>
<td class="modifed">{{ rev.modified|timesince }} ago</td>
<td class="message">{{ rev.message }}</td>
<td class="creator">{{ rev.creator.username }}</td>
<td class="options">
<a href="{% url wakawaka_page slug=rev.page.slug, rev_id=rev.pk %}">{% trans "View" %}</a>
{% if user.is_authenticated %}
<a href="{% url wakawaka_edit slug=rev.page.slug, rev_id=rev.pk %}">{% trans "Revert" %}</a>
{% endif %}
</td>
</tr>
{% endfor %}
</table>

<th>&nbsp;</th>
</tr>
{% for rev in revision_list %}
<tr>
<td>{{ rev.page.slug }}</td>
<td class="modifed">{{ rev.modified|timesince }} ago</td>
<td class="message">{{ rev.message }}</td>
<td class="creator">{{ rev.creator.username }}</td>
<td class="options">
<a href="{% url wakawaka_page slug=rev.page.slug, rev_id=rev.pk %}">{% trans "View" %}</a>
{% if user.is_authenticated %}
<a href="{% url wakawaka_edit slug=rev.page.slug, rev_id=rev.pk %}">{% trans "Revert" %}</a>
{% endif %}
</td>
</tr>
{% endfor %}
</table>
{% endblock %}

0 comments on commit d895acf

Please sign in to comment.