incubator-bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g..@apache.org
Subject svn commit: r1427717 - in /incubator/bloodhound/trunk/bloodhound_theme/bhtheme: htdocs/bloodhound.css templates/bh_ticket.html
Date Wed, 02 Jan 2013 09:10:09 GMT
Author: gjm
Date: Wed Jan  2 09:10:09 2013
New Revision: 1427717

URL: http://svn.apache.org/viewvc?rev=1427717&view=rev
Log:
updates for in-place edit form including workflow control - towards #146 (from olemis)

Modified:
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css?rev=1427717&r1=1427716&r2=1427717&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/htdocs/bloodhound.css Wed Jan  2 09:10:09
2013
@@ -210,10 +210,6 @@ pre.wiki {
   width: auto;
 }
 
-#field-summary {
-  width: 505px;
-}
-
 .bh-ticket-buttons {
   padding-left: 5px;
 }
@@ -289,6 +285,9 @@ h1, h2, h3, h4 {
   white-space: nowrap;
 }
 
+.clip.edit-active, .affix .clip-affic.edit-active {
+  overflow: visible;
+}
 /* @end */
 
 /* @group Alternate download links */
@@ -466,6 +465,10 @@ input[type="submit"].btn.btn-micro {
   }
 }
 
+.help-msg[title] {
+  cursor: help;
+}
+
 /* Revert some changes introduced in 2.1.0 */
 
 h6 {

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html?rev=1427717&r1=1427716&r2=1427717&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket.html Wed Jan 
2 09:10:09 2013
@@ -25,7 +25,16 @@
       xmlns:py="http://genshi.edgewall.org/"
       xmlns:i18n="http://genshi.edgewall.org/i18n"
       xmlns:bh="http://issues.apache.org/bloodhound/wiki/Ui/Dashboard"
-      py:with="preview_mode = 'preview' in req.args">
+      py:with="preview_mode = 'preview' in req.args;
+          can_append = 'TICKET_APPEND' in perm(ticket.resource);
+          can_create = 'TICKET_CREATE' in perm(ticket.resource) and not ticket.exists;
+          can_modify = 'TICKET_CHGPROP' in perm(ticket.resource);
+          can_edit = 'TICKET_EDIT_DESCRIPTION' in perm(ticket.resource);
+          only_for_admin = 'TICKET_ADMIN' in perm(ticket.resource);
+          has_edit_comment = 'TICKET_EDIT_COMMENT' in perm(ticket.resource);
+          has_property_editor = not version and version != 0 and not cnum_edit
+                                and (can_append or can_modify or can_edit or can_create);
+          colspan = 'span8' if bhdb else 'span12'">
   <xi:include href="layout.html" />
   <xi:include href="widget_macros.html" />
 
@@ -42,30 +51,82 @@
         $('.trac-nav').hide();
         $('.trac-topnav').hide();
 
+        <py:if test="has_property_editor">
         // Install in place editing
 
         var modify_elem = $('#modify');
         modify_elem.parent().hide();
   
         function modify_ticket() {
+          if ($('#vc-summary').is('.edit-active'))
+            // Already in editable state
+            return;
           $('[data-edit="inplace"]').each(function() {
-              var fc = $(this);
-              var fieldurl = fc.find('a').attr('href');
+              var fc = $(this).addClass('edit-active');
               var fieldnm = fc.attr('id').substr(3);
-              fc.empty();
+              fc.attr('data-edit-orig', fc.html()).empty();
               var editor = $('#properties #field-' + fieldnm);
               if (editor.length == 0)
                 editor = $('#editor-' + fieldnm);
               var fieldval = editor.val();
               editor = editor.clone(false).appendTo(fc).val(fieldval);
-              if (editor.prop('tagName') == 'TEXTAREA') {
+              if (editor.prop('tagName') === 'TEXTAREA') {
                 if (editor.is('.wikitext'))
                   addWikiFormattingToolbar(editor.get(0));
               }
+              if (fieldnm === 'summary') {
+                // Install inline edit form 
+                var submit_ticket = $('#tmpl-inplace-submit').html();
+                submit_ticket = $(submit_ticket).prepend(editor)
+                    .appendTo(fc);
+                submit_ticket.find('#edit-cancel').click(revert_ticket);
+                editor.wrap('<div class="btn-group"></div>')
+
+                // Workflow actions
+                var actions_box = submit_ticket.find('#workflow-actions')
+                    .click(function(e) { e.stopPropagation(); });
+                $('#action').children('div').each(function() {
+                    var action_ui = $(this).clone(false).prependTo(actions_box)
+                        .wrap('<li style="padding: 5px 10px"></li>');
+                    var action_trigger = action_ui.find('input[name=action]');
+
+                    function action_click() {
+                      var newlabel = action_ui.find('label[for^=action_]')
+                          .text();
+                      $('#submit-action-label').text(newlabel);
+
+                      // Enable | disable action controls
+                      actions_box.find('input[name=action]').each(function() {
+                          $(this).siblings().find("*[id]")
+                              .enable($(this).checked());
+                          $(this).siblings().filter("*[id]")
+                              .enable($(this).checked());
+                        });
+                    }
+                    action_trigger.click(action_click);
+                    if (action_trigger.attr('checked'))
+                      action_click();
+
+                    var action_help = action_ui.find('.help-block').detach()
+                        .text().replace(/\s+/g, ' ').replace(/^ Tip /g, 'Tip: ')
+                        .replace(/^\s$/, '');
+                    if (action_help)
+                        $('<i class="icon-info-sign"></i>').appendTo(action_ui)
+                            .attr('title', action_help);
+                  })
+              }
             });
         }
-  
+
+        function revert_ticket() {
+          $('[data-edit="inplace"]').each(function() {
+              var fc = $(this).removeClass('edit-active');
+              fc.html(fc.attr('data-edit-orig'));
+            });
+        }
+
         $('.local-nav a[href = "#inplace-edit"]').click(modify_ticket);
+        </py:if>
 
         $('body').scrollspy({ 
             'target' : '.local-nav' , 
@@ -143,88 +204,89 @@
       <a href="#comment:$cnum" class="$cls">$prefix$cnum</a>
     </py:def>
 
-    <div id="content" class="ticket row"
-         py:with="can_append = 'TICKET_APPEND' in perm(ticket.resource);
-                  can_create = 'TICKET_CREATE' in perm(ticket.resource) and not ticket.exists;
-                  can_modify = 'TICKET_CHGPROP' in perm(ticket.resource);
-                  can_edit = 'TICKET_EDIT_DESCRIPTION' in perm(ticket.resource);
-                  only_for_admin = 'TICKET_ADMIN' in perm(ticket.resource);
-                  has_edit_comment = 'TICKET_EDIT_COMMENT' in perm(ticket.resource);
-                  has_property_editor = not version and version != 0 and not cnum_edit
-                                        and (can_append or can_modify or can_edit or can_create);
-                  colspan = 'span8' if bhdb else 'span12'">
+    <div id="content" class="ticket row">
       <div class="trac-topnav span2" py:if="ticket.exists and has_property_editor">
         <a href="#propertyform" title="Go to the ticket editor">Modify</a> &darr;
       </div>
       <br/>
 
       <div class="$colspan">
-        <div class="stickyBox">
-          <div id="overview" class="stickyStatus $colspan">
-            <div class="whitebox"></div>
-            <div class="properties">
-              <h2 class="summary searchable clip-affix" py:choose=""
-                  data-edit="${'inplace' if can_modify or can_create else None}"
-                  id="vc-summary">
-                <py:when test="ticket.exists">&#9734; $ticket.summary</py:when>
-                <py:otherwise>Create Ticket</py:otherwise>
-              </h2>
-            </div>
-            <div class="row">
-              <span class="ownership">
-                <py:choose test="">
-                  <py:when test="ticket.exists">
-                    <a href="${href.ticket(ticket.id)}"
-                        i18n:msg="id">Ticket #${ticket.id}</a>
-                  </py:when>
-                  <py:otherwise>
-                    New Ticket <small><span py:if="preview_mode and ticket.type"
class="status">(${ticket.type})</span></small>
-                  </py:otherwise>
-                </py:choose>
-                <py:if test="ticket.exists"> - 
-                  <py:if test="ticket.changetime != ticket.time">
-                    <span i18n:msg="modified">Last modified 
-                      <time datetime="${ticket.changetime.strftime('%Y-%m-%d')}">
-                        ${pretty_dateinfo(ticket.changetime)}
-                      </time>.
-                    </span>
-                  </py:if>
-                </py:if>
-                <span id="h_owner">Assigned to
-                  ${(owner_link if defined('owner_link') else authorinfo(ticket.owner)) if
ticket.owner else ''}.
-                </span>
-              </span>
-            </div>
-            <div class="local-nav" py:if="ticket.exists"
-                py:with="sections = (
-                        (_('Overview'), 'content', True, _('View ticket fields and description'),
'icon-list'),
-                        (_('Attachments'), 'attachments', attachments.attachments or attachments.can_create,
_('Go to the list of attachments'), 'icon-file'),
-                        (_('Comments'), 'changelog', True, _('Go to the changelog'), 'icon-comment'),
-                        (_('Add comment'), 'propertyform', ticket.exists and can_append,
_('Go to the ticket editor'), 'icon-plus-sign'),
-                        (_('Modify Ticket'), 'inplace-edit', can_modify or can_edit or can_create,
_('Modify ticket fields and description'), 'icon-edit'),
-                    )">
-              <div>
-                <small>
-                  <ul class="nav btn-group">
-                    <li py:for="s in sections" py:if="s[2]" class="btn">
-                      <a href="#${s[1]}" title="${s[3]}">
-                        <i class="${s[4]}"></i>
-                        ${s[0]}
-                      </a>
-                    </li>
-                  </ul>
-                </small>
-              </div>
-            </div>
-            <div class="stickyEndMark"></div>
-          </div>
-        </div>
-        <script type="text/javascript">
-          setup_sticky_panel('#overview');
-        </script>
         <py:if test="ticket.exists">
           <div class="row">
-            <div class="$colspan">
+            <div class="$colspan"><form py:strip="not has_property_editor" method="post"

+                id="inplace-propertyform"
+                action="${href.ticket(ticket.id) + '#trac-add-comment' if ticket.exists
+                          else href.newticket() + '#ticket'}">
+              <py:if test="has_property_editor">
+                <input type="hidden" name="start_time" 
+                    value="${to_utimestamp(start_time)}" />
+                <input type="hidden" name="view_time" 
+                    value="${to_utimestamp(ticket['changetime'])}" />
+              </py:if>
+              <div class="stickyBox">
+                <div id="overview" class="stickyStatus $colspan">
+                  <div class="whitebox"></div>
+                  <div class="properties">
+                    <h2 class="summary searchable clip-affix" py:choose=""
+                        data-edit="${'inplace' if can_modify or can_create else None}"
+                        id="vc-summary">
+                      <py:when test="ticket.exists">&#9734; $ticket.summary</py:when>
+                      <py:otherwise>Create Ticket</py:otherwise>
+                    </h2>
+                  </div>
+                  <div class="row">
+                    <span class="ownership">
+                      <py:choose test="">
+                        <py:when test="ticket.exists">
+                          <a href="${href.ticket(ticket.id)}"
+                              i18n:msg="id">Ticket #${ticket.id}</a>
+                        </py:when>
+                        <py:otherwise>
+                          New Ticket <small><span py:if="preview_mode and ticket.type"
class="status">(${ticket.type})</span></small>
+                        </py:otherwise>
+                      </py:choose>
+                      <py:if test="ticket.exists"> - 
+                        <py:if test="ticket.changetime != ticket.time">
+                          <span i18n:msg="modified">Last modified 
+                            <time datetime="${ticket.changetime.strftime('%Y-%m-%d')}">
+                              ${pretty_dateinfo(ticket.changetime)}
+                            </time>.
+                          </span>
+                        </py:if>
+                      </py:if>
+                      <span id="h_owner">Assigned to
+                        ${(owner_link if defined('owner_link') else authorinfo(ticket.owner))
if ticket.owner else ''}.
+                      </span>
+                    </span>
+                  </div>
+                  <div class="local-nav" py:if="ticket.exists"
+                      py:with="sections = (
+                              (_('Overview'), 'content', True, _('View ticket fields and
description'), 'icon-list'),
+                              (_('Attachments'), 'attachments', attachments.attachments or
attachments.can_create, _('Go to the list of attachments'), 'icon-file'),
+                              (_('Comments'), 'changelog', True, _('Go to the changelog'),
'icon-comment'),
+                              (_('Add comment'), 'propertyform', ticket.exists and can_append,
_('Go to the ticket editor'), 'icon-plus-sign'),
+                              (_('Modify Ticket'), 'inplace-edit', can_modify or can_edit
or can_create, _('Modify ticket fields and description'), 'icon-edit'),
+                          )">
+                    <div>
+                      <small>
+                        <ul class="nav btn-group">
+                          <li py:for="s in sections" py:if="s[2]" class="btn">
+                            <a href="#${s[1]}" title="${s[3]}">
+                              <i class="${s[4]}"></i>
+                              ${s[0]}
+                            </a>
+                          </li>
+                        </ul>
+                      </small>
+                    </div>
+                  </div>
+                  <div class="stickyEndMark"></div>
+                </div>
+              </div>
+              <script type="text/javascript">
+                setup_sticky_panel('#overview');
+              </script>
+
               <div>
                 <div class="row">
                   <div class="span4">
@@ -291,7 +353,7 @@
               <xi:include href="bh_ticket_box.html"
                   py:with="preview_mode = change_preview.fields ; 
                       colcount = 4 if bhdb else 6"/>
-            </div>
+            </form></div>
 
             <!--! do not show attachments for old versions of this ticket or for new tickets
-->
             <div class="$colspan" py:if="not version and version != 0 and ticket.exists">
@@ -397,7 +459,8 @@ ${comment}</textarea>
                         <th><label for="field-summary">Summary:</label></th>
                         <td class="fullrow" colspan="3">
                           <input type="text" id="field-summary" name="field_summary"
-                                 value="$ticket.summary" size="70" />
+                                 value="$ticket.summary" size="70" 
+                                 class="input-xlarge" />
                         </td>
                       </tr>
                       <py:if test="only_for_admin">
@@ -593,5 +656,28 @@ ${value}</textarea>
         </bh:widget>
       </div>
     </div>
+
+    <script type="text/x-tmpl" id="tmpl-inplace-submit" py:if="has_property_editor">
+      <div class="btn-toolbar" style="margin: 0px">
+      <div class="btn-group input-append">
+        <button id="edit-submit" class="btn btn-primary" type="submit" 
+            value="Submit changes" name="submit">
+          Update (<span id="submit-action-label"></span>)
+        </button>
+        <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+          <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+          <fieldset id="workflow-actions">
+          </fieldset>
+        </ul>
+      </div>
+      <div class="btn-group">
+        <button id="edit-cancel" class="btn-link" title="Discard changes">
+          Cancel
+        </button>
+      </div>
+      </div>
+    </script>
   </body>
 </html>



Mime
View raw message