[jboss-cvs] JBossBlog SVN: r101 - in trunk-esial/blog-core: src/etc/META-INF and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 22 05:21:31 EDT 2007
Author: acrignon
Date: 2007-03-22 05:21:31 -0400 (Thu, 22 Mar 2007)
New Revision: 101
Removed:
trunk-esial/blog-core/src/java/org/jboss/blog/model/AbstractBlogCategory.java
trunk-esial/blog-core/src/java/org/jboss/blog/model/BlogCategory.java
trunk-esial/blog-core/src/java/org/jboss/blog/model/impl/BlogCategoryImpl.java
trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogCategory.hbm.xml
trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogCategory.java
trunk-esial/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogCategory.java
trunk-esial/blog-core/src/web/views/blog_man.xhtml
Modified:
trunk-esial/blog-core/build.xml
trunk-esial/blog-core/src/etc/META-INF/acl-permissions.xml
trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
trunk-esial/blog-core/src/java/org/jboss/blog/tools/UITools.java
trunk-esial/blog-core/src/java/org/jboss/blog/ui/State.java
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:
- version which works with templates (no changes about categories)
Modified: trunk-esial/blog-core/build.xml
===================================================================
--- trunk-esial/blog-core/build.xml 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/build.xml 2007-03-22 09:21:31 UTC (rev 101)
@@ -2,7 +2,7 @@
<project name="JBoss Blog" default="build">
<!-- Configuration of deployment -->
- <property name="jboss.home" value="/home/theute/Portal/jboss-portal-2.4.1" />
+ <property name="jboss.home" value="C:\\jboss-4.0.5.GA" />
<property name="jboss.conf" value="default" />
<!-- Unset this property if jboss portal is deployed -->
<property name="jboss.portal.present" value="true" />
@@ -85,7 +85,7 @@
<target name="build" depends="init,clean">
<mkdir dir="${build}" />
<!-- Compiling the source -->
- <javac srcdir="${src.java}" destdir="${build}" target="1.4" source="1.4" debug="on">
+ <javac srcdir="${src.java}" destdir="${build}" target="1.4" source="1.4">
<classpath refid="base.jars" />
</javac>
<!-- Copying any xmls -->
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-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/etc/META-INF/acl-permissions.xml 2007-03-22 09:21:31 UTC (rev 101)
@@ -44,7 +44,6 @@
<!-- 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>
@@ -64,21 +63,8 @@
<!-- 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...
Deleted: trunk-esial/blog-core/src/java/org/jboss/blog/model/AbstractBlogCategory.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/model/AbstractBlogCategory.java 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/model/AbstractBlogCategory.java 2007-03-22 09:21:31 UTC (rev 101)
@@ -1,5 +0,0 @@
-package org.jboss.blog.model;
-
-
-public abstract class AbstractBlogCategory implements BlogCategory{
-}
Deleted: trunk-esial/blog-core/src/java/org/jboss/blog/model/BlogCategory.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/model/BlogCategory.java 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/model/BlogCategory.java 2007-03-22 09:21:31 UTC (rev 101)
@@ -1,7 +0,0 @@
-package org.jboss.blog.model;
-
-/**
- * An interface representing a single blog category
- */
-public interface BlogCategory {
-}
Deleted: trunk-esial/blog-core/src/java/org/jboss/blog/model/impl/BlogCategoryImpl.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/model/impl/BlogCategoryImpl.java 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/model/impl/BlogCategoryImpl.java 2007-03-22 09:21:31 UTC (rev 101)
@@ -1,47 +0,0 @@
-package org.jboss.blog.model.impl;
-
-import org.jboss.blog.model.BlogCategory;
-import java.util.Set;
-
-/**
- * A simple java-bean implementation of the category interface.
- */
-public class BlogCategoryImpl implements BlogCategory{
- private String name;
- private String description;
- private Set posts;
-
-
- public BlogCategoryImpl(String name, String description, Set posts) {
- super();
- this.name = name;
- this.description = description;
- this.posts = posts;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
-
- public Set getPosts(){
- return posts;
- }
-
- public void setPosts(Set posts){
- this.posts = posts;
- }
-
-}
Deleted: trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogCategory.hbm.xml
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogCategory.hbm.xml 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogCategory.hbm.xml 2007-03-22 09:21:31 UTC (rev 101)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.jboss.blog.service.store.hibernate">
- <class name="HBlogCategory"
- table="BLOG_CATEGORIES">
- <id name="id" column="CATEGORY_ID">
- <generator class="native" />
- </id>
-
- <property name="name" column="NAME" not-null="true" />
-
- <property name="description" column="DESCRIPTION" type="text" />
-
-
- </class>
-</hibernate-mapping>
\ No newline at end of file
Deleted: trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogCategory.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogCategory.java 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogCategory.java 2007-03-22 09:21:31 UTC (rev 101)
@@ -1,59 +0,0 @@
-package org.jboss.blog.service.store.hibernate;
-
-import java.util.List;
-import org.jboss.blog.service.store.model.ModifiableBlogCategory;
-
-
-public class HBlogCategory implements ModifiableBlogCategory{
- private Integer id;
- private String name;
- private String description;
- private List posts;
-
- private HibernateBlogStoreService storeService;
-
- public HBlogCategory(){
- }
-
- public HibernateBlogStoreService getStoreService() {
- return storeService;
- }
-
- public void setStoreService(HibernateBlogStoreService storeService) {
- this.storeService = storeService;
- }
-
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setId(Integer id){
- this.id = id;
- }
-
- public Integer getId(){
- return id;
- }
-
- public List getPosts(){
- return posts;
- }
-
- public void setPosts(List posts){
- this.posts = posts;
- }
-
-}
Modified: trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java 2007-03-22 09:21:31 UTC (rev 101)
@@ -5,7 +5,6 @@
import org.jboss.blog.service.store.model.ModifiableBlogPost;
import org.jboss.blog.service.store.model.BlogModelAlreadyExistsException;
import org.jboss.blog.service.store.model.ModifiableBlogComment;
-import org.jboss.blog.service.store.model.ModifiableBlogCategory;
import org.jboss.blog.service.AbstractBlogService;
import org.jboss.blog.service.permissions.model.PortalUserBlogAuthor;
import org.jboss.blog.service.permissions.BlogPermissionsService;
@@ -13,7 +12,6 @@
import org.jboss.blog.model.BlogModelDoesNotExistException;
import org.jboss.blog.model.BlogCommentDoesNotExistException;
import org.jboss.blog.model.BlogAuthor;
-import org.jboss.blog.model.BlogCategory;
import org.jboss.blog.tools.BlogTools;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
@@ -70,16 +68,7 @@
return (HBlogModel) model;
}
-
- HBlogCategory castAndAssertBlogCategory(BlogCategory category) {
- BlogTools.assertNotNull(category, "Blog category cannot be null.");
- if (!(category instanceof HBlogCategory)) {
- throw new IllegalArgumentException("Category must be obtained from this store service.");
- }
- return (HBlogCategory) category;
- }
-
HBlogPost castAndAssertBlogPost(ModifiableBlogPost post) {
BlogTools.assertNotNull(post, "Blog post cannot be null.");
if (!(post instanceof HBlogPost)) {
@@ -118,27 +107,13 @@
* @jmx.managed-operation
* @jmx.managed-parameter type="org.jboss.blog.BlogName"
*/
- public List retrieveAllGroups(BlogName blogName) {
+ public List retrieveAllCategories(BlogName blogName) {
assertBlogNameNotNull(blogName);
return sf.getCurrentSession().createQuery(
"select model.blogName from HBlogModel as model " +
"where model.blogName.id = :id")
.setParameter("id", blogName.getId()).list();
}
-
-
-
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="org.jboss.blog.BlogName"
- */
- public List retrieveAllCategories(BlogName blogName) {
- assertBlogNameNotNull(blogName);
- return sf.getCurrentSession().createQuery(
- "select model.categories from HBlogModel as model " +
- "where model.blogName.id = :id")
- .setParameter("id", blogName.getId()).list();
- }
private boolean blogExists(BlogName blogName) {
Long count = (Long) sf.getCurrentSession().createQuery(
@@ -179,26 +154,7 @@
return hbm;
}
-
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="String"
- */
- public ModifiableBlogCategory retrieveBlogCategory(String name){
-
- HBlogCategory hbc = (HBlogCategory) sf.getCurrentSession()
- .createQuery("from HBlogCategory as cat where cat.name = :name")
- .setCacheable(true).setParameter("name", name).uniqueResult();
- //if (hbc == null) {
- // throw new BlogModelDoesNotExistException(blogName.toString());
- //}
- if (hbc != null){
- hbc.setStoreService(this);
- }
- return hbc;
- }
-
/**
* @jmx.managed-operation
* @jmx.managed-parameter type="org.jboss.blog.BlogName"
@@ -225,16 +181,6 @@
/**
* @jmx.managed-operation
*/
- public ModifiableBlogCategory newBlogCategory() {
- HBlogCategory category = new HBlogCategory();
- category.setStoreService(this);
-
- return category;
- }
-
- /**
- * @jmx.managed-operation
- */
public ModifiableBlogPost newBlogPost() {
HBlogPost post = new HBlogPost();
post.setModelPosts(new ArrayList());
@@ -298,22 +244,6 @@
/**
* @jmx.managed-operation
- * @jmx.managed-parameter type="org.jboss.blog.service.store.model.ModifiableBlogCategory"
- */
- public void saveNewBlogCategory(ModifiableBlogCategory category) /*throws BlogCategoryAlreadyExistsException*/ {
- HBlogCategory hcategory = castAndAssertBlogCategory(category);
- //assertBlogNameNotNull(hmodel.getBlogName());
-
- // TODO: checking if the blog already exist or not. Can it be done in a better way?
- //if (blogExists(hmodel.getBlogName())) {
- // throw new BlogModelAlreadyExistsException(hmodel.getBlogName().toString());
- //}
-
- sf.getCurrentSession().save(category);
- }
-
- /**
- * @jmx.managed-operation
* @jmx.managed-parameter type="org.jboss.blog.service.store.model.ModifiableBlogModel"
*/
public void deleteBlogModel(ModifiableBlogModel model) {
@@ -377,7 +307,7 @@
* To the given blog model, adds the given post.
* @param model Model to which the post should be added.
* @param post Post to add.
- */
+ */
void addPost(HBlogModel model, HBlogPost post) {
HBlogModel hmodel = castAndAssertBlogModel(model);
HBlogPost hpost = castAndAssertBlogPost(post);
@@ -394,21 +324,7 @@
sf.getCurrentSession().save(hbmp);
}
}
-
- /**
- * To the given blog model, adds the given category.
- * @param model Model to which the post should be added.
- * @param category Category to add.
- */
- void addCategory(HBlogModel model, HBlogCategory category) {
- HBlogModel hmodel = castAndAssertBlogModel(model);
- HBlogCategory hcat = castAndAssertBlogCategory(category);
- hmodel.getCategories().add(hcat);
- sf.getCurrentSession().saveOrUpdate(hcat);
-
- }
-
/**
* From the given blog model, removes the given post.
* @param model Model from which the post shold be removed.
Deleted: trunk-esial/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogCategory.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogCategory.java 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogCategory.java 2007-03-22 09:21:31 UTC (rev 101)
@@ -1,16 +0,0 @@
-package org.jboss.blog.service.store.model;
-
-import org.jboss.blog.model.BlogCategory;
-
-
-import java.io.Serializable;
-
-
-public interface ModifiableBlogCategory extends BlogCategory{
-
- public void setName(String name);
-
- public void setDescription(String description);
-
- public String getDescription();
-}
Modified: trunk-esial/blog-core/src/java/org/jboss/blog/tools/UITools.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-03-22 09:21:31 UTC (rev 101)
@@ -15,16 +15,10 @@
public static final String BLOG_EDIT = "blog_edit";
public static final String BLOG_NEW = "blog_new";
public static final String BLOG_DEL = "blog_del";
- public static final String BLOG_MAN = "blog_manage";
public static final String POST_EDIT = "post_edit";
public static final String POST_NEW = "post_new";
public static final String POST_DEL = "post_del";
-
- public static final String CAT_EDIT = "cat_edit";
- public static final String CAT_NEW = "cat_new";
- public static final String CAT_DEL = "cat_delete";
- public static final String CAT_MAN = "cat_manage";
public static final String COMMENT_DEL = "comment_del";
Modified: trunk-esial/blog-core/src/java/org/jboss/blog/ui/State.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/ui/State.java 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/ui/State.java 2007-03-22 09:21:31 UTC (rev 101)
@@ -15,7 +15,6 @@
private Map blogViewStates;
private String selectedBlogId;
- private String selectedCategory;
private BlogName selectedBlogName;
private String returnTo;
@@ -45,18 +44,7 @@
public void setSelectedBlogId(String selectedBlogId) {
this.selectedBlogId = selectedBlogId;
}
-
- /**
- * @return name of the category selected for editing.
- */
- public String getSelectedCategory() {
- return selectedCategory;
- }
- public void setSelectedCategory(String selectedCategory) {
- this.selectedCategory = selectedCategory;
- }
-
/**
* Gets the name of the selected blog.
* @return Name of the blog selected for viewing/ editing.
Deleted: trunk-esial/blog-core/src/web/views/blog_man.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/blog_man.xhtml 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/web/views/blog_man.xhtml 2007-03-22 09:21:31 UTC (rev 101)
@@ -1,37 +0,0 @@
-<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-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/web/views/blog_new.xhtml 2007-03-22 09:21:31 UTC (rev 101)
@@ -8,11 +8,11 @@
<ui:param name="requiredPermission" value="acl://manageBlog" />
<ui:define name="editheader">
- New blog
+ New blog category
</ui:define>
<ui:define name="edittableheader">
- Enter blog data:
+ Enter blog category 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-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/web/views/blog_view.xhtml 2007-03-22 09:21:31 UTC (rev 101)
@@ -17,18 +17,11 @@
</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: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>
+ <p class="admin-link"><h:commandLink value="New post" action="#{blogView.postNew}" /></p>
</h:form>
</blog:isAllowed>
</h:panelGroup>
Modified: trunk-esial/blog-core/src/web/views/id_edit.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/id_edit.xhtml 2007-03-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/web/views/id_edit.xhtml 2007-03-22 09:21:31 UTC (rev 101)
@@ -14,38 +14,38 @@
<h:form>
<h:panelGrid columns="3">
<h:panelGroup>
- Associated Group :
+ New category
</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{idEdit.newGroup}"
+ <h:inputText value="#{idEdit.newCategory}"
maxlength="128" size="32" />
</h:panelGroup>
<h:panelGroup>
- <h:commandLink action="#{idEdit.newGroup}" value="Go >>"/>
+ <h:commandLink action="#{idEdit.newCategory}" value="Go >>"/>
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.groupExists}">
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
Edit an existing blog category
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.groupExists}">
- <h:selectOneMenu value="#{idEdit.existingGroup}">
- <f:selectItems value="#{idEdit.groups}" />
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:selectOneMenu value="#{idEdit.existingCategory}">
+ <f:selectItems value="#{idEdit.categories}" />
</h:selectOneMenu>
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.groupExists}">
- <h:commandLink action="#{idEdit.editGroup}" value="Go >>"/>
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:commandLink action="#{idEdit.editCategory}" value="Go >>"/>
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.groupExists}">
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
Delete a blog category
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.groupExists}">
- <h:selectOneMenu value="#{idEdit.deleteGroup}">
- <f:selectItems value="#{idEdit.groups}" />
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:selectOneMenu value="#{idEdit.deleteCategory}">
+ <f:selectItems value="#{idEdit.categories}" />
</h:selectOneMenu>
</h:panelGroup>
- <h:panelGroup rendered="#{idEdit.groupExists}">
- <h:commandLink action="#{idEdit.deleteGroup}" value="Go >>"/>
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:commandLink action="#{idEdit.deleteCategory}" 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-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/web/views/post_mod.xhtml 2007-03-22 09:21:31 UTC (rev 101)
@@ -50,7 +50,7 @@
</h:column>
<h:column>
#{blog.category}
- <h:panelGroup rendered="#{empty blog.group}">
+ <h:panelGroup rendered="#{empty blog.category}">
<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-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/web/views/template_posts_list.xhtml 2007-03-22 09:21:31 UTC (rev 101)
@@ -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="60"/>
+ <h:inputTextarea value="#{templ.templatePostsList}" required="true" rows="30" cols="80"/>
<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-22 08:58:15 UTC (rev 100)
+++ trunk-esial/blog-core/src/web/views/view.xhtml 2007-03-22 09:21:31 UTC (rev 101)
@@ -11,11 +11,11 @@
<h:panelGroup>
#{blogView.blogModel.title}
</h:panelGroup>
- </h2>
-
- <h:panelGroup rendered="#{not empty blogView.blogName.group}">
- Group: #{blogView.blogName.group}
- </h:panelGroup>
+ </h2>
+
+ <h:panelGroup rendered="#{not empty blogView.blogName.category}">
+ categories: #{blogView.blogName.category}
+ </h:panelGroup>
<h:panelGroup rendered="#{not empty blogView.blogModel.title}">
<p class="blog-description">
@@ -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