[jboss-cvs] JBossBlog SVN: r50 - in trunk-esial/blog-core/src: web/WEB-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Feb 10 13:07:55 EST 2007
Author: acrignon
Date: 2007-02-10 13:07:55 -0500 (Sat, 10 Feb 2007)
New Revision: 50
Modified:
trunk-esial/blog-core/src/java/org/jboss/blog/recommendBlog.java
trunk-esial/blog-core/src/web/WEB-INF/faces-config.xml
trunk-esial/blog-core/src/web/views/blog_view.xhtml
trunk-esial/blog-core/src/web/views/recommend.xhtml
trunk-esial/blog-core/src/web/views/view.xhtml
Log:
- ui modifications
- add message errors (but already taken in charge by the portal)
- add a link to return to blog view from the recommendation state
Modified: trunk-esial/blog-core/src/java/org/jboss/blog/recommendBlog.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/recommendBlog.java 2007-02-08 22:18:10 UTC (rev 49)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/recommendBlog.java 2007-02-10 18:07:55 UTC (rev 50)
@@ -43,7 +43,7 @@
}
public String recommendation(){
- return "mailto"+this.getMail()+"?subject="+this.getFirstname()+" "+this.getLastname()+" recommend a blog to you!"+"&body="+this.getComment();
+ return "mailto:"+this.getMail()+"?subject="+this.getFirstname()+" "+this.getLastname()+" recommend a blog to you!"+"&body="+this.getComment();
}
Modified: trunk-esial/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk-esial/blog-core/src/web/WEB-INF/faces-config.xml 2007-02-08 22:18:10 UTC (rev 49)
+++ trunk-esial/blog-core/src/web/WEB-INF/faces-config.xml 2007-02-10 18:07:55 UTC (rev 50)
@@ -110,6 +110,14 @@
<from-outcome>recommend</from-outcome>
<to-view-id>/views/recommend.xhtml</to-view-id>
</navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>default</from-outcome>
+ <to-view-id>/views/index.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<!-- Post edit/new/del -->
Modified: trunk-esial/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/blog_view.xhtml 2007-02-08 22:18:10 UTC (rev 49)
+++ trunk-esial/blog-core/src/web/views/blog_view.xhtml 2007-02-10 18:07:55 UTC (rev 50)
@@ -9,7 +9,14 @@
<h:commandLink value="Edit data" action="#{blogView.blogEditFromBlogView}" />
</ui:define>
- <ui:define name="viewmain">
+ <ui:define name="viewmain">
+
+ <h:panelGroup rendered="#{!blogView.defaultBlog}">
+ <h:form>
+ <h:commandLink action="recommend">Recommend this blog</h:commandLink>
+ </h:form>
+ </h:panelGroup>
+
<h:panelGrid columns="3">
<h:panelGroup>
<blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
@@ -46,8 +53,16 @@
<h:outputText value="#{post.title}"
rendered="#{!blogView.postsExpandable}" />
</span>
- <span class="post-data">
- created on #{post.createdTime}, #{post.createdDate} by #{post.author.fullName}.
+ <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>
</span>
<h:panelGroup rendered="#{!blogView.viewPostsOnSeparatePage and
@@ -84,8 +99,6 @@
<h:commandLink action="#{blogView.next}">Next >></h:commandLink>
</h:panelGroup>
- <h:commandLink action="recommend">Recommend this blog</h:commandLink>
-
</h:panelGrid>
</h:form>
</ui:define>
Modified: trunk-esial/blog-core/src/web/views/recommend.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/recommend.xhtml 2007-02-08 22:18:10 UTC (rev 49)
+++ trunk-esial/blog-core/src/web/views/recommend.xhtml 2007-02-10 18:07:55 UTC (rev 50)
@@ -11,19 +11,31 @@
<h:form>
- <h:panelGrid columns="2">
+ <h:outputText value="Fields with a '*' are required."/>
- <h:outputText value="Your lastname: "/>
- <h:inputText value="#{reco.lastname}" required="true" maxlength="255" size="32"/>
+ <h:panelGrid columns="1">
- <h:outputText value="Your firstname: "/>
- <h:inputText value="#{reco.firstname}" required="true" maxlength="255" size="32"/>
- <h:outputText value="Your friend's mail: "/>
- <h:inputText value="#{reco.mail}" required="true" maxlength="255" size="32"/>
+ </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: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: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: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}"/>
@@ -31,6 +43,12 @@
</h:form>
+ <h:panelGroup rendered="#{!blogView.defaultBlog}">
+ <h:form>
+ <p class="admin-link"><h:commandLink value="Return to blog view" action="default" /></p>
+ </h:form>
+ </h:panelGroup>
+
</ui:define>
</ui:composition>
Modified: trunk-esial/blog-core/src/web/views/view.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/view.xhtml 2007-02-08 22:18:10 UTC (rev 49)
+++ trunk-esial/blog-core/src/web/views/view.xhtml 2007-02-10 18:07:55 UTC (rev 50)
@@ -8,17 +8,17 @@
<ui:param name="requiredPermission" value="acl://viewCategory" />
<ui:define name="content">
<h2>
- <h:panelGroup rendered="#{not empty blogView.blogName.category}">
- #{blogView.blogModel.title}, category: #{blogView.blogName.category}
- </h:panelGroup>
-
- <h:panelGroup rendered="#{empty blogView.blogName.category}">
+ <h:panelGroup>
#{blogView.blogModel.title}
</h:panelGroup>
- </h2>
-
+ </h2>
+
+ <h:panelGroup rendered="#{not empty blogView.blogName.category}">
+ categories: #{blogView.blogName.category}
+ </h:panelGroup>
+
<p class="blog-description">
- #{blogView.blogModel.description}
+ Description: #{blogView.blogModel.description}
</p>
<h:messages />
More information about the jboss-cvs-commits
mailing list