Author: rjollos Date: Mon Mar 24 03:16:09 2014 New Revision: 1580718 URL: http://svn.apache.org/r1580718 Log: 0.8dev: Added Boostrap styling to the //Edit Product// page. Refs #570.
Initial patch by devenderbindal. Modified: bloodhound/trunk/RELEASE_NOTES bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_product_edit.html bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_roadmap.html bloodhound/trunk/bloodhound_theme/bhtheme/theme.py Modified: bloodhound/trunk/RELEASE_NOTES URL: http://svn.apache.org/viewvc/bloodhound/trunk/RELEASE_NOTES?rev=1580718&r1=1580717&r2=1580718&view=diff ============================================================================== --- bloodhound/trunk/RELEASE_NOTES (original) +++ bloodhound/trunk/RELEASE_NOTES Mon Mar 24 03:16:09 2014 @@ -9,7 +9,7 @@ * Improvements to ticket timeline (comments section). * BloodhoundSearch now supports Whoosh >= 2.5.1 (upgraded from 2.4.1). * Fixed errors in BloodhoundRelations validation logic. - * Bootstrap template for the Roadmap view. + * Bootstrap template for the Roadmap and Edit Product views. * Bloodhound installer support for MySQL database. * Numerous other important fixes and minor enhancements. Modified: bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_product_edit.html URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_product_edit.html?rev=1580718&r1=1580717&r2=1580718&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_product_edit.html (original) +++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_product_edit.html Mon Mar 24 03:16:09 2014 @@ -23,9 +23,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://genshi.edgewall.org/" xmlns:i18n="http://genshi.edgewall.org/i18n" - i18n:domain="multiproduct" + i18n:domain="bhtheme" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="layout.html" /> + <head> <py:choose test="product._exists"> <title py:when="True">Edit Product ${product.name}</title> @@ -34,36 +35,52 @@ </head> <body> - <div id="content" class="product"> + <div id="content" class="product row"> <py:choose test="product._exists"> - <h1 py:when="True">Edit Product ${product.name}</h1> - <h1 py:otherwise="">New Product</h1> + <h1 py:when="True" class="span12">Edit Product ${product.name}</h1> + <h1 py:otherwise="" class="span12">New Product</h1> </py:choose> - <form id="edit" action="" method="post"> - <div class="field"> + + <div class="span12"> + <form class="form-horizontal" action="" method="post"> <input type="hidden" name="action" value="edit" /> - <label>Short name for the product (prefix):<br /> - <input type="text" id="prefix" name="prefix" size="32" value="${product.prefix or req.args.get('prefix')}" readonly="${product._exists and 'readonly' or None}"/> - </label> - <label>Name of the product:<br /> - <input type="text" id="name" name="name" size="32" value="${product.name or req.args.get('name')}" /> - </label> - </div> - <div class="field"> - <fieldset class="iefix"> - <label for="description" i18n:msg="">Description (you may use <a tabindex="42" - href="${href.wiki('WikiFormatting')}">WikiFormatting</a> here):</label> - <p><textarea id="description" name="description" class="wikitext trac-resizable" rows="10" cols="78"> -${product.description}</textarea></p> - </fieldset> - </div> - <div class="buttons" py:choose="product._exists"> - <input py:when="True" type="submit" value="${_('Submit changes')}" /> - <input py:otherwise="" type="submit" value="${_('Add Product')}" /> - <input type="submit" name="cancel" value="${_('Cancel')}" /> - </div> - </form> + <div> + <div class="control-group"> + <label class="control-label" for="prefix">Prefix:</label> + <div class="controls"> + <input type="text" id="prefix" name="prefix" class="input-xxlarge" value="${product.prefix or req.args.get('prefix')}" readonly="${product._exists and 'readonly' or None}"/> + </div> + </div> + <div class="control-group"> + <label class="control-label" for="name">Name:</label> + <div class="controls"> + <input type="text" id="name" name="name" class="input-xxlarge" value="${product.name or req.args.get('name')}" /> + </div> + </div> + <div class="control-group"> + <fieldset class="iefix"> + <label class="control-label" for="description" i18n:msg=""> + Description: + </label> + <div class="controls"> + <p><textarea id="description" name="description" class="wikitext trac-resizable input-xxlarge" rows="10" cols="78"> +$product.description</textarea></p> + <p class="help-block"> + <span class="label label-info">Tip</span> + You may use <a tabindex="42" href="${href.wiki('WikiFormatting')}">WikiFormatting</a> here. + </p> + </div> + </fieldset> + </div> + <div class="buttons btn-toolbar" py:choose="product._exists"> + <input py:when="True" type="submit" class="btn" value="${_('Submit changes')}" /> + <input py:otherwise="" type="submit" class="btn" value="${_('Add Product')}" /> + <input type="submit" name="cancel" class="btn-link" value="${_('Cancel')}" /> + </div> + </div> + </form> + </div> </div> </body> </html> Modified: bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_roadmap.html URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_roadmap.html?rev=1580718&r1=1580717&r2=1580718&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_roadmap.html (original) +++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_roadmap.html Mon Mar 24 03:16:09 2014 @@ -23,6 +23,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://genshi.edgewall.org/" xmlns:i18n="http://genshi.edgewall.org/i18n" + i18n:domain="bhtheme" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="layout.html"/> <xi:include href="widget_macros.html"/> Modified: bloodhound/trunk/bloodhound_theme/bhtheme/theme.py URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/theme.py?rev=1580718&r1=1580717&r2=1580718&view=diff ============================================================================== --- bloodhound/trunk/bloodhound_theme/bhtheme/theme.py (original) +++ bloodhound/trunk/bloodhound_theme/bhtheme/theme.py Mon Mar 24 03:16:09 2014 @@ -136,6 +136,7 @@ class BloodhoundTheme(ThemeBase): # Multi Product 'product_view.html': ('bh_product_view.html', '_add_products_general_breadcrumb'), 'product_list.html': ('bh_product_list.html', '_modify_product_list'), + 'product_edit.html': ('bh_product_edit.html', '_add_products_general_breadcrumb'), # General purpose 'about.html': ('bh_about.html', None),