Ticket #2646: preview_wiki_comment.diff

htdocs/css/wiki.css

@@ -17 +17 @@
  overflow: auto;
 }
 
+/* Styles for the revision info (copied from browser.css)*/
+#info {
+ background: #f7f7f0;
+ border: 1px solid #d7d7d7;
+ border-collapse: collapse;
+ border-spacing: 0;
+ clear: both;
+ width: 100%;
+}
+#info th, #info td { font-size: 85%; padding: 2px .5em; vertical-align: top }
+#info th { font-weight: bold; text-align: left; white-space: nowrap }
+#info td.message { width: 100% }
+#info .message ul { padding: 0; margin: 0 2em }
+#info .message p { margin: 0; padding: 0 }
+
 /* Diff view */
 #overview .multi { color: #999 }
 #overview .ipnr { color: #999; font-size: 80% }

trac/wiki/web_ui.py

@@ -311 +311 @@
                                                       action='history')
         if preview:
             info['page_html'] = wiki_to_html(page.text, self.env, req, db)
+            info['comment_html'] = wiki_to_oneliner(comment, self.env, req, db)
             info['readonly'] = int(req.args.has_key('readonly'))
         req.hdf['wiki'] = info
 
@@ -366 +367 @@
             req.hdf['wiki.page_html'] = wiki_to_html(page.text, self.env, req)
             history_href = self.env.href.wiki(page.name, action='history')
             req.hdf['wiki.history_href'] = history_href
+            if version:
+                req.hdf['wiki.comment_html'] = wiki_to_oneliner(page.comment,
+                                                                self.env, db)
+                req.hdf['wiki.author'] = page.author
+                req.hdf['wiki.age'] = pretty_timedelta(page.time)
         else:
             if not req.perm.has_permission('WIKI_CREATE'):
                 raise HTTPNotFound('Page %s not found', page.name)

trac/wiki/model.py

@@ -42 +42 @@
             db = self.env.get_db_cnx()
         cursor = db.cursor()
         if version:
-            cursor.execute("SELECT version,text,readonly FROM wiki "
+            cursor.execute("SELECT version,time,author,text,comment,readonly "
+                           "FROM wiki "
                            "WHERE name=%s AND version=%s",
                            (name, int(version)))
         else:
-            cursor.execute("SELECT version,text,readonly FROM wiki "
+            cursor.execute("SELECT version,time,author,text,comment,readonly "
+                           "FROM wiki "
                            "WHERE name=%s ORDER BY version DESC LIMIT 1",
                            (name,))
         row = cursor.fetchone()
         if row:
-            version,text,readonly = row
+            version,time,author,text,comment,readonly = row
             self.version = int(version)
+            self.author = author
+            self.time = time
             self.text = text
+            self.comment = comment
             self.readonly = readonly and int(readonly) or 0
         else:
             self.version = 0
-            self.text = ''
-            self.readonly = 0
+            self.text = self.comment = self.author = ''
+            self.time = self.readonly = 0
 
     exists = property(fget=lambda self: self.version > 0)
 

templates/wiki.cs

@@ -197 +197 @@
     if wiki.action == "preview" ?>
      <fieldset id="preview">
       <legend>Preview (<a href="#edit">skip</a>)</legend>
-      <div class="wikipage"><?cs var:wiki.page_html ?></div>
+       <table id="info" summary="Revision info"><tbody><tr>
+         <th scope="col">
+          New Version <?cs var:$wiki.version+1 ?> (modified by <?cs var:wiki.author ?>)
+         </th></tr><tr>
+         <td class="message"><?cs var:wiki.comment_html ?></td>
+        </tr>
+       </tbody></table>
+        <div class="wikipage"><?cs var:wiki.page_html ?></div>
      </fieldset><?cs
      elif wiki.action =="collision"?>
      <div class="system-message">
@@ -273 +280 @@
    </form>
   <?cs /if ?>
   <?cs if wiki.action == "view" ?>
+   <?cs if:wiki.version ?>
+    <table id="info" summary="Revision info"><tbody><tr>
+      <th scope="col">
+       Version <?cs var:wiki.version ?> (modified by <?cs var:wiki.author ?>, <?cs var:wiki.age ?> ago)
+      </th></tr><tr>
+      <td class="message"><?cs var:wiki.comment_html ?></td>
+     </tr>
+    </tbody></table>
+   <?cs /if ?>
    <div class="wikipage">
     <div id="searchable"><?cs var:wiki.page_html ?></div>
    </div>