[jboss-cvs] JBossBlog SVN: r82 - in trunk-esial/blog-core/src: web/views and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: acrignon
Date: 2007-03-19 10:56:34 -0400 (Mon, 19 Mar 2007)
New Revision: 82

Modified:
   trunk-esial/blog-core/src/java/org/jboss/blog/ui/templateManager.java
   trunk-esial/blog-core/src/web/views/blog_view.xhtml
Log:
template system improved

Modified: trunk-esial/blog-core/src/java/org/jboss/blog/ui/templateManager.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/ui/templateManager.java	2007-03-19 12:45:38 UTC (rev 81)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/ui/templateManager.java	2007-03-19 14:56:34 UTC (rev 82)
@@ -4,6 +4,7 @@
 import freemarker.template.*;
 import org.jboss.blog.tools.*;
 import org.jboss.blog.*;
+import java.util.*;
 
 public class templateManager {
 	
@@ -26,13 +27,14 @@
 		String str = "init str";
 		
 		try{
-		SimpleHash modelRoot = new SimpleHash();
+		Map modelRoot = new HashMap();
 		str = BlogTools.getBlogService().getStoreService().retrieveTemplatePostsList(blogView.getBlogName());//blogView.getBlogName()
 		if(str==null)
 			str = "There was a problem in retrieving the template.";
 		Template t = new Template("test",new StringReader(str),new Configuration());
 		Writer out = new OutputStreamWriter(System.out);
-		modelRoot.put("pouet","pouet");
+		List l = blogView.getBlogModel().getPosts();
+		modelRoot.put("postsList",l);
 		t.process(modelRoot, out);
 		s = t.toString();
 		}
@@ -52,7 +54,14 @@
 	}
 	
 	public String getTemplatePostsList(){
-		return templatePostsList;
+		//return templatePostsList;
+		String s="";
+		try{
+			s = BlogTools.getBlogService().getStoreService().retrieveTemplatePostsList(blogView.getBlogName());
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		return s;
 	}
 	
 	public boolean getAllowPostsList(){

Modified: trunk-esial/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/blog_view.xhtml	2007-03-19 12:45:38 UTC (rev 81)
+++ trunk-esial/blog-core/src/web/views/blog_view.xhtml	2007-03-19 14:56:34 UTC (rev 82)
@@ -42,19 +42,22 @@
         
         </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:panelGroup>
-        	<h:outputText escape="false" value="#{templ.listOfPosts}" rendered="#{!templ.allowPostsList}"/>
-        </h:panelGroup>
+                
+        <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="#{templ.allowPostsList}">
+                rendered="false">
             <h:column>
             	<f:facet name="header">
             		<h:outputText value="Title"/>