bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rjol...@apache.org
Subject svn commit: r1452181 - in /incubator/bloodhound/trunk: bloodhound_multiproduct/multiproduct/templates/ bloodhound_theme/bhtheme/ bloodhound_theme/bhtheme/templates/
Date Mon, 04 Mar 2013 04:20:52 GMT
Author: rjollos
Date: Mon Mar  4 04:20:51 2013
New Revision: 1452181

URL: http://svn.apache.org/r1452181
Log:
Refs #413:
 * Consistently place the ''Cancel'' button to the right for all existing templates.
 * Copied `ticket_delete.html` to `bh_ticket_delete.html`, modified the button styling and
moved the ''Cancel'' button to the right. The work of converting the template to bootstrap
will be completed in #424. The ticket delete page hasn't been tested at all due to the issues
described in #427.
 * Copied `attachment.html` to `bh_attachment.html`, modified the button styling and moved
the ''Cancel'' button to the right. The work of converting the template to bootstrap will
be completed in #425.

Added:
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_attachment.html
      - copied, changed from r1452172, incubator/bloodhound/trunk/trac/trac/templates/attachment.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_delete.html
      - copied, changed from r1452172, incubator/bloodhound/trunk/trac/tracopt/ticket/templates/ticket_delete.html
Modified:
    incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/admin_products.html
    incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_delete.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_products.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_report_delete.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_delete.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_rename.html
    incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py

Modified: incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/admin_products.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/admin_products.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/admin_products.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/admin_products.html
Mon Mar  4 04:20:51 2013
@@ -74,8 +74,8 @@ $product.description</textarea>
             </fieldset>
           </div>
           <div class="buttons">
-            <input type="submit" name="cancel" value="${_('Cancel')}" />
             <input type="submit" name="save" value="${_('Save')}" />
+            <input type="submit" name="cancel" value="${_('Cancel')}" />
           </div>
         </fieldset>
       </form>

Modified: incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_delete.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_delete.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_delete.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_multiproduct/multiproduct/templates/product_delete.html
Mon Mar  4 04:20:51 2013
@@ -39,8 +39,8 @@
         <p><strong>Are you sure you want to delete this product?</strong></p>
       </div>
       <div class="buttons">
-        <input type="submit" name="cancel" value="${_('Cancel')}" />
         <input type="submit" value="${_('Delete product')}" />
+        <input type="submit" name="cancel" value="${_('Cancel')}" />
       </div>
     </form>
 

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_components.html
Mon Mar  4 04:20:51 2013
@@ -80,10 +80,10 @@
             </fieldset>
           </div>
           <div class="control-group">
-            <input class="btn-link" type="submit" name="cancel"
-                value="${_('Cancel')}" />
             <input class="btn" type="submit" name="save"
                 value="${_('Save')}" />
+            <input class="btn-link" type="submit" name="cancel"
+                   value="${_('Cancel')}" />
           </div>
         </fieldset>
       </form>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_enums.html Mon
Mar  4 04:20:51 2013
@@ -43,9 +43,10 @@
             </div>
           </div>
           <div class="btn-group">
+            <input class="btn" type="submit" name="save"
+                   value="${_('Save')}"/>
             <input class="btn-link" type="submit" name="cancel"
-                value="${_('Cancel')}"/>
-            <input class="btn" type="submit" name="save" value="${_('Save')}"/>
+                   value="${_('Cancel')}"/>
           </div>
         </fieldset>
       </form>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_milestones.html
Mon Mar  4 04:20:51 2013
@@ -98,10 +98,10 @@
             </fieldset>
           </div>
           <div class="control-group">
-            <input class="btn-link" type="submit" name="cancel"
-                value="${_('Cancel')}"/>
             <input class="btn" type="submit" name="save"
                 value="${_('Save')}" disabled="${readonly}"/>
+            <input class="btn-link" type="submit" name="cancel"
+                   value="${_('Cancel')}"/>
           </div>
         </fieldset>
       </form>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_products.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_products.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_products.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_products.html Mon
Mar  4 04:20:51 2013
@@ -86,10 +86,10 @@
             </fieldset>
           </div>
           <div class="control-group">
-            <input class="btn-link" type="submit" name="cancel"
-                value="${_('Cancel')}" />
             <input class="btn" type="submit" name="save"
                 value="${_('Save')}" />
+            <input class="btn-link" type="submit" name="cancel"
+                   value="${_('Cancel')}" />
           </div>
         </fieldset>
       </form>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_repositories.html
Mon Mar  4 04:20:51 2013
@@ -127,9 +127,10 @@
             </fieldset>
           </div>
           <div class="control-group">
-            <input class="btn-link" type="submit" name="cancel" value="${_('Cancel')}"/>
             <input class="btn" py:if="info.editable" type="submit"
                    name="save" value="${_('Save')}"/>
+            <input class="btn-link" type="submit" name="cancel"
+                   value="${_('Cancel')}"/>
           </div>
         </fieldset>
       </form>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_admin_versions.html Mon
Mar  4 04:20:51 2013
@@ -74,10 +74,10 @@
             </fieldset>
           </div>
           <div class="control-group">
-            <input class="btn-link" type="submit" name="cancel"
-                value="${_('Cancel')}"/>
             <input class="btn" type="submit" name="save"
-                value="${_('Save')}"/>
+                   value="${_('Save')}"/>
+            <input class="btn-link" type="submit" name="cancel"
+                   value="${_('Cancel')}"/>
           </div>
         </fieldset>
       </form>

Copied: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_attachment.html (from
r1452172, incubator/bloodhound/trunk/trac/trac/templates/attachment.html)
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_attachment.html?p2=incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_attachment.html&p1=incubator/bloodhound/trunk/trac/trac/templates/attachment.html&r1=1452172&r2=1452181&rev=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/trac/trac/templates/attachment.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_attachment.html Mon Mar
 4 04:20:51 2013
@@ -55,12 +55,13 @@
               <br />
             </py:if>
           </fieldset>
-          <div class="buttons">
+          <div class="control-group">
             <input type="hidden" name="action" value="new" />
             <input type="hidden" name="realm" value="$parent.realm" />
             <input type="hidden" name="id" value="$parent.id" />
-            <input type="submit" value="${_('Add attachment')}" />
-            <input type="submit" name="cancel" value="${_('Cancel')}" />
+            <input class="btn" type="submit" value="${_('Add attachment')}" />
+            <input class="btn-link" type="submit" name="cancel"
+                   value="${_('Cancel')}" />
           </div>
         </form>
       </py:when>
@@ -69,12 +70,14 @@
         <h1><a href="${url_of(parent)}">${name_of(parent)}</a>: $attachment.filename</h1>
         <p><strong>Are you sure you want to delete this attachment?</strong><br
/>
           This is an irreversible operation.</p>
-        <div class="buttons">
+        <div class="control-group">
           <form method="post" action="">
             <div id="delete">
               <input type="hidden" name="action" value="delete" />
-              <input type="submit" name="cancel" value="${_('Cancel')}" />
-              <input type="submit" value="${_('Delete attachment')}" />
+              <input class="btn" type="submit"
+                     value="${_('Delete attachment')}" />
+              <input class="btn-group" type="submit" name="cancel"
+                     value="${_('Cancel')}" />
             </div>
           </form>
         </div>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html
(original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_milestone_delete.html
Mon Mar  4 04:20:51 2013
@@ -60,10 +60,10 @@
             </select>
           </div>
           <div class="buttons">
-            <input type="submit" name="cancel" value="${_('Cancel')}" 
-                class="btn-link" />
             <input type="submit" value="${_('Delete milestone')}" 
                 class="btn" />
+            <input type="submit" name="cancel" value="${_('Cancel')}"
+                   class="btn-link" />
           </div>
         </form>
       </div>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_report_delete.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_report_delete.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_report_delete.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_report_delete.html Mon
Mar  4 04:20:51 2013
@@ -1,5 +1,4 @@
 <!--!
-  Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
   distributed with this work for additional information
   regarding copyright ownership.  The ASF licenses this file
@@ -38,10 +37,10 @@
           <div class="buttons">
             <input type="hidden" name="id" value="$report.id"/>
             <input type="hidden" name="action" value="delete" />
+            <input type="submit" class="btn"
+                   value="${_('Delete report')}"/>
             <input type="submit" class="btn-link" name="cancel"
-                value="${_('Cancel')}"/>
-            <input type="submit" class="btn" 
-                value="${_('Delete report')}"/>
+                   value="${_('Cancel')}"/>
           </div>
         </form>
       </div>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html Mon
Mar  4 04:20:51 2013
@@ -82,7 +82,7 @@ Arguments:
     </div>
     <div class="offset2">
       <h4 class="change">
-      <div py:if="show_buttons" class="pull-right bh-ticket-buttons hidden-desktop">
+      <div py:if="show_buttons" class="pull-right bh-ticket-buttons hidden-desktop trac-ticket-buttons">
         <form py:if="'cnum' in change and can_edit_comment" method="get"
             style="display:inline" action="#comment:${cnum}">
           <div class="inlinebuttons">

Copied: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_delete.html
(from r1452172, incubator/bloodhound/trunk/trac/tracopt/ticket/templates/ticket_delete.html)
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_delete.html?p2=incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_delete.html&p1=incubator/bloodhound/trunk/trac/tracopt/ticket/templates/ticket_delete.html&r1=1452172&r2=1452181&rev=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/trac/tracopt/ticket/templates/ticket_delete.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_delete.html Mon
Mar  4 04:20:51 2013
@@ -61,9 +61,10 @@
             <p><strong>Are you sure you want to delete this ticket comment?</strong><br/>
                This is an irreversible operation.</p>
           </div>
-          <div class="buttons">
-            <input type="submit" name="cancel" value="${_('Cancel')}"/>
-            <input type="submit" value="${_('Delete comment')}"/>
+          <div class="control-group">
+            <input class="btn" type="submit" value="${_('Delete comment')}" />
+            <input class="btn-link" type="submit" name="cancel"
+                   value="${_('Cancel')}" />
           </div>
         </form>
       </py:otherwise>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_delete.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_delete.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_delete.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_delete.html Mon
Mar  4 04:20:51 2013
@@ -116,10 +116,12 @@
             <strong>This is an irreversible operation.</strong>
           </p>
           <div class="control-group">
-            <input class="btn-link" type="submit" name="cancel" value="${_('Cancel')}"
/>
-            <input class="btn" type="submit" value="${what == 'multiple' and _('Delete
those versions')
-                                          or what == 'single' and _('Delete this version')
-                                          or _('Delete page')}" />
+            <input class="btn" type="submit"
+                   value="${what == 'multiple' and _('Delete those versions')
+                            or what == 'single' and _('Delete this version')
+                            or _('Delete page')}" />
+            <input class="btn-link" type="submit" name="cancel"
+                   value="${_('Cancel')}" />
           </div>
         </form>
       </div>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_rename.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_rename.html?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_rename.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_wiki_rename.html Mon
Mar  4 04:20:51 2013
@@ -49,8 +49,10 @@
           </label>
           <br/><br/>
           <div class="control-group">
-            <input class="btn-link" type="submit" name="cancel" value="${_('Cancel')}"/>
-            <input class="btn" type="submit" name="submit" value="${_('Rename page')}"/>
+            <input class="btn" type="submit" name="submit"
+                   value="${_('Rename page')}"/>
+            <input class="btn-link" type="submit" name="cancel"
+                   value="${_('Cancel')}"/>
           </div>
         </form>
       </div>

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py?rev=1452181&r1=1452180&r2=1452181&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py Mon Mar  4 04:20:51 2013
@@ -106,6 +106,10 @@ class BloodhoundTheme(ThemeBase):
         'report_view.html' : ('bh_report_view.html', None),
         'ticket.html' : ('bh_ticket.html', '_modify_ticket'),
         'ticket_preview.html' : ('bh_ticket_preview.html', None),
+        'ticket_delete.html' : ('bh_ticket_delete.html', None),
+
+        # Attachment
+        'attachment.html' : ('bh_attachment.html', None),
 
         # Multi Product
         'product_view.html' : ('bh_product_view.html', None),



Mime
View raw message