trac-hacks · manumitted · Mar 15, 2022 · Mar 15, 2022 · Mar 15, 2022 · Mar 16, 2022
diff --git a/setup.py b/setup.py
@@ -1,6 +1,8 @@
+#!/usr/bin/env python
+
 from setuptools import setup
 
-VERSION = '0.2.1'
+VERSION = '0.2.2'
 PACKAGE = 'ticketreminder'
 
 setup(
@@ -21,7 +23,19 @@
             'templates/*.html',
         ],
     },
-    install_requires = [],
+    install_requires = ['Trac'],
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Plugins',
+        'Environment :: Web Environment',
+        'Framework :: Trac',
+        'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)'
+        'Natural Language :: English',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+    ],
     zip_safe = False,
     entry_points = {
         'trac.plugins': '%s = %s' % (PACKAGE, PACKAGE),

diff --git a/ticketreminder/__init__.py b/ticketreminder/__init__.py
@@ -1,4 +1,4 @@
-from api import *
+from .api import *
 import pkg_resources
 
-pkg_resources.require('Trac >= 1.0')
+pkg_resources.require('Trac >= 1.3')
diff --git a/ticketreminder/api.py b/ticketreminder/api.py
diff --git a/ticketreminder/htdocs/js/ticketreminderjinja.js b/ticketreminder/htdocs/js/ticketreminderjinja.js
@@ -0,0 +1,17 @@
+
+(function ($) {
+
+  $(document).ready(function ($) {
+    $("#attachments").after(trdata.tags);
+    if($(location).attr('hash') != "#reminders") {
+        $("#reminders").toggleClass("collapsed");
+    }
+    $(".trac-nav").prepend(' <a href="#reminders" id="trac-up-reminders" title="Go to the list of reminders">Reminders</a> &uarr;');
+    $("#trac-up-reminders").click(function () {
+      $("#reminders").removeClass("collapsed");
+      return true;
+    });
+  });
+
+})(jQuery);
+
diff --git a/...minder/templates/ticket_reminder_add.html → .../templates/ticket_reminder_add_jinja.html b/...minder/templates/ticket_reminder_add.html → .../templates/ticket_reminder_add_jinja.html
@@ -1,23 +1,26 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:i18n="http://genshi.edgewall.org/i18n">
-  <xi:include href="layout.html" />
+# extends 'layout.html'
+<!DOCTYPE html>
+<html>
   <head>
-    <title>${name_of(ticket.resource)} &ndash; Add Reminder</title>
+    # block title
+    ${name_of(ticket.resource)} &ndash; Add Reminder ${ super() }
+    # endblock title
+
+    # block head
+    ${ super() }
+    # endblock head
   </head>
 
   <body>
     <div id="content" class="reminder">
+    # block content
       <h1>Add reminder on <a href="${url_of(ticket.resource)}">${name_of(ticket.resource)}</a></h1>
       <form id="reminder" method="post" enctype="multipart/form-data" action="">
+        ${jmacros.form_token_input()}
         <fieldset>
           <legend><label><input type="radio" name="reminder_type" value="date" checked="${'checked' if req.args.get('reminder_type') == 'date' else None}" /> Specific Date</label></legend>
           <div class="field">
-            On <input type="text" name="date" size="15" value="${req.args.get('date')}" />.
+            On <input type="text" class="trac-datepicker" name="date" size="15" value="${req.args.get('date')}" />.
             <p class="hint">Enter date in ${date_hint} format.</p>
           </div>
           <br />
@@ -35,13 +38,13 @@ <h1>Add reminder on <a href="${url_of(ticket.resource)}">${name_of(ticket.resour
         </fieldset>
         <fieldset>
           <legend>Reminder Info</legend>
-          <py:if test="authname == 'anonymous'">
+          # if authname == 'anonymous'
             <div class="field">
               <label>Your email or username:<br />
                 <input type="text" name="author" size="30" value="${req.args.get('author', author)}" />
               </label>
             </div>
-            </py:if>
+          # endif
           <div class="field">
             <label>Description of the reminder (optional):<br />
               <input type="text" name="description" size="60" value="${req.args.get('description')}" /></label>
@@ -55,5 +58,7 @@ <h1>Add reminder on <a href="${url_of(ticket.resource)}">${name_of(ticket.resour
         </div>
       </form>
     </div>
+    ${ super() }
+    # endblock content
   </body>
 </html>
diff --git a/...der/templates/ticket_reminder_delete.html → ...mplates/ticket_reminder_delete_jinja.html b/...der/templates/ticket_reminder_delete.html → ...mplates/ticket_reminder_delete_jinja.html
@@ -1,23 +1,26 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:i18n="http://genshi.edgewall.org/i18n">
-  <xi:include href="layout.html" />
+# extends 'layout.html'
+<!DOCTYPE html>
+<html>
   <head>
-    <title>${name_of(ticket.resource)} &ndash; Delete Reminder</title>
+    # block title
+    ${name_of(ticket.resource)} &ndash; Delete Reminder ${ super() }
+    # endblock title
+
+    # block head
+    ${ super() }
+    # endblock head
   </head>
 
   <body>
     <div id="content" class="reminder">
+    # block content
       <h1>Delete reminder on <a href="${url_of(ticket.resource)}">${name_of(ticket.resource)}</a></h1>
       <div id="formatted_reminder">${formatted_reminder}</div>
       <p><strong>Are you sure you want to delete this reminder?</strong><br />
         This is an irreversible operation.</p>
       <div class="buttons">
         <form method="post" action="">
+          ${jmacros.form_token_input()}
           <div id="delete">
             <input type="hidden" name="action" value="deletereminder" />
             <input type="hidden" name="reminder" value="${req.args.get('reminder')}" />
@@ -27,5 +30,7 @@ <h1>Delete reminder on <a href="${url_of(ticket.resource)}">${name_of(ticket.res
         </form>
       </div>
     </div>
+    ${ super() }
+    # endblock content
   </body>
 </html>
diff --git a/ticketreminder/templates/ticket_reminder_email_jinja.html b/ticketreminder/templates/ticket_reminder_email_jinja.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <base href="${abs_href.ticket(ticket.id)}" />
+    <title>#${ticket.id} (${ticket.summary})</title>
+    <style type="text/css">${styles|safe}</style>
+  </head>
+  <body>
+    <div id="reminder">
+        <pre>
+${reminder}
+        </pre>
+    </div>
+    <div id="main">
+      <div id="content" class="ticket">
+        <h1 id="trac-ticket-title">
+          <a href="${abs_href.ticket(ticket.id)}">Ticket #${ticket.id}</a>
+          <span class="trac-status">${ticket.status}</span>
+          # if ticket.type:
+          <span class="trac-type">${ticket.type}</span>
+          # endif
+          # if ticket.resolution:
+          <span class="trac-resolution">${ticket.resolution}</span>
+          # endif
+        </h1>
+        <hr />
+        # with preview_mode = change_preview.fields
+        #   include 'ticket_box.html'
+        # endwith
+      </div>
+    </div>
+    <div id="footer">
+      <hr />
+      <p>
+        ${tag_('Ticket URL: \x3c%(link)s\x3e', link=link)}<br />
+        ${project.name} &lt;<a href="${project.url or abs_href()}">${project.url or abs_href()}</a>&gt;<br />
+        ${project.descr}
+      </p>
+    </div>
+  </body>
+</html>
diff --git a/ticketreminder/templates/ticket_reminder_email_jinja.txt b/ticketreminder/templates/ticket_reminder_email_jinja.txt
@@ -0,0 +1,8 @@
+${reminder}
+
+${ticket_body_hdr}
+${ticket_props}
+${'-- '}
+${_('Ticket URL: <%(link)s>', link=ticket.link)}
+${project.name} <${project.url or abs_href()}>
+${project.descr}