From 4bf40bbb5ce2c5557f6b827f9d0f06dfbaac95b8 Mon Sep 17 00:00:00 2001
From: sean <sean@155-99-232-195.uconnect.utah.edu>
Date: Tue, 11 Oct 2011 16:24:55 -0600
Subject: [PATCH 1/3] navigation.pt: support content icon on content that is
 also navigation root, supressing the site icon for navigation roots that are
 not sites.

---
 plone/app/portlets/portlets/navigation.pt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plone/app/portlets/portlets/navigation.pt b/plone/app/portlets/portlets/navigation.pt
index 2d524226..6b45333e 100644
--- a/plone/app/portlets/portlets/navigation.pt
+++ b/plone/app/portlets/portlets/navigation.pt
@@ -19,15 +19,18 @@
                             li_class python:selectedClass and ' navTreeCurrentNode' or '';"
                 tal:condition="view/include_top"
                 tal:attributes="class string:navTreeItem navTreeTopNode${li_class}">
-                <div tal:define="rootIsPortal view/root_is_portal;">
+                <div tal:define="rootIsPortal view/root_is_portal;
+                                 siteclass python:rootIsPortal and 'contenttype-plone-site ' or '';">
                    <a tal:attributes="href root/absolute_url;
                                       title root/Description;
-                                      class string:contenttype-plone-site $selectedClass;">
+                                      class string:${siteclass}${selectedClass};">
                    <span tal:omit-tag=""
                          tal:condition="rootIsPortal"
                          i18n:translate="tabs_home">Home</span>
-                   <span tal:condition="not:rootIsPortal"
-                         tal:replace="root/Title">Root item title</span>
+                   <tal:block condition="not:rootIsPortal">
+                        <img width="16" height="16" src="" tal:attributes="src view/root_icon" alt="root/Title" />
+                        <span tal:replace="root/Title">Root item title</span>
+                   </tal:block>
                    </a>
                 </div>
             </li>

From b1eb01d0c2fcd6614b35dd5bc2e4590598a75d8a Mon Sep 17 00:00:00 2001
From: sean <sean@hsc190-219.med.utah.edu>
Date: Wed, 12 Oct 2011 09:49:22 -0600
Subject: [PATCH 2/3] changelog entry for navigation.pt change in previous
 commit.

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9b0970e0..9ac544cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 2.2.2 - Unreleased
 ------------------
 
+- Navigation portlet template renders a non-site navigation root content
+  item with its apporpriate content icon, reserving the Plone site icon
+  CSS sprite for default use by a site only. [seanupton]
+
 - Fixed issue where the events, news and recent portlet would fail
   with a setting of no items (zero) shown due to a catalog sorting
   assertion.

From 9651e2770c93d092907fab3d4da9fd847c8db569 Mon Sep 17 00:00:00 2001
From: sean <sean@hsc190-219.med.utah.edu>
Date: Wed, 12 Oct 2011 12:56:25 -0600
Subject: [PATCH 3/3] fix tal expression to correctly render alt attribute for
 img tag in navigation.pt (icon for non-site navigation root).

---
 plone/app/portlets/portlets/navigation.pt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plone/app/portlets/portlets/navigation.pt b/plone/app/portlets/portlets/navigation.pt
index 6b45333e..8f9463fb 100644
--- a/plone/app/portlets/portlets/navigation.pt
+++ b/plone/app/portlets/portlets/navigation.pt
@@ -28,7 +28,7 @@
                          tal:condition="rootIsPortal"
                          i18n:translate="tabs_home">Home</span>
                    <tal:block condition="not:rootIsPortal">
-                        <img width="16" height="16" src="" tal:attributes="src view/root_icon" alt="root/Title" />
+                        <img width="16" height="16" src="" alt="" tal:attributes="src view/root_icon; alt root/Title" />
                         <span tal:replace="root/Title">Root item title</span>
                    </tal:block>
                    </a>