incubator-bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1433322 [2/2] - in /incubator/bloodhound/branches/bep_0003_multiproduct: ./ bloodhound_dashboard/ bloodhound_multiproduct/ bloodhound_search/ bloodhound_search/bhsearch/ bloodhound_search/bhsearch/templates/ bloodhound_search/bhsearch/test...
Date Tue, 15 Jan 2013 09:32:54 GMT
Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_logging.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_logging.html?rev=1433322&r1=1433321&r2=1433322&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_logging.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_logging.html
Tue Jan 15 09:32:53 2013
@@ -46,7 +46,7 @@
         <div class="control-group">
           <label class="control-label" for="log_type">Type:</label>
           <div class="controls">
-            <select id="log_type" name="log_type" class="input-small">
+            <select id="log_type" name="log_type" class="input-medium">
               <option py:for="type in log.types" value="${type.name}"
                       selected="${type.selected or None}"
                       disabled="${type.disabled or None}">${type.label}</option>
@@ -56,7 +56,7 @@
         <div class="control-group">
           <label class="control-label" for="log_level">Log level:</label>
           <div class="controls">
-            <select id="log_level" name="log_level" class="input-small">
+            <select id="log_level" name="log_level" class="input-medium">
               <option py:for="level in log.levels"
                       selected="${level==log.level or None}">$level</option>
             </select>
@@ -67,11 +67,13 @@
           <div class="controls">
             <input type="text" id="log_file" name="log_file" value="$log.file"
                 class="input-xlarge" />
+            <p class="help-block" i18n:msg="dir">
+              <span class="label label-info">Note</span> If you specify a
+              relative path, the log file will be stored inside the
+              <code>log</code> directory of the project environment
+              (<code>$log.dir</code>).
+            </p>
           </div>
-          <p class="help" i18n:msg="dir">
-            If you specify a relative path, the log file will be stored inside the
-            <code>log</code> directory of the project environment (<code>$log.dir</code>).
-          </p>
         </div>
         <div class="control-group">
           <input type="submit" class="btn"

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html?rev=1433322&r1=1433321&r2=1433322&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
Tue Jan 15 09:32:53 2013
@@ -27,6 +27,12 @@
   <xi:include href="bh_admin.html" />
   <head>
     <title>Milestones</title>
+    <script type="text/javascript">/*<![CDATA[*/
+      jQuery(document).ready(function($) {
+        $("#duedate").datetimepicker();
+        $("#completeddate").datetimepicker();
+      });
+    /*]]>*/</script>
   </head>
 
   <body>
@@ -48,8 +54,9 @@
           <div class="control-group">
             <label class="control-label" for="duedate">Due:</label>
             <div class="controls">
-              <input type="text" id="duedate" name="duedate" size="${len(datetime_hint)}"
-                     value="${milestone.due and format_datetime(milestone.due)}" readonly="${readonly}"
+              <input type="text" id="duedate" name="duedate"
+                     size="${len(datetime_hint)}" readonly="${readonly}"
+                     value="${milestone.due and format_datetime(milestone.due)}"
                      placeholder="${_('Format: %(datehint)s', datehint=datetime_hint)}"/>
             </div>
           </div>

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_versions.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_versions.html?rev=1433322&r1=1433321&r2=1433322&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_versions.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_admin_versions.html
Tue Jan 15 09:32:53 2013
@@ -27,6 +27,11 @@
   <xi:include href="bh_admin.html" />
   <head>
     <title>Versions</title>
+    <script type="text/javascript">/*<![CDATA[*/
+      jQuery(document).ready(function($) {
+        $("#releaseddate").datetimepicker();
+      });
+    /*]]>*/</script>
   </head>
 
   <body>
@@ -44,9 +49,9 @@
             </div>
           </div>
           <div class="control-group">
-            <label class="control-label" for="versiondate">Date:</label>
+            <label class="control-label" for="releaseddate">Date:</label>
             <div class="controls">
-              <input type="text" id="versiondate" name="time" size="${len(datetime_hint)}"
+              <input type="text" id="releaseddate" name="time" size="${len(datetime_hint)}"
                   value="${format_datetime(version.time)}"
                   placeholder="${_('Format: %(datehint)s', datehint=datetime_hint)}" />
             </div>

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket.html?rev=1433322&r1=1433321&r2=1433322&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket.html
Tue Jan 15 09:32:53 2013
@@ -55,7 +55,21 @@
         // Install in place editing
 
         var modify_elem = $('#modify');
-        modify_elem.parent().hide();
+        <py:if test="ticket.exists">
+          modify_elem.parent().hide();
+          $('#propertyform .buttons [name="preview"]').hide();
+          $('#comment').change(function (e) {
+            $('#hidden-comment').val($('#comment').val());
+          });
+          $('#propertyform .buttons [name="submit"]').click(function (e) {
+            if ($('button#edit-submit').length) {
+              // if available trigger the edit state's update button
+              $('button#edit-submit').click();
+              e.preventDefault();
+            }
+            // otherwise the default submit comment only happens
+          });
+        </py:if>
   
         function modify_ticket() {
           if ($('#vc-summary').is('.edit-active'))
@@ -116,12 +130,19 @@
                   })
               }
             });
+
+          // Enable automatic preview
+          //$('#inplace-propertyform').autoSubmit({preview : 1}, 
+          //    full_preview, '#overview .trac-loading')
+          $('#inplace-propertyform').submit(function() {
+              $('#hidden-comment').val($('#comment').val())
+            })
         }
 
         function revert_ticket() {
           $('[data-edit="inplace"]').each(function() {
               var fc = $(this).removeClass('edit-active');
-              fc.html(fc.attr('data-edit-orig'));
+              fc.html(fc.attr('data-edit-orig')).attr('data-edit-orig', '');
             });
         }
 
@@ -154,10 +175,8 @@
         var comment_focused = false;
         $("#comment").focus(function() { comment_focused = true; })
                      .blur(function() { comment_focused = false; });
-        $("#propertyform").autoSubmit({preview: '1'}, function(data, reply) {
+        function full_preview(data, reply) {
           var items = $(reply);
-          // Update ticket box
-          $("#ticket").replaceWith(items.filter('#ticket'));
           // Unthread, unrevert and update changelog
           if (!$('#trac-comments-oldest').checked())
             $('#trac-comments-oldest').click().change();
@@ -176,7 +195,9 @@
           // Collapse property form if comment editor has focus
           if (show_preview && comment_focused)
             $("#modify").parent().addClass("collapsed");
-        }, "#ticketchange .trac-loading");
+        }
+        $("#propertyform").autoSubmit({preview: '1'}, full_preview,
+            "#ticketchange .trac-loading");
         $("#trac-comment-editor").autoSubmit({preview_comment: '1'}, function(data, reply)
{
           var comment = $("#trac-comment-editor").next("div.comment").html(reply);
           comment.toggle(comment.children().length != 0);
@@ -223,6 +244,8 @@
                 <input type="hidden" name="view_time" 
                     value="${to_utimestamp(ticket['changetime'])}" />
               </py:if>
+              <input id="hidden-comment" type="hidden" name="comment" 
+                     value=""/>
               <div class="stickyBox">
                 <div id="overview" class="stickyStatus $colspan">
                   <div class="whitebox"></div>
@@ -287,7 +310,7 @@
                 setup_sticky_panel('#overview');
               </script>
 
-              <div>
+              <div id="basic-properties">
                 <div class="row">
                   <div class="span4">
                     <div class="row">
@@ -678,6 +701,9 @@ ${value}</textarea>
           Cancel
         </button>
       </div>
+      <div class="btn-group">
+        <span class="trac-loading">&nbsp;</span>
+      </div>
       </div>
     </script>
   </body>

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket_box.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket_box.html?rev=1433322&r1=1433321&r2=1433322&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket_box.html
(original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_ticket_box.html
Tue Jan 15 09:32:53 2013
@@ -100,16 +100,16 @@ Arguments:
         <div class="pull-right">
           <form py:if="ticket.exists and ticket.description and can_append"
               id="addreply" method="get" action="#comment">
-            <input type="hidden" name="replyto" value="description" />
-            <input type="submit" name="reply" value="${_('Reply')}"
-                class="btn btn-mini"
-                title="Reply, quoting this description" />
+            <a href="?replyto=description#trac-add-comment" class="btn btn-mini"
+                title="Reply, quoting this description" type="submit">Reply</a>
           </form>
         </div>
-        <div py:if="ticket.description" class="searchable" xml:space="preserve"
+        <div class="searchable" xml:space="preserve"
             data-edit="${'inplace' if can_edit or can_create else None}"
             id="vc-description">
-          ${wiki_to_html(context, ticket.description, escape_newlines=preserve_newlines)}
+          <py:if test="ticket.description">
+            ${wiki_to_html(context, ticket.description, escape_newlines=preserve_newlines)}
+          </py:if>
         </div>
         <br py:if="not ticket.description" style="clear: both" />
       </div>

Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.py?rev=1433322&r1=1433321&r2=1433322&view=diff
==============================================================================
--- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.py (original)
+++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/setup.py Tue Jan
15 09:32:53 2013
@@ -23,7 +23,7 @@ import sys
 
 setup(
   name = 'BloodhoundTheme',
-  version = '0.3.0',
+  version = '0.4.0',
   description = "Look and feel of Bloodhound issue tracker",
   license = "Apache License v2",
   keywords = "trac plugin theme bloodhound",



Mime
View raw message