From 7fb8c8c21019faafda291a9c1df9b86c3d08b568 Mon Sep 17 00:00:00 2001 From: hernani Date: Mon, 7 Jun 2010 17:37:49 +0000 Subject: [PATCH] Some fixes in custom pages logic. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@388 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/actions/page.py | 14 +++++++------- .../default/templates/osqaadmin/djstyle_base.html | 11 +++++------ .../default/templates/osqaadmin/edit_page.html | 8 ++++++-- forum/skins/default/templates/osqaadmin/set.html | 2 +- forum/templatetags/extra_filters.py | 7 ++++++- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/forum/actions/page.py b/forum/actions/page.py index bfeda16..508e8c2 100644 --- a/forum/actions/page.py +++ b/forum/actions/page.py @@ -15,8 +15,8 @@ class NewPageAction(ActionProxy): def describe(self, viewer=None): return _("%(user)s created a new page titled %(page)s") % { - 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), - 'page': self.hyperlink(self.node.get_absolute_url(), self.node.title) + 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), + 'page': self.hyperlink(self.node.get_absolute_url(), self.node.title) } class EditPageAction(ActionProxy): @@ -26,7 +26,7 @@ class EditPageAction(ActionProxy): title = data.pop('title') body = data.pop('content') - if (title != self.node.title) and (body != self.node.body): + if (title != self.node.title) or (body != self.node.body): self.node.create_revision(self.user, title=title, body=body) self.node.extra = data @@ -34,8 +34,8 @@ class EditPageAction(ActionProxy): def describe(self, viewer=None): return _("%(user)s edited the page titled %(page)s") % { - 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), - 'page': self.hyperlink(self.node.get_absolute_url(), self.node.title) + 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), + 'page': self.hyperlink(self.node.get_absolute_url(), self.node.title) } class PublishAction(ActionProxy): @@ -53,6 +53,6 @@ class PublishAction(ActionProxy): def describe(self, viewer=None): return _("%(user)s published a new page titled %(page)s") % { - 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), - 'page': self.hyperlink(self.node.get_absolute_url(), self.node.title) + 'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)), + 'page': self.hyperlink(self.node.get_absolute_url(), self.node.title) } diff --git a/forum/skins/default/templates/osqaadmin/djstyle_base.html b/forum/skins/default/templates/osqaadmin/djstyle_base.html index 3f09125..dcea80f 100644 --- a/forum/skins/default/templates/osqaadmin/djstyle_base.html +++ b/forum/skins/default/templates/osqaadmin/djstyle_base.html @@ -1,5 +1,4 @@ -{% load extra_tags %} -{% load i18n %} +{% load extra_tags extra_filters i18n %} @@ -97,15 +96,15 @@
  • {{ allsets.sidebar.title }}
  • {{ allsets.css.title }} - {% if "css" in unsaved %}{% trans {% endif %} + {% if "css"|contained_in:unsaved %}{% trans {% endif %}
  • {{ allsets.headandfoot.title }} - {% if "headandfoot" in unsaved %}{% trans {% endif %} + {% if "headandfoot"|contained_in:unsaved %}{% trans {% endif %}
  • {{ allsets.head.title }} - {% if "head" in unsaved %}{% trans {% endif %} + {% if "head"|contained_in:unsaved %}{% trans {% endif %}
    • @@ -115,7 +114,7 @@ {% for set in othersets %}
  • {{ set.title }} - {% if set.name in unsaved %}{% trans {% endif %} + {% if set.name|contained_in:unsaved %}{% trans {% endif %}
    • {% endfor %} diff --git a/forum/skins/default/templates/osqaadmin/edit_page.html b/forum/skins/default/templates/osqaadmin/edit_page.html index 269cec8..d8d251f 100644 --- a/forum/skins/default/templates/osqaadmin/edit_page.html +++ b/forum/skins/default/templates/osqaadmin/edit_page.html @@ -1,6 +1,6 @@ {% extends basetemplate %} -{% load i18n %} +{% load i18n extra_filters %} {% block subtitle %}{% trans "Editing page" %}{% endblock %} {% block pagename %} @@ -19,7 +19,11 @@ - + {% if page %} + + {% else %} + + {% endif %} {% if published %} {% else %} diff --git a/forum/skins/default/templates/osqaadmin/set.html b/forum/skins/default/templates/osqaadmin/set.html index c909f9b..2377e84 100644 --- a/forum/skins/default/templates/osqaadmin/set.html +++ b/forum/skins/default/templates/osqaadmin/set.html @@ -17,7 +17,7 @@ {% if form.set.can_preview %} - {% if form.set.name in unsaved %} + {% if form.set.name|contained_in:unsaved %} {% endif %} {% endif %} diff --git a/forum/templatetags/extra_filters.py b/forum/templatetags/extra_filters.py index b2887ec..6f3679c 100644 --- a/forum/templatetags/extra_filters.py +++ b/forum/templatetags/extra_filters.py @@ -13,7 +13,7 @@ def collapse(input): def can_edit_post(user, post): return user.can_edit_post(post) - + @register.filter def cnprog_intword(number): try: @@ -33,3 +33,8 @@ def or_preview(setting, request): return previewing[setting.name] return setting.value + + +@register.filter +def contained_in(item, container): + return item in container \ No newline at end of file -- 2.45.2