[jboss-cvs] JBossBlog SVN: r51 - in trunk-esial/blog-core/src: web/views and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 13 11:08:57 EST 2007
Author: acrignon
Date: 2007-02-13 11:08:57 -0500 (Tue, 13 Feb 2007)
New Revision: 51
Modified:
trunk-esial/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
trunk-esial/blog-core/src/web/views/blog_view.xhtml
trunk-esial/blog-core/src/web/views/post_view.xhtml
trunk-esial/blog-core/src/web/views/recommend.xhtml
trunk-esial/blog-core/src/web/views/view.xhtml
Log:
- modification in posts' datatable (add columns' names)
- remove <h:messages/> from view.xhtml
Modified: trunk-esial/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java 2007-02-10 18:07:55 UTC (rev 50)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java 2007-02-13 16:08:57 UTC (rev 51)
@@ -23,7 +23,7 @@
private String title;
private String description;
private String link;
-
+
public BlogEdit() {
initDone = false;
}
Modified: trunk-esial/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/blog_view.xhtml 2007-02-10 18:07:55 UTC (rev 50)
+++ trunk-esial/blog-core/src/web/views/blog_view.xhtml 2007-02-13 16:08:57 UTC (rev 51)
@@ -25,26 +25,31 @@
</h:form>
</blog:isAllowed>
</h:panelGroup>
-
+
<h:panelGroup rendered="#{!blogView.defaultBlog}">
<h:form>
- <p class="admin-link"><h:commandLink value="Return to default view" action="#{blogView.returnToDefault}" /></p>
+ <p class="admin-link"><h:commandLink value=" | Return to default view" action="#{blogView.returnToDefault}" /></p>
</h:form>
</h:panelGroup>
-
+
<h:panelGroup>
<blog:isAllowed fragment="acl://accessAdminModule">
<h:form>
- <p class="admin-link"><h:commandLink value="Administrate blogs" action="admin_panel" /></p>
+ <p class="admin-link"><h:commandLink value=" | Administrate blogs" action="admin_panel" /></p>
</h:form>
</blog:isAllowed>
- </h:panelGroup>
+ </h:panelGroup>
+
</h:panelGrid>
<h:form>
<h:dataTable value="#{blogView.posts}" var="post" binding="#{blogView.postsData}"
- rowClasses="posts-row,posts-row-alternate" styleClass="posts">
+ rowClasses="posts-row,posts-row-alternate" styleClass="posts"
+ rendered="#{!blogView.defaultBlog}">
<h:column>
+ <f:facet name="header">
+ <h:outputText value="Title"/>
+ </f:facet>
<span class="post-title">
<h:commandLink value="#{post.title}"
action="#{blogView.postView}"
@@ -53,37 +58,48 @@
<h:outputText value="#{post.title}"
rendered="#{!blogView.postsExpandable}" />
</span>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Creation date and time"/>
+ </f:facet>
<span class="post-data">
- <h:panelGrid columns="2">
-
- <h:outputText value="created on: "/>
- <h:outputText value="#{post.createdTime}, #{post.createdDate}"/>
-
- <h:outputText value="Author: "/>
- <h:outputText value="#{post.author.fullName}."/>
-
- </h:panelGrid>
+ #{post.createdTime}, #{post.createdDate}
</span>
-
- <h:panelGroup rendered="#{!blogView.viewPostsOnSeparatePage and
- (blogView.viewAllPosts ||
- (blogView.selectedPostTitleAsId == post.titleAsId))}">
- <p class="post-description">
- <h:outputText value="#{post.description}" escape="false" />
- </p>
- </h:panelGroup>
</h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Author"/>
+ </f:facet>
+ <span class="post-data">
+ <h:outputText value="#{post.author.fullName}"/>
+ </span>
+ </h:column>
- <h:column>
- <h:panelGroup rendered="#{blogView.blogModifiable}">
+ <h:column rendered="#{blogView.blogModifiable}">
+ <f:facet name="header">
+ <h:outputText value=""/>
+ </f:facet>
<blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
<span class="admin-link">
- <h:commandLink value="Edit" action="#{blogView.postEditFromBlogView}" />
+ <h:commandLink value="Edit post" action="#{blogView.postEditFromBlogView}" />
</span>
</blog:isAllowed>
- </h:panelGroup>
</h:column>
+
+ <h:panelGroup rendered="#{!blogView.viewPostsOnSeparatePage and
+ (blogView.viewAllPosts ||
+ (blogView.selectedPostTitleAsId == post.titleAsId))}">
+ <p class="post-description">
+ <h:outputText value="#{post.description}" escape="false" />
+ </p>
+ </h:panelGroup>
+
</h:dataTable>
+
+
</h:form>
<h:form>
Modified: trunk-esial/blog-core/src/web/views/post_view.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/post_view.xhtml 2007-02-10 18:07:55 UTC (rev 50)
+++ trunk-esial/blog-core/src/web/views/post_view.xhtml 2007-02-13 16:08:57 UTC (rev 51)
@@ -58,8 +58,8 @@
</p>
</h:column>
- <h:column>
- <h:panelGroup rendered="#{blogView.blogModifiable}">
+ <h:column rendered="#{blogView.blogModifiable}">
+ <h:panelGroup>
<blog:isAllowed fragment="acl://manageComment"
contextData="#{blogView.blogName}">
<span class="admin-link">
Modified: trunk-esial/blog-core/src/web/views/recommend.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/recommend.xhtml 2007-02-10 18:07:55 UTC (rev 50)
+++ trunk-esial/blog-core/src/web/views/recommend.xhtml 2007-02-13 16:08:57 UTC (rev 51)
@@ -13,31 +13,25 @@
<h:outputText value="Fields with a '*' are required."/>
- <h:panelGrid columns="1">
-
-
-
- </h:panelGrid>
-
<h:panelGrid columns="3">
<h:outputText value="Your lastname: (*)"/>
- <h:inputText id="firstname" value="#{reco.lastname}" required="true" maxlength="255" size="32"/>
- <h:message for="firstname" showDetail="false" showSummary="true" style="color: red"/>
+ <h:inputText id="Firstname" value="#{reco.lastname}" required="true" maxlength="255" size="32"/>
+ <h:message for="Firstname" showDetail="true" showSummary="false" style="color: red"/>
<h:outputText value="Your firstname: (*)"/>
- <h:inputText id="lastname" value="#{reco.firstname}" required="true" maxlength="255" size="32"/>
- <h:message for="lastname" showDetail="false" showSummary="true" style="color: red"/>
+ <h:inputText id="Lastname" value="#{reco.firstname}" required="true" maxlength="255" size="32"/>
+ <h:message for="Lastname" showDetail="true" showSummary="false" style="color: red"/>
<h:outputText value="Your friend's mail: (*)"/>
- <h:inputText id="mail" value="#{reco.mail}" required="true" maxlength="255" size="32"/>
- <h:message for="mail" showDetail="false" showSummary="true" style="color: red"/>
+ <h:inputText id="Mail" value="#{reco.mail}" required="true" maxlength="255" size="32"/>
+ <h:message for="Mail" showDetail="true" showSummary="false" style="color: red"/>
<h:outputText value="Your comment: "/>
<h:inputTextarea value="#{reco.comment}" required="true" rows="5" cols="32" maxlength="255"/>
<h:outputText value=""/>
- <h:commandLink value="Send recommendation mail" action="{reco.recommendation}"/>
+ <h:commandLink value="Send the recommendation" action="{reco.recommendation}"/>
</h:panelGrid>
Modified: trunk-esial/blog-core/src/web/views/view.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/view.xhtml 2007-02-10 18:07:55 UTC (rev 50)
+++ trunk-esial/blog-core/src/web/views/view.xhtml 2007-02-13 16:08:57 UTC (rev 51)
@@ -17,11 +17,12 @@
categories: #{blogView.blogName.category}
</h:panelGroup>
+ <h:panelGroup rendered="#{not empty blogView.blogModel.title}">
<p class="blog-description">
Description: #{blogView.blogModel.description}
</p>
+ </h:panelGroup>
- <h:messages />
<h:panelGroup rendered="#{blogView.blogModifiable}">
<blog:isAllowed fragment="acl://manageCategory" contextData="#{blogView.blogName}">
More information about the jboss-cvs-commits
mailing list