[jboss-cvs] JBossBlog SVN: r252 - in trunk: view/common and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 10 09:09:58 EDT 2008
Author: adamw
Date: 2008-03-10 09:09:57 -0400 (Mon, 10 Mar 2008)
New Revision: 252
Modified:
trunk/resources/WEB-INF/components.xml
trunk/view/common/next_previous_navigation.xhtml
trunk/view/common/post.xhtml
trunk/view/layout/template.xhtml
trunk/view/stylesheet/blog_styles.css
trunk/view/stylesheet/more_blog.css
trunk/view/view/feed.xhtml
trunk/view/view/feed_toolbar.xhtml
trunk/view/view/post.xhtml
Log:
Modified: trunk/resources/WEB-INF/components.xml
===================================================================
--- trunk/resources/WEB-INF/components.xml 2008-03-10 11:36:42 UTC (rev 251)
+++ trunk/resources/WEB-INF/components.xml 2008-03-10 13:09:57 UTC (rev 252)
@@ -62,7 +62,7 @@
<action execute="#{feedMod.proposedFeed}"/>
</event>
- <mail:mail-session host="localhost" port="25" username="root" password="" />
+ <mail:mail-session host="localhost" port="25" />
<web:context-filter url-pattern="/feeds.seam" />
Modified: trunk/view/common/next_previous_navigation.xhtml
===================================================================
--- trunk/view/common/next_previous_navigation.xhtml 2008-03-10 11:36:42 UTC (rev 251)
+++ trunk/view/common/next_previous_navigation.xhtml 2008-03-10 13:09:57 UTC (rev 252)
@@ -7,17 +7,21 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j">
- <li>
- <s:link view="#{viewId}" value="« Previous" rendered="#{navigationBean.showPrevious}" propagation="none">
- <f:param name="from" value="#{navigationBean.previousFrom}" />
- </s:link>
- </li>
+ <s:fragment rendered="#{navigationBean.showPrevious}">
+ <li>
+ <s:link view="#{viewId}" value="« Previous" propagation="none">
+ <f:param name="from" value="#{navigationBean.previousFrom}" />
+ </s:link>
+ </li>
+ </s:fragment>
- <li>
- <s:link view="#{viewId}" value="Next »" rendered="#{navigationBean.showNext}" propagation="none">
- <f:param name="from" value="#{navigationBean.nextFrom}" />
- </s:link>
- </li>
+ <s:fragment rendered="#{navigationBean.showNext}">
+ <li>
+ <s:link view="#{viewId}" value="Next »" rendered="#{navigationBean.showNext}" propagation="none">
+ <f:param name="from" value="#{navigationBean.nextFrom}" />
+ </s:link>
+ </li>
+ </s:fragment>
<s:fragment rendered="#{(navigationBean.showNext || navigationBean.showPrevious) and showColon}">
<li>:</li>
Modified: trunk/view/common/post.xhtml
===================================================================
--- trunk/view/common/post.xhtml 2008-03-10 11:36:42 UTC (rev 251)
+++ trunk/view/common/post.xhtml 2008-03-10 13:09:57 UTC (rev 252)
@@ -16,9 +16,8 @@
<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}">
+ <s:fragment rendered="#{showAddToHighlights and identity.hasPermission('management', 'view') and highlightsSecurity.feeds.size() > 0}">
+ [ <s:link value="Add this post to a highlights feed" view="/manage/highlights/post_add.xhtml">
<f:param name="post" value="#{post.titleAsId}" />
</s:link> ]
</s:fragment>
@@ -36,4 +35,6 @@
<h:outputText value="#{post.content}" escape="false" rendered="#{!showSummary}" />
<h:outputText value="#{stringTools.createSummary(post.content)}" rendered="#{showSummary}" />
+
+ <hr />
</ui:composition>
\ No newline at end of file
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-03-10 11:36:42 UTC (rev 251)
+++ trunk/view/layout/template.xhtml 2008-03-10 13:09:57 UTC (rev 252)
@@ -8,7 +8,7 @@
xmlns:a="http://richfaces.org/a4j">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>blog</title>
+ <title>JBoss.ORG Feeds</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/more_blog.css" rel="stylesheet" type="text/css" />
Modified: trunk/view/stylesheet/blog_styles.css
===================================================================
--- trunk/view/stylesheet/blog_styles.css 2008-03-10 11:36:42 UTC (rev 251)
+++ trunk/view/stylesheet/blog_styles.css 2008-03-10 13:09:57 UTC (rev 252)
@@ -1,65 +1,20 @@
-/* Styles that are unique to the blog pages */
-
-.blogContent {
- margin: 0px 230px 0px 0px;
- padding: 0px;
+.blogFeedNav {
}
-.blogContent p {
- margin: .5em auto;
- padding: 0px;
+.blogFeedNav_bottom {
+ border: none 0;
+ padding: 0 0 0 10px;
}
-#firstblogentry {
- margin-top: 0px;
- border-top: 0px;
+.blogFeedNav_top {
+ border-bottom: 1px solid #8c8f91;
+ padding: 15px 0 5px 10px;
+ margin-bottom: 1em;
}
-.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;
+ padding-left: 0;
+ margin-left: 0;
display: inline;
}
Modified: trunk/view/stylesheet/more_blog.css
===================================================================
--- trunk/view/stylesheet/more_blog.css 2008-03-10 11:36:42 UTC (rev 251)
+++ trunk/view/stylesheet/more_blog.css 2008-03-10 13:09:57 UTC (rev 252)
@@ -73,9 +73,9 @@
border-right: 1px solid #233345;
border-bottom: 1px solid #233345;
height:15px;
- padding:5px 10px 0px 10px;
+ padding:5px 10px 0 10px;
float:right;
- margin: 10px 5px 0px -10px;
+ margin: 10px 5px 0 -10px;
}
@@ -106,13 +106,13 @@
.blogRightsidebox ul {
padding-left: 10px;
- margin-left: 0px;
+ margin-left: 0;
}
.blogRightsidebox li {
list-style: none;
display: block;
- padding:.25em 0px;
+ padding:.25em 0;
}
@@ -138,13 +138,13 @@
width: 680px;
text-align: left;
line-height: 150%;
- margin: 0px 0px 20px 20px;
+ margin: 0 0 20px 20px;
}
.laundrytable th {
vertical-align: top;
- padding: 5px 5px 5px 0px;
+ padding: 5px 5px 5px 0;
font-weight: bold;
@@ -152,7 +152,7 @@
.laundrytable td {
vertical-align: top;
- padding: 5px 5px 5px 0px;
+ padding: 5px 5px 5px 0;
color: #000000;
border-bottom-color: #e1e1e1;
border-bottom-width: 1px;
@@ -169,15 +169,15 @@
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;
+ padding:0 12px 12px 11px;
+ margin:0 0 10px 0;
width:200px;
}
.TwoColumnBlogSubnav dt{
font-weight:bold;
font-size: 14px;
color: white;
- padding:6px 0px 12px 0px;
+ padding:6px 0 12px 0;
}
.TwoColumnBlogSubnav dd {
background-image: url(/blogs/images/ico_linkarrow_blue.gif);
@@ -230,21 +230,21 @@
border-right: 1px solid #976c18;
border-bottom: 1px solid #976c18;
height:20px;
- padding:0px 10px 0px 10px;
+ padding:0 10px 0 10px;
}
/* Feeds Pages: Right column - Subnav list */
.feedsRightsidebox {
- padding: 0px 20px 20px 40px;
+ padding: 0 20px 20px 40px;
float:right;
width:260px;
height:100%;
}
.feedsRightsidebox img{
- margin:10px 0px 20px 10px;
+ margin:10px 0 20px 10px;
}
.feedsRightsidebox h4 {
@@ -269,37 +269,43 @@
background-image:url(/blogs/images/ico_linkarrow_blue.gif);
padding:0 0 6px 10px;
background-repeat: no-repeat;
- background-position: 0px 3px;
+ background-position: 0 3px;
font-size: 11px;
color: #333366;
- margin:0px 0px 0px -10px;
+ margin:0 0 0 -10px;
}
.feedsContent {
/* spacing for when the archive is added margin: 0px 230px 0px 15px; */
- margin: 0px 325px 0px 15px;
- padding: 0px;
+ margin: 0 325px 0 15px;
+ padding: 0;
}
.feedsContent p {
margin: .5em auto;
- padding: 0px;
+ padding: 0;
}
#feedstblogentry {
- margin-top: 0px;
- border-top: 0px;
+ margin-top: 0;
+ border-top: 0;
}
.feedsContent h3 {
- margin: 1.5em auto 0px auto;
- padding: 0px;
+ margin: auto auto 0 auto;
+ padding: 0;
line-height:2em;
- border-top: 1px solid #8c8f91;
}
+.feedsContent hr {
+ border: none 0;
+ border-top: 1px solid #8c8f91;
+ height: 1px;
+ margin-bottom: 1em;
+}
+
.feedsContent .blogauthortag {
- margin:0px Auto;
+ margin:0 Auto;
padding-bottom: .5em;
font-size:10px;
font-weight:normal;
@@ -307,14 +313,14 @@
.feedsContent .blogcategorytag {
margin:2em Auto 1.5em Auto;
- padding:0px;
+ padding:0;
font-size:10px;
font-weight:normal;
}
.feedsContent .blogcommentsheader {
- margin: 1.5em auto 0px auto;
- padding: 0px;
+ margin: 1.5em auto 0 auto;
+ padding: 0;
line-height:2em;
border-top: 1px dotted #a5a5a5;
background-color:#FFFFFF;
Modified: trunk/view/view/feed.xhtml
===================================================================
--- trunk/view/view/feed.xhtml 2008-03-10 11:36:42 UTC (rev 251)
+++ trunk/view/view/feed.xhtml 2008-03-10 13:09:57 UTC (rev 252)
@@ -28,7 +28,9 @@
<div class="OneColumnContent">
<div class="feedsContent">
- <ui:include src="feed_toolbar.xhtml" />
+ <ui:include src="feed_toolbar.xhtml">
+ <ui:param name="additionalStyle" value="blogFeedNav_top" />
+ </ui:include>
<a:repeat var="post" value="#{feedView.posts}" rows="#{feedView.feed.maxPostsOnPage}">
<a id="#{post.titleAsId}" />
@@ -39,7 +41,9 @@
</ui:include>
</a:repeat>
- <ui:include src="feed_toolbar.xhtml" />
+ <ui:include src="feed_toolbar.xhtml">
+ <ui:param name="additionalStyle" value="blogFeedNav_bottom" />
+ </ui:include>
</div>
</div>
</ui:define>
Modified: trunk/view/view/feed_toolbar.xhtml
===================================================================
--- trunk/view/view/feed_toolbar.xhtml 2008-03-10 11:36:42 UTC (rev 251)
+++ trunk/view/view/feed_toolbar.xhtml 2008-03-10 13:09:57 UTC (rev 252)
@@ -7,7 +7,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j">
- <div class="blogFeedNav">
+ <div class="blogFeedNav #{additionalStyle}">
<ul>
<ui:include src="../common/next_previous_navigation.xhtml">
<ui:param name="viewId" value="/view/feed.xhtml" />
Modified: trunk/view/view/post.xhtml
===================================================================
--- trunk/view/view/post.xhtml 2008-03-10 11:36:42 UTC (rev 251)
+++ trunk/view/view/post.xhtml 2008-03-10 13:09:57 UTC (rev 252)
@@ -19,22 +19,24 @@
<div class="OneColumnContent">
<div class="feedsContent">
- <ul>
- <li>
- « 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>
- <s:fragment rendered="#{identity.hasPermission('post', 'delete', post, post.feed, post.feed.group)}">
+ <div class="blogFeedNav blogFeedNav_top">
+ <ul>
<li>
- <br />
- <s:link value="Delete post" action="#{postView.delete}"
- onclick="if (!confirm('Are you sure you want to delete this post?')) return false" />
+ « 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>
- </s:fragment>
- </ul>
+ <s:fragment rendered="#{identity.hasPermission('post', 'delete', post, post.feed, post.feed.group)}">
+ <li>
+ <br />
+ <s:link value="Delete post" action="#{postView.delete}"
+ onclick="if (!confirm('Are you sure you want to delete this post?')) return false" />
+ </li>
+ </s:fragment>
+ </ul>
+ </div>
<ui:include src="../common/post.xhtml">
<ui:param name="post" value="#{post}" />
More information about the jboss-cvs-commits
mailing list