[jboss-cvs] JBossBlog SVN: r247 - in trunk: src/action/org/jboss/blog/session/feed/posts and 17 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 7 03:58:18 EST 2008
Author: adamw
Date: 2008-03-07 03:58:18 -0500 (Fri, 07 Mar 2008)
New Revision: 247
Added:
trunk/view/images/hdr_feed_gradient.gif
trunk/view/images/ico_linkarrow_blue.gif
trunk/view/images/portlethdr_home.gif
trunk/view/images/propose_blog.png
trunk/view/stylesheet/more_blog.css
Modified:
trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java
trunk/src/action/org/jboss/blog/session/feed/posts/DatabaseFeedPosts.java
trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java
trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
trunk/src/services/org/jboss/blog/service/FeedsService.java
trunk/view/common/post.xhtml
trunk/view/home.xhtml
trunk/view/layout/menu.xhtml
trunk/view/layout/template.xhtml
trunk/view/manage/aggregated/aggregated_mod.xhtml
trunk/view/manage/feed_mod.xhtml
trunk/view/manage/group/group_mod.xhtml
trunk/view/manage/highlights/post_add.xhtml
trunk/view/manage/remote/remote_add.xhtml
trunk/view/manage/remote/remote_edit.xhtml
trunk/view/manage/remote/remote_mod.xhtml
trunk/view/manage/remote/remote_propose.xhtml
trunk/view/manage/shotoku/shotoku_mod.xhtml
trunk/view/manage/template/template_list.xhtml
trunk/view/security/login.xhtml
trunk/view/stylesheet/blog.css
trunk/view/view/feed_toolbar.xhtml
Log:
Modified: trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/src/action/org/jboss/blog/session/feed/FeedsServiceImpl.java 2008-03-07 08:58:18 UTC (rev 247)
@@ -8,6 +8,7 @@
import org.jboss.blog.service.FeedsService;
import org.jboss.blog.service.PostNotFoundException;
import org.jboss.blog.session.feed.type.FeedTypes;
+import org.jboss.blog.session.feed.posts.DatabaseFeedPosts;
import org.jboss.blog.session.cache.FeedsServiceGetPostsInterceptor;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
@@ -36,6 +37,9 @@
@In
private FeedTypes feedTypes;
+ @In
+ private DatabaseFeedPosts databaseFeedPosts;
+
@Logger
private Log log;
@@ -71,7 +75,7 @@
@Interceptors(FeedsServiceGetPostsInterceptor.class)
public List<? extends RestrictedPost> getPosts(RestrictedFeed feed, int from, int to) {
- log.debug("Reading feed '#0' posts from the DB, from #1 to #2.", feed.getName(), from, to);
+ log.debug("Reading feed '#0' posts, from #1 to #2.", feed.getName(), from, to);
try {
return feedTypes.getFeedDao(feed).getPosts(from, to);
} catch (InvalidFeedTypeException e) {
@@ -80,6 +84,12 @@
}
}
+ public List<? extends RestrictedPost> getPosts(int from, int to) {
+ log.debug("Reading posts from the DB, from #01 to #1.", from, to);
+
+ return databaseFeedPosts.getPosts(from, to);
+ }
+
@Remove
public void remove() { }
}
Modified: trunk/src/action/org/jboss/blog/session/feed/posts/DatabaseFeedPosts.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/posts/DatabaseFeedPosts.java 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/src/action/org/jboss/blog/session/feed/posts/DatabaseFeedPosts.java 2008-03-07 08:58:18 UTC (rev 247)
@@ -3,6 +3,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.ScopeType;
import org.jboss.blog.model.Post;
import org.jboss.blog.model.RestrictedPost;
@@ -16,6 +17,7 @@
*/
@Name("databaseFeedPosts")
@Scope(ScopeType.STATELESS)
+ at AutoCreate
public class DatabaseFeedPosts {
@In
private EntityManager entityManager;
@@ -26,4 +28,11 @@
"select post from Post post where post.feed = ?1 order by post.published desc, post.link")
.setParameter(1, feed).setMaxResults(to-from).setFirstResult(from).getResultList();
}
+
+ @SuppressWarnings("unchecked")
+ public List<? extends RestrictedPost> getPosts(int from, int to) {
+ return (List<Post>) entityManager.createQuery(
+ "select post from Post post order by post.published desc, post.link")
+ .setMaxResults(to-from).setFirstResult(from).getResultList();
+ }
}
Modified: trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java 2008-03-07 08:58:18 UTC (rev 247)
@@ -37,7 +37,7 @@
}
public String generateFeedLink(Feed feed, XmlType type) {
- return serverAddress + "/" + contextName + "/feed/" + feed.getName() + "?type=" + type;
+ return serverAddress + "/" + contextName + "/feed/" + feed.getName() + "?type=" + type.toString().toLowerCase();
}
public String generateFeedPageLink(Feed feed) {
Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java 2008-03-07 08:58:18 UTC (rev 247)
@@ -68,7 +68,7 @@
XmlType xmlType;
try {
- xmlType = XmlType.valueOf(feedType == null? "" : feedType.toUpperCase());
+ xmlType = XmlType.valueOf(feedType == null ? "" : feedType.toUpperCase());
} catch (IllegalArgumentException e) {
throw new InvalidTemplateTypeException(e);
}
Modified: trunk/src/services/org/jboss/blog/service/FeedsService.java
===================================================================
--- trunk/src/services/org/jboss/blog/service/FeedsService.java 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/src/services/org/jboss/blog/service/FeedsService.java 2008-03-07 08:58:18 UTC (rev 247)
@@ -21,4 +21,6 @@
List<? extends RestrictedPost> getPosts(RestrictedFeed feed, int from, int to);
void remove();
+
+ List<? extends RestrictedPost> getPosts(int from, int to);
}
Modified: trunk/view/common/post.xhtml
===================================================================
--- trunk/view/common/post.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/common/post.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -8,15 +8,13 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j">
<h3>
- <s:div>
- <s:link value="#{post.title}" view="/view/post.xhtml" propagation="none">
- <f:param name="post" value="#{post.titleAsId}" />
- </s:link>
- </s:div>
+ <s:link value="#{post.title}" view="/view/post.xhtml" propagation="none">
+ <f:param name="post" value="#{post.titleAsId}" />
+ </s:link>
</h3>
<p class="blogauthortag">
- Published on #{post.published} by #{post.effectiveAuthor} #{additionalHeader}
+ Posted on #{post.published} by <b>#{post.effectiveAuthor}</b> #{additionalHeader}
[ <a href="#{post.link}">View original post</a> ]
</p>
Modified: trunk/view/home.xhtml
===================================================================
--- trunk/view/home.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/home.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -12,32 +12,48 @@
</ui:define>
<ui:define name="body">
- <div class="QuickstartMargin" id="QuickStart">
- <ul>
- <li>
- <p>If you are blogging on a JBoss-related subject, hesitate no more and aggregate it in our system!</p>
- </li>
- <li><s:link value="Propose a blog" view="/manage/remote/remote_propose.xhtml" propagation="none" /></li>
- </ul>
+ <div id="columnrightBLOG">
+ <div id="TwoColumnBlogJelly">
+ <s:link value="" view="/manage/remote/remote_propose.xhtml" propagation="none">
+ <img src="/blogs/images/propose_blog.png"
+ alt="Propose a Blog! If you are blogging on a JBoss-related subject, aggregate it in our system!" />
+ </s:link>
+ </div>
+
+ <div class="TwoColumnBlogSubnav">
+ <dt>Recent Posts</dt>
+ <ui:repeat var="post" value="#{feedsService.getPosts(0, 5)}">
+ <dd>
+ <s:link view="/view/feed.xhtml" value="#{post.title}" propagation="none">
+ <f:param name="name" value="#{post.feed.name}"/>
+ </s:link>
+ </dd>
+ </ui:repeat>
+ </div>
</div>
- <h3 class="head3">Select a feed to view:</h3>
-
- <table cellspacing="5" class="deftable" width="75%">
+ <div id="columnleftBLOG">
<ui:repeat var="group" value="#{groupsService.allGroups}">
<s:fragment rendered="#{groupsService.acceptedFeeds(group).size() > 0}">
- <tr>
- <td class="term" width="15%">#{group.displayName}</td>
- <td class="def">
- <ui:repeat var="feed" value="#{groupsService.acceptedFeeds(group)}">
- <s:link view="/view/feed.xhtml" value="#{feed.title}" propagation="none">
- <f:param name="name" value="#{feed.name}"/>
- </s:link> <br />
- </ui:repeat>
- </td>
- </tr>
+ <h4>#{group.displayName}</h4>
+ <table cellspacing="5" class="laundrytable" width="75%">
+ <tr>
+ <th width="200px">Feed Author</th>
+ <th width="480px">Feed Title</th>
+ </tr>
+ <ui:repeat var="feed" value="#{groupsService.acceptedFeeds(group)}">
+ <tr>
+ <td>#{feed.author}</td>
+ <td>
+ <s:link view="/view/feed.xhtml" value="#{feed.title}" propagation="none">
+ <f:param name="name" value="#{feed.name}"/>
+ </s:link>
+ </td>
+ </tr>
+ </ui:repeat>
+ </table>
</s:fragment>
</ui:repeat>
- </table>
+ </div>
</ui:define>
</ui:composition>
Added: trunk/view/images/hdr_feed_gradient.gif
===================================================================
(Binary files differ)
Property changes on: trunk/view/images/hdr_feed_gradient.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/view/images/ico_linkarrow_blue.gif
===================================================================
(Binary files differ)
Property changes on: trunk/view/images/ico_linkarrow_blue.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/view/images/portlethdr_home.gif
===================================================================
(Binary files differ)
Property changes on: trunk/view/images/portlethdr_home.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/view/images/propose_blog.png
===================================================================
(Binary files differ)
Property changes on: trunk/view/images/propose_blog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/view/layout/menu.xhtml
===================================================================
--- trunk/view/layout/menu.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/layout/menu.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -46,16 +46,25 @@
<div id="primarynav">
<ul>
<li>
- <a href="/">JBoss.ORG</a>
+ <s:link view="/home.xhtml" value="(temp: Feeds home)" propagation="none" />
</li>
- <li>
- <s:link view="/home.xhtml" value="Feeds central home" propagation="none" />
- </li>
<s:fragment rendered="#{identity.hasPermission('management', 'view')}">
<li>
- <s:link value="Manage" view="/manage/index.xhtml" propagation="none" />
+ <s:link value="(temp: Manage)" view="/manage/index.xhtml" propagation="none" />
</li>
</s:fragment>
+ <li>
+ <a href="/">Home</a>
+ </li>
+ <li>
+ <a href="/resources">Resources</a>
+ </li>
+ <li>
+ <a href="/projects">Projects</a>
+ </li>
+ <li id='current'>
+ <a href="/community">Community</a>
+ </li>
</ul>
</div>
</div>
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/layout/template.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -12,6 +12,7 @@
<link href="/blogs/stylesheet/org_main.css" rel="stylesheet" type="text/css" />
<link href="/blogs/stylesheet/org_layout.css" rel="stylesheet" type="text/css" />
<link href="/blogs/stylesheet/blog.css" rel="stylesheet" type="text/css" />
+ <link href="/blogs/stylesheet/more_blog.css" rel="stylesheet" type="text/css" />
<ui:insert name="additional_headers" />
</head>
Modified: trunk/view/manage/aggregated/aggregated_mod.xhtml
===================================================================
--- trunk/view/manage/aggregated/aggregated_mod.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/aggregated/aggregated_mod.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -7,12 +7,13 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j">
-<div class="QuickstartMargin" id="QuickStart">
+<div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
<ul>
<li>
<p>If you choose to aggregate a feed group, all feeds from that group will be aggregated.</p>
</li>
- <li>
+ <li class="last">
<p>Filters will be applied to each post in a feed, group, or to all posts (depending where you choose to
place the filter), and if the filter output is positive the post will be included in the aggregated
feed.</p>
Modified: trunk/view/manage/feed_mod.xhtml
===================================================================
--- trunk/view/manage/feed_mod.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/feed_mod.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -8,12 +8,13 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:blog="http://jboss.org/blog/tags"
xmlns:a="http://richfaces.org/a4j">
-<div class="QuickstartMargin" id="QuickStart">
+<div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
<ul>
<li>
<p>Please fill in all the details that are necessary to handle your feed.</p>
</li>
- <li>
+ <li class="last">
<p>Also, choose an atom template that suites the type of your feed. Most of the time, 'standard' will
suffice, however if you have a podcast, choose 'podcast'.</p>
</li>
Modified: trunk/view/manage/group/group_mod.xhtml
===================================================================
--- trunk/view/manage/group/group_mod.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/group/group_mod.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -8,9 +8,10 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:blog="http://jboss.org/blog/tags"
xmlns:a="http://richfaces.org/a4j">
- <div class="QuickstartMargin" id="QuickStart">
+ <div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
<ul>
- <li>
+ <li class="last">
<p>Header is an optional piece of HTML that will be displayed on the top of the page when
viewing feeds/posts from that group.</p>
</li>
Modified: trunk/view/manage/highlights/post_add.xhtml
===================================================================
--- trunk/view/manage/highlights/post_add.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/highlights/post_add.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -13,9 +13,10 @@
</ui:define>
<ui:define name="body">
- <div class="QuickstartMargin" id="QuickStart">
+ <div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
<ul>
- <li>
+ <li id="last">
<p>After selecting a highlights feed, you'll be able to change the order of the posts.</p>
</li>
</ul>
Modified: trunk/view/manage/remote/remote_add.xhtml
===================================================================
--- trunk/view/manage/remote/remote_add.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/remote/remote_add.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -13,12 +13,13 @@
</ui:define>
<ui:define name="body">
- <div class="QuickstartMargin" id="QuickStart">
+ <div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
<ul>
<li>
<p>#{messages['blog.feed.remote.adding.quickstart']}</p>
</li>
- <li>
+ <li class="last">
<p>#{messages['blog.feed.remote.mod.authors']}</p>
</li>
</ul>
Modified: trunk/view/manage/remote/remote_edit.xhtml
===================================================================
--- trunk/view/manage/remote/remote_edit.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/remote/remote_edit.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -13,13 +13,14 @@
</ui:define>
<ui:define name="body">
- <div class="QuickstartMargin" id="QuickStart">
+ <div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
<ul>
<li>
<p>You can change the address of your feed, however use this option with caution; if you
have a completely new feed, maybe it's better to create a new remote feed instead?</p>
</li>
- <li>
+ <li class="last">
<p>#{messages['blog.feed.remote.mod.authors']}</p>
</li>
</ul>
Modified: trunk/view/manage/remote/remote_mod.xhtml
===================================================================
--- trunk/view/manage/remote/remote_mod.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/remote/remote_mod.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -71,7 +71,7 @@
<s:fragment rendered="#{remoteFeedMod.parseOk and new}">
<li>
<h:commandButton value="Next »" action="#{remoteFeedMod.saveNew}"
- styleClass="submit" />
+ styleClass="submit_first" />
</li>
</s:fragment>
<s:fragment rendered="#{remoteFeedMod.parseOk and !new}">
Modified: trunk/view/manage/remote/remote_propose.xhtml
===================================================================
--- trunk/view/manage/remote/remote_propose.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/remote/remote_propose.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -13,12 +13,13 @@
</ui:define>
<ui:define name="body">
- <div class="QuickstartMargin" id="QuickStart">
+ <div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
<ul>
<li>
<p>#{messages['blog.feed.remote.adding.quickstart']}</p>
</li>
- <li>
+ <li class="last">
<p>#{messages['blog.feed.remote.mod.authors']}</p>
</li>
</ul>
Modified: trunk/view/manage/shotoku/shotoku_mod.xhtml
===================================================================
--- trunk/view/manage/shotoku/shotoku_mod.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/shotoku/shotoku_mod.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -7,7 +7,8 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j">
-<div class="QuickstartMargin" id="QuickStart">
+<div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
<ul>
<li>
<p>
@@ -41,7 +42,7 @@
<i>post image (optional)</i> - value of the 'thumbnail' property (also a relative URL)
</p>
</li>
- <li>
+ <li id="last">
<p>#{messages['blog.feed.remote.mod.authors']}</p>
</li>
</ul>
@@ -134,7 +135,7 @@
<s:fragment rendered="#{shotokuFeedMod.pathOk and new}">
<li>
<h:commandButton value="Next »" action="#{shotokuFeedMod.saveNew}"
- styleClass="submit" />
+ styleClass="submit_first" />
</li>
</s:fragment>
<s:fragment rendered="#{shotokuFeedMod.pathOk and !new}">
Modified: trunk/view/manage/template/template_list.xhtml
===================================================================
--- trunk/view/manage/template/template_list.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/manage/template/template_list.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -23,8 +23,8 @@
<table border="0" cellpadding="4" cellspacing="0" class="basetablestyle" style="margin-top:12px;">
<tr class="header">
- <td class="tableheaderfirst" style="width:160px;">Group display name</td>
- <td class="tableheader">Group name</td>
+ <td class="tableheaderfirst" style="width:160px;">Template name</td>
+ <td class="tableheader">Template type</td>
<td class="tableheader" />
<td class="tableheader" />
</tr>
Modified: trunk/view/security/login.xhtml
===================================================================
--- trunk/view/security/login.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/security/login.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -12,6 +12,20 @@
</ui:define>
<ui:define name="body">
+ <div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
+ <ul>
+ <li>
+ <p>If you don't have yet an account, click the 'Register' link at the top.</p>
+ </li>
+ <li class="last">
+ <p>If you do have registered, but can't login, you may not have a JBoss.ORG account yet.
+ To get one, just login once to JBoss.ORG (<a href="http://labs.jboss.com/auth">here</a>),
+ it will be created automatically.</p>
+ </li>
+ </ul>
+ </div>
+
<div class="adminforms">
<h:form>
<h:panelGrid columns="2">
Modified: trunk/view/stylesheet/blog.css
===================================================================
--- trunk/view/stylesheet/blog.css 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/stylesheet/blog.css 2008-03-07 08:58:18 UTC (rev 247)
@@ -182,19 +182,18 @@
padding:15px;
background-color:#fef9e6;
border: 1px solid #f9ba82;
+ list-style:none;
}
.messages_warn {
margin-bottom:12px;
padding:15px;
- background-color: red;
- border: 1px solid #f9ba82;
+ background-color: #CC3333;
+ border: 1px solid #7B1E1E;
+ list-style: none;
}
.messages {
}
-.portlet_author_date {
- font-style: italic;
-}
Added: trunk/view/stylesheet/more_blog.css
===================================================================
--- trunk/view/stylesheet/more_blog.css (rev 0)
+++ trunk/view/stylesheet/more_blog.css 2008-03-07 08:58:18 UTC (rev 247)
@@ -0,0 +1,285 @@
+
+
+/* Cheyenne's new styles begin here */
+/* Tips and Recent Blog Entries BOX: From the blog pages ------- need to upload new image for header labeled 'Tips' and 'Recent Blog Entries'----------------------------------*/
+
+
+.globalOps ul{
+ list-style: none;
+}
+
+.globalOps li{
+ margin: -20px 5px 10px 0px;
+ float: right;
+}
+
+.feedTable .basetablestyle th {
+ height:20px;
+ padding-left: 6px;
+ padding-right: 30px;
+}
+
+.feedheader h4{
+ color: #FFFFFF;
+ font-size:14px;
+ margin: 5px 0px 5px 3px;
+ padding:10px 0px 0px 0px;
+}
+
+.feedTable{
+ margin: 25px 0px 15px 0px;
+}
+
+.feedTable .mainHeader2 {
+ float:left;
+}
+
+.feedTable .formbuttons {
+ float:right;
+}
+
+
+.feedOps {
+ background-color:#FFFFFF;
+}
+
+.newFeed {
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #4a5d75;
+ border-top: 1px solid #94aebd;
+ border-left: 1px solid #94aebd;
+ border-right: 1px solid #233345;
+ border-bottom: 1px solid #233345;
+ height:15px;
+ padding:5px 10px 0px 10px;
+ color:CC3333;
+ float:right;
+ margin: 10px -24px 0px 1px;
+}
+
+.newFeed a{
+ color: #FFFFFF;
+ text-decoration: none;
+}
+
+.newGroup {
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #4a5d75;
+ border-top: 1px solid #94aebd;
+ border-left: 1px solid #94aebd;
+ border-right: 1px solid #233345;
+ border-bottom: 1px solid #233345;
+ height:15px;
+ padding:5px 10px 0px 10px;
+ float:right;
+ margin: 10px 5px 0px -10px;
+
+}
+
+.newGroup a{
+ color: #FFFFFF;
+ text-decoration: none;
+}
+
+.rowline select {
+ width: 120px;
+}
+
+/* Archive List css from blog_styles.css */
+
+.blogRightsidebox {
+ padding: 20px;
+ float:right;
+ width:200px;
+}
+
+.blogRightsidebox h4 {
+ font-size:11px;
+ font-weight:bold;
+ padding-left:10px;
+ padding-bottom: 5px;
+ border-bottom: 1px solid #8c8f91;
+}
+
+.blogRightsidebox ul {
+ padding-left: 10px;
+ margin-left: 0px;
+}
+
+.blogRightsidebox li {
+ list-style: none;
+ display: block;
+ padding:.25em 0px;
+}
+
+
+
+/* Homepage css */
+
+#columnleftBLOG {
+ float:left;
+ margin: 10px;
+ width:680px;
+}
+
+#columnleftBLOG h4{
+ color: #cc0000;
+}
+
+#columnrightBLOG {
+ float:right;
+ width: 225px;
+}
+
+.laundrytable {
+ width: 680px;
+ text-align: left;
+ line-height: 150%;
+ margin: 0px 0px 20px 20px;
+}
+
+
+.laundrytable th {
+ vertical-align: top;
+ padding: 5px 5px 5px 0px;
+ font-weight: bold;
+
+
+}
+
+.laundrytable td {
+ vertical-align: top;
+ padding: 5px 5px 5px 0px;
+ color: #000000;
+ border-bottom-color: #e1e1e1;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+
+}
+
+/* Homepage: Right column - Blog Subnav */
+
+.TwoColumnBlogSubnav {
+ float: right;
+ border: 1px solid #94aebd;
+ background-color: #e1eef4;
+ background-image: url(/blogs/images/hdr_feed_gradient.gif);
+ background-repeat: repeat-x;
+ background-position: top;
+ padding:0px 12px 12px 11px;
+ margin:0px 0px 10px 0px;
+ width:200px;
+}
+.TwoColumnBlogSubnav dt{
+ font-weight:bold;
+ font-size: 14px;
+ color: white;
+ padding:6px 0px 12px 0px;
+}
+.TwoColumnBlogSubnav dd {
+ background-image: url(/blogs/images/ico_linkarrow_blue.gif);
+ color: #233446;
+ background-repeat: no-repeat;
+ background-position: 0px 3px;
+ padding:0 0 6px 15px;
+}
+
+.TwoColumnBlogSubnav li {
+ padding: 10px;
+ border-bottom: 1px solid #000000;
+}
+.TwoColumnBlogSubnav li.last {
+ border-bottom: none;
+}
+
+
+/* Homepage: Right column - Blog Jelly Box */
+#TwoColumnBlogJelly {
+ float: right;
+
+ background-color: #e1eef4;
+ background-image:url(/blogs/images/jelly_box.png);
+ background-repeat:no-repeat;
+ background-position:top;
+
+ margin-bottom: 10px;
+}
+
+/* Edit feeds page - additions to Admin List */
+
+.TwoColumnBlogSubnav h4 {
+ font-weight:bold;
+ font-size: 14px;
+ color: white;
+ padding:6px 0px 12px 0px;
+}
+
+hr.formSeparator {
+ margin: 10px 23px 25px auto;
+ border-top: 1px solid #d7d9d9;
+}
+
+.adminforms .checkbox{
+ margin-left:170px;
+}
+
+.submit_first {
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #e3a835;
+ border-top: 1px solid #fbdea4;
+ border-left: 1px solid #fbdea4;
+ border-right: 1px solid #976c18;
+ border-bottom: 1px solid #976c18;
+ height:20px;
+}
+/***********************************************/
+/* =Normalizes Browser Styles */
+/***********************************************/
+
+/*--Normalize margin, padding */
+body, div, dl, dt, dd, ul, ol, li, h3, h4, h5, h6, pre, form, fieldset, input, p, blockquote, th, td {
+ margin: 0;
+ padding: 0;
+ }
+
+/*--Normalize font-size for headers*/
+ h3, h4, h5, h6 {
+ font-size: 100%;
+ }
+
+/*--Removes list-style from lists */
+ol,ul {
+ list-style: none;
+ }
+
+/*--Normalizes font-style and font-weight to normal*/
+address, caption, cite, code, dfn, em, strong, th, var {
+ font-style: normal; font-weight: normal;
+ }
+
+/*--Removes list-style from lists*/
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+ }
+
+/*--Removes border from fieldset and img */
+fieldset, img {
+ border: 0;
+ }
+
+/*--Left-aligns text in caption and th*/
+caption, th {
+ text-align: left;
+ }
+
+/*--Removes Quotation marks from Q*/
+q: before, q: after {
+ content: '';
+ }
Modified: trunk/view/view/feed_toolbar.xhtml
===================================================================
--- trunk/view/view/feed_toolbar.xhtml 2008-03-06 16:38:48 UTC (rev 246)
+++ trunk/view/view/feed_toolbar.xhtml 2008-03-07 08:58:18 UTC (rev 247)
@@ -18,10 +18,7 @@
Subscribe to this feed:
</li>
<li>
- <s:link styleClass="standardFeedLink" view="/feeds.xhtml" value="ATOM" propagation="none">
- <f:param name="type" value="atom" />
- <f:param name="name" value="#{feedView.feed.name}" />
- </s:link>
+ <a class="standardFeedLink" href="#{linkService.generateFeedLink(feedView.feed, 'ATOM')}">ATOM</a>
</li>
</ul>
</div>
More information about the jboss-cvs-commits
mailing list