Commits

Peter Suter committed a64848d

Update to trunk

Comments (0)

Files changed (1)

datetimepicker.patch

 # HG changeset patch
-# Parent c4a263e1f20de52c7de081a6c3976835cccc11a2
+# Parent d8c3e3c00c94013f093fdcff882f2fd04d498369
 Use jQuery datetime picker for custom time fields.
 
-diff -r c4a263e1f20d trac/htdocs/js/query.js
---- a/trac/htdocs/js/query.js	Fri Mar 02 20:31:47 2012 +0100
-+++ b/trac/htdocs/js/query.js	Fri Mar 02 20:36:20 2012 +0100
+diff -r d8c3e3c00c94 trac/htdocs/js/query.js
+--- a/trac/htdocs/js/query.js	Fri Apr 06 20:56:48 2012 +0200
++++ b/trac/htdocs/js/query.js	Fri Apr 06 20:58:14 2012 +0200
 @@ -179,11 +179,19 @@
              .append(createRadio(propertyName, "0", propertyName + "_off"))
              .append(" ").append(createLabel(_("no"), propertyName + "_off"));
          }
          tr.append(td);
        } else {
-diff -r c4a263e1f20d trac/ticket/query.py
---- a/trac/ticket/query.py	Fri Mar 02 20:31:47 2012 +0100
-+++ b/trac/ticket/query.py	Fri Mar 02 20:36:20 2012 +0100
-@@ -1107,13 +1107,14 @@
+diff -r d8c3e3c00c94 trac/ticket/query.py
+--- a/trac/ticket/query.py	Fri Apr 06 20:56:48 2012 +0200
++++ b/trac/ticket/query.py	Fri Apr 06 20:58:14 2012 +0200
+@@ -1114,13 +1114,14 @@
  
          properties = dict((name, dict((key, field[key])
                                        for key in ('type', 'label', 'options',
  
          return 'query.html', data, None
  
-diff -r c4a263e1f20d trac/ticket/templates/query.html
---- a/trac/ticket/templates/query.html	Fri Mar 02 20:31:47 2012 +0100
-+++ b/trac/ticket/templates/query.html	Fri Mar 02 20:36:20 2012 +0100
-@@ -21,6 +21,8 @@
+diff -r d8c3e3c00c94 trac/ticket/templates/query.html
+--- a/trac/ticket/templates/query.html	Fri Apr 06 20:56:48 2012 +0200
++++ b/trac/ticket/templates/query.html	Fri Apr 06 20:58:14 2012 +0200
+@@ -24,6 +24,8 @@
            $("#filters").toggleClass("collapsed");
          /* Hide the columns by default. */
          $("#columns").toggleClass("collapsed");
        });
      /*]]>*/</script>
    </head>
-@@ -118,12 +120,13 @@
+@@ -121,12 +123,13 @@
                          
                          <py:when test="field.type == 'time'"
                                   py:with="(start, end) = '..' in constraint_value and constraint_value.split('..', 1)
                            </i18n:msg>
                          </py:when>
                        </td>
-diff -r c4a263e1f20d trac/ticket/templates/ticket.html
---- a/trac/ticket/templates/ticket.html	Fri Mar 02 20:31:47 2012 +0100
-+++ b/trac/ticket/templates/ticket.html	Fri Mar 02 20:36:20 2012 +0100
-@@ -13,11 +13,13 @@
+diff -r d8c3e3c00c94 trac/ticket/templates/ticket.html
+--- a/trac/ticket/templates/ticket.html	Fri Apr 06 20:56:48 2012 +0200
++++ b/trac/ticket/templates/ticket.html	Fri Apr 06 20:58:14 2012 +0200
+@@ -12,12 +12,14 @@
+     <title py:choose="">
        <py:when test="ticket.exists">#${ticket.id} (${ticket.summary})</py:when>
        <py:otherwise>New Ticket</py:otherwise>
-     </title>
--    <script type="text/javascript" src="${chrome.htdocs_location}js/threaded_comments.js"></script>
-+    <script py:if="ticket.exists" type="text/javascript" src="${chrome.htdocs_location}js/threaded_comments.js"></script>
+-    </title>
++    </title>
+     <script py:if="ticket.exists" type="text/javascript" src="${chrome.htdocs_location}js/threaded_comments.js"></script>
      <script type="text/javascript" py:choose="">
        jQuery(document).ready(function($) {
          $("div.description").find("h1,h2,h3,h4,h5,h6").addAnchor(_("Link to this section"));
-         $(".foldable").enableFolding(false, true);
-+        $(".datepicker").datepicker();
+-        $(".foldable").enableFolding(false, true);
++        $(".foldable").enableFolding(false, true);
++        $(".datepicker").datepicker();
 +        $(".datetimepicker").datetimepicker();
        <py:when test="ticket.exists">/*<![CDATA[*/
          $("#modify").parent().toggleClass("collapsed");
                          <py:otherwise><!--! Text input fields -->
                            <py:choose>
                              <span py:when="field.cc_entry"><!--! Special case for Cc: field -->
-diff -r c4a263e1f20d trac/ticket/web_ui.py
---- a/trac/ticket/web_ui.py	Fri Mar 02 20:31:47 2012 +0100
-+++ b/trac/ticket/web_ui.py	Fri Mar 02 20:36:20 2012 +0100
-@@ -451,6 +451,7 @@
+diff -r d8c3e3c00c94 trac/ticket/web_ui.py
+--- a/trac/ticket/web_ui.py	Fri Apr 06 20:56:48 2012 +0200
++++ b/trac/ticket/web_ui.py	Fri Apr 06 20:58:14 2012 +0200
+@@ -500,6 +500,7 @@
          add_script(req, 'common/js/folding.js')
          Chrome(self.env).add_wiki_toolbars(req)
          Chrome(self.env).add_auto_preview(req)
          return 'ticket.html', data, None
  
      def _process_ticket_request(self, req):
-@@ -641,6 +642,7 @@
+@@ -690,6 +691,7 @@
          add_script(req, 'common/js/folding.js')
          Chrome(self.env).add_wiki_toolbars(req)
          Chrome(self.env).add_auto_preview(req)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.