Changeset 847:f0a01e1e5fa8

Timestamp:

08/21/10 20:11:15 (3 years ago)

Author:

fl

Branch:

trunk

Message:

[svn r1193] remove some mentions of "status quo"

Location:

adhocracy

Files:

• lib/event/formatting.py (modified) (2 diffs)
• lib/tiles/decision_tiles.py (modified) (1 diff)
• model/text.py (modified) (4 diffs)
• templates/page/show.html (modified) (1 diff)
• templates/selection/tiles.html (modified) (1 diff)
• templates/text/tiles.html (modified) (2 diffs)

adhocracy/lib/event/formatting.py

@@ -50 +50 @@
         if poll.action == poll.SELECT and poll.selection: 
             text = poll.selection.page.variant_head(poll.variant)
-            title = _("Status quo") if text.variant == text.HEAD else text.variant
-            return self.SELECT_PATTERN(title, poll.selection.page.title)
+            return self.SELECT_PATTERN(text.variant_name, poll.selection.page.title)
         else:
             fmt = self._get_formatter(poll)
@@ -60 +59 @@
         if poll.action == poll.SELECT: 
             text = poll.selection.page.variant_head(poll.variant)
-            title = _("Status quo") if text.variant == text.HEAD else text.variant
             variant_link = "<a href='%s'>%s</a>" % (h.text.url(text), 
-                                                    cgi.escape(title))
+                                                    cgi.escape(text.variant_name))
             page_link = h.page.link(poll.selection.page, icon=True, icon_size=16)
             return self.SELECT_PATTERN(variant_link, page_link)

adhocracy/lib/tiles/decision_tiles.py

@@ -19 +19 @@
         if self.poll.action == self.poll.SELECT and self.poll.selection:
             text = self.poll.selection.page.variant_head(self.poll.variant)
-            title = _("Status quo") if text.variant == text.HEAD else text.variant
-            variant_link = "<a href='%s'><code>%s</code></a>" % (h.text.url(text), cgi.escape(title))
+            variant_link = "<a href='%s'><code>%s</code></a>" % (h.text.url(text), cgi.escape(title.variant_name))
             page_link = h.page.link(self.poll.scope)
             return _("variant %(variant)s of %(page)s") % dict(variant=variant_link, page=page_link)

adhocracy/model/text.py

@@ -2 +2 @@
 import logging
 
+from pylons.i18n import _
 from sqlalchemy import Table, Column, Integer, Unicode, UnicodeText, ForeignKey, DateTime, func, or_
 from sqlalchemy.orm import relation, backref
@@ -9 +10 @@
 
 log = logging.getLogger(__name__)
+
 
 
@@ -79 +81 @@
             return [self] + self.parent.history
         return [self]
-    
-    
-    @property
-    def variant_title(self):
-        from pylons.i18n import _
-        if self.variant == self.HEAD:
-            return _("[status quo]")
-        return self.variant
-    
+        
     
     def delete(self, delete_time=None):
@@ -127 +121 @@
     
     
+    @property
+    def variant_name(self):
+        if self.is_head:
+            return _("Status Quo")
+        return self.variant
+    
+    
     @property 
     def is_head(self):

adhocracy/templates/page/show.html

@@ -19 +19 @@
                         <li>
                                 %if variant == c.model.Text.HEAD:
-                                        <b>${_("Status quo")}</b>
+                                        <b>${text.variant_name}</b>
                                 %else:
                                         <a href="${h.entity_url(text)}"><code>${variant}</code></a>
                                 %endif
-                                (<a href="${h.entity_url(text, member='history')}">${_("history")}</a>)
-                                </li>
+                        </li>
                 %endfor
         </ul>

adhocracy/templates/selection/tiles.html

@@ -128 +128 @@
                                 <div class="variant_innerheader">                               
                                 %if row.text.is_head:
-                                        <b><a href="${h.entity_url(row.text)}">${_("Status quo")}</a></b>
+                                        <b><a href="${h.entity_url(row.text)}">${row.text.variant_name}</a></b>
                                         ${_("(this proposal should not change this norm)")}
                                 %else:

adhocracy/templates/text/tiles.html

@@ -100 +100 @@
                                                         <!-- nop -->
                                                 %else:
-                                                        <option value="${text.id}">${text.variant_title}</option>
+                                                        <option value="${text.id}">${text.variant_name}</option>
                                                 %endif
                                         %endfor
@@ -114 +114 @@
                                         </div>
                                 %else:
-                                        <b><a href="${h.entity_url(this)|n}">
-                                        %if this.variant == c.model.Text.HEAD:
-                                                ${_("Status quo")}
-                                        %else:
-                                                ${this.variant}
-                                        %endif
-                                        </a></b>
+                                        <b><a href="${h.entity_url(this)|n}">${this.variant_name}</a></b>
                                 %endif
                         %endif