From 6a782e412d837fc85a0457aba4d54d3a4632dc0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dario=20B=C3=B6sch?= <daboesch@student.ethz.ch>
Date: Thu, 21 May 2015 12:03:09 +0200
Subject: [PATCH] #2 Structure of list of posts (blog)Ordered the posts by
 creation date. For this, I added a field to the nodes storage and api. Show
 the creation date and author. Styled the post and added a more link to the
 detail page

---
 .../site/themes/bootstrap/assets/css/node.css | 32 +++++++++++++++++--
 modules/node/cms_node_api.e                   |  6 ++++
 modules/node/handler/blog_handler.e           | 23 +++++++++++--
 modules/node/persistence/cms_node_storage_i.e |  5 +++
 .../node/persistence/cms_node_storage_null.e  |  6 ++++
 .../node/persistence/cms_node_storage_sql.e   | 30 +++++++++++++++++
 6 files changed, 97 insertions(+), 5 deletions(-)

diff --git a/examples/demo/site/themes/bootstrap/assets/css/node.css b/examples/demo/site/themes/bootstrap/assets/css/node.css
index 85b78c9..cc105b5 100644
--- a/examples/demo/site/themes/bootstrap/assets/css/node.css
+++ b/examples/demo/site/themes/bootstrap/assets/css/node.css
@@ -4,13 +4,13 @@ ul.cms-nodes {
   border: solid 1px #ccc;
 }
 
-li.cms_type_page, li.cms_type_blog {
+.cms-nodes li.cms_type_page, .cms-nodes li.cms_type_blog {
   border-top: dotted 1px #ccc;
 }
 li.cms_type_page a::before {
   content: "[page] ";
 }
-li.cms_type_blog a::before {
+.cms-nodes li.cms_type_blog a::before {
   content: "[blog] ";
 }
 ul.cms-nodes li:first-child {
@@ -20,4 +20,32 @@ ul.cms-nodes li:first-child {
 .summary{
 	margin-top:20px;
 	font-weight:bold;
+}
+.cms-blog-nodes{
+	padding:0;
+	margin:0;
+}
+.cms-blog-nodes li{
+	list-style: none;
+	display: block;
+	margin-top:20px;
+	padding-bottom:20px;
+	border-bottom:1px dotted black;
+}
+
+.cms-blog-nodes li > a{
+	color:black;
+	font-size:18px;
+	text-decoration: none;
+	display:block;
+	margin:6px 0;
+}
+
+.cms-blog-nodes li > a:hover{
+	color:#999;
+}
+
+.blog_list_summary a{
+	margin-top:20px;
+	display:block;
 }
\ No newline at end of file
diff --git a/modules/node/cms_node_api.e b/modules/node/cms_node_api.e
index 8f0a8d9..ab990ea 100644
--- a/modules/node/cms_node_api.e
+++ b/modules/node/cms_node_api.e
@@ -212,6 +212,12 @@ feature -- Access: Node
 			Result := node_storage.nodes
 		end
 
+	nodes_order_created_desc: LIST[CMS_NODE]
+			-- List of nodes ordered by creation date (descending)
+		do
+			Result := node_storage.nodes_order_created_desc
+		end
+
 	recent_nodes (a_offset, a_rows: INTEGER): LIST [CMS_NODE]
 			-- List of the `a_rows' most recent nodes starting from  `a_offset'.
 		do
diff --git a/modules/node/handler/blog_handler.e b/modules/node/handler/blog_handler.e
index 63786b3..58e50cf 100644
--- a/modules/node/handler/blog_handler.e
+++ b/modules/node/handler/blog_handler.e
@@ -24,6 +24,7 @@ feature -- HTTP Methods
 			s: STRING
 			n: CMS_NODE
 			lnk: CMS_LOCAL_LINK
+			hdate: HTTP_DATE
 		do
 				-- At the moment the template is hardcoded, but we can
 				-- get them from the configuration file and load them into
@@ -35,10 +36,10 @@ feature -- HTTP Methods
 
 				-- NOTE: for development purposes we have the following hardcode output.
 			create s.make_from_string ("<h2>Blog entries:</h2>")
-			if attached node_api.nodes as lst then
+			if attached node_api.nodes_order_created_desc as lst then
 				-- Filter out blog entries from all nodes
 				--if n.content_type.is_equal ("blog") then
-					s.append ("<ul class=%"cms-nodes%">%N")
+					s.append ("<ul class=%"cms-blog-nodes%">%N")
 					across
 						lst as ic
 					loop
@@ -47,17 +48,33 @@ feature -- HTTP Methods
 							lnk := node_api.node_link (n)
 							s.append ("<li class=%"cms_type_"+ n.content_type +"%">")
 
+							-- Post date (creation)
+							if attached n.creation_date as l_modified then
+								create hdate.make_from_date_time (l_modified)
+								s.append (hdate.yyyy_mmm_dd_string)
+								s.append (" ")
+							end
+
+							-- Author
+							if attached n.author as l_author then
+								s.append ("by ")
+								s.append (l_author.name)
+							end
+
 							-- Title with link
 							s.append (l_page.link (lnk.title, lnk.location, Void))
 
 							-- Summary
 							if attached n.summary as l_summary then
-								s.append ("<br />")
+								s.append ("<p class=%"blog_list_summary%">")
 								if attached api.format (n.format) as f then
 									s.append (f.formatted_output (l_summary))
 								else
 									s.append (l_page.formats.default_format.formatted_output (l_summary))
 								end
+								s.append ("<br />")
+								s.append (l_page.link ("More...", lnk.location, Void))
+								s.append ("</p>")
 							end
 
 							s.append ("</li>%N")
diff --git a/modules/node/persistence/cms_node_storage_i.e b/modules/node/persistence/cms_node_storage_i.e
index 6090d95..2a2051b 100644
--- a/modules/node/persistence/cms_node_storage_i.e
+++ b/modules/node/persistence/cms_node_storage_i.e
@@ -70,6 +70,11 @@ feature -- Access
 		deferred
 		end
 
+	nodes_order_created_desc: LIST [CMS_NODE]
+			-- List of nodes ordered by creation date (descending).
+		deferred
+		end
+
 	recent_nodes (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_NODE]
 			-- List of recent `a_count' nodes with an offset of `lower'.
 		deferred
diff --git a/modules/node/persistence/cms_node_storage_null.e b/modules/node/persistence/cms_node_storage_null.e
index 87559af..a917ec5 100644
--- a/modules/node/persistence/cms_node_storage_null.e
+++ b/modules/node/persistence/cms_node_storage_null.e
@@ -41,6 +41,12 @@ feature -- Access: node
 			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
 		end
 
+	nodes_order_created_desc: LIST[CMS_NODE]
+			-- List of nodes ordered descending by creation date
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+		end
+		
 	recent_nodes (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_NODE]
 			-- List of the `a_count' most recent nodes, starting from `a_lower'.
 		do
diff --git a/modules/node/persistence/cms_node_storage_sql.e b/modules/node/persistence/cms_node_storage_sql.e
index 06ecadc..5d9c7f2 100644
--- a/modules/node/persistence/cms_node_storage_sql.e
+++ b/modules/node/persistence/cms_node_storage_sql.e
@@ -33,6 +33,32 @@ feature -- Access
 			end
 		end
 
+	nodes_order_created_desc: LIST [CMS_NODE]
+			-- List of nodes ordered by creation date (descending).
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+
+			error_handler.reset
+			write_information_log (generator + ".nodes")
+
+			from
+				sql_query (sql_select_nodes_order_created_desc, Void)
+				sql_start
+			until
+				sql_after
+			loop
+				if attached fetch_node as l_node then
+					Result.force (l_node)
+				end
+				sql_forth
+			end
+--			across
+--				Result as ic
+--			loop
+--				fill_node (ic.item)
+--			end
+		end
+
 	nodes: LIST [CMS_NODE]
 			-- List of nodes.
 		do
@@ -228,6 +254,10 @@ feature {NONE} -- Queries
 			-- SQL Query to retrieve all nodes.
 			--| note: {CMS_NODE_API}.trashed = -1
 
+	sql_select_nodes_order_created_desc: STRING = "SELECT * FROM Nodes WHERE status != -1 ORDER BY created DESC;"
+			-- SQL Query to retrieve all nodes order by descending creation date.
+			--| note: {CMS_NODE_API}.trashed = -1
+
 	sql_select_node_by_id: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM Nodes WHERE nid =:nid ORDER BY revision DESC, publish DESC LIMIT 1;"
 
 	sql_select_recent_nodes: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM Nodes ORDER BY nid DESC, publish DESC LIMIT :rows OFFSET :offset ;"