changeset 1715:8d2035dfb153

use separate conflict icon (TODO: add a png for it), minor cleanups
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 07 Jan 2007 12:34:53 +0100
parents 8f944671df08
children 9a3290aeff36
files MoinMoin/macro/RecentChanges.py MoinMoin/theme/__init__.py
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/macro/RecentChanges.py	Sun Jan 07 11:26:52 2007 +0100
+++ b/MoinMoin/macro/RecentChanges.py	Sun Jan 07 12:34:53 2007 +0100
@@ -73,18 +73,17 @@
             # just indicate page was deleted
             html_link = img
     elif page.isConflict():
-        img = macro.formatter.smiley("/!\\")
-        #img = request.theme.make_icon('help')
+        img = request.theme.make_icon('conflict')
         html_link = page.link_to_raw(request, img, querystr={'action': 'edit'}, rel='nofollow')
     elif hilite:
         # show special icons if change was after the user's bookmark
         if is_new:
-            img = request.theme.make_icon('new')
-            #html_link = page.link_to_raw(request, img, rel='nofollow') # XXX better use same code as for "renamed"?
+            img = 'new'
         elif is_renamed:
-            img = request.theme.make_icon('renamed')
+            img = 'renamed'
         else:
-            img = request.theme.make_icon('updated')
+            img = 'updated'
+        img = request.theme.make_icon(img)
         html_link = page.link_to_raw(request, img, querystr={'action': 'diff', 'date': '%d' % bookmark_usecs}, rel='nofollow')
     else:
         # show "DIFF" icon else
--- a/MoinMoin/theme/__init__.py	Sun Jan 07 11:26:52 2007 +0100
+++ b/MoinMoin/theme/__init__.py	Sun Jan 07 12:34:53 2007 +0100
@@ -51,6 +51,7 @@
         'deleted':    (_("[DELETED]"),           "moin-deleted.png",60, 12),
         'updated':    (_("[UPDATED]"),           "moin-updated.png",60, 12),
         'renamed':    (_("[RENAMED]"),           "moin-updated.png",60, 12), # XXX need new icon
+        'conflict':   (_("[CONFLICT]"),          "alert.png", 15, 15),       # XXX need new icon
         'new':        (_("[NEW]"),               "moin-new.png",    31, 12),
         'diffrc':     (_("[DIFF]"),              "moin-diff.png",   15, 11),
         # General