Changeset 846:681350daee5a

Timestamp:

08/21/10 20:04:00 (3 years ago)

Author:

fl

Branch:

trunk

Message:

[svn r1192] code simplification, remove cruft

Location:

adhocracy

Files:

• lib/text/__init__.py (modified) (1 diff)
• lib/text/diff.py (modified) (1 diff)
• lib/tiles/text_tiles.py (modified) (1 diff)
• templates/selection/tiles.html (modified) (1 diff)
• templates/text/tiles.html (modified) (2 diffs)

adhocracy/lib/text/__init__.py

@@ -41 +41 @@
     if revision.text is None:
         return 10
-    rows = int((len([ch for ch in text if ch == "\n"]) + len(text)/70))
+    rows = int((len([ch for ch in revision.text if ch == "\n"]) + len(revision.text)/70))
     return max(min(30, rows), 5)
 

adhocracy/lib/text/diff.py

@@ -46 +46 @@
                       render(rev_from.text))
 
+def page_title_compare(text_form, text_to):
+    if text_to is None or text_from.id == text_to.id:
+        return text_from.title
+    return _diff_html(text_to.title,
+                      text_from.title)
+
 def page_texts_history_compare(text_from, text_to):
     if text_from.page.function == model.Page.NORM:

adhocracy/lib/tiles/text_tiles.py

@@ -16 +16 @@
         self.text = text 
     
-
-    @property
-    def page(self):
-        return self.text.page
-    
-    
-    @property
-    def parent_text_diff(self):
-        return text.diff.page_texts_history_compare(self.text,
-                                                    self.text.parent)
-        
-    @property 
-    def parent_title_diff(self):
-        if not self.text.parent:
-            return self.text.title
-        return text.html_diff(self.text.parent.title,
-                              self.text.title)
-    
-    
-
      
 def history_row(text):

adhocracy/templates/selection/tiles.html

@@ -151 +151 @@
                                         %if tile.selected_text:
                                                 %if row.selected:
-                                                        ${h.html_diff(selection.page.head.render(), row.text.render())|n}
+                                                    ${diff.norm_texts_history_compare(row.text, selection.page.head)|n}
                                                 %else:
-                                                        ${h.html_diff(tile.selected_text.render(), row.text.render())|n}
+                                                    ${diff.norm_texts_history_compare(row.text, tile.selected_text)|n}
                                                 %endif
                                         %else:

adhocracy/templates/text/tiles.html

@@ -4 +4 @@
         <div class="tile text history">
                 <ul>
-                        %if (not text.parent) or text.parent.title != text.title:
-                                <li>${tile.parent_title_diff|n}</li>
-                        %endif
+                        <li>${diff.page_title_compare(text, text.parent)|n}</li>
                         %if text.page.has_variants:
                                 <li>${text.variant}</li>
@@ -18 +16 @@
                         %if text.has_text:
                                 <div class="text">
-                                        ${tile.parent_text_diff|n}
+                                        ${diff.page_texts_history_compare(text, text.parent)|n}
                                 </div>
                         %else: