svn commit: r1455676 - in /incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme: templates/bh_path_general.html templates/bh_path_search.html theme.py

[matevz]

Author: matevz
Date: Tue Mar 12 19:27:15 2013
New Revision: 1455676

URL: http://svn.apache.org/r1455676
Log:
#326 - Multiproduct UI: Breadcrumbs (added breadcrumbs to query/report and 
search)

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_search.html
    
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py

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=1455676&r1=1455675&r2=1455676&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 19:27:15 2013
@@ -30,7 +30,7 @@
   </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>
+      <a title="Current 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">

Modified: 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_search.html
URL: 
http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_search.html?rev=1455676&r1=1455675&r2=1455676&view=diff
==============================================================================
--- 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_search.html
 (original)
+++ 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/templates/bh_path_search.html
 Tue Mar 12 19:27:15 2013
@@ -21,9 +21,11 @@
      xmlns:py="http://genshi.edgewall.org/";
      xmlns:i18n="http://genshi.edgewall.org/i18n";
      xmlns:xi="http://www.w3.org/2001/XInclude";
-    py:strip="" py:if="query">
-  <li>Search <span class="divider">/</span></li>
-  <li py:with="query_summary = query[:15] + ' ...'" title="$query">
+    py:strip="">
+  <xi:include href="bh_path_general.html" />
+  <li><span class="divider">/</span></li>
+  <li><a href="${href.search()}">Search</a><span py:if="query" 
class="divider">/</span></li>
+  <li py:if="query" py:with="query_summary = query[:15] + ' ...'" 
title="$query">
     <code>${query_summary if len(query) &gt; 19 else query}</code>
   </li>
 </div>

Modified: 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py
URL: 
http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py?rev=1455676&r1=1455675&r2=1455676&view=diff
==============================================================================
--- 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py
 (original)
+++ 
incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_theme/bhtheme/theme.py
 Tue Mar 12 19:27:15 2013
@@ -107,15 +107,15 @@ class BloodhoundTheme(ThemeBase):
         'wiki_view.html' : ('bh_wiki_view.html', '_modify_wiki_page_path'),
 
         # Ticket
-        'milestone_edit.html' : ('bh_milestone_edit.html', None),
-        'milestone_delete.html' : ('bh_milestone_delete.html', None),
+        'milestone_edit.html' : ('bh_milestone_edit.html', 
'_add_products_general_breadcrumb'),
+        'milestone_delete.html' : ('bh_milestone_delete.html', 
'_add_products_general_breadcrumb'),
         'milestone_view.html' : ('bh_milestone_view.html', 
'_modify_roadmap_page'),
         'roadmap.html' : ('roadmap.html', '_add_products_general_breadcrumb'),
-        'query.html' : ('bh_query.html', None),
-        'report_delete.html' : ('bh_report_delete.html', None),
-        'report_edit.html' : ('bh_report_edit.html', None), 
-        'report_list.html' : ('bh_report_list.html', None),
-        'report_view.html' : ('bh_report_view.html', None),
+        'query.html' : ('bh_query.html', '_add_products_general_breadcrumb'),
+        'report_delete.html' : ('bh_report_delete.html', 
'_add_products_general_breadcrumb'),
+        'report_edit.html' : ('bh_report_edit.html', 
'_add_products_general_breadcrumb'), 
+        'report_list.html' : ('bh_report_list.html', 
'_add_products_general_breadcrumb'),
+        'report_view.html' : ('bh_report_view.html', 
'_add_products_general_breadcrumb'),
         'ticket.html' : ('bh_ticket.html', '_modify_ticket'),
         'ticket_preview.html' : ('bh_ticket_preview.html', None),
         'ticket_delete.html' : ('bh_ticket_delete.html', None),
@@ -310,10 +310,12 @@ class BloodhoundTheme(ThemeBase):
         if is_active:
             # Insert query string in search box (see bloodhound_theme.html)
             req.search_query = data.get('query')
-            # Breadcrumbs nav
-            data['resourcepath_template'] = 'bh_path_search.html'
             # Context nav
             prevnext_nav(req, _('Previous'), _('Next'))
+        # Breadcrumbs nav
+        data['product_list'] = [(p.prefix, p.name)
+            for p in self._get_product_list(req)]
+        data['resourcepath_template'] = 'bh_path_search.html'
 
     def _modify_wiki_page_path(self, req, template, data, content_type, 
is_active):
         """Override wiki breadcrumbs nav items