Commits

jonas  committed 7da1921

Added information about the responsible author to the timeline

  • Participants
  • Parent commits 73217c0
  • Branches trunk

Comments (0)

Files changed (3)

File svntrac/Timeline.py

         # 3: closed tickets
         # 4: reopened tickets
 
-        cursor.execute ("SELECT time, rev AS data, 1 AS type, message "
+        cursor.execute ("SELECT time, rev AS data, 1 AS type, message, author "
                         "FROM revision WHERE time>=%s AND time<=%s UNION ALL "
-                        "SELECT time, id AS data, 2 AS type, summary AS message "
+                        "SELECT time, id AS data, 2 AS type, "
+                        "summary AS message, reporter AS author "
                         "FROM ticket WHERE time>=%s AND time<=%s UNION ALL "
-                        "SELECT time, ticket AS data, 3 AS type, '' AS message "
+                        "SELECT time, ticket AS data, 3 AS type, "
+                        "'' AS message, author "
                         "FROM ticket_change WHERE field='status' "
                         "AND newvalue='closed' AND time>=%s AND time<=%s UNION ALL "
-                        "SELECT time, ticket AS data, 4 AS type, '' AS message "
+                        "SELECT time, ticket AS data, 4 AS type, "
+                        "'' AS message, author "
                         "FROM ticket_change WHERE field='status' "
                         "AND newvalue='reopened' AND time>=%s AND time<=%s "
                         "ORDER BY time DESC, message, type",
                     'date': time.strftime('%D, %F', t),
                     'data': row['data'],
                     'type': row['type'],
-                    'message': row['message']}
+                    'message': row['message'],
+                    'author': row['author']}
             if row['type'] == '1':
                 item['changeset_href'] = href.changeset(int(row['data']))
             else:

File templates/footer.cs

   <table id="page-footer" width="100%" bgcolor="#eeeeee">
     <tr>
       <td align="left" class="footer">
-	Email: <a href="mailto:info@edgewall.com">info@edgewall.com</a>
-	<br />
-	  <a href="http://www.edgewall.com/contact/">Contact information</a>
+	Powered by <a href="http://svntrac.edgewall.com/">SVNTRAC</a>
       </td>
-      <td align="right" class="footer">Copyright (c)2003 
-	<a href="http://www.edgewall.com/">Edgewall Software</a> . 
-	All rights reserved.<br />
+      <td align="right" class="footer">
+	Plase visit <a href="http://www.edgewall.com/">www.edgewall.com.</a>
       </td>
     </tr>
   </table>

File templates/timeline.cs

   <?cs if: $date != $current_date ?>
     <?cs set: $current_date = $date ?>
     <tr>
-      <td colspan="2" class="timeline-day"><?cs var:date?></td>
+      <td colspan="2" class="timeline-day"><?cs var:date?>:</td>
     </tr>
   <?cs /if ?>
 <?cs /def ?>
   <?cs if:item.type == #1 ?>
     <tr>
       <td><?cs var:item.time?></td>
-      <td>change set [<a href="<?cs var:item.changeset_href ?>"><?cs var:item.data?></a>]: <?cs var:item.message?></td>
+      <td>change set [<a href="<?cs var:item.changeset_href ?>"><?cs var:item.data?></a>] by <?cs var:item.author ?>: <?cs var:item.message?></td>
     </tr>
 <!-- New ticket -->
   <?cs elif:item.type == #2 ?>
     <tr>
       <td><?cs var:item.time?></td>
-      <td>ticket <a href="<?cs var:item.ticket_href ?>">#<?cs var:item.data?></a> created: <?cs var:item.message?></td>
+      <td>ticket <a href="<?cs var:item.ticket_href ?>">#<?cs var:item.data?></a> created by <?cs var:item.author ?>: <?cs var:item.message?>.</td>
     </tr>
 <!-- Closed ticket -->
   <?cs elif:item.type == #3 ?>
     <tr>
       <td><?cs var:item.time?></td>
-      <td>ticket <a href="<?cs var:item.ticket_href ?>">#<?cs var:item.data?></a> closed.</td>
+      <td>ticket <a href="<?cs var:item.ticket_href ?>">#<?cs var:item.data?></a> closed by <?cs var:item.author ?>.</td>
     </tr>
 <!-- Reopened ticket -->
   <?cs elif:item.type == #4 ?>
     <tr>
       <td><?cs var:item.time?></td>
-      <td>ticket <a href="<?cs var:item.ticket_href ?>">#<?cs var:item.data?></a> reopened.</td>
+      <td>ticket <a href="<?cs var:item.ticket_href ?>">#<?cs var:item.data?></a> reopened by <?cs var:item.author ?>.</td>
     </tr>
   <?cs /if ?>
 <?cs /each ?>