[seam-commits] Seam SVN: r10394 - in trunk/examples/wiki: src/plugin/org/jboss/seam/wiki/plugin/blog/i18n and 3 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Tue Apr 14 10:28:35 EDT 2009
Author: christian.bauer at jboss.com
Date: 2009-04-14 10:28:35 -0400 (Tue, 14 Apr 2009)
New Revision: 10394
Added:
trunk/examples/wiki/view/includes/feedSubscribeMenu.xhtml
Modified:
trunk/examples/wiki/src/etc/i18n/messages_en.properties
trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/i18n/messages_blog_en.properties
trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/templates/blogArchive.xhtml
trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/templates/blogRecentEntries.xhtml
trunk/examples/wiki/view/themes/inrelationto/css/inrelationto.css
Log:
JBSEAM-2873, added UI for links to feeds w/wo comments
Modified: trunk/examples/wiki/src/etc/i18n/messages_en.properties
===================================================================
--- trunk/examples/wiki/src/etc/i18n/messages_en.properties 2009-04-14 05:06:17 UTC (rev 10393)
+++ trunk/examples/wiki/src/etc/i18n/messages_en.properties 2009-04-14 14:28:35 UTC (rev 10394)
@@ -154,7 +154,12 @@
lacewiki.button.SiteFeed=Subscribe to site
lacewiki.button.DirectoryFeed=Subscribe to directory
+lacewiki.label.Subscribe=Subscribe
+lacewiki.label.SubscribeWithComments=All
+lacewiki.label.SubscribeWithoutComments=No Comments
+lacewiki.label.SubscribeOnlyComments=Only Comments
+
lacewiki.label.PermLink=PermLink
lacewiki.label.WikiLink=WikiLink
lacewiki.label.DirLink=Link to directory
Modified: trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/i18n/messages_blog_en.properties
===================================================================
--- trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/i18n/messages_blog_en.properties 2009-04-14 05:06:17 UTC (rev 10393)
+++ trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/i18n/messages_blog_en.properties 2009-04-14 14:28:35 UTC (rev 10394)
@@ -24,13 +24,11 @@
blog.archive.description=Displays all blog entries in combo box (tag filtered)
blog.archive.preferences.property.archiveSubscribeIcon=Show feed subscribe icon on archive
blog.archive.label.Archive=Archive
-blog.archive.label.Subscribe=Subscribe
blog.archive.label.AllEntries=All Entries
blog.recentEntries.label=Recent Entries
blog.recentEntries.description=Displays all recent entries
blog.recentEntries.label.RecentEntries=Recent Entries
-blog.recentEntries.label.Subscribe=Subscribe
blog.recentEntries.preferences.property.recentEntriesItems=Number of recent entries shown
blog.recentEntries.preferences.property.recentEntriesTruncateTitle=Truncate recent entries title after characters
blog.recentEntries.preferences.property.recentEntriesSubscribeIcon=Show feed subscribe icon on recent entries
Modified: trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/templates/blogArchive.xhtml
===================================================================
--- trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/templates/blogArchive.xhtml 2009-04-14 05:06:17 UTC (rev 10393)
+++ trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/templates/blogArchive.xhtml 2009-04-14 14:28:35 UTC (rev 10394)
@@ -24,15 +24,9 @@
columns="2" cellpadding="0" cellspacing="0" border="0"
styleClass="boxHeader fullWidth">
- <h:panelGrid styleClass="smallFont" rendered="#{not empty currentDirectory.feed}" columns="2"
- cellpadding="2" cellspacing="0" border="0">
- <h:outputLink value="#{wikiURLRenderer.renderFeedURL(currentDirectory.feed, null, null)}">
- <h:graphicImage value="#{imagePath}/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/>
- </h:outputLink>
- <h:outputLink value="#{wikiURLRenderer.renderFeedURL(currentDirectory.feed, null, null)}">
- <h:outputText value="#{messages['blog.archive.label.Subscribe']}"/>
- </h:outputLink>
- </h:panelGrid>
+ <ui:include src="/includes/feedSubscribeMenu.xhtml">
+ <ui:param name="feed" value="#{currentDirectory.feed}"/>
+ </ui:include>
<h:outputText rendered="#{empty param.tag}" value="#{messages['blog.archive.label.Archive']}"/>
<h:outputText rendered="#{not empty param.tag}" value="#{messages['blog.archive.label.Archive']} '#{param.tag}'"/>
Modified: trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/templates/blogRecentEntries.xhtml
===================================================================
--- trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/templates/blogRecentEntries.xhtml 2009-04-14 05:06:17 UTC (rev 10393)
+++ trunk/examples/wiki/src/plugin/org/jboss/seam/wiki/plugin/blog/templates/blogRecentEntries.xhtml 2009-04-14 14:28:35 UTC (rev 10394)
@@ -23,19 +23,9 @@
columns="2" cellpadding="0" cellspacing="0" border="0"
styleClass="boxHeader fullWidth">
- <h:panelGrid styleClass="undecoratedLink smallFont" rendered="#{not empty currentDirectory.feed}" columns="2"
- cellpadding="2" cellspacing="0" border="0">
- <h:outputLink
- target="_top"
- value="#{wikiURLRenderer.renderFeedURL(currentDirectory.feed, null, null)}">
- <h:graphicImage value="#{imagePath}/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/>
- </h:outputLink>
- <h:outputLink
- target="_top"
- value="#{wikiURLRenderer.renderFeedURL(currentDirectory.feed, null, null)}">
- <h:outputText value="#{messages['blog.recentEntries.label.Subscribe']}"/>
- </h:outputLink>
- </h:panelGrid>
+ <ui:include src="/includes/feedSubscribeMenu.xhtml">
+ <ui:param name="feed" value="#{currentDirectory.feed}"/>
+ </ui:include>
<h:outputText value="#{messages['blog.recentEntries.label.RecentEntries']}"/>
Added: trunk/examples/wiki/view/includes/feedSubscribeMenu.xhtml
===================================================================
--- trunk/examples/wiki/view/includes/feedSubscribeMenu.xhtml (rev 0)
+++ trunk/examples/wiki/view/includes/feedSubscribeMenu.xhtml 2009-04-14 14:28:35 UTC (rev 10394)
@@ -0,0 +1,46 @@
+<s:div styleClass="contextMenu"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:s="http://jboss.com/products/seam/taglib">
+
+ <h:panelGrid styleClass="undecoratedLink smallFont" rendered="#{not empty feed}" columns="2"
+ cellpadding="2" cellspacing="0" border="0">
+
+ <h:outputLink value="javascript://no-op"
+ onmouseover="jQuery(this).parents('.contextMenu').menu();">
+ <h:graphicImage value="#{imagePath}/icon.atom.ongrey.gif" width="18" height="18" alt="Atom"/>
+ </h:outputLink>
+
+ <h:outputLink value="javascript://no-op"
+ onmouseover="jQuery(this).parents('.contextMenu').menu();">
+ <h:outputText value="#{messages['lacewiki.label.Subscribe']}"/>
+ </h:outputLink>
+
+ </h:panelGrid>
+
+ <ul class="contextMenuItems">
+ <li>
+ <h:outputLink
+ target="_top"
+ value="#{wikiURLRenderer.renderFeedURL(feed, null, null)}">
+ <h:outputText value="#{messages['lacewiki.label.SubscribeWithComments']}"/>
+ </h:outputLink>
+ </li>
+ <li>
+ <h:outputLink
+ target="_top"
+ value="#{wikiURLRenderer.renderFeedURL(feed, null, 'exclude')}">
+ <h:outputText value="#{messages['lacewiki.label.SubscribeWithoutComments']}"/>
+ </h:outputLink>
+ </li>
+ <li>
+ <h:outputLink
+ target="_top"
+ value="#{wikiURLRenderer.renderFeedURL(feed, null, 'only')}">
+ <h:outputText value="#{messages['lacewiki.label.SubscribeOnlyComments']}"/>
+ </h:outputLink>
+ </li>
+ </ul>
+
+</s:div>
Modified: trunk/examples/wiki/view/themes/inrelationto/css/inrelationto.css
===================================================================
--- trunk/examples/wiki/view/themes/inrelationto/css/inrelationto.css 2009-04-14 05:06:17 UTC (rev 10393)
+++ trunk/examples/wiki/view/themes/inrelationto/css/inrelationto.css 2009-04-14 14:28:35 UTC (rev 10394)
@@ -1637,7 +1637,6 @@
}
.activetarget {
- font-weight: bold;
cursor: pointer;
}
More information about the seam-commits
mailing list