[jboss-cvs] JBossBlog SVN: r99 - 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
Wed Mar 21 16:55:34 EDT 2007
Author: acrignon
Date: 2007-03-21 16:55:34 -0400 (Wed, 21 Mar 2007)
New Revision: 99
Added:
trunk-esial/blog-core/src/web/views/blog_man.xhtml
Modified:
trunk-esial/blog-core/src/etc/META-INF/acl-permissions.xml
trunk-esial/blog-core/src/web/views/blog_new.xhtml
trunk-esial/blog-core/src/web/views/blog_view.xhtml
trunk-esial/blog-core/src/web/views/id_edit.xhtml
trunk-esial/blog-core/src/web/views/post_mod.xhtml
trunk-esial/blog-core/src/web/views/template_posts_list.xhtml
trunk-esial/blog-core/src/web/views/view.xhtml
Log:
Modified: trunk-esial/blog-core/src/etc/META-INF/acl-permissions.xml
===================================================================
--- trunk-esial/blog-core/src/etc/META-INF/acl-permissions.xml 2007-03-21 16:53:24 UTC (rev 98)
+++ trunk-esial/blog-core/src/etc/META-INF/acl-permissions.xml 2007-03-21 20:55:34 UTC (rev 99)
@@ -13,7 +13,7 @@
<permission functionId="editCategory"> //complicated with criteria specification
<criteria context="jsfAction">target.categoryName.indexOf('sandbox') != -1</criteria>
<criteria context="fragment">param[0].categoryName.toLowerCase().indexOf('sandbox') != -1</criteria>
- </permission>
+ </permission>
-->
<!--
@@ -44,6 +44,7 @@
<!-- User Module permissions -->
<permission action="addComment" />
+ <permission action="manageComment"/>
<!-- permission to edit only my own posts -->
<!--<permission action="editPost">
<criteria for="editPost://ui">param[0].poster.user.userName.equals(identity.identity.userName)</criteria>
@@ -63,8 +64,21 @@
<!-- wild card permission -->
<permission action="all" />
+ <!--permission action="viewComment" />
+ <permission action="accessAdminModule" />
+ <permission action="manageBlog"/-->
</role>
+ <role name="BlogAdministrateur" id="BlogAdmin">
+ <permission action="viewComment" />
+ <permission action="managePost" />
+ <permission action="manageBlog" />
+ <permission action="manageCategory"/>
+ <permission action="manageComment"/>
+ <!-- permission action="manageCategory"/-->
+
+ </role>
+
<!--
deployment specific roles......just examples of how fine grained permissions can be assigned
this is an example of how the rules would possibly setup for JBoss.org Forums...
Added: trunk-esial/blog-core/src/web/views/blog_man.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/blog_man.xhtml (rev 0)
+++ trunk-esial/blog-core/src/web/views/blog_man.xhtml 2007-03-21 20:55:34 UTC (rev 99)
@@ -0,0 +1,37 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:blog="http://www.jboss.org/portal/jbossblog">
+ <ui:composition template="common.xhtml">
+ <ui:param name="requiredPermission" value="acl://manageBlog" />
+ <ui:define name="content">
+ <h2>Blog Administration</h2>
+
+ <h:messages />
+
+ <h:panelGroup>
+ <h:panelGroup>
+ <blog:isAllowed fragment="acl://manageBlog" contextData="#{blogView.blogName}">
+ <h:form rendered="#{blogView.blogModifiable}">
+ <p class="admin-link"><h:commandLink value="Edit blog's data" action="#{blogView.blogEditFromBlogView}" /></p>
+ </h:form>
+ </blog:isAllowed>
+ </h:panelGroup>
+ <h:panelGroup>
+ <blog:isAllowed fragment="acl://manageCategory" contextData="#{blogView.blogName}">
+ <h:form rendered="#{blogView.blogModifiable}">
+ <p class="admin-link"><h:commandLink value="Manage Categories" action="#{blogView.manageCategory}" /></p>
+ </h:form>
+ </blog:isAllowed>
+ </h:panelGroup>
+ <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
+ <h:form rendered="#{blogView.blogModifiable}">
+ <p class="admin-link"><h:commandLink value="Edit template" action="toTemplatePostsList" /></p>
+ </h:form>
+ </blog:isAllowed>
+ </h:panelGroup>
+ </ui:define>
+ </ui:composition>
+</div>
\ No newline at end of file
Modified: trunk-esial/blog-core/src/web/views/blog_new.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/blog_new.xhtml 2007-03-21 16:53:24 UTC (rev 98)
+++ trunk-esial/blog-core/src/web/views/blog_new.xhtml 2007-03-21 20:55:34 UTC (rev 99)
@@ -8,11 +8,11 @@
<ui:param name="requiredPermission" value="acl://manageBlog" />
<ui:define name="editheader">
- New blog category
+ New blog
</ui:define>
<ui:define name="edittableheader">
- Enter blog category data:
+ Enter blog data:
</ui:define>
<ui:define name="savelink">
Modified: trunk-esial/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/blog_view.xhtml 2007-03-21 16:53:24 UTC (rev 98)
+++ trunk-esial/blog-core/src/web/views/blog_view.xhtml 2007-03-21 20:55:34 UTC (rev 99)
@@ -1,14 +1,14 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:blog="http://www.jboss.org/portal/jbossblog">
-<ui:composition template="view.xhtml">
- <ui:define name="editlink">
- <h:commandLink value="Edit data" action="#{blogView.blogEditFromBlogView}" />
- </ui:define>
-
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:blog="http://www.jboss.org/portal/jbossblog">
+<ui:composition template="view.xhtml">
+ <ui:define name="editlink">
+ <h:commandLink value="Edit data" action="#{blogView.blogEditFromBlogView}" />
+ </ui:define>
+
<ui:define name="viewmain">
<h:panelGroup rendered="#{!blogView.defaultBlog}">
@@ -16,119 +16,126 @@
<a href="mailto:">Recommend this blog</a>
</h:form>
</h:panelGroup>
-
- <h:panelGrid columns="3">
- <h:panelGroup>
- <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
- <h:form rendered="#{blogView.blogModifiable}">
- <p class="admin-link"><h:commandLink value="New post" action="#{blogView.postNew}" /></p>
- </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>
- </h:form>
- </h:panelGroup>
+
+ <h:panelGrid columns="4">
+ <h:panelGroup>
+ <blog:isAllowed fragment="acl://manageBlog" contextData="#{blogView.blogName}">
+ <h:form rendered="#{blogView.blogModifiable}">
+ <p class="admin-link"><h:commandLink value="Manage Blog" action="#{blogView.manageBlog}" /></p>
+ </h:form>
+ </blog:isAllowed>
+ </h:panelGroup>
+ <h:panelGroup>
+ <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
+ <h:form rendered="#{blogView.blogModifiable}">
+ <p class="admin-link"><h:commandLink value=" | New post" action="#{blogView.postNew}" /></p>
+ </h:form>
+ </blog:isAllowed>
+ </h:panelGroup>
- <h:panelGroup>
- <blog:isAllowed fragment="acl://accessAdminModule">
- <h:form>
- <p class="admin-link"><h:commandLink value=" | Administrate blogs" action="admin_panel" /></p>
- </h:form>
+ <h:panelGroup rendered="#{!blogView.defaultBlog}">
+ <h:form>
+ <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>
+ </h:form>
</blog:isAllowed>
- </h:panelGroup>
+ </h:panelGroup>
- </h:panelGrid>
-
-
- <h:panelGrid columns="1">
-
-
- <h:form rendered="#{!blogView.defaultBlog}">
- <h:commandLink value="Click here to modify the template used to display the posts list." action="toTemplatePostsList"/>
- </h:form>
-
- <h:outputText escape="false" value="#{templ.listOfPosts}"/>
- </h:panelGrid>
-
- <h:form>
- <h:panelGroup rendered="#{!blogView.defaultBlog}">
- <h:dataTable value="#{blogView.posts}" var="post" binding="#{blogView.postsData}"
- rowClasses="posts-row,posts-row-alternate" styleClass="posts"
- rendered="false">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Title"/>
- </f:facet>
- <span class="post-title">
- <h:commandLink value="#{post.title}"
- action="#{blogView.postView}"
- rendered="#{blogView.postsExpandable}" />
-
- <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>
+ </h:panelGrid>
+
+
+ <h:panelGrid columns="1">
+
+
+ <h:form rendered="#{!blogView.defaultBlog}">
+ <h:commandLink value="Click here to modify the template used to display the posts list." action="toTemplatePostsList"/>
+ </h:form>
+
+ <h:outputText escape="false" value="#{templ.listOfPosts}"/>
+ </h:panelGrid>
+
+ <h:form>
+ <h:panelGroup rendered="#{!blogView.defaultBlog}">
+ <h:dataTable value="#{blogView.posts}" var="post" binding="#{blogView.postsData}"
+ rowClasses="posts-row,posts-row-alternate" styleClass="posts"
+ rendered="false">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Title"/>
+ </f:facet>
+ <span class="post-title">
+ <h:commandLink value="#{post.title}"
+ action="#{blogView.postView}"
+ rendered="#{blogView.postsExpandable}" />
+
+ <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">
- #{post.createdTime}, #{post.createdDate}
- </span>
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="Author"/>
- </f:facet>
+ #{post.createdTime}, #{post.createdDate}
+ </span>
+ </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 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 post" action="#{blogView.postEditFromBlogView}" />
- </span>
- </blog:isAllowed>
- </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:panelGroup>
-
- </h:form>
-
+ <h:outputText value="#{post.author.fullName}"/>
+ </span>
+ </h:column>
+
+ <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 post" action="#{blogView.postEditFromBlogView}" />
+ </span>
+ </blog:isAllowed>
+ </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:panelGroup>
+
+ </h:form>
+
<h:form>
<h:panelGrid columns="3">
-
- <h:panelGroup rendered="#{blogView.hasPrevious}">
- <h:commandLink action="#{blogView.previous}"><< Previous</h:commandLink>
-  
- </h:panelGroup>
-
- <h:panelGroup rendered="#{blogView.hasNext}">
- <h:commandLink action="#{blogView.next}">Next >></h:commandLink>
+
+ <h:panelGroup rendered="#{blogView.hasPrevious}">
+ <h:commandLink action="#{blogView.previous}"><< Previous</h:commandLink>
+  
</h:panelGroup>
- </h:panelGrid>
- </h:form>
- </ui:define>
-</ui:composition>
-</div>
+ <h:panelGroup rendered="#{blogView.hasNext}">
+ <h:commandLink action="#{blogView.next}">Next >></h:commandLink>
+ </h:panelGroup>
+
+ </h:panelGrid>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</div>
Modified: trunk-esial/blog-core/src/web/views/id_edit.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/id_edit.xhtml 2007-03-21 16:53:24 UTC (rev 98)
+++ trunk-esial/blog-core/src/web/views/id_edit.xhtml 2007-03-21 20:55:34 UTC (rev 99)
@@ -14,38 +14,38 @@
<h:form>
<h:panelGrid columns="3">
<h:panelGroup>
- New category
+ Associated Group :
</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{idEdit.newCategory}"
+ <h:inputText value="#{idEdit.newGroup}"
maxlength="128" size="32" />
</h:panelGroup>
<h:panelGroup>
- <h:commandLink action="#{idEdit.newCategory}" value="Go >>"/>
+ <h:commandLink action="#{idEdit.newGroup}" value="Go >>"/>
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:panelGroup rendered="#{idEdit.groupExists}">
Edit an existing blog category
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.categoryExists}">
- <h:selectOneMenu value="#{idEdit.existingCategory}">
- <f:selectItems value="#{idEdit.categories}" />
+ <h:panelGroup rendered="#{idEdit.groupExists}">
+ <h:selectOneMenu value="#{idEdit.existingGroup}">
+ <f:selectItems value="#{idEdit.groups}" />
</h:selectOneMenu>
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.categoryExists}">
- <h:commandLink action="#{idEdit.editCategory}" value="Go >>"/>
+ <h:panelGroup rendered="#{idEdit.groupExists}">
+ <h:commandLink action="#{idEdit.editGroup}" value="Go >>"/>
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:panelGroup rendered="#{idEdit.groupExists}">
Delete a blog category
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.categoryExists}">
- <h:selectOneMenu value="#{idEdit.deleteCategory}">
- <f:selectItems value="#{idEdit.categories}" />
+ <h:panelGroup rendered="#{idEdit.groupExists}">
+ <h:selectOneMenu value="#{idEdit.deleteGroup}">
+ <f:selectItems value="#{idEdit.groups}" />
</h:selectOneMenu>
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.categoryExists}">
- <h:commandLink action="#{idEdit.deleteCategory}" value="Go >>"/>
+ <h:panelGroup rendered="#{idEdit.groupExists}">
+ <h:commandLink action="#{idEdit.deleteGroup}" value="Go >>"/>
</h:panelGroup>
<h:panelGroup>
Modified: trunk-esial/blog-core/src/web/views/post_mod.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/post_mod.xhtml 2007-03-21 16:53:24 UTC (rev 98)
+++ trunk-esial/blog-core/src/web/views/post_mod.xhtml 2007-03-21 20:55:34 UTC (rev 99)
@@ -50,7 +50,7 @@
</h:column>
<h:column>
#{blog.category}
- <h:panelGroup rendered="#{empty blog.category}">
+ <h:panelGroup rendered="#{empty blog.group}">
<p class="sidenote">(empty)</p>
</h:panelGroup>
</h:column>
Modified: trunk-esial/blog-core/src/web/views/template_posts_list.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/template_posts_list.xhtml 2007-03-21 16:53:24 UTC (rev 98)
+++ trunk-esial/blog-core/src/web/views/template_posts_list.xhtml 2007-03-21 20:55:34 UTC (rev 99)
@@ -14,7 +14,7 @@
<h:panelGrid columns="1">
<h:outputText value="Here you can change the template used to display the list of the posts:"/>
- <h:inputTextarea value="#{templ.templatePostsList}" required="true" rows="30" cols="80"/>
+ <h:inputTextarea value="#{templ.templatePostsList}" required="true" rows="30" cols="60"/>
<h:commandLink value="Save this template" action="#{templ.saveTemplatePostsList}"/>
</h:panelGrid>
Modified: trunk-esial/blog-core/src/web/views/view.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/view.xhtml 2007-03-21 16:53:24 UTC (rev 98)
+++ trunk-esial/blog-core/src/web/views/view.xhtml 2007-03-21 20:55:34 UTC (rev 99)
@@ -13,8 +13,8 @@
</h:panelGroup>
</h2>
- <h:panelGroup rendered="#{not empty blogView.blogName.category}">
- categories: #{blogView.blogName.category}
+ <h:panelGroup rendered="#{not empty blogView.blogName.group}">
+ Group: #{blogView.blogName.group}
</h:panelGroup>
<h:panelGroup rendered="#{not empty blogView.blogModel.title}">
@@ -24,13 +24,13 @@
</h:panelGroup>
- <h:panelGroup rendered="#{blogView.blogModifiable}">
+ <!-- h:panelGroup rendered="#{blogView.blogModifiable}">
<blog:isAllowed fragment="acl://manageCategory" contextData="#{blogView.blogName}">
<h:form>
<p class="admin-link"><ui:insert name="editlink" /></p>
</h:form>
</blog:isAllowed>
- </h:panelGroup>
+ </h:panelGroup-->
<ui:insert name="viewmain" />
</ui:define>
More information about the jboss-cvs-commits
mailing list