svn commit: r1455516 - in /incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates: bh_path_general.html bh_path_ticket.html bh_product_view.html

[matevz]

Author: matevz
Date: Tue Mar 12 12:56:05 2013
New Revision: 1455516

URL: http://svn.apache.org/r1455516
Log:
#326 - Multiproduct UI: Breadcrumbs (replaced ticket-specific breadcrumbs with 
general, minor fix for product page)

Modified:
    
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_general.html
    
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_ticket.html
    
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_product_view.html

Modified: 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_general.html
URL: 
http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_general.html?rev=1455516&r1=1455515&r2=1455516&view=diff
==============================================================================
--- 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_general.html
 (original)
+++ 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_general.html
 Tue Mar 12 12:56:05 2013
@@ -24,19 +24,23 @@
      xmlns:xi="http://www.w3.org/2001/XInclude";
      py:strip=""
      py:with="single_product = not product_list or len(product_list) < 2">
-    <div class="btn-group" py:strip="single_product">
-      <button class="btn btn-mini" py:strip="single_product">
-        <a title="Select product" 
href="${href.products(req.perm.env.product.prefix)}">${req.perm.env.product.name}</a>
+  <li py:if="bhdb">
+    <a title="View the dashboard" href="${href.dashboard()}">Dashboard</a>
+    <span class="divider">/</span>
+  </li>
+  <div class="btn-group" py:strip="single_product">
+    <button class="btn btn-mini" py:strip="single_product">
+      <a title="Select product" 
href="${href.products(req.perm.env.product.prefix)}">${req.perm.env.product.name}</a>
+    </button>
+    <py:if test="not single_product">
+      <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
+        <span class="caret"></span>
       </button>
-      <py:if test="not single_product">
-        <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li py:for="prefix,name in product_list">
-            <a title="Product $name ($prefix)" 
href="${href.products(prefix)}">$name ($prefix)</a>
-          </li>
-        </ul>
-      </py:if>
-    </div>
+      <ul class="dropdown-menu">
+        <li py:for="prefix,name in product_list">
+          <a title="Product $name ($prefix)" 
href="${href.products(prefix)}">$name ($prefix)</a>
+        </li>
+      </ul>
+    </py:if>
+  </div>
 </div>

Modified: 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_ticket.html
URL: 
http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_ticket.html?rev=1455516&r1=1455515&r2=1455516&view=diff
==============================================================================
--- 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_ticket.html
 (original)
+++ 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_ticket.html
 Tue Mar 12 12:56:05 2013
@@ -22,30 +22,12 @@
      xmlns:i18n="http://genshi.edgewall.org/i18n";
      xmlns:xi="http://www.w3.org/2001/XInclude";
     py:strip="">
-  <li py:if="bhdb">
-    <a title="View the dashboard" href="${href.dashboard()}">Dashboard</a>
-    <span class="divider">/</span>
-  </li>
-  <li py:if="ticket.product"
-      py:with="prodlink = path_show_product and href.products(ticket.product) 
or href.query(product=ticket['product'], active='!closed') ;
-          single_product = not product_list or len(product_list) &lt; 2">
-    <div class="btn-group" py:strip="single_product">
-      <button class="btn btn-mini" py:strip="single_product">
-        <a title="Active tickets for product ${ticket.product}" 
href="${prodlink}">${ticket.product}</a>
-      </button>
-      <py:if test="not single_product">
-        <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li py:for="prefix,name in product_list">
-            <a title="Active tickets for product ${prefix}" 
href="${href.products(prefix)}">${prefix}</a>
-          </li>
-        </ul>
-      </py:if>
-    </div>
-    <span class="divider">/</span>
-  </li>
+
+  <py:if test="ticket.product">
+    <xi:include href="bh_path_general.html" />
+    <li><span class="divider">/</span></li>
+  </py:if>
+
   <li py:if="ticket.milestone" py:with="mslink = path_show_milestone and 
href.milestone(ticket.milestone) or href.query(milestone=ticket['milestone'], 
active='!closed')">
     <a title="Active tickets in milestone ${ticket.milestone}"
         href="${mslink}">

Modified: 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_product_view.html
URL: 
http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_product_view.html?rev=1455516&r1=1455515&r2=1455516&view=diff
==============================================================================
--- 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_product_view.html
 (original)
+++ 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_product_view.html
 Tue Mar 12 12:56:05 2013
@@ -79,11 +79,12 @@
       <bh:args>
         <bh:arg name="max">10</bh:arg>
         <bh:arg 
name="query">product=${product.prefix}&amp;status=!closed&amp;group=time&amp;col=id&amp;col=summary&amp;col=owner&amp;col=status&amp;col=priority&amp;order=priority&amp;groupdesc=1&amp;desc=1</bh:arg>
-        <bh:arg name="title">Active tickets</bh:arg>
+        <bh:arg name="title">Active Tickets</bh:arg>
       </bh:args>
     </bh:widget>
     <bh:widget urn="TicketFieldValues">
       <bh:args>
+        <bh:arg name="title">Versions</bh:arg>
         <bh:arg name="field">version</bh:arg>
         <bh:arg name="verbose">true</bh:arg>
         <bh:arg 
name="query">product=${product.prefix}&amp;group=version</bh:arg>
@@ -91,6 +92,15 @@
     </bh:widget>
     <bh:widget urn="TicketFieldValues">
       <bh:args>
+        <bh:arg name="title">Milestones</bh:arg>
+        <bh:arg name="field">milestone</bh:arg>
+        <bh:arg name="verbose">true</bh:arg>
+        <bh:arg 
name="query">product=${product.prefix}&amp;group=milestone</bh:arg>
+      </bh:args>
+    </bh:widget>
+    <bh:widget urn="TicketFieldValues">
+      <bh:args>
+        <bh:arg name="title">Components</bh:arg>
         <bh:arg name="field">component</bh:arg>
         <bh:arg name="verbose">true</bh:arg>
         <bh:arg 
name="query">product=${product.prefix}&amp;group=component</bh:arg>