Updated django-wakawaka to 0.4.dev4

wongo888 · Jul 21, 2010 · 980e1e6 · 980e1e6
1 parent f909aed
commit 980e1e6
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 8 deletions.
diff --git a/pinax/projects/code_project/requirements/base.txt b/pinax/projects/code_project/requirements/base.txt
@@ -37,7 +37,7 @@ creole==1.1
 django-tagging==0.3.1
 django-threadedcomments==0.5.2
 django-avatar==1.0.4
-django-wakawaka==0.4.dev3
+django-wakawaka==0.4.dev4
 django-attachments==0.3.1
 django-markup==0.3
 django-sorting>=0.1

diff --git a/pinax/projects/intranet_project/requirements/base.txt b/pinax/projects/intranet_project/requirements/base.txt
@@ -35,7 +35,7 @@ creole==1.1
 django-tagging==0.3.1
 django-threadedcomments==0.5.2
 django-avatar==1.0.4
-django-wakawaka==0.4.dev3
+django-wakawaka==0.4.dev4
 django-attachments==0.3.1
 django-markup==0.3
 django-bookmarks==0.1.0

diff --git a/pinax/projects/sample_group_project/requirements/base.txt b/pinax/projects/sample_group_project/requirements/base.txt
@@ -34,7 +34,7 @@ django-atomformat==0.1.1.dev1
 creole==1.1
 django-flag==0.2.dev9
 django-bookmarks==0.1.0
-django-wakawaka==0.4.dev3
+django-wakawaka==0.4.dev4
 django-tagging==0.3.1
 django-avatar==1.0.4
 django-threadedcomments==0.5.2

diff --git a/pinax/projects/social_project/requirements/base.txt b/pinax/projects/social_project/requirements/base.txt
@@ -51,7 +51,7 @@ django-sorting>=0.1
 django-tagging==0.3.1
 django-threadedcomments==0.5.2
 django-voting==0.1
-django-wakawaka==0.4.dev3
+django-wakawaka==0.4.dev4
 django-photologue==2.3
 django-attachments==0.3.1
 django-markup==0.3

diff --git a/pinax/templates/default/wakawaka/changes.html b/pinax/templates/default/wakawaka/changes.html
@@ -8,6 +8,10 @@
     {% if rev.is_not_current %}
         <meta name="robots" content="noindex" />
     {% endif %}
+    {# Add support for the Universal Edit Button #}
+    {% if perms.wakawaka.change_wikipage %}
+    <link rel="edit" title="{% trans "Edit this page" %}" href="{% url wakawaka_edit slug=page.slug %}" />
+    {% endif %}
 {% endblock %}
 
 {% block head_title %}

diff --git a/pinax/templates/default/wakawaka/edit.html b/pinax/templates/default/wakawaka/edit.html
@@ -3,6 +3,14 @@
 {% load i18n %}
 {% load group_tags %}
 
+{% block extrahead %}
+    {{ block.super }}
+    {# Add support for the Universal Edit Button #}
+    {% if perms.wakawaka.change_wikipage %}
+    <link rel="edit" title="{% trans "Edit this page" %}" href="{% url wakawaka_edit slug=page.slug %}" />
+    {% endif %}
+{% endblock %}
+
 {% block head_title %}
     {% if page.is_initial %}
         {% blocktrans with page.slug as slug %}Add {{ slug  }}{% endblocktrans %}
@@ -24,6 +32,8 @@ <h1>
     <p class="revert-warning">{% trans "You are editing an revision which is not the latest!" %}</p>
     {% endif %}
 
+    {% if is_locked and have_lock %}
+    <p class="lock-notice">{% trans "The page is locked for you." %}</p>
     <form class="wakawaka_edit_form" method="POST" action="">
         {% csrf_token %}
         {{ form.as_p }}
@@ -33,11 +43,18 @@ <h1>
             {% if page.is_initial %}
                 javascript:window.history.go(-1);
             {% else %}
-                {% groupurl wakawaka_page group slug=page.slug %}
+                ?cancel_lock=true
             {% endif %}
             ">{% trans "Cancel" %}</a>
         </p>
     </form>
+    {% else %}
+    {% blocktrans with lock_timestamp|timesince as lock_timestamp %}The page is locked for {{ lock_owner }} since about {{ lock_timestamp }}.{% endblocktrans %}
+    {% if allowed_to_reset %}<a href="?reset_lock=true" title="Locked for another {{ lock_ttl|timeuntil }}">{% trans "Reset lock" %}</a>{% endif %}
+    <div class="page">
+      {% include "wakawaka/page_content.html" %}
+    </div>
+    {% endif %}
 
     {% if not page.is_initial and delete_form %}
     <form class="wakawaka_delete_form" method="POST" action="" onsubmit="return confirm('{% trans "Please confirm deletion" %}');">

diff --git a/pinax/templates/default/wakawaka/page.html b/pinax/templates/default/wakawaka/page.html
@@ -9,6 +9,11 @@
     {% if rev.is_not_current %}
         <meta name="robots" content="noindex" />
     {% endif %}
+
+    {# Add support for the Universal Edit Button #}
+    {% if perms.wakawaka.change_wikipage %}
+    <link rel="edit" title="{% trans "Edit this page" %}" href="{% url wakawaka_edit slug=page.slug %}" />
+    {% endif %}
 {% endblock %}
 
 {% block head_title %}
@@ -28,8 +33,7 @@ <h1><a href="{% groupurl wakawaka_page group slug=page.slug %}">{{ page.slug }}<
     {% endif %}
 
     <div class="page">
-    {% wikify_content rev.content group as content %}
-    {{ content|urlize|linebreaks }}
+        {% include "wakawaka/page_content.html" %}
     </div>
 
     {% spaceless %}

diff --git a/pinax/templates/default/wakawaka/page_content.html b/pinax/templates/default/wakawaka/page_content.html
@@ -0,0 +1 @@
+{% load wakawaka_tags %}{% wikify_content rev.content group as content %}{{ content|urlize|linebreaks }}
diff --git a/pinax/templates/default/wakawaka/revisions.html b/pinax/templates/default/wakawaka/revisions.html
@@ -2,6 +2,14 @@
 
 {% load i18n %}
 
+{% block extrahead %}
+    {{ block.super }}
+    {# Add support for the Universal Edit Button #}
+    {% if perms.wakawaka.change_wikipage %}
+    <link rel="edit" title="{% trans "Edit this page" %}" href="{% url wakawaka_edit slug=page.slug %}" />
+    {% endif %}
+{% endblock %}
+
 {% block head_title %}
     {% blocktrans with page.slug as slug %}History for {{ slug }}{% endblocktrans %}
 {% endblock %}

diff --git a/requirements/pinax.txt b/requirements/pinax.txt
@@ -45,7 +45,7 @@ django-db-log==1.0.1
 django-attachments==0.3.1
 django-markup==0.3
 django-microblogging==0.2.dev1
-django-wakawaka==0.4.dev3
+django-wakawaka==0.4.dev4
 sorl-thumbnail==3.2.5
 django-generic-flatblocks==0.9.1
 django-frontendadmin==0.4