[jboss-cvs] JBossBlog SVN: r248 - in trunk: src/action/org/jboss/blog/session/view and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 10 06:00:00 EDT 2008
Author: adamw
Date: 2008-03-10 06:00:00 -0400 (Mon, 10 Mar 2008)
New Revision: 248
Added:
trunk/view/stylesheet/blog_styles.css
trunk/view/view/right_box.xhtml
Removed:
trunk/view/stylesheet/blog.css
Modified:
trunk/blog.iml
trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java
trunk/src/test/org/jboss/blog/session/merge/test/GenericsExample1.java
trunk/view/common/post.xhtml
trunk/view/home.xhtml
trunk/view/layout/menu.xhtml
trunk/view/layout/template.xhtml
trunk/view/manage/feed_mod.xhtml
trunk/view/security/login.xhtml
trunk/view/stylesheet/more_blog.css
trunk/view/stylesheet/org_main.css
trunk/view/view/feed.xhtml
trunk/view/view/post.xhtml
Log:
Modified: trunk/blog.iml
===================================================================
--- trunk/blog.iml 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/blog.iml 2008-03-10 10:00:00 UTC (rev 248)
@@ -16,6 +16,22 @@
<datasource-map />
</configuration>
</facet>
+ <facet type="javaeeApplication" name="javaEEApplication">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="application.xml" url="file://$MODULE_DIR$/resources/META-INF/application.xml" optional="false" version="5" />
+ </descriptors>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ </building>
+ </configuration>
+ </facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
@@ -215,6 +231,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/src/action/org/jboss/blog/session/view/FeedViewBean.java 2008-03-10 10:00:00 UTC (rev 248)
@@ -8,13 +8,11 @@
import org.jboss.blog.service.GroupsService;
import org.jboss.blog.tools.StringTools;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.security.Restrict;
-import javax.faces.application.FacesMessage;
import java.util.List;
import java.io.Serializable;
Modified: trunk/src/test/org/jboss/blog/session/merge/test/GenericsExample1.java
===================================================================
--- trunk/src/test/org/jboss/blog/session/merge/test/GenericsExample1.java 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/src/test/org/jboss/blog/session/merge/test/GenericsExample1.java 2008-03-10 10:00:00 UTC (rev 248)
@@ -16,7 +16,7 @@
//GenericsExample1.getInstance(list1).process(list2);
}
- public static void test1(List<Long> list2) {
+ public static void test2(List<Long> list2) {
new GenericsExample1<List<? extends Number>>().process(list2);
}
Modified: trunk/view/common/post.xhtml
===================================================================
--- trunk/view/common/post.xhtml 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/common/post.xhtml 2008-03-10 10:00:00 UTC (rev 248)
@@ -16,15 +16,14 @@
<p class="blogauthortag">
Posted on #{post.published} by <b>#{post.effectiveAuthor}</b> #{additionalHeader}
[ <a href="#{post.link}">View original post</a> ]
+ <s:fragment rendered="#{showAddToHighlights}">
+ [ <s:link value="Add this post to a highlights feed" view="/manage/highlights/post_add.xhtml"
+ rendered="#{identity.hasPermission('management', 'view') and highlightsSecurity.feeds.size() > 0}">
+ <f:param name="post" value="#{post.titleAsId}" />
+ </s:link> ]
+ </s:fragment>
</p>
- <s:div rendered="#{showAddToHighlights}">
- <s:link value="Add this post to a highlights feed ..." view="/manage/highlights/post_add.xhtml"
- rendered="#{identity.hasPermission('management', 'view') and highlightsSecurity.feeds.size() > 0}">
- <f:param name="post" value="#{post.titleAsId}" />
- </s:link>
- </s:div>
-
<ui:repeat var="image" value="#{post.images}">
<img src="#{image.url}" alt="#{image.title}" width="180" />
</ui:repeat>
Modified: trunk/view/home.xhtml
===================================================================
--- trunk/view/home.xhtml 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/home.xhtml 2008-03-10 10:00:00 UTC (rev 248)
@@ -22,10 +22,11 @@
<div class="TwoColumnBlogSubnav">
<dt>Recent Posts</dt>
- <ui:repeat var="post" value="#{feedsService.getPosts(0, 5)}">
+ <!-- TODO: configure the number of posts -->
+ <ui:repeat var="post" value="#{feedsService.getPosts(0, 10)}">
<dd>
- <s:link view="/view/feed.xhtml" value="#{post.title}" propagation="none">
- <f:param name="name" value="#{post.feed.name}"/>
+ <s:link view="/view/post.xhtml" value="#{post.title}" propagation="none">
+ <f:param name="post" value="#{post.titleAsId}"/>
</s:link>
</dd>
</ui:repeat>
Modified: trunk/view/layout/menu.xhtml
===================================================================
--- trunk/view/layout/menu.xhtml 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/layout/menu.xhtml 2008-03-10 10:00:00 UTC (rev 248)
@@ -46,14 +46,6 @@
<div id="primarynav">
<ul>
<li>
- <s:link view="/home.xhtml" value="(temp: Feeds home)" propagation="none" />
- </li>
- <s:fragment rendered="#{identity.hasPermission('management', 'view')}">
- <li>
- <s:link value="(temp: Manage)" view="/manage/index.xhtml" propagation="none" />
- </li>
- </s:fragment>
- <li>
<a href="/">Home</a>
</li>
<li>
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/layout/template.xhtml 2008-03-10 10:00:00 UTC (rev 248)
@@ -11,8 +11,8 @@
<title>blog</title>
<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" />
+ <link href="/blogs/stylesheet/blog_styles.css" rel="stylesheet" type="text/css" />
<ui:insert name="additional_headers" />
</head>
@@ -22,7 +22,14 @@
<div id="contentcontainer">
<div id="ORGContent">
- <div id='orgprojectdetailstriple'>
+ <div id='orgprojectdetailstriple'>
+ <s:fragment rendered="#{identity.hasPermission('management', 'view')}">
+ <div class="adminlinks">
+ <s:link view="/home.xhtml" value="Feeds home" propagation="none" />   
+ <s:link view="/manage/index.xhtml" value="Manage home" propagation="none" />
+ </div>
+ </s:fragment>
+
<h3 id="majorsectiontitle" style="margin-bottom: 0"><ui:insert name="header"/></h3>
</div>
<div id="orghomemaximized">
Modified: trunk/view/manage/feed_mod.xhtml
===================================================================
--- trunk/view/manage/feed_mod.xhtml 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/manage/feed_mod.xhtml 2008-03-10 10:00:00 UTC (rev 248)
@@ -92,7 +92,7 @@
<h:message for="group" styleClass="error" />
</a:outputPanel>
- <span><br /><s:link value="Add new group" action="#{groupMod.add}" /></span>
+ <div><s:link value="Add new group" action="#{groupMod.add}" /></div><br />
</h:panelGroup>
<h:outputLabel for="maxPostsInFeed">
Modified: trunk/view/security/login.xhtml
===================================================================
--- trunk/view/security/login.xhtml 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/security/login.xhtml 2008-03-10 10:00:00 UTC (rev 248)
@@ -16,10 +16,10 @@
<h4>Tips</h4>
<ul>
<li>
- <p>If you don't have yet an account, click the 'Register' link at the top.</p>
+ <p>If you don't have an account yet, 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.
+ <p>If you 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>
@@ -41,6 +41,9 @@
<li>
<h:commandButton value="Login" action="#{identity.login}" styleClass="submit" />
</li>
+ <li>
+ <s:button value="Cancel" view="/home.xhtml" styleClass="submit" propagation="none" />
+ </li>
</ul>
</div>
</h:form>
Deleted: trunk/view/stylesheet/blog.css
===================================================================
--- trunk/view/stylesheet/blog.css 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/stylesheet/blog.css 2008-03-10 10:00:00 UTC (rev 248)
@@ -1,199 +0,0 @@
-.blogContent {
-/* spacing for when the archive is added margin: 0px 230px 0px 15px; */
- margin: 0px 25px 0px 15px;
- padding: 0px;
-}
-
-.blogContent p {
- margin: .5em auto;
- padding: 0px;
-}
-
-#firstblogentry {
- margin-top: 0px;
- border-top: 0px;
-}
-
-.blogContent h3 {
- margin: 1.5em auto 0px auto;
- padding: 0px;
- line-height:2em;
- border-top: 1px solid #8c8f91;
-}
-
-.blogContent .blogauthortag {
- margin:0px Auto;
- padding-bottom: .5em;
- font-size:10px;
- font-weight:normal;
-}
-
-.blogContent .blogcategorytag {
- margin:2em Auto 1.5em Auto;
- padding:0px;
- font-size:10px;
- font-weight:normal;
-}
-
-.blogContent .blogcommentsheader {
- margin: 1.5em auto 0px auto;
- padding: 0px;
- line-height:2em;
- border-top: 1px dotted #a5a5a5;
- background-color:#FFFFFF;
- font-size:11px;
- font-weight:bold;
-}
-.blogContent .blogcommentsbody {
- margin: 0px auto 1em auto;
- padding-bottom: 6px;
- border-bottom: 1px dashed #d5d5d5;
- background-color:#FFFFFF;
-}
-.blogFeedNav {
- margin-top: 1em;
- padding-top: .5em;
- border-top: 1px solid #8c8f91;
-}
-
-.blogFeedNav ul {
- padding-left: 0px;
- margin-left: 0px;
- display: inline;
-}
-
-.blogFeedNav li {
- list-style: none;
- display: inline;
- padding-right: 6px;
-}
-
-.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;
-}
-
-/* MY CHANGES START HERE */
-/* --------------------- Admin list ------------------------ */
-
-.adminlist {
- width: 200px;
- margin-bottom: 0;
-}
-
-.adminlist h3 {
- font-size:12px;
- font-weight: bold;
- margin:9px auto 9px auto;
-}
-
-.adminlist p {
- margin:0 auto;
- padding-bottom:1em;
- }
-
-.adminlist dl {
- margin-right:20px;
-}
-
-.adminlist dt {
- font-size:12px;
- font-weight:bold;
- color:#CC0000;
- margin:12px 0 1px 0;
- padding:0;
-}
-
-.adminlist dd {
- margin:0 0 3px 0;
-}
-
-.adminlist dt a {
- color:#CC0000;
- text-decoration:none;
- background-image:none;
- padding-left:0;
-}
-
-.adminlist dd a {
- background-image:url(http://labs.jboss.com/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
- background-repeat: no-repeat;
- background-position: 3px 3px;
- padding-left: 12px;
- white-space:nowrap;
-}
-
-.adminlist hr {
- border-top:1px dashed #d5d5d5;
- color: #ffffff;
- border-bottom:0;
- border-left:0;
- border-right:0;
- margin-bottom:6px;
-}
-
-span.error {
- color: black;
- background-color: #fef9e6;
- border: 1px solid red;
- padding: 5px;
- display: block;
-}
-
-span.required {
- color: red;
-}
-
-.bold {
- font-weight: bold;
-}
-
-.empty {
-
-}
-
-.adminforms .selectwide {
- width: 400px;
- margin-bottom: 8px;
-}
-
-.messages_info {
- margin-bottom:12px;
- padding:15px;
- background-color:#fef9e6;
- border: 1px solid #f9ba82;
- list-style:none;
-}
-
-.messages_warn {
- margin-bottom:12px;
- padding:15px;
- background-color: #CC3333;
- border: 1px solid #7B1E1E;
- list-style: none;
-}
-
-.messages {
-
-}
-
Added: trunk/view/stylesheet/blog_styles.css
===================================================================
--- trunk/view/stylesheet/blog_styles.css (rev 0)
+++ trunk/view/stylesheet/blog_styles.css 2008-03-10 10:00:00 UTC (rev 248)
@@ -0,0 +1,190 @@
+/* Styles that are unique to the blog pages */
+
+.blogContent {
+ margin: 0px 230px 0px 0px;
+ padding: 0px;
+}
+
+.blogContent p {
+ margin: .5em auto;
+ padding: 0px;
+}
+
+#firstblogentry {
+ margin-top: 0px;
+ border-top: 0px;
+}
+
+.blogContent h3 {
+ margin: 1.5em auto 0px auto;
+ padding: 0px;
+ line-height:2em;
+ border-top: 1px solid #8c8f91;
+}
+
+.blogContent .blogauthortag {
+ margin:0px Auto;
+ padding-bottom: .5em;
+ font-size:10px;
+ font-weight:normal;
+}
+
+.blogContent .blogcategorytag {
+ margin:2em Auto 1.5em Auto;
+ padding:0px;
+ font-size:10px;
+ font-weight:normal;
+}
+
+.blogContent .blogcommentsheader {
+ margin: 1.5em auto 0px auto;
+ padding: 0px;
+ line-height:2em;
+ border-top: 1px dotted #a5a5a5;
+ background-color:#FFFFFF;
+ font-size:11px;
+ font-weight:bold;
+}
+.blogContent .blogcommentsbody {
+ margin: 0px auto 1em auto;
+ padding-bottom: 6px;
+ border-bottom: 1px dashed #d5d5d5;
+ background-color:#FFFFFF;
+}
+.blogFeedNav {
+ margin-top: 1em;
+ padding-top: .5em;
+ border-top: 1px solid #8c8f91;
+}
+
+.blogFeedNav ul {
+ padding-left: 0px;
+ margin-left: 0px;
+ display: inline;
+}
+
+.blogFeedNav li {
+ list-style: none;
+ display: inline;
+ padding-right: 6px;
+}
+
+.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;
+}
+
+/* MY CHANGES START HERE */
+/* --------------------- Admin list ------------------------ */
+
+.adminlist {
+ width: 200px;
+ margin-bottom: 0;
+}
+
+.adminlist h3 {
+ font-size:12px;
+ font-weight: bold;
+ margin:9px auto 9px auto;
+}
+
+.adminlist p {
+ margin:0 auto;
+ padding-bottom:1em;
+ }
+
+.adminlist dl {
+ margin-right:20px;
+}
+
+.adminlist dt {
+ font-size:12px;
+ font-weight:bold;
+ color:#CC0000;
+ margin:12px 0 1px 0;
+ padding:0;
+}
+
+.adminlist dd {
+ margin:0 0 3px 0;
+}
+
+.adminlist dt a {
+ color:#CC0000;
+ text-decoration:none;
+ background-image:none;
+ padding-left:0;
+}
+
+.adminlist dd a {
+ background-image:url(http://labs.jboss.com/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
+ background-repeat: no-repeat;
+ background-position: 3px 3px;
+ padding-left: 12px;
+ white-space:nowrap;
+}
+
+.adminlist hr {
+ border-top:1px dashed #d5d5d5;
+ color: #ffffff;
+ border-bottom:0;
+ border-left:0;
+ border-right:0;
+ margin-bottom:6px;
+}
+
+span.error {
+ color: black;
+ background-color: #fef9e6;
+ border: 1px solid red;
+ padding: 5px;
+ display: block;
+}
+
+span.required {
+ color: red;
+}
+
+.bold {
+ font-weight: bold;
+}
+
+.empty {
+
+}
+
+.adminforms .selectwide {
+ width: 400px;
+ margin-bottom: 8px;
+}
+
+.messages {
+
+}
+
+.adminlinks {
+ float:right;
+ margin-right: 20px;
+ padding-top: 24px;
+}
+
Modified: trunk/view/stylesheet/more_blog.css
===================================================================
--- trunk/view/stylesheet/more_blog.css 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/stylesheet/more_blog.css 2008-03-10 10:00:00 UTC (rev 248)
@@ -1,7 +1,6 @@
/* 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{
@@ -199,13 +198,7 @@
/* 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;
-
+ float: right;
margin-bottom: 10px;
}
@@ -237,7 +230,104 @@
border-right: 1px solid #976c18;
border-bottom: 1px solid #976c18;
height:20px;
+ padding:0px 10px 0px 10px;
}
+
+/* Feeds Pages: Right column - Subnav list */
+
+
+.feedsRightsidebox {
+ padding: 0px 20px 20px 40px;
+ float:right;
+ width:260px;
+ height:100%;
+}
+
+.feedsRightsidebox img{
+ margin:10px 0px 20px 10px;
+}
+
+.feedsRightsidebox h4 {
+ font-size:11px;
+ font-weight:bold;
+ padding:15px 0px 5px 10px;
+ border-bottom: 1px solid #8c8f91;
+}
+
+.feedsRightsidebox ul {
+ padding-left: 10px;
+ margin-left: 0px;
+}
+
+.feedsRightsidebox li {
+ list-style: none;
+ display: block;
+ padding:.25em 0px;
+}
+
+#feeds_subnav li{
+ background-image:url(/blogs/images/ico_linkarrow_blue.gif);
+ padding:0 0 6px 10px;
+ background-repeat: no-repeat;
+ background-position: 0px 3px;
+ font-size: 11px;
+ color: #333366;
+ margin:0px 0px 0px -10px;
+}
+
+.feedsContent {
+/* spacing for when the archive is added margin: 0px 230px 0px 15px; */
+ margin: 0px 325px 0px 15px;
+ padding: 0px;
+}
+
+.feedsContent p {
+ margin: .5em auto;
+ padding: 0px;
+}
+
+#feedstblogentry {
+ margin-top: 0px;
+ border-top: 0px;
+}
+
+.feedsContent h3 {
+ margin: 1.5em auto 0px auto;
+ padding: 0px;
+ line-height:2em;
+ border-top: 1px solid #8c8f91;
+}
+
+.feedsContent .blogauthortag {
+ margin:0px Auto;
+ padding-bottom: .5em;
+ font-size:10px;
+ font-weight:normal;
+}
+
+.feedsContent .blogcategorytag {
+ margin:2em Auto 1.5em Auto;
+ padding:0px;
+ font-size:10px;
+ font-weight:normal;
+}
+
+.feedsContent .blogcommentsheader {
+ margin: 1.5em auto 0px auto;
+ padding: 0px;
+ line-height:2em;
+ border-top: 1px dotted #a5a5a5;
+ background-color:#FFFFFF;
+ font-size:11px;
+ font-weight:bold;
+}
+.feedsContent .blogcommentsbody {
+ margin: 0px auto 1em auto;
+ padding-bottom: 6px;
+ border-bottom: 1px dashed #d5d5d5;
+ background-color:#FFFFFF;
+}
+
/***********************************************/
/* =Normalizes Browser Styles */
/***********************************************/
Modified: trunk/view/stylesheet/org_main.css
===================================================================
--- trunk/view/stylesheet/org_main.css 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/stylesheet/org_main.css 2008-03-10 10:00:00 UTC (rev 248)
@@ -567,11 +567,12 @@
border-right: 1px solid #233345;
border-bottom: 1px solid #233345;
height:20px;
+ padding:0px 10px 0px 10px;
}
.formbuttons {
margin: 10px auto 15px auto;
- padding-top: 5px;
+ padding-top: 5px ;
border-top: 1px solid #4a5d75;
}
@@ -1039,3 +1040,21 @@
padding-bottom: 6px;
border-bottom:1px solid #e6e7e8;
}
+
+/* ---------------------------- Warning and Info Styles --------------------------------- */
+
+.messages_info {
+ margin-bottom:12px;
+ padding:15px;
+ background-color:#fef9e6;
+ border: 1px solid #f9ba82;
+ list-style:none;
+}
+
+.messages_warn {
+ margin-bottom:12px;
+ padding:15px;
+ background-color: #CC3333;
+ border: 1px solid #7B1E1E;
+ list-style: none;
+}
Modified: trunk/view/view/feed.xhtml
===================================================================
--- trunk/view/view/feed.xhtml 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/view/feed.xhtml 2008-03-10 10:00:00 UTC (rev 248)
@@ -19,24 +19,28 @@
</ui:define>
<ui:define name="body">
- <s:div rendered="#{not empty feedView.feed.group.header}">
- <h:outputText value="#{feedView.feed.group.header}" escape="false" />
- </s:div>
+ <ui:include src="right_box.xhtml">
+ <ui:param name="feed" value="#{feedView.feed}" />
+ <ui:param name="posts" value="#{feedView.posts}" />
+ <ui:param name="posts_count" value="#{feedView.feed.maxPostsOnPage}" />
+ <ui:param name="more_posts" value="#{feedView.showNext || feedView.showPrevious}" />
+ </ui:include>
- <div class="blogContent">
- <ui:include src="feed_toolbar.xhtml" />
+ <div class="OneColumnContent">
+ <div class="feedsContent">
+ <ui:include src="feed_toolbar.xhtml" />
- <a:repeat var="post" value="#{feedView.posts}" rows="#{feedView.feed.maxPostsOnPage}">
- <ui:include src="../common/post.xhtml">
- <ui:param name="post" value="#{post}" />
- <ui:param name="showSummary" value="false" />
- <ui:param name="showAddToHighlights" value="true" />
- </ui:include>
+ <a:repeat var="post" value="#{feedView.posts}" rows="#{feedView.feed.maxPostsOnPage}">
+ <a id="#{post.titleAsId}" />
+ <ui:include src="../common/post.xhtml">
+ <ui:param name="post" value="#{post}" />
+ <ui:param name="showSummary" value="false" />
+ <ui:param name="showAddToHighlights" value="true" />
+ </ui:include>
+ </a:repeat>
- <br />
- </a:repeat>
-
- <ui:include src="feed_toolbar.xhtml" />
+ <ui:include src="feed_toolbar.xhtml" />
+ </div>
</div>
</ui:define>
</ui:composition>
Modified: trunk/view/view/post.xhtml
===================================================================
--- trunk/view/view/post.xhtml 2008-03-07 08:58:18 UTC (rev 247)
+++ trunk/view/view/post.xhtml 2008-03-10 10:00:00 UTC (rev 248)
@@ -13,33 +13,34 @@
</ui:define>
<ui:define name="body">
- <s:div rendered="#{not empty postView.post.feed.group.header}">
- <h:outputText value="#{postView.post.feed.group.header}" escape="false" />
- </s:div>
-
- <div class="blogContent">
- <div class="blogFeedNav">
+ <ui:include src="right_box.xhtml">
+ <ui:param name="feed" value="#{postView.post.feed}" />
+ </ui:include>
+
+ <div class="OneColumnContent">
+ <div class="feedsContent">
<ul>
<li>
- « Back to:
+ « Back to feed:  
<s:link view="/view/feed.xhtml" value="#{postView.post.feed.title}"
propagation="none">
<f:param name="name" value="#{postView.post.feed.name}"/>
</s:link>
</li>
<li>
+ <br />
<s:link value="Delete post" action="#{postView.delete}"
- onclick="if (!confirm('Are you sure you want to delete this post?')) return false"
- rendered="#{identity.hasPermission('post', 'delete', post, post.feed, post.feed.group)}"/>
+ onclick="if (!confirm('Are you sure you want to delete this post?')) return false"
+ rendered="#{identity.hasPermission('post', 'delete', post, post.feed, post.feed.group)}"/>
</li>
</ul>
+
+ <ui:include src="../common/post.xhtml">
+ <ui:param name="post" value="#{post}" />
+ <ui:param name="showSummary" value="false" />
+ <ui:param name="showAddToHighlights" value="true" />
+ </ui:include>
</div>
-
- <ui:include src="../common/post.xhtml">
- <ui:param name="post" value="#{post}" />
- <ui:param name="showSummary" value="false" />
- <ui:param name="showAddToHighlights" value="true" />
- </ui:include>
</div>
</ui:define>
</ui:composition>
Added: trunk/view/view/right_box.xhtml
===================================================================
--- trunk/view/view/right_box.xhtml (rev 0)
+++ trunk/view/view/right_box.xhtml 2008-03-10 10:00:00 UTC (rev 248)
@@ -0,0 +1,50 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a="http://richfaces.org/a4j">
+ <div class="feedsRightsidebox">
+ <ul id="feeds_subnav">
+ <li><s:link view="/home.xhtml" value="Feeds home" propagation="none" /></li>
+ </ul>
+
+ <s:div rendered="#{not empty feed.group.header}">
+ <h:outputText value="#{feed.group.header}" escape="false" />
+ </s:div>
+
+ <div id="TwoColumnBlogJelly">
+ <s:link value="" view="/manage/remote/remote_propose.xhtml" propagation="none">
+ <img src="/blogs/images/propose_blog_full.png"
+ alt="Propose a Blog! If you are blogging on a JBoss-related subject, aggregate it in our system!" />
+ </s:link>
+ </div>
+
+ <s:fragment rendered="#{posts != null}">
+ <h4>Posts of this feed on this page</h4>
+ <ul>
+ <a:repeat var="post" value="#{posts}" rows="#{posts_count}">
+ <li><a href="##{post.titleAsId}">#{post.title}</a></li>
+ </a:repeat>
+ <s:fragment rendered="#{more_posts}">
+ <li>(to view more posts, click the next/previous link)</li>
+ </s:fragment>
+ </ul>
+ </s:fragment>
+
+ <h4>Recent posts from all feeds</h4>
+ <ul>
+ <!-- TODO: configure the number of posts -->
+ <ui:repeat var="post" value="#{feedsService.getPosts(0, 10)}">
+ <li>
+ <s:link view="/view/post.xhtml" value="#{post.title}" propagation="none">
+ <f:param name="post" value="#{post.titleAsId}"/>
+ </s:link>
+ </li>
+ </ui:repeat>
+ </ul>
+ </div>
+</ui:composition>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list