Removed dependency from pagination to cms_data_query_parameters

TODO: review and fix any NATURAL_64 truncation.

.gitignore

@@ -2,6 +2,4 @@ EIFGENs
 *.swp
 *.log*
 *.rc
-*.bak
-*.sqlite
-Thumbs.db
+*.bak

cms-safe.ecf

@@ -24,6 +24,7 @@
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template-safe.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf" readonly="false"/>

cms.ecf

@@ -24,6 +24,7 @@
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>

examples/demo/modules/blog/cms_blog.e

@@ -31,13 +31,7 @@ feature -- Conversion
 		do
 			Precursor (a_node)
 			if attached {CMS_BLOG} a_node as l_blog then
-				if attached l_blog.tags as l_tags then
-					across
-						l_tags as ic
-					loop
-						add_tag (ic.item)
-					end
-				end
+--				l_blog
 			end
 		end
 
@@ -48,7 +42,7 @@ feature -- Access
 			Result := {CMS_BLOG_NODE_TYPE}.name
 		end
 
-feature -- Access: node
+feature -- Access: content
 
 	summary: detachable READABLE_STRING_8
 			-- A short summary of the node.
@@ -60,12 +54,10 @@ feature -- Access: node
 			-- Format associated with `content' and `summary'.
 			-- For example: text, mediawiki, html, etc
 
-feature -- Access: blog
-
 	tags: detachable ARRAYED_LIST [READABLE_STRING_32]
 			-- Optional tags
 
-feature -- Element change: node
+feature -- Element change
 
 	set_content (a_content: like content; a_summary: like summary; a_format: like format)
 		do
@@ -74,8 +66,6 @@ feature -- Element change: node
 			format := a_format
 		end
 
-feature -- Element change: blog		
-
 	add_tag (a_tag: READABLE_STRING_32)
 			-- Set `parent' to `a_page'
 		require

examples/demo/modules/blog/cms_blog_api.e

@@ -1,118 +0,0 @@
-note
-	description: "API to handle nodes of type blog. Extends the node API."
-	author: "Dario B<>sch <daboesch@student.ethz.ch"
-	date: "$Date: 2015-05-21 14:46:00 +0100$"
-	revision: "$Revision: 96616 $"
-
-class
-	CMS_BLOG_API
-
-inherit
-	CMS_MODULE_API
-		rename
-			make as make_with_cms_api
-		redefine
-			initialize
-		end
-
-	REFACTORING_HELPER
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_api: CMS_API; a_node_api: CMS_NODE_API)
-			-- (from CMS_MODULE_API)
-			-- (export status {NONE})
-		do
-			node_api := a_node_api
-			make_with_cms_api (a_api)
-		end
-
-	initialize
-			-- <Precursor>
-		do
-			Precursor
-
-				-- Create the node storage for type blog
-			if attached {CMS_STORAGE_SQL_I} storage as l_storage_sql then
-				create {CMS_BLOG_STORAGE_SQL} blog_storage.make (l_storage_sql)
-			else
-				create {CMS_BLOG_STORAGE_NULL} blog_storage.make
-			end
---			initialize_node_types
-		end
-
-feature {CMS_API_ACCESS, CMS_MODULE, CMS_API} -- Restricted access		
-
-	node_api: CMS_NODE_API
-
-feature {CMS_MODULE} -- Access nodes storage.
-
-	blog_storage: CMS_BLOG_STORAGE_I
-
-feature -- Configuration of blog handlers
-
-	entries_per_page : NATURAL_32 = 2
-			-- The numbers of posts that are shown on one page. If there are more post a pagination is generated
-			--| For test reasons this is 2, so we don't have to create a lot of blog entries.
-			--| TODO: Set to bigger constant.
-
-feature -- Access node
-
-	blogs_count: INTEGER_64
-			-- Number of nodes of type blog.
-		do
-			Result := blog_storage.blogs_count
-		end
-
-	blogs_count_from_user (a_user: CMS_USER): INTEGER_64
-			-- Number of nodes of type blog from user with `a_user_id'.
-		require
-			has_id: a_user.has_id
-		do
-			Result := blog_storage.blogs_count_from_user (a_user)
-		end
-
-	blogs_order_created_desc: LIST [CMS_BLOG]
-			-- List of nodes ordered by creation date (descending)
-		do
-			Result := nodes_to_blogs (blog_storage.blogs)
-		end
-
-	blogs_order_created_desc_limited (a_limit: NATURAL_32; a_offset: NATURAL_32): LIST [CMS_BLOG]
-			-- List of nodes ordered by creation date and limited by limit and offset
-		do
-				-- load all posts and add the authors to each post
-			Result := nodes_to_blogs (blog_storage.blogs_limited (a_limit, a_offset))
-		end
-
-	blogs_from_user_order_created_desc_limited (a_user: CMS_USER; a_limit: NATURAL_32; a_offset: NATURAL_32) : LIST [CMS_BLOG]
-			-- List of nodes ordered by creation date and limited by limit and offset
-		require
-			has_id: a_user.has_id
-		do
-				-- load all posts and add the authors to each post
-			Result := nodes_to_blogs (blog_storage.blogs_from_user_limited (a_user, a_limit, a_offset))
-		end
-
-feature {NONE} -- Helpers
-
-	nodes_to_blogs (a_nodes: LIST [CMS_NODE]): ARRAYED_LIST [CMS_BLOG]
-			-- Convert list of nodes into a list of blog when possible.
-		do
-			create {ARRAYED_LIST [CMS_BLOG]} Result.make (a_nodes.count)
-
-			if attached node_api as l_node_api then
-				across
-					a_nodes as ic
-				loop
-					if attached {CMS_BLOG} l_node_api.full_node (ic.item) as l_blog then
-						Result.force (l_blog)
-					end
-				end
-			end
-		end
-
-end

examples/demo/modules/blog/cms_blog_module-safe.ecf

@@ -20,7 +20,6 @@
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf"/>
-		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
 		<cluster name="src" location=".\" recursive="true"/>
 	</target>

examples/demo/modules/blog/cms_blog_module.e

@@ -1,22 +1,17 @@
 note
-	description: "Displays all posts (pages with type blog). It's possible to list posts by user."
-	author: "Dario B<>sch <daboesch@student.ethz.ch>"
-	date: "$Date: 2015-05-22 15:13:00 +0100 (lun., 18 mai 2015) $"
-	revision: "$Revision 96616$"
+	description: "Summary description for {CMS_BLOG_MODULE}."
+	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
+	revision: "$Revision: 96616 $"
 
 class
 	CMS_BLOG_MODULE
 
 inherit
 	CMS_MODULE
-		rename
-			module_api as blog_api
 		redefine
 			register_hooks,
 			initialize,
-			is_installed,
-			install,
-			blog_api
+			install
 		end
 
 	CMS_HOOK_MENU_SYSTEM_ALTER
@@ -44,10 +39,6 @@ feature {CMS_API} -- Module Initialization
 			Precursor (api)
 
 			if attached {CMS_NODE_API} api.module_api ({NODE_MODULE}) as l_node_api then
-				create blog_api.make (api, l_node_api)
-
-				node_api := l_node_api
-					-- Depends on {NODE_MODULE}
 				create ct
 				l_node_api.add_content_type (ct)
 				l_node_api.add_content_type_webform_manager (create {CMS_BLOG_NODE_TYPE_WEBFORM_MANAGER}.make (ct))
@@ -61,12 +52,6 @@ feature {CMS_API} -- Module Initialization
 
 feature {CMS_API} -- Module management
 
-	is_installed (api: CMS_API): BOOLEAN
-			-- Is Current module installed?
-		do
-			Result := attached api.storage.custom_value ("is_initialized", "module-" + name) as v and then v.is_case_insensitive_equal_general ("yes")
-		end
-
 	install (api: CMS_API)
 		local
 			sql: STRING
@@ -86,57 +71,16 @@ CREATE TABLE "blog_post_nodes"(
 						api.logger.put_error ("Could not initialize database for blog module", generating_type)
 					end
 				end
-				api.storage.set_custom_value ("is_initialized", "module-" + name, "yes")
+				Precursor (api)
 			end
 		end
 
-feature {CMS_API} -- Access: API
-
-	blog_api: detachable CMS_BLOG_API
-			-- <Precursor>
-
-	node_api: detachable CMS_NODE_API
-
 feature -- Access: router
 
 	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
 			-- <Precursor>
 		do
-			if attached blog_api as l_blog_api then
-				configure_web (a_api, l_blog_api, a_router)
-			else
-					-- Issue with api/dependencies,
-					-- thus Current module should not be used!
-					-- thus no url mapping
-			end
-		end
-
-	configure_web (a_api: CMS_API; a_blog_api: CMS_BLOG_API; a_router: WSF_ROUTER)
-			-- Configure router mapping for web interface.
-		local
-			l_blog_handler: BLOG_HANDLER
-			l_blog_user_handler: BLOG_USER_HANDLER
-			l_uri_mapping: WSF_URI_MAPPING
-		do
-				-- TODO: for now, focused only on web interface, add REST api later. [2015-May-18]
-			create l_blog_handler.make (a_api, a_blog_api)
-			create l_blog_user_handler.make (a_api, a_blog_api)
-
-				-- Let the class BLOG_HANDLER handle the requests on "/blogs"
-			create l_uri_mapping.make_trailing_slash_ignored ("/blogs", l_blog_handler)
-			a_router.map_with_request_methods (l_uri_mapping, a_router.methods_get)
-
-				-- We can add a page number after /blogs/ to get older posts
-			a_router.handle_with_request_methods ("/blogs/page/{page}", l_blog_handler, a_router.methods_get)
-
-				-- If a user id is given route with blog user handler
-				--| FIXME: maybe /user/{user}/blogs/  would be better.
-			a_router.handle_with_request_methods ("/blogs/user/{user}", l_blog_user_handler, a_router.methods_get)
-
-				-- If a user id is given we also want to allow different pages
-				--| FIXME: what about /user/{user}/blogs/?page={page} ?
-			a_router.handle_with_request_methods ("/blogs/user/{user}/page/{page}", l_blog_user_handler, a_router.methods_get)
-
+			a_router.handle_with_request_methods ("/blogs/", create {WSF_URI_AGENT_HANDLER}.make (agent handle_blogs (?,?, a_api)), a_router.methods_get)
 		end
 
 feature -- Hooks
@@ -150,8 +94,19 @@ feature -- Hooks
 		local
 			lnk: CMS_LOCAL_LINK
 		do
-			-- Add the link to the blog to the main menu
-			create lnk.make ("Blogs", "/blogs/")
+			create lnk.make ("Blogs", "blogs/")
 			a_menu_system.primary_menu.extend (lnk)
 		end
+
+feature -- Handler
+
+	handle_blogs (req: WSF_REQUEST; res: WSF_RESPONSE; a_api: CMS_API)
+		local
+			r: NOT_IMPLEMENTED_ERROR_CMS_RESPONSE
+		do
+			create r.make (req, res, a_api)
+			r.set_main_content ("Blog module is in development ...")
+			r.execute
+		end
+
 end

examples/demo/modules/blog/cms_blog_node_type.e

@@ -17,11 +17,10 @@ feature {NONE} -- Initialization
 	default_create
 		do
 			Precursor
-			create {ARRAYED_LIST [like available_formats.item]} available_formats.make (4)
+			create {ARRAYED_LIST [like available_formats.item]} available_formats.make (3)
 			available_formats.extend (create {PLAIN_TEXT_CONTENT_FORMAT})
 			available_formats.extend (create {FILTERED_HTML_CONTENT_FORMAT})
 			available_formats.extend (create {FULL_HTML_CONTENT_FORMAT})
-			available_formats.extend (create {CMS_EDITOR_CONTENT_FORMAT})
 		end
 
 feature -- Access

examples/demo/modules/blog/handler/blog_handler.e

@@ -1,279 +0,0 @@
-note
-	description: "Request handler related to /blogs and /blogs/{page}. Displays all posts in the blog."
-	author: "Dario B<>sch <daboesch@student.ethz.ch>"
-	date: "$Date: 2015-05-18 13:49:00 +0100 (lun., 18 mai 2015) $"
-	revision: "$9661667$"
-
-class
-	BLOG_HANDLER
-
-inherit
-	CMS_BLOG_HANDLER
-
-	WSF_URI_HANDLER
-		rename
-			execute as uri_execute,
-			new_mapping as new_uri_mapping
-		end
-
-	WSF_URI_TEMPLATE_HANDLER
-		rename
-			execute as uri_template_execute,
-			new_mapping as new_uri_template_mapping
-		select
-			new_uri_template_mapping
-		end
-
-	WSF_RESOURCE_HANDLER_HELPER
-		redefine
-			do_get
-		end
-
-	REFACTORING_HELPER
-
-	CMS_API_ACCESS
-
-create
-	make
-
-feature -- execute
-
-	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Execute request handler for any kind of mapping.
-		do
-			execute_methods (req, res)
-		end
-
-	uri_execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Execute request handler for URI mapping.
-		do
-			execute (req, res)
-		end
-
-	uri_template_execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Execute request handler for URI-template mapping.
-		do
-			execute (req, res)
-		end
-
-feature -- Global Variables
-
-	page_number: NATURAL_32
-			-- Current page number.
-
-feature -- HTTP Methods	
-
-	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- <Precursor>
-		local
-			l_page: CMS_RESPONSE
-		do
-				-- Read page number from path parameter.
-			page_number := page_number_path_parameter (req)
-
-				-- Responding with `main_content_html (l_page)'.
-			create {GENERIC_VIEW_CMS_RESPONSE} l_page.make (req, res, api)
-			l_page.set_main_content (main_content_html (l_page))
-			l_page.execute
-		end
-
-feature -- Query
-
-	posts: LIST [CMS_NODE]
-			-- Blog posts to display on given page ordered by date (descending).
-		do
-			Result := blog_api.blogs_order_created_desc_limited (
-						entries_per_page,
-						entries_per_page * (page_number - 1)
-					)
-		end
-
-	multiple_pages_needed : BOOLEAN
-			-- Return if more that one page is needed to display posts.
-		do
-			Result := entries_per_page < total_entries
-		end
-
-	pages_count: NATURAL_32
-			-- Number of pages needed to display all posts.
-		require
-			entries_per_page > 0
-		local
-			tmp: REAL_32
-		do
-			tmp := total_entries.to_real_32 / entries_per_page.to_real_32;
-			Result := tmp.ceiling.to_natural_32
-		end
-
-	page_number_path_parameter (req: WSF_REQUEST): NATURAL_32
-			-- Page number from path /blogs/{page}.
-			-- Unsigned integer since negative pages are not allowed.
-		local
-			s: STRING
-		do
-			Result := 1 -- default if not get variable is set
-			if attached {WSF_STRING} req.path_parameter ("page") as p_page then
-				s := p_page.value
-				if s.is_natural_32 then
-					if s.to_natural_32 > 1 then
-						Result := s.to_natural_32
-					end
-				end
-			end
-		end
-
-	total_entries: NATURAL_32
-			-- Total number of entries/posts.
-		do
-			Result := blog_api.blogs_count.to_natural_32
-		end
-
-feature -- HTML Output
-
-	frozen main_content_html (page: CMS_RESPONSE): STRING
-			-- Content of the page as a html string.
-		do
-			create Result.make_empty
-			append_main_content_html_to (page, Result)
-		end
-
-	append_main_content_html_to (page: CMS_RESPONSE; a_output: STRING)
-			-- Append to `a_output, the content of the page as a html string.
-		local
-			n: CMS_NODE
-			lnk: CMS_LOCAL_LINK
-		do
-				-- Output the title. If more than one page, also output the current page number
-			append_page_title_html_to (a_output)
-
-				-- Get the posts from the current page (given by page number and entries per page)
-				-- Start list of posts
-			a_output.append ("<ul class=%"cms_blog_nodes%">%N")
-			across
-				posts as ic
-			loop
-				n := ic.item
-				lnk := blog_api.node_api.node_link (n)
-				a_output.append ("<li class=%"cms_type_"+ n.content_type +"%">")
-
-					-- Output the creation date
-				append_creation_date_html_to (n, a_output)
-
-					-- Output the author of the post
-				append_author_html_to (n, a_output)
-
-					-- Output the title of the post as a link (to the detail page)
-				append_title_html_to (n, page, a_output)
-
-					-- Output the summary of the post and a more link to the detail page
-				append_summary_html_to (n, page, a_output)
-
-				a_output.append ("</li>%N")
-			end
-
-				-- End of post list
-			a_output.append ("</ul>%N")
-
-				-- Pagination (older and newer links)
-			append_pagination_html_to (a_output)
-		end
-
-	append_page_title_html_to (a_output: STRING)
-			-- Append the title of the page as a html string to `a_output'.
-			-- It shows the current page number.
-		do
-			a_output.append ("<h2>Blog")
-			if multiple_pages_needed then
-				a_output.append (" (Page " + page_number.out + " of " + pages_count.out + ")")
-			end
-			a_output.append ("</h2>")
-		end
-
-	append_creation_date_html_to (n: CMS_NODE; a_output: STRING)
-			-- Append the creation date as a html string to `a_output'.
-		local
-			hdate: HTTP_DATE
-		do
-			if attached n.creation_date as l_modified then
-				create hdate.make_from_date_time (l_modified)
-				hdate.append_to_yyyy_mmm_dd_string (a_output)
-				a_output.append (" ")
-			end
-		end
-
-	append_author_html_to (n: CMS_NODE; a_output: STRING)
-			-- Append to `a_output', the author of node `n' as html link to author's posts.
-		do
-			if attached n.author as l_author then
-				a_output.append ("by ")
-				a_output.append ("<a class=%"blog_user_link%" href=%"/blogs/user/" + l_author.id.out + "%">" + l_author.name + "</a>")
-			end
-		end
-
-	append_title_html_to (n: CMS_NODE; page: CMS_RESPONSE; a_output: STRING)
-			-- Append to `a_output', the title of node `n' as html link to detail page.
-		local
-			lnk: CMS_LOCAL_LINK
-		do
-			lnk := blog_api.node_api.node_link (n)
-			a_output.append ("<span class=%"blog_title%">")
-			a_output.append (page.link (lnk.title, lnk.location, Void))
-			a_output.append ("</span>")
-		end
-
-	append_summary_html_to (n: CMS_NODE; page: CMS_RESPONSE; a_output: STRING)
-			-- returns a html string with the summary of the node and a link to the detail page
-		local
-			lnk: CMS_LOCAL_LINK
-		do
-			if attached n.summary as l_summary then
-				lnk := blog_api.node_api.node_link (n)
-				a_output.append ("<p class=%"blog_list_summary%">")
-				if attached api.format (n.format) as f then
-					a_output.append (f.formatted_output (l_summary))
-				else
-					a_output.append (page.formats.default_format.formatted_output (l_summary))
-				end
-				a_output.append ("<br />")
-				a_output.append (page.link ("See more...", lnk.location, Void))
-				a_output.append ("</p>")
-			end
-		end
-
-	append_pagination_html_to (a_output: STRING)
-			-- Append to `a_output' with the pagination links (if necessary).
-		local
-			tmp: NATURAL_32
-		do
-			if multiple_pages_needed then
-				a_output.append ("<div class=%"pagination%">")
-
-					-- If exist older posts show link to next page
-				if page_number < pages_count then
-					tmp := page_number + 1
-					a_output.append (" <a class=%"blog_older_posts%" href=%"" + base_path + "/page/" + tmp.out + "%"><< Older Posts</a> ")
-				end
-
-				-- Delimiter
-				if page_number < pages_count AND page_number > 1 then
-					a_output.append (" | ")
-				end
-
-				-- If exist newer posts show link to previous page
-				if page_number > 1 then
-					tmp := page_number -1
-					a_output.append (" <a class=%"blog_newer_posts%" href=%"" + base_path + "/page/" + tmp.out + "%">Newer Posts >></a> ")
-				end
-
-				a_output.append ("</div>")
-			end
-
-		end
-
-	base_path : STRING
-			-- the path to the page that lists all blogs
-		do
-			Result := "/blogs"
-		end
-
-end

examples/demo/modules/blog/handler/blog_user_handler.e

@@ -1,150 +0,0 @@
-note
-	description: "[
-			Request handler related to 
-				/blogs/user/{id}/ 
-				or /blogs/user/{id}/page/{page}. 
-				
-			Displays all posts of the given user
-		]"
-	author: "Dario B<>sch <daboesch@student.ethz.ch>"
-	date: "$Date: 2015-05-22 15:13:00 +0100 (lun., 18 mai 2015) $"
-	revision: "$Revision 96616$"
-
-class
-	BLOG_USER_HANDLER
-
-inherit
-	BLOG_HANDLER
-		redefine
-			do_get,
-			posts,
-			total_entries,
-			append_page_title_html_to,
-			base_path
-		end
-
-create
-	make
-
-feature -- Global Variables
-
-	user : detachable CMS_USER
-
-feature -- HTTP Methods
-
-	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- <Precursor>
-		local
-			l_error: NOT_FOUND_ERROR_CMS_RESPONSE
-		do
-			user := Void
-			if attached user_from_request (req) as l_user then
-				user := l_user
-					-- Output the results, similar as in the blog hanlder (but with other queries)
-				Precursor (req, res)
-			else
-					-- Throw a bad request error because the user is not valid
-				create l_error.make (req, res, api)
-				l_error.set_main_content ("<h1>Error</h1>User with id " + user_id_path_parameter (req).out + " doesn't exist!")
-				l_error.execute
-			end
-		end
-
-feature -- Query
-
-	user_valid (req: WSF_REQUEST) : BOOLEAN
-			-- Returns true if a valid user id is given and a user with this id exists,
-			-- otherwise returns false.
-		local
-			user_id: INTEGER_32
-		do
-			user_id := user_id_path_parameter (req)
-
-			if user_id <= 0 then
-					-- Given user id is not valid
-				Result := False
-			else
-					--Check if user with user_id exists
-				Result := api.user_api.user_by_id (user_id) /= Void
-			end
-		end
-
-	user_from_request (req: WSF_REQUEST): detachable CMS_USER
-			-- Eventual user with given id in the path of request `req'.
-		local
-			uid: like user_id_path_parameter
-		do
-			uid := user_id_path_parameter (req)
-			if uid > 0 then
-				Result := api.user_api.user_by_id (uid)
-			else
-					-- Missing or invalid user id.
-			end
-		end
-
-	user_id_path_parameter (req: WSF_REQUEST): INTEGER_32
-			-- User id from path /blogs/{user}.
-			-- Unsigned integer since negative ids are not allowed.
-			-- If no valid id can be read it returns -1
-		local
-			s: STRING
-		do
-			Result := -1
-			if attached {WSF_STRING} req.path_parameter ("user") as l_user_id then
-				if l_user_id.is_integer then
-					Result := l_user_id.integer_value
-				end
-			end
-		end
-
-	posts: LIST [CMS_BLOG]
-			-- Blog posts to display on given page.
-			-- Filters out the posts of the current user.
-		do
-			if attached user as l_user then
-				Result := blog_api.blogs_from_user_order_created_desc_limited (l_user, entries_per_page, entries_per_page * (page_number - 1))
-			else
-				create {ARRAYED_LIST [CMS_BLOG]} Result.make (0)
-			end
-		end
-
-	total_entries : NATURAL_32
-			-- Returns the number of total entries/posts of the current user
-		do
-			if attached user as l_user then
-				Result := blog_api.blogs_count_from_user (l_user).to_natural_32
-			else
-				Result := Precursor
-			end
-		end
-
-feature -- HTML Output
-
-	append_page_title_html_to (a_output: STRING)
-			-- Returns the title of the page as a html string. It shows the current page number and the name of the current user
-		do
-			a_output.append ("<h2>Posts from ")
-			if attached user as l_user then
-				a_output.append (l_user.name)
-			else
-				a_output.append ("unknown user")
-			end
-			if multiple_pages_needed then
-				a_output.append (" (Page " + page_number.out + " of " + pages_count.out + ")")
-					-- Get the posts from the current page (limited by entries per page)
-			end
-			a_output.append ("</h2>")
-		end
-
-	base_path : STRING
-			-- Path to page listing all blogs.
-			-- If user is logged in, include user id
-		do
-			if attached user as l_user then
-				Result := "/blogs/user/" + l_user.id.out
-			else
-				Result := precursor
-			end
-		end
-
-end

examples/demo/modules/blog/handler/cms_blog_handler.e

@@ -1,23 +0,0 @@
-note
-	description: "Deferred request handler related to /blogs/... Has an own blog api."
-	author: "Dario B<>sch <daboesch@student.ethz.ch>"
-	date: "$Date: 2015-05-18 13:49:00 +0100 (lun., 18 mai 2015) $"
-	revision: "$9661667$"
-
-deferred class
-	CMS_BLOG_HANDLER
-
-inherit
-	CMS_MODULE_HANDLER [CMS_BLOG_API]
-		rename
-			module_api as blog_api
-		end
-
-feature -- Access
-
-	entries_per_page: NATURAL_32
-		do
-			Result := blog_api.entries_per_page
-		end
-
-end

examples/demo/modules/blog/persistence/cms_blog_storage_i.e

@@ -1,43 +0,0 @@
-note
-	description: "Interface for accessing blog contents from the database."
-	date: "$Date: 2015-01-27 19:15:02 +0100 (mar., 27 janv. 2015) $"
-	revision: "$Revision: 96542 $"
-
-deferred class
-	CMS_BLOG_STORAGE_I
-
-inherit
-	CMS_NODE_STORAGE_I
-
-feature -- Access
-
-	blogs_count: INTEGER_64
-			-- Count of blog nodes
-		deferred
-		end
-
-	blogs_count_from_user (a_user: CMS_USER) : INTEGER_64
-			-- Number of nodes of type blog from `a_user'.
-		require
-			has_id: a_user.has_id
-		deferred
-		end
-
-	blogs: LIST [CMS_NODE]
-			-- List of nodes ordered by creation date (descending).
-		deferred
-		end
-
-	blogs_limited (limit: NATURAL_32; offset: NATURAL_32): LIST [CMS_NODE]
-			-- List of posts ordered by creation date from offset to offset + limit.
-		deferred
-		end
-
-	blogs_from_user_limited (a_user: CMS_USER; limit: NATURAL_32; offset: NATURAL_32): LIST [CMS_NODE]
-			-- List of posts from `a_user' ordered by creation date from offset to offset + limit.
-		require
-			has_id: a_user.has_id
-		deferred
-		end
-
-end

examples/demo/modules/blog/persistence/cms_blog_storage_null.e

@@ -1,47 +0,0 @@
-note
-	description: "Summary description for {CMS_BLOG_STORAGE_NULL}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_BLOG_STORAGE_NULL
-
-inherit
-	CMS_NODE_STORAGE_NULL
-
-	CMS_BLOG_STORAGE_I
-
-create
-	make
-
-feature -- Access
-
-	blogs_count: INTEGER_64
-			-- Count of nodes.
-		do
-		end
-
-	blogs_count_from_user (a_user: CMS_USER) : INTEGER_64
-			-- <Precursor>
-		do
-		end
-
-	blogs: LIST [CMS_NODE]
-			-- <Precursor>
-		do
-			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
-		end
-
-	blogs_limited (limit: NATURAL_32; offset: NATURAL_32) : LIST [CMS_NODE]
-			-- <Precursor>
-		do
-			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
-		end
-
-	blogs_from_user_limited (a_user: CMS_USER; limit: NATURAL_32; offset: NATURAL_32): LIST [CMS_NODE]
-			-- <Precursor>
-		do
-			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
-		end
-end

examples/demo/modules/blog/persistence/cms_blog_storage_sql.e

@@ -1,140 +0,0 @@
-note
-	description: "Access to the sql database for the blog module"
-	author: "Dario B<>sch <daboesch@student.ethz.ch>"
-	date: "$Date: 2015-05-21 14:46:00 +0100$"
-	revision: "$Revision: 96616 $"
-
-class
-	CMS_BLOG_STORAGE_SQL
-
-inherit
-	CMS_NODE_STORAGE_SQL
-
-	CMS_BLOG_STORAGE_I
-
-create
-	make
-
-feature -- Access
-
-	blogs_count: INTEGER_64
-			-- <Precursor>
-		do
-			error_handler.reset
-			write_information_log (generator + ".blogs_count")
-			sql_query (sql_select_blog_count, Void)
-			if sql_rows_count = 1 then
-				Result := sql_read_integer_64 (1)
-			end
-		end
-
-	blogs_count_from_user (a_user: CMS_USER) : INTEGER_64
-			-- <Precursor>
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-		do
-			error_handler.reset
-			write_information_log (generator + ".blogs_count_from_user")
-			create l_parameters.make (2)
-			l_parameters.put (a_user.id, "user")
-			sql_query (sql_select_blog_count_from_user, l_parameters)
-			if sql_rows_count = 1 then
-				Result := sql_read_integer_64 (1)
-			end
-		end
-
-	blogs: LIST [CMS_NODE]
-			-- <Precursor>
-		do
-			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
-
-			error_handler.reset
-			write_information_log (generator + ".blogs")
-
-			from
-				sql_query (sql_select_blogs_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
-		end
-
-	blogs_limited (a_limit: NATURAL_32; a_offset: NATURAL_32): LIST [CMS_NODE]
-			-- <Precursor>
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-		do
-			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
-
-			error_handler.reset
-			write_information_log (generator + ".blogs_limited")
-
-			from
-				create l_parameters.make (2)
-				l_parameters.put (a_limit, "limit")
-				l_parameters.put (a_offset, "offset")
-				sql_query (sql_blogs_limited, l_parameters)
-				sql_start
-			until
-				sql_after
-			loop
-				if attached fetch_node as l_node then
-					Result.force (l_node)
-				end
-				sql_forth
-			end
-		end
-
-	blogs_from_user_limited (a_user: CMS_USER; a_limit: NATURAL_32; a_offset: NATURAL_32): LIST [CMS_NODE]
-			-- <Precursor>
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-		do
-			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
-
-			error_handler.reset
-			write_information_log (generator + ".blogs_from_user_limited")
-
-			from
-				create l_parameters.make (2)
-				l_parameters.put (a_limit, "limit")
-				l_parameters.put (a_offset, "offset")
-				l_parameters.put (a_user.id, "user")
-				sql_query (sql_blogs_from_user_limited, l_parameters)
-				sql_start
-			until
-				sql_after
-			loop
-				if attached fetch_node as l_node then
-					Result.force (l_node)
-				end
-				sql_forth
-			end
-		end
-
-feature {NONE} -- Queries
-
-	sql_select_blog_count: STRING = "SELECT count(*) FROM Nodes WHERE status != -1 AND type = %"blog%";"
-			-- Nodes count (Published and not Published)
-			--| note: {CMS_NODE_API}.trashed = -1
-
-	sql_select_blog_count_from_user: STRING = "SELECT count(*) FROM Nodes WHERE status != -1 AND type = %"blog%" AND author = :user ;"
-			-- Nodes count (Published and not Published)
-			--| note: {CMS_NODE_API}.trashed = -1
-
-	sql_select_blogs_order_created_desc: STRING = "SELECT * FROM Nodes WHERE status != -1 AND type = %"blog%" ORDER BY created DESC;"
-			-- SQL Query to retrieve all nodes that are from the type "blog" ordered by descending creation date.
-
-	sql_blogs_limited: STRING = "SELECT * FROM Nodes WHERE status != -1 AND type = %"blog%" ORDER BY created DESC LIMIT :limit OFFSET :offset ;"
-			--- SQL Query to retrieve all node of type "blog" limited by limit and starting at offset
-
-	sql_blogs_from_user_limited: STRING = "SELECT * FROM Nodes WHERE status != -1 AND type = %"blog%" AND author = :user ORDER BY created DESC LIMIT :limit OFFSET :offset ;"
-			--- SQL Query to retrieve all node of type "blog" from author with id limited by limit + offset
-
-
-end

examples/demo/modules/demo/cms_demo_module.e

@@ -110,9 +110,9 @@ feature -- Hooks
 			if a_block_id.is_case_insensitive_equal_general ("demo-info") then
 				if a_response.request.request_uri.starts_with ("/demo/") then
 					create m.make_with_title (a_block_id, "Demo", 2)
-					create lnk.make ("/demo/abc", a_response.url ("/demo/abc", Void))
+					create lnk.make ("demo: abc", "demo/abc")
 					m.extend (lnk)
-					create lnk.make ("/demo/123", a_response.url ("/demo/123", Void))
+					create lnk.make ("demo: 123", "demo/123")
 					m.extend (lnk)
 					create mb.make (m)
 					a_response.add_block (mb, "sidebar_second")
@@ -125,7 +125,7 @@ feature -- Hooks
 			lnk: CMS_LOCAL_LINK
 --			perms: detachable ARRAYED_LIST [READABLE_STRING_8]
 		do
-			create lnk.make ("Demo", "/demo/")
+			create lnk.make ("Demo", "demo/")
 			a_menu_system.primary_menu.extend (lnk)
 		end
 
@@ -137,8 +137,8 @@ feature -- Handler
 			r: NOT_IMPLEMENTED_ERROR_CMS_RESPONSE
 		do
 			create r.make (req, res, a_api)
-			r.set_main_content ("NODE module does not yet implement %"" + req.path_info + "%" ...")
-			r.add_error_message ("NODE Module: not yet implemented")
+			r.set_main_content ("DEMO module does not yet implement %"" + req.path_info + "%" ...")
+			r.add_error_message ("DEMO Module: not yet implemented")
 			r.execute
 		end
 

examples/demo/site/scripts/core.sql

@@ -15,7 +15,7 @@ CREATE TABLE "logs"(
 CREATE TABLE "custom_values"(
   "type" VARCHAR(255) NOT NULL,
   "name" VARCHAR(255) NOT NULL,
-  "value" VARCHAR(255) NOT NULL
+  "value" TEXT
 );
 
 CREATE TABLE "path_aliases"(

examples/demo/site/scripts/node.sql

@@ -1,18 +1,18 @@
 BEGIN;
 
-CREATE TABLE "nodes"(
-  "nid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("nid">=0),
-  "revision" INTEGER,
-  "type" TEXT NOT NULL,
-  "title" VARCHAR(255) NOT NULL,
-  "summary" TEXT,
-  "content" MEDIUMTEXT NOT NULL,
-  "format" VARCHAR(255),
-  "author" INTEGER,
-  "publish" DATETIME,
-  "created" DATETIME NOT NULL,
-  "changed" DATETIME NOT NULL,
-  "status"  INTEGER
+CREATE TABLE "nodes" (
+	"nid"	INTEGER NOT NULL CHECK("nid" > 0) PRIMARY KEY AUTOINCREMENT UNIQUE,
+	"revision"	INTEGER,
+	"type"	TEXT NOT NULL,
+	"title"	VARCHAR(255) NOT NULL,
+	"summary"	TEXT,
+	"content"	TEXT,
+	"format"	VARCHAR(128),
+	"author"	INTEGER,
+	"publish"	DATETIME,
+	"created"	DATETIME NOT NULL,
+	"changed"	DATETIME NOT NULL,
+	"status"	INTEGER
 );
 
 CREATE TABLE page_nodes(

examples/demo/site/themes/bootstrap/assets/css/blog.css

@@ -1,25 +0,0 @@
-ul.cms_blog_nodes {
-  padding: 0;
-  margin: 0;
-}
-ul.cms_blog_nodes li.cms_type_blog {
-  list-style: none;
-  display: block;
-  margin-top: 20px;
-  padding-bottom: 20px;
-  border-bottom: 1px dotted black;
-}
-ul.cms_blog_nodes li.cms_type_blog .blog_title a {
-  color: black;
-  font-size: 18px;
-  text-decoration: none;
-  display: block;
-  margin: 6px 0;
-}
-ul.cms_blog_nodes li.cms_type_blog .blog_title a:hover {
-  color: #999;
-}
-ul.cms_blog_nodes li.cms_type_blog .blog_list_summary a {
-  margin-top: 20px;
-  display: block;
-}

examples/demo/site/themes/bootstrap/assets/css/node.css

@@ -3,15 +3,13 @@ ul.cms-nodes {
   padding: 3px 3px 3px 3px;
   border: solid 1px #ccc;
 }
-ul.cms-nodes li {
+
+li.cms_type_page {
   border-top: dotted 1px #ccc;
 }
-ul.cms-nodes li:first-child {
-  border-top: none;
-}
-ul.cms-nodes li.cms_type_page a::before {
+li.cms_type_page a::before {
   content: "[page] ";
 }
-ul.cms-nodes li.cms_type_blog a::before {
-  content: "[blog] ";
+li.cms_type_page:first-child {
+  border-top: none;
 }

examples/demo/site/themes/bootstrap/assets/scss/blog.scss

@@ -1,30 +0,0 @@
-ul.cms_blog_nodes{
-
-	padding:0;
-	margin:0;
-
-	li.cms_type_blog{
-		list-style: none;
-		display: block;
-		margin-top:20px;
-		padding-bottom:20px;
-		border-bottom:1px dotted black;
-
-		.blog_title a{
-			color:black;
-			font-size:18px;
-			text-decoration: none;
-			display:block;
-			margin:6px 0;
-
-			&:hover{
-				color:#999;
-			}
-		}
-
-		.blog_list_summary a{
-			margin-top:20px;
-			display:block;
-		}
-	}
-}

examples/demo/site/themes/bootstrap/assets/scss/node.scss

@@ -1,24 +1,14 @@
 ul.cms-nodes {
-	
 	list-style-type: none;
 	padding: 3px 3px 3px 3px;
 	border: solid 1px #ccc;
-
-	li{
-		border-top: dotted 1px #ccc;
-		&:first-child {
-			border-top: none;
-		}
-	}
-
-	li.cms_type_page a::before {
+}
+li.cms_type_page {
+	a::before {
 		content: "[page] ";
 	}
-
-	li.cms_type_blog a::before {
-		content: "[blog] ";
+	border-top: dotted 1px #ccc;
+	&:first-child {
+		border-top: none;
 	}
-
-
 }
-

examples/demo/site/themes/bootstrap/page.tpl

@@ -6,10 +6,6 @@
 	<!-- EWF CMS -->
 	<link rel="stylesheet" href="{$site_url/}/theme/css/style.css">
 	<link rel="stylesheet" href="{$site_url/}/theme/css/node.css">
-
-  <!-- CMS Blog Module -->
-  <link rel="stylesheet" href="{$site_url/}/theme/css/blog.css">
-
   <script src="{$site_url/}/theme/js/jquery-1.10.2.min.js"></script>
   <script src="{$site_url/}/theme/js/roc_auth.js"></script>
 

library/model/src/link/cms_local_link.e

@@ -25,8 +25,10 @@ create
 
 feature {NONE} -- Initialization
 
-	make (a_title: detachable like title; a_location: like location)
+	make (a_title: detachable READABLE_STRING_GENERAL; a_location: like location)
 			-- Create current local link with optional title `a_title' and location `a_location'.
+		require
+			is_valid_local_location_argument: not a_location.starts_with_general ("/")
 		do
 			location := a_location
 			set_title (a_title)
@@ -71,13 +73,13 @@ feature -- Status report
 
 feature -- Element change
 
-	set_title (a_title: detachable like title)
+	set_title (a_title: detachable READABLE_STRING_GENERAL)
 			-- Set `title' to `a_title' or `location'.
 		do
 			if a_title /= Void then
-				title := a_title
+				title := a_title.as_string_32
 			else
-				title := location
+				title := location.as_string_32
 			end
 		end
 

modules/basic_auth/basic_auth_module.e

@@ -109,9 +109,9 @@ feature -- Hooks
 			lnk: CMS_LOCAL_LINK
 		do
 			if attached a_response.current_user (a_response.request) as u then
-				create lnk.make (u.name +  " (Logout)", "/basic_auth_logoff?destination=" + a_response.request.request_uri)
+				create lnk.make (u.name +  " (Logout)", "basic_auth_logoff?destination=" + a_response.request.request_uri)
 			else
-				create lnk.make ("Login", "/basic_auth_login?destination=" + a_response.request.request_uri)
+				create lnk.make ("Login", "basic_auth_login?destination=" + a_response.request.request_uri)
 			end
 --			if not a_menu_system.primary_menu.has (lnk) then
 				lnk.set_weight (99)

modules/basic_auth/filter/basic_auth_filter.e

@@ -22,11 +22,12 @@ feature -- Basic operations
 			-- Execute the filter.
 		local
 			l_auth: HTTP_AUTHORIZATION
+			utf: UTF_CONVERTER
 		do
 			api.logger.put_debug (generator + ".execute ", Void)
 			create l_auth.make (req.http_authorization)
 			if attached req.raw_header_data as l_raw_data then
-			   api.logger.put_debug (generator + ".execute " + l_raw_data, Void)
+			   api.logger.put_debug (generator + ".execute " + utf.escaped_utf_32_string_to_utf_8_string_8 (l_raw_data), Void)
 			end
 				-- A valid user
 			if

modules/node/cms_node_api.e

@@ -16,20 +16,21 @@ inherit
 
 	REFACTORING_HELPER
 
-create
-	make
+create {NODE_MODULE}
+	make_with_storage
 
-feature {NONE} -- Implementation
+feature {NONE} -- Initialization
+
+	make_with_storage (a_api: CMS_API; a_node_storage: CMS_NODE_STORAGE_I)
+		do
+			node_storage := a_node_storage
+			make (a_api)
+		end
 
 	initialize
 			-- <Precursor>
 		do
 			Precursor
-			if attached {CMS_STORAGE_SQL_I} storage as l_storage_sql then
-				create {CMS_NODE_STORAGE_SQL} node_storage.make (l_storage_sql)
-			else
-				create {CMS_NODE_STORAGE_NULL} node_storage.make
-			end
 			initialize_node_types
 		end
 
@@ -170,9 +171,9 @@ feature -- URL
 			-- or URI of path for selection of new content possibilities if ct is Void.
 		do
 			if ct /= Void then
-				Result := "/node/add/" + ct.name
+				Result := "node/add/" + ct.name
 			else
-				Result := "/node/"
+				Result := "node/"
 			end
 		end
 
@@ -190,18 +191,18 @@ feature -- URL
 		require
 			a_node.has_id
 		do
-			Result := "/node/" + a_node.id.out
+			Result := "node/" + a_node.id.out
 		end
 
 	nodes_path: STRING
 			-- URI path for list of nodes.
 		do
-			Result := "/nodes"
+			Result := "nodes"
 		end
 
 feature -- Access: Node
 
-	nodes_count: INTEGER_64
+	nodes_count: NATURAL_64
 		do
 			Result := node_storage.nodes_count
 		end
@@ -212,10 +213,17 @@ feature -- Access: Node
 			Result := node_storage.nodes
 		end
 
-	recent_nodes (a_offset, a_rows: INTEGER): LIST [CMS_NODE]
+	trashed_nodes (a_user: CMS_USER): LIST [CMS_NODE]
+			-- List of nodes with status in {CMS_NODE_API}.trashed.
+			-- if the current user is admin, it will retrieve all the trashed nodes
+		do
+			Result := node_storage.trashed_nodes (a_user.id)
+		end
+
+	recent_nodes (params: CMS_DATA_QUERY_PARAMETERS): ITERABLE [CMS_NODE]
 			-- List of the `a_rows' most recent nodes starting from  `a_offset'.
 		do
-			Result := node_storage.recent_nodes (a_offset, a_rows)
+			Result := node_storage.recent_nodes (params.offset.to_integer_32, params.size.to_integer_32)
 		end
 
 	node (a_id: INTEGER_64): detachable CMS_NODE
@@ -316,6 +324,21 @@ feature -- Change: Node
 			node_storage.update_node (a_node)
 		end
 
+	trash_node (a_node: CMS_NODE)
+			-- Trash node `a_node'.
+			--! remove the node from the storage.
+		do
+			node_storage.trash_node (a_node)
+		end
+
+
+	restore_node (a_node: CMS_NODE)
+			-- Restore node `a_node'.
+			-- From {CMS_NODE_API}.trashed to {CMS_NODE_API}.not_published.
+		do
+			node_storage.restore_node (a_node)
+		end
+
 
 feature -- Node status
 

modules/node/content_type/cms_page_node_type.e

@@ -17,11 +17,10 @@ feature {NONE} -- Initialization
 	default_create
 		do
 			Precursor
-			create {ARRAYED_LIST [like available_formats.item]} available_formats.make (4)
+			create {ARRAYED_LIST [like available_formats.item]} available_formats.make (3)
 			available_formats.extend (create {PLAIN_TEXT_CONTENT_FORMAT})
 			available_formats.extend (create {FILTERED_HTML_CONTENT_FORMAT})
 			available_formats.extend (create {FULL_HTML_CONTENT_FORMAT})
-			available_formats.extend (create {CMS_EDITOR_CONTENT_FORMAT})
 		end
 
 feature -- Access

modules/node/handler/cms_node_type_webform_manager.e

@@ -9,19 +9,19 @@ deferred class
 inherit
 	CMS_NODE_TYPE_WEBFORM_MANAGER_I [G]
 
+	SHARED_WSF_PERCENT_ENCODER
+
 feature -- Forms ...		
 
 	populate_form (response: NODE_RESPONSE; f: CMS_FORM; a_node: detachable CMS_NODE)
 		local
 			ti: WSF_FORM_TEXT_INPUT
 			fset: WSF_FORM_FIELD_SET
-			ta, sum: CMS_FORM_TEXTAREA
+			ta: WSF_FORM_TEXTAREA
 			tselect: WSF_FORM_SELECT
 			opt: WSF_FORM_SELECT_OPTION
-			cms_format: CMS_EDITOR_CONTENT_FORMAT
+			l_uri: detachable READABLE_STRING_8
 		do
-			create cms_format
-			
 			create ti.make ("title")
 			ti.set_label ("Title")
 			ti.set_size (70)
@@ -33,47 +33,25 @@ feature -- Forms ...
 
 			f.extend_html_text ("<br/>")
 
-				-- Select field has to be initialized before textareas are replaced, because they depend on the selection of the field
-			create tselect.make ("format")
-			tselect.set_label ("Body's format")
-			tselect.set_is_required (True)
-
-				-- Main Content
 			create ta.make ("body")
 			ta.set_rows (10)
 			ta.set_cols (70)
-			ta.show_as_editor_if_selected (tselect, cms_format.name)
 			if a_node /= Void then
 				ta.set_text_value (a_node.content)
 			end
-			ta.set_label ("Content")
+--			ta.set_label ("Body")
 			ta.set_description ("This is the main content")
 			ta.set_is_required (False)
 
-				-- Summary
-			create sum.make ("summary")
-			sum.set_rows (3)
-			sum.set_cols (70)
-				-- if cms_html is selected
-			sum.show_as_editor_if_selected (tselect, cms_format.name)
-			if a_node /= Void then
-				sum.set_text_value (a_node.summary)
-			end
-			sum.set_label ("Summary")
-			sum.set_description ("This is the summary")
-			sum.set_is_required (False)
-
 			create fset.make
 			fset.set_legend ("Body")
-
-				-- Add summary
-			fset.extend (sum)
-			fset.extend_html_text("<br />")
-
-				-- Add content (body)
 			fset.extend (ta)
+
 			fset.extend_html_text ("<br/>")
 
+			create tselect.make ("format")
+			tselect.set_label ("Body's format")
+			tselect.set_is_required (True)
 			across
 				 content_type.available_formats as c
 			loop
@@ -91,16 +69,37 @@ feature -- Forms ...
 
 			f.extend (fset)
 
-				-- Path alias		
+				-- Path alias
 			create ti.make ("path_alias")
 			ti.set_label ("Path")
 			ti.set_size (70)
 			if a_node /= Void and then a_node.has_id then
 				if attached a_node.link as lnk then
-					ti.set_text_value (lnk.location)
+					l_uri := lnk.location
 				else
-					ti.set_text_value (response.api.path_alias (response.node_api.node_path (a_node)))
+					l_uri := percent_encoder.percent_decoded_string (response.api.path_alias (response.node_api.node_path (a_node)))
 				end
+				ti.set_text_value (l_uri)
+				ti.set_description ("Optionally specify an alternative URL path by which this content can be accessed. For example, type 'about' when writing an about page. Use a relative path or the URL alias won't work.")
+				ti.set_validation_action (agent (fd: WSF_FORM_DATA; a_response: CMS_RESPONSE)
+						do
+							if
+								attached fd.string_item ("path_alias") as f_path_alias
+							then
+								if a_response.api.is_valid_path_alias (f_path_alias) then
+										-- Ok.
+								elseif f_path_alias.is_empty then
+										-- Ok
+								elseif f_path_alias.starts_with_general ("/") then
+									fd.report_invalid_field ("path_alias", "Path alias should not start with a slash '/' .")
+								elseif f_path_alias.has_substring ("://") then
+									fd.report_invalid_field ("path_alias", "Path alias should not be absolute url .")
+								else
+										-- TODO: implement full path alias validation
+								end
+							end
+						end(?, response)
+					)
 			end
 			if
 				attached f.fields_by_name ("title") as l_title_fields and then
@@ -114,7 +113,7 @@ feature -- Forms ...
 
 	update_node	(response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: CMS_NODE)
 		local
-			b,s: detachable READABLE_STRING_8
+			b: detachable READABLE_STRING_8
 			f: detachable CONTENT_FORMAT
 		do
 			if attached fd.integer_item ("id") as l_id and then l_id > 0 then
@@ -127,12 +126,6 @@ feature -- Forms ...
 			if attached fd.string_item ("body") as l_body then
 				b := l_body
 			end
-
-			-- Read out the summary field from the form data
-			if attached fd.string_item ("summary") as l_summary then
-				s := l_summary
-			end
-
 			if attached fd.string_item ("format") as s_format and then attached response.api.format (s_format) as f_format then
 				f := f_format
 			elseif a_node /= Void and then attached a_node.format as s_format and then attached response.api.format (s_format) as f_format then
@@ -140,19 +133,15 @@ feature -- Forms ...
 			else
 				f := response.formats.default_format
 			end
-
-			-- Update node with summary and body content
 			if b /= Void then
-				a_node.set_content (b, s, f.name)
+				a_node.set_content (b, Void, f.name) -- FIXME: summary
 			end
-
-
 		end
 
 	new_node (response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: detachable CMS_NODE): G
 			-- <Precursor>
 		local
-			b,s: detachable READABLE_STRING_8
+			b: detachable READABLE_STRING_8
 			f: detachable CONTENT_FORMAT
 			l_node: detachable like new_node
 		do
@@ -186,16 +175,9 @@ feature -- Forms ...
 			end
 			l_node.set_author (response.user)
 
-			--Summary
-			if attached fd.string_item ("summary") as l_summary then
-				s := l_summary
-			end
-
-			--Content
 			if attached fd.string_item ("body") as l_body then
 				b := l_body
 			end
-
 			if attached fd.string_item ("format") as s_format and then attached response.api.format (s_format) as f_format then
 				f := f_format
 			elseif a_node /= Void and then attached a_node.format as s_format and then attached response.api.format (s_format) as f_format then
@@ -203,10 +185,8 @@ feature -- Forms ...
 			else
 				f := response.formats.default_format
 			end
-
-			-- Update node with summary and content
 			if b /= Void then
-				l_node.set_content (b, s, f.name)
+				l_node.set_content (b, Void, f.name)
 			end
 			Result := l_node
 		end
@@ -224,13 +204,31 @@ feature -- Output
 			node_api := a_response.node_api
 
 			a_response.add_variable (a_node, "node")
-			create lnk.make (a_response.translation ("View", Void), a_response.node_local_link (a_node).location)
+			lnk := a_response.node_local_link (a_node, a_response.translation ("View", Void))
 			lnk.set_weight (1)
+			a_response.add_to_primary_tabs (lnk)
 
-			a_response.add_to_primary_tabs (lnk)
-			create lnk.make ("Edit", node_api.node_path (a_node) + "/edit")
-			lnk.set_weight (2)
-			a_response.add_to_primary_tabs (lnk)
+			if a_node.status = {CMS_NODE_API}.trashed then
+				create lnk.make ("Trash", node_api.node_path (a_node) + "/trash")
+				lnk.set_weight (2)
+				a_response.add_to_primary_tabs (lnk)
+			else
+					-- Node in {{CMS_NODE_API}.published} or {CMS_NODE_API}.not_published} status.
+				create lnk.make ("Edit", node_api.node_path (a_node) + "/edit")
+				lnk.set_weight (2)
+				a_response.add_to_primary_tabs (lnk)
+
+				if
+					a_node /= Void and then
+					a_node.id > 0 and then
+					attached node_api.node_type_for (a_node) as l_type and then
+					node_api.has_permission_for_action_on_node ("delete", a_node, a_response.current_user (a_response.request))
+				then
+					create lnk.make ("Delete", node_api.node_path (a_node) + "/delete")
+					lnk.set_weight (3)
+					a_response.add_to_primary_tabs (lnk)
+				end
+			end
 
 			create s.make_empty
 			s.append ("<div class=%"info%"> ")
@@ -245,23 +243,6 @@ feature -- Output
 				s.append (")")
 			end
 			s.append ("</div>")
-
-
-			-- We don't show the summary on the detail page, since its just a short view of the full content. Otherwise we would write the same thing twice.
-			-- The usage of the summary is to give a short overview in the list of nodes or for the meta tag "description"
-
---			if attached a_node.summary as l_summary then
---				s.append ("<p class=%"summary%">")
---				if attached node_api.cms_api.format (a_node.format) as f then
---					s.append (f.formatted_output (l_summary))
---				else
---					s.append (a_response.formats.default_format.formatted_output (l_summary))
---				end
-
---				s.append ("</p>")
-
---			end
-
 			if attached a_node.content as l_content then
 				s.append ("<p class=%"content%">")
 				if attached node_api.cms_api.format (a_node.format) as f then

modules/node/handler/node_form_response.e

@@ -26,7 +26,7 @@ feature {NONE} -- Initialization
 	initialize
 		do
 			Precursor
-			create {WSF_CMS_THEME} wsf_theme.make (Current, theme)
+			create {CMS_TO_WSF_THEME} wsf_theme.make (Current, theme)
 		end
 
 	wsf_theme: WSF_THEME
@@ -48,7 +48,11 @@ feature -- Execution
 				attached node_api.node (nid) as l_node
 			then
 				if attached node_api.node_type_for (l_node) as l_type then
-					if node_api.has_permission_for_action_on_node ("edit", l_node, current_user (request)) then
+ 					fixme ("refactor: process_edit, process_create porcess edit")
+ 					if
+						request.path_info.ends_with_general ("/edit") and then
+						node_api.has_permission_for_action_on_node ("edit", l_node, current_user (request))
+					then
 						f := new_edit_form (l_node, url (request.path_info, Void), "edit-" + l_type.name, l_type)
 						invoke_form_alter (f, fd)
 						if request.is_post_request_method then
@@ -58,8 +62,9 @@ feature -- Execution
 							fd := f.last_data
 						end
 						if l_node.has_id then
-							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("View", Void), node_url (l_node)), primary_tabs)
-							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), "/node/" + l_node.id.out + "/edit"), primary_tabs)
+							add_to_menu (node_local_link (l_node, translation ("View", Void)), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), node_api.node_path (l_node) + "/edit"), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("Delete", node_api.node_path (l_node) + "/delete"), primary_tabs)
 						end
 
 						if attached redirection as l_location then
@@ -70,6 +75,53 @@ feature -- Execution
 							set_title (formatted_string (translation ("Edit $1 #$2", Void), [l_type.title, l_node.id]))
 							f.append_to_html (wsf_theme, b)
 						end
+					elseif
+						request.path_info.ends_with_general ("/delete") and then
+						node_api.has_permission_for_action_on_node ("delete", l_node, current_user (request))
+					then
+						f := new_delete_form (l_node, url (request.path_info, Void), "delete-" + l_type.name, l_type)
+						invoke_form_alter (f, fd)
+						if request.is_post_request_method then
+							f.process (Current)
+							fd := f.last_data
+						end
+						if l_node.has_id then
+							add_to_menu (node_local_link (l_node, translation ("View", Void)), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), node_api.node_path (l_node) + "/edit"), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("Delete", node_api.node_path (l_node) + "/delete"), primary_tabs)
+						end
+
+						if attached redirection as l_location then
+								-- FIXME: Hack for now
+							set_title (l_node.title)
+							b.append (html_encoded (l_type.title) + " deleted")
+						else
+							set_title (formatted_string (translation ("Delete $1 #$2", Void), [l_type.title, l_node.id]))
+							f.append_to_html (wsf_theme, b)
+						end
+					elseif
+						request.path_info.ends_with_general ("/trash") and then
+						node_api.has_permission_for_action_on_node ("trash", l_node, current_user (request))
+					then
+						f := new_trash_form (l_node, url (request.path_info, Void), "trash-" + l_type.name, l_type)
+						invoke_form_alter (f, fd)
+						if request.is_post_request_method then
+							f.process (Current)
+							fd := f.last_data
+						end
+						if l_node.has_id then
+							add_to_menu (node_local_link (l_node, translation ("View", Void)), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("Trash", node_api.node_path (l_node) + "/Trash"), primary_tabs)
+						end
+
+						if attached redirection as l_location then
+								-- FIXME: Hack for now
+							set_title (l_node.title)
+							b.append (html_encoded (l_type.title) + " trashed")
+						else
+							set_title (formatted_string (translation ("Trash $1 #$2", Void), [l_type.title, l_node.id]))
+							f.append_to_html (wsf_theme, b)
+						end
 					else
 						b.append ("<h1>")
 						b.append (translation ("Access denied", Void))
@@ -96,8 +148,8 @@ feature -- Execution
 						set_title ("Edit " + html_encoded (l_type.title) + " #" + l_node.id.out)
 
 						if l_node.has_id then
-							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("View", Void), node_url (l_node)), primary_tabs)
-							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), "/node/" + l_node.id.out + "/edit"), primary_tabs)
+							add_to_menu (node_local_link (l_node, translation ("View", Void)), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), node_api.node_path (l_node) + "/edit"), primary_tabs)
 						end
 
 						f.append_to_html (wsf_theme, b)
@@ -121,7 +173,7 @@ feature -- Execution
 						attached ic.item as l_node_type and then
 						has_permissions (<<"create any", "create " + l_node_type.name>>)
 					then
-						b.append ("<li>" + link (l_node_type.name, "/node/add/" + l_node_type.name, Void))
+						b.append ("<li>" + link (l_node_type.name, "node/add/" + l_node_type.name, Void))
 						if attached l_node_type.description as d then
 							b.append ("<div class=%"description%">" + d + "</div>")
 						end
@@ -167,6 +219,7 @@ feature -- Form
 			l_preview: BOOLEAN
 			l_node: detachable CMS_NODE
 			s: STRING
+			l_path_alias: detachable READABLE_STRING_8
 		do
 			l_preview := attached {WSF_STRING} fd.item ("op") as l_op and then l_op.same_string ("Preview")
 			if not l_preview then
@@ -198,20 +251,29 @@ feature -- Form
 				end
 				node_api.save_node (l_node)
 				if attached current_user (request) as u then
-					api.log ("node", "User %"" + user_html_link (u) + "%" " + s + " node " + link (a_type.name +" #" + l_node.id.out, "/node/" + l_node.id.out , Void), 0, node_local_link (l_node))
+					api.log ("node",
+							"User %"" + user_html_link (u) + "%" " + s + " node " + node_html_link (l_node, a_type.name + " #" + l_node.id.out),
+							0, node_local_link (l_node, Void)
+						)
 				else
-					api.log ("node", "Anonymous " + s + " node " + a_type.name +" #" + l_node.id.out, 0, node_local_link (l_node))
+					api.log ("node", "Anonymous " + s + " node " + a_type.name +" #" + l_node.id.out, 0, node_local_link (l_node, Void))
 				end
 				add_success_message ("Node #" + l_node.id.out + " saved.")
 
-				if attached fd.string_item ("path_alias") as l_path_alias then
+				if
+					attached fd.string_item ("path_alias") as f_path_alias and then
+					not f_path_alias.is_empty
+				then
+					l_path_alias := percent_encoder.partial_encoded_string (f_path_alias, <<'/'>>)
+						-- Path alias, are always from the root of the cms.
 					api.set_path_alias (node_api.node_path (l_node), l_path_alias, False)
 					l_node.set_link (create {CMS_LOCAL_LINK}.make (l_node.title, l_path_alias))
 				else
 					l_node.set_link (node_api.node_link (l_node))
 				end
-
-				set_redirection (node_url (l_node))
+				if attached l_node.link as lnk then
+					set_redirection (lnk.location)
+				end
 			end
 		end
 
@@ -243,10 +305,25 @@ feature -- Form
 			ts.set_default_value ("Preview")
 			f.extend (ts)
 
+			Result := f
+		end
+
+
+	new_delete_form (a_node: detachable CMS_NODE; a_url: READABLE_STRING_8; a_name: STRING; a_node_type: CMS_NODE_TYPE [CMS_NODE]): CMS_FORM
+			-- Create a web form named `a_name' for node `a_node' (if set), using form action url `a_url', and for type of node `a_node_type'.
+		local
+			f: CMS_FORM
+			ts: WSF_FORM_SUBMIT_INPUT
+		do
+			create f.make (a_url, a_name)
+
+			f.extend_html_text ("<br/>")
+			f.extend_html_text ("<legend>Are you sure you want to delete?</legend>")
+
+				-- TODO check if we need to check for has_permissions!!
 			if
 				a_node /= Void and then
-				a_node.id > 0 and then
-				has_permission ("delete " + a_name)
+				a_node.id > 0
 			then
 				create ts.make ("op")
 				ts.set_default_value ("Delete")
@@ -254,11 +331,52 @@ feature -- Form
 					ts.set_default_value (translation ("Delete"))
 					]")
 				f.extend (ts)
+				fixme ("wsf_html: add support for HTML5 input attributes!!! ")
+				f.extend_html_text("<input type='submit' value='Cancel' formmethod='GET', formaction='/node/"+a_node.id.out+"'>" )
 			end
 
 			Result := f
 		end
 
+
+	new_trash_form (a_node: detachable CMS_NODE; a_url: READABLE_STRING_8; a_name: STRING; a_node_type: CMS_NODE_TYPE [CMS_NODE]): CMS_FORM
+			-- Create a web form named `a_name' for node `a_node' (if set), using form action url `a_url', and for type of node `a_node_type'.
+		local
+			f: CMS_FORM
+			ts: WSF_FORM_SUBMIT_INPUT
+		do
+			create f.make (a_url, a_name)
+
+			f.extend_html_text ("<br/>")
+			f.extend_html_text ("<legend>Are you sure you want to trash the current node?</legend>")
+			if
+				a_node /= Void and then
+				a_node.id > 0
+			then
+				create ts.make ("op")
+				ts.set_default_value ("Trash")
+				fixme ("[
+					ts.set_default_value (translation ("Trash"))
+					]")
+				f.extend (ts)
+			end
+			f.extend_html_text ("<br/>")
+			f.extend_html_text ("<legend>Do you want to restore the current node?</legend>")
+			if
+				a_node /= Void and then
+				a_node.id > 0
+			then
+				create ts.make ("op")
+				ts.set_default_value ("Restore")
+				fixme ("[
+					ts.set_default_value (translation ("Restore"))
+					]")
+				f.extend (ts)
+			end
+			Result := f
+		end
+
+
 	populate_form (a_content_type: CMS_NODE_TYPE [CMS_NODE]; a_form: WSF_FORM; a_node: detachable CMS_NODE)
 			-- Fill the web form `a_form' with data from `a_node' if set,
 			-- and apply this to content type `a_content_type'.

modules/node/handler/node_handler.e

@@ -89,6 +89,14 @@ feature -- HTTP Methods
 				check valid_url: req.path_info.starts_with_general ("/node/") end
 				create edit_response.make (req, res, api, node_api)
 				edit_response.execute
+			elseif req.path_info.ends_with_general ("/delete")  then
+				check valid_url: req.path_info.starts_with_general ("/node/") end
+				create edit_response.make (req, res, api, node_api)
+				edit_response.execute
+			elseif req.path_info.ends_with_general ("/trash")  then
+				check valid_url: req.path_info.starts_with_general ("/node/") end
+				create edit_response.make (req, res, api, node_api)
+				edit_response.execute
 			else
 					-- Display existing node
 				l_nid := node_id_path_parameter (req)
@@ -116,14 +124,26 @@ feature -- HTTP Methods
 		do
 			fixme ("Refactor code: extract methods: edit_node and add_node")
 			if req.path_info.ends_with_general ("/edit") then
+				create edit_response.make (req, res, api, node_api)
+				edit_response.execute
+			elseif req.path_info.ends_with_general ("/delete") then
 				if
 					attached {WSF_STRING} req.form_parameter ("op") as l_op and then
 					l_op.value.same_string ("Delete")
 				then
 					do_delete (req, res)
-				else
-					create edit_response.make (req, res, api, node_api)
-					edit_response.execute
+				end
+			elseif req.path_info.ends_with_general ("/trash") then
+				if
+					attached {WSF_STRING} req.form_parameter ("op") as l_op and then
+					l_op.value.same_string ("Trash")
+				then
+					do_trash (req, res)
+				elseif
+					attached {WSF_STRING} req.form_parameter ("op") as l_op and then
+					l_op.value.same_string ("Restore")
+				then
+					do_restore (req, res)
 				end
 			elseif req.path_info.starts_with_general ("/node/add/") then
 				create edit_response.make (req, res, api, node_api)
@@ -174,6 +194,62 @@ feature -- HTTP Methods
 			send_not_implemented ("REST API not yet implemented", req, res)
 		end
 
+feature {NONE} -- Trash:Restore
+
+	do_trash (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Trash a node from the database.
+		do
+			if attached current_user (req) as l_user then
+				if attached {WSF_STRING} req.path_parameter ("id") as l_id then
+					if
+						l_id.is_integer and then
+						attached node_api.node (l_id.integer_value) as l_node
+					then
+						if node_api.has_permission_for_action_on_node ("trash", l_node, current_user (req)) then
+							node_api.trash_node (l_node)
+							res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (req.absolute_script_url ("")))
+						else
+							send_access_denied (req, res)
+								-- send_not_authorized ?
+						end
+					else
+						do_error (req, res, l_id)
+					end
+				else
+					(create {INTERNAL_SERVER_ERROR_CMS_RESPONSE}.make (req, res, api)).execute
+				end
+			else
+				send_access_denied (req, res)
+			end
+		end
+
+	do_restore (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Restore a node: From {CMS_NODE_API}.trashed to {CMS_NODE_API}.not_published.
+		do
+			if attached current_user (req) as l_user then
+				if attached {WSF_STRING} req.path_parameter ("id") as l_id then
+					if
+						l_id.is_integer and then
+						attached node_api.node (l_id.integer_value) as l_node
+					then
+						if node_api.has_permission_for_action_on_node ("trash", l_node, current_user (req)) then
+							node_api.restore_node (l_node)
+							res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (req.absolute_script_url ("")))
+						else
+							send_access_denied (req, res)
+								-- send_not_authorized ?
+						end
+					else
+						do_error (req, res, l_id)
+					end
+				else
+					(create {INTERNAL_SERVER_ERROR_CMS_RESPONSE}.make (req, res, api)).execute
+				end
+			else
+				send_access_denied (req, res)
+			end
+		end
+
 feature -- Error
 
 	do_error (req: WSF_REQUEST; res: WSF_RESPONSE; a_id: detachable WSF_STRING)

modules/node/handler/node_response.e

@@ -53,30 +53,45 @@ feature -- Helpers
 
 feature -- Helpers: cms link
 
-	user_local_link (u: CMS_USER): CMS_LOCAL_LINK
+	user_local_link (u: CMS_USER; a_opt_title: detachable READABLE_STRING_GENERAL): CMS_LOCAL_LINK
 		do
-			create Result.make (u.name, user_url (u))
+			if a_opt_title /= Void then
+				create Result.make (a_opt_title, user_url (u))
+			else
+				create Result.make (u.name, user_url (u))
+			end
 		end
 
-	node_local_link (n: CMS_NODE): CMS_LOCAL_LINK
+	node_local_link (n: CMS_NODE; a_opt_title: detachable READABLE_STRING_GENERAL): CMS_LOCAL_LINK
 		do
 			if attached n.link as lnk then
 				Result := lnk
 			else
 				Result := node_api.node_link (n)
 			end
+			if a_opt_title /= Void and then not Result.title.same_string_general (a_opt_title) then
+				create Result.make (a_opt_title, Result.location)
+			end
 		end
 
 feature -- Helpers: html link
 
 	user_html_link (u: CMS_USER): like link
 		do
-			Result := link (u.name, "/user/" + u.id.out, Void)
+			Result := link (u.name, "user/" + u.id.out, Void)
 		end
 
-	node_html_link (n: CMS_NODE): like link
+	node_html_link (n: CMS_NODE; a_opt_title: detachable READABLE_STRING_GENERAL): like link
+		local
+			l_title: detachable READABLE_STRING_GENERAL
 		do
-			Result := link (n.title, "/node/" + n.id.out, Void)
+			if a_opt_title /= Void then
+				l_title := a_opt_title
+			else
+				l_title := n.title
+			end
+			Result := link (l_title, node_api.node_path (n), Void)
+
 		end
 
 feature -- Helpers: URL		
@@ -85,7 +100,7 @@ feature -- Helpers: URL
 		require
 			u_with_id: u.has_id
 		do
-			Result := url ("/user/" + u.id.out, Void)
+			Result := url ("user/" + u.id.out, Void)
 		end
 
 	node_url (n: CMS_NODE): like url

modules/node/handler/node_view_response.e

@@ -27,7 +27,7 @@ feature {NONE} -- Initialization
 	initialize
 		do
 			Precursor
-			create {WSF_CMS_THEME} wsf_theme.make (Current, theme)
+			create {CMS_TO_WSF_THEME} wsf_theme.make (Current, theme)
 		end
 
 	wsf_theme: WSF_THEME

modules/node/handler/nodes_handler.e

@@ -37,22 +37,40 @@ feature -- HTTP Methods
 	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
 			-- <Precursor>
 		local
-			l_page: CMS_RESPONSE
+			l_response: CMS_RESPONSE
 			s: STRING
 			n: CMS_NODE
 			lnk: CMS_LOCAL_LINK
+			l_page_helper: CMS_PAGINATION_GENERATOR
+			s_pager: STRING
+			l_count: NATURAL_64
 		do
-				-- At the moment the template is hardcoded, but we can
+				-- At the moment the template are hardcoded, but we can
 				-- get them from the configuration file and load them into
 				-- the setup class.
 
-			create {GENERIC_VIEW_CMS_RESPONSE} l_page.make (req, res, api)
-			l_page.add_variable (node_api.nodes, "nodes")
+			l_count := node_api.nodes_count
 
+			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
 
-				-- NOTE: for development purposes we have the following hardcode output.
-			create s.make_from_string ("<p>Nodes:</p>")
-			if attached node_api.nodes as lst then
+			create s.make_empty
+			if l_count > 1 then
+				l_response.set_title ("Listing " + l_count.out + " nodes")
+			else
+				l_response.set_title ("Listing " + l_count.out + " node")
+			end
+
+			create s_pager.make_empty
+			create l_page_helper.make ("nodes/?page={page}&size={size}", node_api.nodes_count, 25) -- FIXME: Make this default page size a global CMS settings
+			l_page_helper.get_setting_from_request (req)
+			if l_page_helper.pages_count > 1 then
+				l_page_helper.append_to_html (l_response, s_pager)
+				if l_page_helper.page_size > 25 then
+					s.append (s_pager)
+				end
+			end
+
+			if attached node_api.recent_nodes (create {CMS_DATA_QUERY_PARAMETERS}.make (l_page_helper.current_page_offset, l_page_helper.page_size)) as lst then
 				s.append ("<ul class=%"cms-nodes%">%N")
 				across
 					lst as ic
@@ -60,16 +78,23 @@ feature -- HTTP Methods
 					n := ic.item
 					lnk := node_api.node_link (n)
 					s.append ("<li class=%"cms_type_"+ n.content_type +"%">")
-					s.append (l_page.link (lnk.title, lnk.location, Void))
---					s.append (l_page.link (n.title + " (#" + n.id.out + ")", node_api.node_path (n), Void))
+					s.append (l_response.link (lnk.title, lnk.location, Void))
+					debug
+						if attached node_api.content_type (n.content_type) as ct then
+							s.append ("<span class=%"description%">")
+							s.append (html_encoded (ct.title))
+							s.append ("</span>")
+						end
+					end
 					s.append ("</li>%N")
 				end
 				s.append ("</ul>%N")
 			end
+				-- Again the pager at the bottom, if needed
+			s.append (s_pager)
 
-			l_page.set_main_content (s)
-			l_page.add_block (create {CMS_CONTENT_BLOCK}.make ("nodes_warning", Void, "/nodes/ is not yet fully implemented<br/>", Void), "highlighted")
-			l_page.execute
+			l_response.set_main_content (s)
+			l_response.execute
 		end
 
 end

modules/node/handler/trash_handler.e

@@ -0,0 +1,78 @@
+note
+	description: "Request handler related to /trash "
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	TRASH_HANDLER
+
+
+inherit
+	CMS_NODE_HANDLER
+
+	WSF_URI_HANDLER
+		rename
+			new_mapping as new_uri_mapping
+		end
+
+	WSF_RESOURCE_HANDLER_HELPER
+		redefine
+			do_get
+		end
+
+	REFACTORING_HELPER
+
+create
+	make
+
+feature -- execute
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute request handler
+		do
+			execute_methods (req, res)
+		end
+
+feature -- HTTP Methods
+
+	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- <Precursor>
+		local
+			l_page: CMS_RESPONSE
+			s: STRING
+			n: CMS_NODE
+			lnk: CMS_LOCAL_LINK
+		do
+				-- At the moment the template is hardcoded, but we can
+				-- get them from the configuration file and load them into
+				-- the setup class.
+
+			create {GENERIC_VIEW_CMS_RESPONSE} l_page.make (req, res, api)
+
+			if attached current_user (req) as l_user then
+
+				l_page.add_variable (node_api.trashed_nodes (l_user), "nodes")
+
+					-- NOTE: for development purposes we have the following hardcode output.
+				create s.make_from_string ("<p>Nodes:</p>")
+				if attached node_api.trashed_nodes (l_user) as lst then
+					s.append ("<ul class=%"cms-nodes%">%N")
+					across
+						lst as ic
+					loop
+						n := ic.item
+						lnk := node_api.node_link (n)
+						s.append ("<li class=%"cms_type_"+ n.content_type +"%">")
+						s.append (l_page.link (lnk.title, lnk.location, Void))
+						s.append ("</li>%N")
+					end
+					s.append ("</ul>%N")
+				end
+
+				l_page.set_main_content (s)
+				-- l_page.add_block (create {CMS_CONTENT_BLOCK}.make ("nodes_warning", Void, "/nodes/ is not yet fully implemented<br/>", Void), "highlighted")
+				l_page.execute
+			end
+		end
+
+end

modules/node/node_module.e

@@ -9,14 +9,12 @@ class
 inherit
 
 	CMS_MODULE
-		rename
-			module_api as node_api
 		redefine
 			register_hooks,
 			initialize,
 			is_installed,
 			install,
-			node_api
+			module_api
 		end
 
 	CMS_HOOK_MENU_SYSTEM_ALTER
@@ -43,15 +41,26 @@ feature {NONE} -- Initialization
 
 feature {CMS_API} -- Module Initialization			
 
-	initialize (api: CMS_API)
+	initialize (a_api: CMS_API)
 			-- <Precursor>
 		local
 			p1,p2: CMS_PAGE
 			ct: CMS_PAGE_NODE_TYPE
 			l_node_api: like node_api
+			l_node_storage: CMS_NODE_STORAGE_I
 		do
-			Precursor (api)
-			create l_node_api.make (api)
+			Precursor (a_api)
+
+				-- Storage initialization
+			if attached {CMS_STORAGE_SQL_I} a_api.storage as l_storage_sql then
+				create {CMS_NODE_STORAGE_SQL} l_node_storage.make (l_storage_sql)
+			else
+				-- FIXME: in case of NULL storage, should Current be disabled?
+				create {CMS_NODE_STORAGE_NULL} l_node_storage.make
+			end
+
+				-- Node API initialization
+			create l_node_api.make_with_storage (a_api, l_node_storage)
 			node_api := l_node_api
 
 				-- Add support for CMS_PAGE, which requires a storage extension to store the optional "parent" id.
@@ -61,7 +70,7 @@ feature {CMS_API} -- Module Initialization
 
 					-- FIXME: the following code is mostly for test purpose/initialization, remove later
 				if l_sql_node_storage.sql_table_items_count ("page_nodes") = 0 then
-					if attached api.user_api.user_by_id (1) as u then
+					if attached a_api.user_api.user_by_id (1) as u then
 						create ct
 						p1 := ct.new_node (Void)
 						p1.set_title ("Welcome")
@@ -81,29 +90,42 @@ feature {CMS_API} -- Module Initialization
 					-- FIXME: maybe provide a default solution based on file system, when no SQL storage is available.
 					-- IDEA: we could also have generic extension to node system, that handle generic addition field.
 			end
+		ensure then
+			node_api_set: node_api /= Void
 		end
 
 feature {CMS_API} -- Module management
 
-	is_installed (api: CMS_API): BOOLEAN
+	is_installed (a_api: CMS_API): BOOLEAN
 			-- Is Current module installed?
 		do
-			if attached {CMS_STORAGE_SQL_I} api.storage as l_sql_storage then
+			if attached {CMS_STORAGE_SQL_I} a_api.storage as l_sql_storage then
 				Result := l_sql_storage.sql_table_exists ("nodes") and
 					l_sql_storage.sql_table_exists ("page_nodes")
 			end
 		end
 
-	install (api: CMS_API)
+	install (a_api: CMS_API)
 		do
 				-- Schema
-			if attached {CMS_STORAGE_SQL_I} api.storage as l_sql_storage then
-				l_sql_storage.sql_execute_file_script (api.setup.environment.path.extended ("scripts").extended (name).appended_with_extension ("sql"))
+			if attached {CMS_STORAGE_SQL_I} a_api.storage as l_sql_storage then
+				l_sql_storage.sql_execute_file_script (a_api.setup.environment.path.extended ("scripts").extended (name).appended_with_extension ("sql"))
 			end
 		end
 
 feature {CMS_API} -- Access: API
 
+	module_api: detachable CMS_MODULE_API
+			-- <Precursor>
+		do
+			if attached node_api as l_api then
+				Result := l_api
+			else
+					-- Current is initialized, so node_api should be set.
+				check has_node_api: False end
+			end
+		end
+
 	node_api: detachable CMS_NODE_API
 			-- <Precursor>
 
@@ -111,15 +133,10 @@ feature -- Access: router
 
 	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
 			-- <Precursor>
-		local
-			l_node_api: like node_api
 		do
-			l_node_api := node_api
-			if l_node_api = Void then
-				create l_node_api.make (a_api)
-				node_api := l_node_api
+			if attached node_api as l_node_api then
+				configure_web (a_api, l_node_api, a_router)
 			end
-			configure_web (a_api, l_node_api, a_router)
 		end
 
 	configure_web (a_api: CMS_API; a_node_api: CMS_NODE_API; a_router: WSF_ROUTER)
@@ -127,6 +144,7 @@ feature -- Access: router
 			l_node_handler: NODE_HANDLER
 			l_nodes_handler: NODES_HANDLER
 			l_uri_mapping: WSF_URI_MAPPING
+			l_trash_handler: TRASH_HANDLER
 		do
 				-- TODO: for now, focused only on web interface, add REST api later. [2015-April-29]
 			create l_node_handler.make (a_api, a_node_api)
@@ -135,6 +153,8 @@ feature -- Access: router
 
 			a_router.handle_with_request_methods ("/node/add/{type}", l_node_handler, a_router.methods_get_post)
 			a_router.handle_with_request_methods ("/node/{id}/edit", l_node_handler, a_router.methods_get_post)
+			a_router.handle_with_request_methods ("/node/{id}/delete", l_node_handler, a_router.methods_get_post)
+			a_router.handle_with_request_methods ("/node/{id}/trash", l_node_handler, a_router.methods_get_post)
 
 			a_router.handle_with_request_methods ("/node/{id}", l_node_handler, a_router.methods_get)
 				-- For now: no REST API handling... a_router.methods_get_put_delete + a_router.methods_get_post)
@@ -143,6 +163,13 @@ feature -- Access: router
 			create l_nodes_handler.make (a_api, a_node_api)
 			create l_uri_mapping.make_trailing_slash_ignored ("/nodes", l_nodes_handler)
 			a_router.map_with_request_methods (l_uri_mapping, a_router.methods_get)
+
+				--Trash
+
+			create l_trash_handler.make (a_api, a_node_api)
+			create l_uri_mapping.make_trailing_slash_ignored ("/trash", l_trash_handler)
+			a_router.map_with_request_methods (l_uri_mapping, a_router.methods_get)
+
 		end
 
 feature -- Hooks
@@ -173,10 +200,13 @@ feature -- Hooks
 			lnk: CMS_LOCAL_LINK
 --			perms: detachable ARRAYED_LIST [READABLE_STRING_8]
 		do
-			create lnk.make ("List of nodes", a_response.url ("/nodes", Void))
+			create lnk.make ("List of nodes", "nodes")
 			a_menu_system.primary_menu.extend (lnk)
 
-			create lnk.make ("Create ..", a_response.url ("/node/", Void))
+			create lnk.make ("Trash", "trash")
+			a_menu_system.primary_menu.extend (lnk)
+
+			create lnk.make ("Create ..", "node")
 			a_menu_system.primary_menu.extend (lnk)
 		end
 

modules/node/persistence/cms_node_storage_i.e

@@ -43,6 +43,8 @@ feature {NONE} -- Implementation
 
 	extended_store (a_node: CMS_NODE)
 			-- Store extended data from `a_node'.
+		require
+			not error_handler.has_error
 		do
 			if attached node_storage_extension (a_node) as ext then
 				ext.store_node (a_node)
@@ -51,16 +53,17 @@ feature {NONE} -- Implementation
 
 	extended_load (a_node: CMS_NODE)
 			-- Load extended data into `a_node'.
+		require
+			not error_handler.has_error
 		do
 			if attached node_storage_extension (a_node) as ext then
 				ext.load_node (a_node)
 			end
 		end
 
-
 feature -- Access		
 
-	nodes_count: INTEGER_64
+	nodes_count: NATURAL_64
 			-- Count of nodes.
 		deferred
 		end
@@ -70,6 +73,11 @@ feature -- Access
 		deferred
 		end
 
+	trashed_nodes (a_user_id: INTEGER_64): LIST [CMS_NODE]
+			-- List of nodes by user `a_user_id'.
+		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
@@ -108,7 +116,7 @@ feature -- Change: Node
 			valid_user: attached a_node.author as l_author and then l_author.id > 0
 		deferred
 		ensure
-			has_id: a_node.has_id
+			has_id: not error_handler.has_error implies a_node.has_id
 		end
 
 	update_node (a_node: CMS_NODE)
@@ -135,32 +143,35 @@ feature -- Change: Node
 		deferred
 		end
 
---	update_node_title (a_user_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_title: READABLE_STRING_32)
---			-- Update node title to `a_title', node identified by id `a_node_id'.
---			-- The user `a_user_id' is an existing or new collaborator.
---		require
---			valid_node_id: a_node_id > 0
---			valid_user_id: a_user_id > 0
---		deferred
---		end
+	trash_node (a_node: CMS_NODE)
+			-- Trash `a_node'.
+		do
+			if a_node.has_id then
+				trash_node_by_id (a_node.id)
+			end
+		end
 
---	update_node_summary (a_user_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_summary: READABLE_STRING_32)
---			-- Update node summary to `a_summary', node identified by id `a_node_id'.
---			-- The user `a_user_id' is an existing or new collaborator.
---		require
---			valid_id: a_node_id > 0
---			valid_user_id: a_user_id > 0
---		deferred
---		end
+	restore_node (a_node: CMS_NODE)
+			-- Restore `a_node'.
+		do
+			if a_node.has_id then
+				restore_node_by_id (a_node.id)
+			end
+		end
 
---	update_node_content (a_user_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_content: READABLE_STRING_32)
---			-- Update node content to `a_content', node identified by id `a_node_id'.
---			-- The user `a_user_id' is an existing or new collaborator.
---		require
---			valid_id: a_node_id > 0
---			valid_user_id: a_user_id > 0
---		deferred
---		end
+	trash_node_by_id (a_id: INTEGER_64)
+			-- Trash node by id `a_id'.
+		require
+			valid_node_id: a_id > 0
+		deferred
+		end
+
+	restore_node_by_id (a_id: INTEGER_64)
+			-- Restore node by id `a_id'.
+		require
+			valid_node_id: a_id > 0
+		deferred
+		end
 
 feature -- Helpers
 

modules/node/persistence/cms_node_storage_null.e

@@ -30,7 +30,7 @@ feature -- Error Handling
 
 feature -- Access: node
 
-	nodes_count: INTEGER_64
+	nodes_count: NATURAL_64
 			-- Count of nodes.
 		do
 		end
@@ -41,6 +41,12 @@ feature -- Access: node
 			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
 		end
 
+	trashed_nodes (a_user_id: INTEGER_64): LIST [CMS_NODE]
+			-- List of nodes by user `a_user_id'.
+		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
@@ -80,6 +86,16 @@ feature -- Node
 		do
 		end
 
+	trash_node_by_id (a_id: INTEGER_64)
+			-- <Precursor>
+		do
+		end
+
+	restore_node_by_id (a_id: INTEGER_64)
+			-- <Precursor>
+		do
+		end
+
 --	update_node_title (a_user_id: like {CMS_NODE}.id; a_node_id: like {CMS_NODE}.id; a_title: READABLE_STRING_32)
 --			-- <Precursor>
 --		do

modules/node/persistence/cms_node_storage_sql.e

@@ -22,18 +22,17 @@ create
 
 feature -- Access	
 
-	nodes_count: INTEGER_64
+	nodes_count: NATURAL_64
 			-- Number of items nodes.
 		do
 			error_handler.reset
 			write_information_log (generator + ".nodes_count")
 			sql_query (sql_select_nodes_count, Void)
 			if sql_rows_count = 1 then
-				Result := sql_read_integer_64 (1)
+				Result := sql_read_natural_64 (1)
 			end
 		end
 
-
 	nodes: LIST [CMS_NODE]
 			-- List of nodes.
 		do
@@ -60,6 +59,36 @@ feature -- Access
 --			end
 		end
 
+	trashed_nodes (a_user_id: INTEGER_64): LIST [CMS_NODE]
+			-- List of nodes.
+		local
+			l_parameters: STRING_TABLE [detachable ANY]
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+
+			error_handler.reset
+			write_information_log (generator + ".trash_nodes")
+
+			from
+				create l_parameters.make (1)
+				if a_user_id > 1 then
+					-- Not admin user
+					l_parameters.put (a_user_id, "author")
+					sql_query (sql_select_trash_nodes_by_author, l_parameters)
+				else
+					sql_query (sql_select_trash_nodes, Void)
+				end
+				sql_start
+			until
+				sql_after
+			loop
+				if attached fetch_node as l_node then
+					Result.force (l_node)
+				end
+				sql_forth
+			end
+		end
+
 	recent_nodes (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_NODE]
 			-- List of recent `a_count' nodes with an offset of `lower'.
 		local
@@ -148,7 +177,7 @@ feature -- Change: Node
 			l_time: DATE_TIME
 		do
 			create l_time.make_now_utc
-			write_information_log (generator + ".delete_node")
+			write_information_log (generator + ".delete_node {" + a_id.out + "}")
 
 			error_handler.reset
 			create l_parameters.make (1)
@@ -158,6 +187,40 @@ feature -- Change: Node
 			sql_change (sql_delete_node, l_parameters)
 		end
 
+
+	trash_node_by_id (a_id: INTEGER_64)
+			-- <Precursor>
+		local
+			l_parameters: STRING_TABLE [ANY]
+			l_time: DATE_TIME
+		do
+			create l_time.make_now_utc
+			write_information_log (generator + ".trash_node {" + a_id.out + "}")
+
+			error_handler.reset
+			create l_parameters.make (1)
+			l_parameters.put (a_id, "nid")
+			sql_change (sql_trash_node, l_parameters)
+		end
+
+	restore_node_by_id (a_id: INTEGER_64)
+			-- <Precursor>
+		local
+			l_parameters: STRING_TABLE [ANY]
+			l_time: DATE_TIME
+		do
+			create l_time.make_now_utc
+			write_information_log (generator + ".restore_node {" + a_id.out + "}")
+
+			error_handler.reset
+			create l_parameters.make (1)
+			l_parameters.put (l_time, "changed")
+			l_parameters.put ({CMS_NODE_API}.not_published, "status")
+			l_parameters.put (a_id, "nid")
+			sql_change (sql_restore_node, l_parameters)
+		end
+
+
 feature {NONE} -- Implementation
 
 	store_node (a_node: CMS_NODE)
@@ -204,8 +267,14 @@ feature {NONE} -- Implementation
 					a_node.set_revision (1) -- New object.
 				end
 			end
-			extended_store (a_node)
-			sql_commit_transaction
+			if not error_handler.has_error then
+				extended_store (a_node)
+			end
+			if error_handler.has_error then
+				sql_rollback_transaction
+			else
+				sql_commit_transaction
+			end
 		end
 
 feature -- Helpers
@@ -229,6 +298,14 @@ feature {NONE} -- Queries
 			-- SQL Query to retrieve all nodes.
 			--| note: {CMS_NODE_API}.trashed = -1
 
+	sql_select_trash_nodes: STRING = "SELECT * FROM Nodes WHERE status = -1 ;"
+			-- SQL Query to retrieve all trahsed nodes.
+			--| note: {CMS_NODE_API}.trashed = -1		
+
+	sql_select_trash_nodes_by_author: STRING = "SELECT * FROM Nodes WHERE status = -1 and author = :author ;"
+			-- SQL Query to retrieve all nodes by a given author.
+			--| 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 ;"
@@ -244,6 +321,12 @@ feature {NONE} -- Queries
 	sql_delete_node: STRING = "UPDATE nodes SET changed=:changed, status =:status WHERE nid=:nid"
 			-- Soft deletion with free metadata.
 
+	sql_trash_node: STRING = "DELETE FROM nodes WHERE nid=:nid"
+			-- Physical deletion with free metadata.		
+
+	sql_restore_node: STRING = "UPDATE nodes SET changed=:changed, status =:status WHERE nid=:nid"
+			-- Restore node to  {CMS_NODE_API}.not_publised.
+
 --	sql_update_node_author: STRING  = "UPDATE nodes SET author=:author WHERE nid=:nid;"
 
 --	sql_update_node_title: STRING ="UPDATE nodes SET title=:title, changed=:changed, revision = revision + 1 WHERE nid=:nid;"

package.iron

@@ -0,0 +1,31 @@
+package ROC_cms
+
+project
+	cms = "cms-safe.ecf"
+	cms = "cms.ecf"
+	app_env = "library/app_env/app_env-safe.ecf"
+	app_env = "library/app_env/app_env.ecf"
+	config = "library/configuration/config-safe.ecf"
+	config = "library/configuration/config.ecf"
+	app_env = "library/layout/layout-safe.ecf"
+	app_env = "library/layout/layout.ecf"
+	cms_model = "library/model/cms_model-safe.ecf"
+	cms_model = "library/model/cms_model.ecf"
+	persistence_mysql = "library/persistence/mysql/persistence_mysql-safe.ecf"
+	persistence_mysql = "library/persistence/mysql/persistence_mysql.ecf"
+	persistence_sqlite = "library/persistence/sqlite/persistence_sqlite-safe.ecf"
+	persistence_sqlite = "library/persistence/sqlite/persistence_sqlite.ecf"
+	basic_auth = "modules/basic_auth/basic_auth-safe.ecf"
+	basic_auth = "modules/basic_auth/basic_auth.ecf"
+	node = "modules/node/node-safe.ecf"
+	node = "modules/node/node.ecf"
+
+note
+	title: ROC CMS
+	description: CMS written with Eiffel
+	tags: cms, web, rest, api
+	license: Eiffel Forum v2
+	copyright: Jocelyn Fiat, Javier Velilla, Eiffel Software
+	link[source]: "Github" https://github.com/EiffelWebFramework/ROC.git
+
+end

src/configuration/cms_default_setup.e

@@ -39,17 +39,21 @@ feature {NONE} -- Initialization
 		end
 
 	configure
+		local
+			l_url: like site_url
 		do
 				--| Site id, used to identified a site, this could be set to a uuid, or else
 			site_id := text_item_or_default ("site.id", "_EWF_CMS_NO_ID_")
 
 				-- Site url: optional, but ending with a slash
-			site_url := string_8_item ("site_url")
-			if attached site_url as l_url and then not l_url.is_empty then
-				if l_url[l_url.count] /= '/' then
-					site_url := l_url + "/"
+			l_url := string_8_item ("site_url")
+			if l_url /= Void and then not l_url.is_empty then
+				if l_url [l_url.count] /= '/' then
+					l_url := l_url + "/"
 				end
 			end
+			site_url := l_url
+
 				-- Site name
 			site_name := text_item_or_default ("site.name", "EWF::CMS")
 

src/configuration/cms_setup.e

@@ -62,7 +62,7 @@ feature -- Access: Site
 			-- Mainly used for internal notification.
 
 	site_url: detachable READABLE_STRING_8
-			-- Optional base url of the site.
+			-- Optional url of current CMS site.
 
 	front_page_path: detachable READABLE_STRING_8
 			-- Optional path defining the front page.

src/kernel/content/format/cms_editor_content_format.e

@@ -1,31 +0,0 @@
-note
-	description: "HTML Content format editable with WYSIWYG editor."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_EDITOR_CONTENT_FORMAT
-
-inherit
-	CONTENT_FORMAT
-		redefine
-			default_create
-		end
-
-feature {NONE} -- Initialization
-
-	default_create
-		do
-			Precursor
-			create filters.make (0)
-		end
-
-feature -- Access
-
-	name: STRING = "cms_editor"
-
-	title: STRING_8 = "CMS HTML content"
-
-	filters: ARRAYED_LIST [CONTENT_FILTER]
-
-end

src/kernel/content/format/cms_formats.e

@@ -27,11 +27,10 @@ feature -- Access
 		once
 				-- Can we provide an external file to read the
 				-- supported formats?
-			create {ARRAYED_LIST [CONTENT_FORMAT]} Result.make (4)
+			create {ARRAYED_LIST [CONTENT_FORMAT]} Result.make (3)
 			Result.force (plain_text)
 			Result.force (full_html)
 			Result.force (filtered_html)
-			Result.force (cms_html)
 		end
 
 	default_format: CONTENT_FORMAT
@@ -44,11 +43,6 @@ feature -- Access
 			create Result
 		end
 
-	cms_html: CMS_EDITOR_CONTENT_FORMAT
-		once
-			create Result
-		end
-
 	full_html: FULL_HTML_CONTENT_FORMAT
 		once
 			create Result
@@ -59,6 +53,7 @@ feature -- Access
 			create Result
 		end
 
+
 note
 	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"

src/kernel/form/cms_editor.e

@@ -1,106 +0,0 @@
-note
-	description: "Class to import a WYSIWIG editor using javascript code"
-	author: "Dario B<>sch <daboesch@student.ethz.ch"
-	date: "$Date$"
-	revision: "$Revision$"
-
-deferred class
-	CMS_EDITOR
-
-feature -- Initialisation
-	load_assets : STRING
-			-- Loads all assest needed to show the editor
-		deferred
-		end
-
-feature -- Javascript
-
-	javascript_replace_textarea (a_textarea : WSF_FORM_TEXTAREA) : STRING
-			-- Javascript code that replaces a textarea with the editor. The editor instance should be saved in editor_variable
-		deferred
-		end
-
-	javascript_restore_textarea (a_textarea : WSF_FORM_TEXTAREA) : STRING
-			-- Javascript code that restores a textarea
-		deferred
-		end
-
-	javascript_textarea_to_editor(a_textarea : WSF_FORM_TEXTAREA) : STRING
-			-- Javascript code to display the textarea as a WYSIWIG editor as soon as the document is loaded
-		do
-			Result := javascript_ready(javascript_replace_textarea (a_textarea))
-		end
-
-	javascript_textarea_to_editor_if_selected (a_textarea : WSF_FORM_TEXTAREA; a_select_field : WSF_FORM_SELECT; a_value : STRING) : STRING
-			-- Javascript code to display the textarea as a WYSIWIG editor if a_select_field has a_value
-		local
-			initial_replace_code, on_select_replace_code : STRING
-		do
-			-- Javascript that replaces the textarea if a_value is selected at load time
-			initial_replace_code := javascript_ready(javascript_if_selected(a_select_field, a_value, javascript_replace_textarea(a_textarea)))
-
-			-- Javascript code that replaces the textarea as soon as value is selected at a_select_field
-			on_select_replace_code := javascript_ready(
-										javascript_init_editor_variable(a_textarea) +
-										javascript_on_select(a_select_field, a_value,
-											-- If a_value is selected, replace textarea
-											javascript_replace_textarea(a_textarea),
-
-											-- Otherwise restore it
-											javascript_restore_textarea(a_textarea)
-										)
-									)
-
-			Result := initial_replace_code + " " + on_select_replace_code
-		end
-
-	javascript_init_editor_variable(a_textarea : WSF_FORM_TEXTAREA) : STRING
-			-- Returns the javascript code that initializes a local variable to store the editor instance
-		do
-			Result := "var " + editor_variable(a_textarea) + "; "
-		end
-
-
-
-	javascript_if_selected(a_select_field : WSF_FORM_SELECT; a_value : STRING; a_code : STRING) : STRING
-			-- Javascript that executes a_code if a_value is selected at a_select_field
-		do
-			Result := "if($('#" + field_id(a_select_field) + "').val() == %"" + a_value + "%"){ " + a_code + " }"
-		end
-
-	javascript_ready (a_code : STRING) : STRING
-			-- Wraps the given javascript code with a ready statement, such that it's executed when the document has loaded
-		do
-			Result := "$(function() { " + a_code + " });"
-		end
-
-	javascript_on_select (a_select_field : WSF_FORM_SELECT; a_value : STRING; a_then : STRING; a_else : STRING) : STRING
-			-- Javascript code that executes a_then if at the given select_field the given string value is selected, otherwise it executes a_else
-		do
-			Result := "$('#" + field_id(a_select_field) + "').change(function(){" +
-					javascript_if_selected(a_select_field, a_value, a_then) +
-				"else{" +
-					a_else +
-				"}" +
-			"});"
-		end
-
-feature -- Helper
-
-	field_id(a_select_field : WSF_FORM_SELECT) : STRING
-			-- Returns the id of the given field
-		do
-			if attached a_select_field.css_id  as a_id then
-				Result := a_id
-			else
-				Result := a_select_field.name + "-select"
-			end
-		end
-
-	editor_variable (a_textarea : WSF_FORM_TEXTAREA) : STRING
-			-- Returns the variable name that stores the editor instance of the given textarea
-		do
-			Result := "editor_" + a_textarea.name
-		end
-
-end

src/kernel/form/cms_editor_ckeditor.e

@@ -1,37 +0,0 @@
-note
-	description: "Summary description for {CMS_EDITOR_CKEDITOR}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_EDITOR_CKEDITOR
-
-inherit
-	CMS_EDITOR
-
-feature -- Initialisation
-
-	load_assets : STRING
-			-- <Precursor>
-		do
-			Result := "<script src=%"//cdn.ckeditor.com/4.4.7/standard/ckeditor.js%"></script>"
-		end
-
-feature -- Javascript
-
-	javascript_replace_textarea (a_textarea : WSF_FORM_TEXTAREA) : STRING
-			-- <Precursor>
-		do
-			-- Replaces the textarea with an editor instance. Save the instance in a variable
-			Result := editor_variable(a_textarea) + " = CKEDITOR.replace( '" + a_textarea.name + "' );"
-		end
-
-	javascript_restore_textarea (a_textarea : WSF_FORM_TEXTAREA) : STRING
-			-- <Precursor>
-		do
-			-- Replaces the textarea with an editor instance. Save the instance in a variable
-			Result := "if (" + editor_variable(a_textarea) + " != undefined) " + editor_variable(a_textarea) + ".destroy();"
-		end
-
-end

src/kernel/form/cms_form_textarea.e

@@ -1,77 +0,0 @@
-note
-	description: "Extends the WSF form textarea with features to add a WYSIWIG editor."
-	author: "Dario B<>sch <daboesch@student.ethz.ch"
-	date: "$Date: 2015-05-23 16:02:55 +0100 (Sat, 23 May 2015) $"
-	revision: "$Revision: 96616 $"
-
-class
-	CMS_FORM_TEXTAREA
-
-inherit
-	WSF_FORM_TEXTAREA
-		redefine
-			make,
-			append_item_to_html
-		end
-
-	CMS_EDITOR_CKEDITOR
-
-create
-	make
-
-feature -- Initialisation
-
-	make (a_name: like name)
-			-- <Precursor>
-		do
-			precursor(a_name)
-
-				-- By default we don't replace the textarea by an editor
-			editor := False;
-		end
-
-feature -- Access
-
-	editor : BOOLEAN
-			-- True if the textarea should be replaced by the editor. Default is false.
-
-	format_field : detachable WSF_FORM_SELECT
-			-- Selection field for the format on that it depends, if the editor is shown or not.
-
-	condition_value : detachable STRING
-
-feature -- Editor
-
-	show_as_editor
-			-- The textarea will be replaced by a wysiwyg editor
-		do
-			editor := True
-		end
-
-	show_as_editor_if_selected (a_select_field : WSF_FORM_SELECT; a_value : STRING)
-			-- Replaces the textarea only if a_select_field has a_value (or the value gets selected)
-		do
-			editor := True
-			format_field := a_select_field
-			condition_value := a_value
-		end
-
-feature -- Conversion
-
-	append_item_to_html (a_theme: WSF_THEME; a_html: STRING_8)
-		do
-			-- Add javascript to replace textarea with editor
-			precursor(a_theme, a_html)
-			if editor then
-				a_html.append (load_assets)
-				a_html.append ("<script type=%"text/javascript%">");
-				if attached format_field as l_field and then attached condition_value as l_value then
-					a_html.append (javascript_textarea_to_editor_if_selected (Current, l_field, l_value))
-				else
-					a_html.append (javascript_textarea_to_editor (Current))
-				end
-				a_html.append ("</script>")
-			end
-		end
-
-end

src/kernel/form/cms_lower_upper_pager.e

@@ -0,0 +1,15 @@
+note
+	description: "Pager widget for ROC CMS."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_LOWER_UPPER_PAGER
+
+inherit
+	WSF_WIDGET_PAGER
+
+create
+	make
+
+end

src/persistence/cms_data_query_parameters.e

@@ -0,0 +1,88 @@
+note
+	description: "[
+			Parameters associated with data query.
+			It could be query over http, or storage.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_DATA_QUERY_PARAMETERS
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_offset: NATURAL_64; a_size: NATURAL)
+		do
+			offset := a_offset
+			size := a_size
+		ensure
+			size_set: size = a_size
+			offset_set: offset = a_offset
+		end
+
+feature -- Access
+
+	size: NATURAL assign set_size
+			-- Number of items per page.
+
+	offset: NATURAL_64 assign set_offset
+			--  lower index of `items' pagination.
+
+	order_by: detachable READABLE_STRING_8
+			-- field to order by.
+
+	order_ascending: BOOLEAN
+			-- is ascending ordering?
+
+feature -- Element change
+
+	set_size (a_size: NATURAL)
+			-- Set `size' with `a_size'.
+		do
+			size := a_size
+		ensure
+			size_set: size = a_size
+		end
+
+	set_offset (a_offset: NATURAL_64)
+			-- Set offset with `a_offset'.
+		do
+			offset := a_offset
+		ensure
+			limit_set: offset = a_offset
+		end
+
+	set_ascending_order_by_field (a_field: detachable READABLE_STRING_8)
+			-- Pager with a order_by `a_field' asc.	
+		do
+			if a_field /= Void then
+				order_by := a_field
+				order_ascending := True
+			else
+				order_by := Void
+			end
+		ensure
+			order_by_unset: a_field = Void implies order_by = Void
+			order_by_set: a_field /= Void implies attached order_by as l_order_by and then l_order_by.same_string (a_field)
+			asc_true: order_ascending
+		end
+
+	set_descending_order_by_field (a_field: detachable READABLE_STRING_8)
+			-- Pager sorting descending with field `a_field' if set, otherwise remove sorting.	
+		do
+			if a_field /= Void then
+				order_by := a_field
+				order_ascending := False
+			else
+				order_by := Void
+			end
+		ensure
+			order_by_unset: a_field = Void implies order_by = Void
+			order_by_set: a_field /= Void implies attached order_by as l_order_by and then l_order_by.same_string (a_field)
+			asc_fasle: not order_ascending
+		end
+
+end

src/persistence/core/cms_core_storage_i.e

@@ -1,6 +1,6 @@
 note
 	description: "[
-			Objects that ...
+			CMS Storage for core functionalities.
 		]"
 	author: "$Author$"
 	date: "$Date$"

src/persistence/sql/cms_storage_fs_i.e

@@ -0,0 +1,107 @@
+note
+	description: "Interface used to implement CMS Storage based on File system."
+	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
+	revision: "$Revision: 96616 $"
+
+deferred class
+	CMS_STORAGE_FS_I
+
+inherit
+	SHARED_LOGGER
+
+feature {NONE} -- Initialization
+
+	make (a_location: PATH; a_api: CMS_API)
+		do
+			location := a_location
+			api := a_api
+			create error_handler.make
+		end
+
+feature -- Access
+
+	api: CMS_API
+			-- Associated CMS api.
+
+	location: PATH
+			-- File system location.
+
+feature -- Error handler
+
+	error_handler: ERROR_HANDLER
+			-- Error handler.
+
+	has_error: BOOLEAN
+			-- Last operation reported error.
+		do
+			Result := error_handler.has_error
+		end
+
+	reset_error
+			-- Reset errors.
+		do
+			error_handler.reset
+		end
+
+feature -- Helpers
+
+	save_to_file (a_text: STRING; opt_name: detachable READABLE_STRING_GENERAL)
+		local
+			s: READABLE_STRING_GENERAL
+			now: DATE_TIME
+			fut: WSF_FILE_UTILITIES [RAW_FILE]
+		do
+			create fut
+			if opt_name /= Void then
+				s := opt_name
+			else
+				create now.make_now_utc
+				s := date_to_yyyymmdd_hhmmss_string (now)
+			end
+			if attached fut.new_file (location.extended (s)) as f then
+				f.put_string (a_text)
+				f.close
+			else
+				error_handler.add_custom_error (0, "saving failure", Void)
+			end
+		end
+
+	date_to_yyyymmdd_hhmmss_string (d: DATE_TIME): STRING
+		local
+			i: INTEGER
+		do
+			create Result.make_empty
+			Result.append_integer (d.year)
+			Result.append_character ('-')
+			i := d.month
+			if i < 10 then
+				Result.append_integer (0)
+			end
+			Result.append_integer (i)
+			Result.append_character ('-')
+			i := d.day
+			if i < 10 then
+				Result.append_integer (0)
+			end
+			Result.append_integer (i)
+			Result.append_character ('_')
+			i := d.hour
+			if i < 10 then
+				Result.append_integer (0)
+			end
+			Result.append_integer (i)
+			Result.append_character ('-')
+			i := d.minute
+			if i < 10 then
+				Result.append_integer (0)
+			end
+			Result.append_integer (i)
+			Result.append_character ('-')
+			i := d.second
+			if i < 10 then
+				Result.append_integer (0)
+			end
+			Result.append_integer (i)
+		end
+
+end

src/persistence/sql/cms_storage_sql_builder.e

@@ -40,6 +40,10 @@ feature -- Initialization
 
 				--| Node			
 				-- FIXME: move that initialization to node module
+				-- TODO: should we move the initialization to an
+				--! external configuration file?
+				--! at the moment we only have 1 admin to the whole site.
+				--! is that ok?
 			l_anonymous_role.add_permission ("view any page")
 			a_storage.save_user_role (l_anonymous_role)
 
@@ -47,9 +51,11 @@ feature -- Initialization
 			l_authenticated_role.add_permission ("view any page")
 			l_authenticated_role.add_permission ("edit any page")
 			l_authenticated_role.add_permission ("delete page")
+			l_authenticated_role.add_permission ("trash page")
 			l_authenticated_role.add_permission ("view own page")
 			l_authenticated_role.add_permission ("edit own page")
 			l_authenticated_role.add_permission ("delete own page")
+			l_authenticated_role.add_permission ("trash own page")
 			a_storage.save_user_role (l_authenticated_role)
 
 

src/persistence/sql/cms_storage_sql_i.e

@@ -217,6 +217,21 @@ feature -- Access
 		deferred
 		end
 
+	sql_read_natural_64 (a_index: INTEGER): NATURAL_64
+			-- Retrieved value at `a_index' position in `item'.
+		local
+			l_item: like sql_item
+		do
+			l_item := sql_item (a_index)
+			if attached {NATURAL_64} l_item as i then
+				Result := i
+			elseif attached {NATURAL_64_REF} l_item as l_value then
+				Result := l_value.item
+			else
+				Result := sql_read_integer_64 (a_index).to_natural_64
+			end
+		end
+
 	sql_read_integer_64 (a_index: INTEGER): INTEGER_64
 			-- Retrieved value at `a_index' position in `item'.
 		local

src/service/cms_api.e

@@ -148,17 +148,15 @@ feature -- Permissions system
 
 feature -- Query: module
 
-	module (a_type: TYPE [detachable CMS_MODULE]): detachable CMS_MODULE
+	module (a_type: TYPE [CMS_MODULE]): detachable CMS_MODULE
 			-- Enabled module typed `a_type', if any.
 			--| usage: if attached module ({FOO_MODULE}) as mod then ...
 		local
-			t: STRING_8
+--			t: STRING_8
 			l_type: TYPE [detachable CMS_MODULE]
 		do
-			t := a_type.name
-			if t.starts_with ("!") then
-				t.remove_head (1)
-			end
+--			t := type_name_without_annotation (a_type)
+
 			across
 				setup.modules as ic
 			until
@@ -171,8 +169,12 @@ feature -- Query: module
 					l_type := Result.generating_type
 					if a_type ~ l_type then
 							-- Found
-					elseif t.same_string (l_type.name) then
+					elseif
+						attached a_type.attempt (Result) and then attached l_type.generating_type.attempt (a_type)
+					then
 							-- Found
+--					elseif t.same_string (type_name_without_annotation (l_type)) then
+--							-- Found
 					else
 						Result := Void
 					end
@@ -185,8 +187,11 @@ feature -- Query: module
 	module_api (a_type: TYPE [CMS_MODULE]): detachable CMS_MODULE_API
 			-- Enabled module API associated with module typed `a_type'.
 		do
-			if attached {CMS_MODULE} module (a_type) as mod then
+			if attached module (a_type) as mod then
 				if mod.is_enabled then
+					if not mod.is_initialized then
+						mod.initialize (Current)
+					end
 					Result := mod.module_api
 				end
 			end
@@ -236,9 +241,16 @@ feature -- Query: API
 
 feature -- Path aliases	
 
+	is_valid_path_alias (a_alias: READABLE_STRING_8): BOOLEAN
+		do
+			Result := a_alias.is_empty or else not a_alias.starts_with_general ("/")
+		end
+
 	set_path_alias (a_source, a_alias: READABLE_STRING_8; a_keep_previous: BOOLEAN)
 			-- Set `a_alias' as alias of `a_source',
 			-- and eventually unset previous alias if any.
+		require
+			valid_alias: is_valid_path_alias (a_alias)
 		local
 			l_continue: BOOLEAN
 		do
@@ -275,7 +287,7 @@ feature -- Path aliases
 		do
 			Result := a_source
 			if attached storage.path_alias (Result) as l_path then
-				Result := "/" + l_path
+				Result := l_path
 			end
 		end
 
@@ -283,8 +295,8 @@ feature -- Path aliases
 			-- Resolved path for alias `a_alias'.
 			--| the CMS supports aliases for path, and then this function simply returns
 			--| the effective target path/url for this `a_alias'.
-			--| For instance: /articles/2015/may/this-is-an-article can be an alias to /node/123
-			--| This function will return "/node/123".
+			--| For instance: articles/2015/may/this-is-an-article can be an alias to node/123
+			--| This function will return "node/123".
 			--| If the alias is bad (i.e does not alias real path), then this function
 			--| returns the alias itself.
 		do
@@ -310,6 +322,41 @@ feature {NONE}-- Implemenation
 	internal_user_api: detachable like user_api
 			-- Cached value for `user_api'.
 
+	type_name_without_annotation (a_type: TYPE [detachable ANY]): STRING
+			-- Type name for `a_type, without any annotation.
+			-- Used by `module' to search by type.
+		local
+			i,j,n: INTEGER
+			c: CHARACTER
+		do
+			create Result.make_from_string (a_type.name)
+			from
+				i := 1
+				n := Result.count
+			until
+				i > n
+			loop
+				c := Result[i]
+				if c = '!' or c = '?' then
+					Result.remove (i)
+					n := n - 1
+				elseif c.is_lower then
+					j := Result.index_of (' ', i + 1)
+					if j > 0 then
+						Result.remove_substring (i, j)
+						n := n - (j - i)
+					end
+				else
+					i := i + 1
+				end
+			end
+			if Result.starts_with ("!") or Result.starts_with ("?") then
+				Result.remove_head (1)
+			elseif Result.starts_with ("detachable ") then
+				Result.remove_head (11)
+			end
+		end
+
 feature -- Environment
 
 	module_configuration (a_module_name: READABLE_STRING_GENERAL; a_name: detachable READABLE_STRING_GENERAL): detachable CONFIG_READER

src/service/cms_api_options.e

@@ -14,4 +14,10 @@ create
 	make,
 	make_from_manifest
 
+convert
+	make_from_manifest ({ ARRAY [TUPLE [key: STRING; value: detachable ANY]],
+						  ARRAY [TUPLE [STRING_8, ARRAY [TUPLE [STRING_8, STRING_32]]]],
+						  ARRAY [TUPLE [STRING_8, ARRAY [TUPLE [STRING_8, STRING_8]]]]
+						})
+
 end

src/service/cms_module.e

@@ -43,34 +43,38 @@ feature {CMS_API} -- Module Initialization
 feature -- Status		
 
 	is_initialized: BOOLEAN
-			-- Is Current module initialized?		
+			-- Is Current module initialized?
 
 feature {CMS_API} -- Access: API
 
 	module_api: detachable CMS_MODULE_API
 			-- Eventual module api.
+		require
+			is_initialized: is_initialized
+		do
+				-- No API by default.
+		end
 
 feature {CMS_API} -- Module management
 
 	is_installed (api: CMS_API): BOOLEAN
 			-- Is Current module installed?
 		do
-			Result := is_enabled
-				-- FIXME: implement proper installation status.
+			Result := attached api.storage.custom_value ("is_initialized", "module-" + name) as v and then v.is_case_insensitive_equal_general ("yes")
 		end
 
 	install (api: CMS_API)
 		require
 			is_not_installed: not is_installed (api)
 		do
-				-- Not Yet Supported
+			api.storage.set_custom_value ("is_initialized", "module-" + name, "yes")
 		end
 
 	uninstall (api: CMS_API)
 		require
 			is_installed: is_installed (api)
 		do
-				-- Not Yet Supported
+			api.storage.set_custom_value ("is_initialized", "module-" + name, "no")
 		end
 
 feature -- Router

src/service/cms_module_api.e

@@ -1,6 +1,5 @@
 note
 	description: "Summary description for {CMS_MODULE_API}."
-	author: ""
 	date: "$Date: 2015-02-13 14:54:27 +0100 (ven., 13 févr. 2015) $"
 	revision: "$Revision: 96620 $"
 

src/service/cms_module_collection.e

@@ -1,6 +1,5 @@
 note
-	description: "Summary description for {CMS_MODULE_COLLECTION}."
-	author: ""
+	description: "Collection of CMS modules."
 	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
 	revision: "$Revision: 96596 $"
 

src/service/filter/cms_error_filter.e

@@ -19,15 +19,17 @@ feature -- Basic operations
 
 	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
 			-- Execute the filter
+		local
+			utf: UTF_CONVERTER
 		do
 			fixme ("Check if it's ok to add new fetures CMS_API.has_error:BOOLEAN and CMS_API.error_description.")
 			if not api.has_error then
 				api.logger.put_information (generator + ".execute with req: " + req.debug_output, Void)
 				if attached req.raw_header_data as l_header_data  then
-					api.logger.put_debug (generator + ".execute with req header: " + l_header_data, Void)
+					api.logger.put_debug (generator + ".execute with req header: " + utf.escaped_utf_32_string_to_utf_8_string_8 (l_header_data), Void)
 				end
 				if attached req.raw_input_data as l_input_data  then
-					api.logger.put_debug (generator + ".execute with req input: " + l_input_data, Void)
+					api.logger.put_debug (generator + ".execute with req input: " + utf.escaped_utf_32_string_to_utf_8_string_8 (l_input_data), Void)
 				end
 				execute_next (req, res)
 			else

src/service/handler/cms_handler.e

@@ -36,6 +36,18 @@ feature -- Response helpers
 --			res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (a_location))
 		end
 
+	send_bad_request_message (res: WSF_RESPONSE)
+			-- Send via `res' a bad request response.
+		do
+			res.send (create {CMS_CUSTOM_RESPONSE_MESSAGE}.make ({HTTP_STATUS_CODE}.bad_request))
+		end
+
+	send_not_found_message (res: WSF_RESPONSE)
+			-- Send via `res' a bad request response.
+		do
+			res.send (create {CMS_CUSTOM_RESPONSE_MESSAGE}.make ({HTTP_STATUS_CODE}.not_found))
+		end
+
 	send_access_denied_message (res: WSF_RESPONSE)
 			-- Send via `res' an access denied response.
 		do

src/service/misc/cms_request_util.e

@@ -70,14 +70,4 @@ feature -- Media Type
 			end
 		end
 
-feature -- Absolute Host
-
-	absolute_host (req: WSF_REQUEST; a_path:STRING): STRING
-		do
-			Result := req.absolute_script_url (a_path)
-			if Result.last_index_of ('/', Result.count) = Result.count then
-				Result.remove_tail (1)
-			end
-		end
-
 end

src/service/misc/cms_url_utilities.e

@@ -13,6 +13,7 @@ inherit
 feature -- Core
 
 	site_url: READABLE_STRING_8
+			-- Absolute site URL of Current CMS site.
 		deferred
 		end
 

src/service/path/cms_router.e

@@ -31,8 +31,22 @@ feature {WSF_ROUTER_MAPPING} -- Dispatch helper
 
 	path_to_dispatch (req: WSF_REQUEST): READABLE_STRING_8
 			-- Path used by the router, to apply url dispatching of request `req'.
+		local
+			l_path: STRING_8
 		do
-			Result := api.source_of_path_alias (Precursor (req))
+			create l_path.make_from_string (Precursor (req))
+			if not l_path.is_empty and l_path [1] = '/' then
+				l_path.remove_head (1)
+			end
+			Result := api.source_of_path_alias (l_path)
+			if Result.is_empty then
+				Result := "/"
+			elseif Result [1] /= '/' then
+				create l_path.make (Result.count + 1)
+				l_path.append_character ('/')
+				l_path.append (Result)
+				Result := l_path
+			end
 		end
 
 end

src/service/response/cms_response.e

@@ -3,8 +3,8 @@ note
 			Generic CMS Response.
 			It builds the content to get process to render the output.
 		]"
-	date: "$Date: 2015-02-16 20:14:19 +0100 (lun., 16 févr. 2015) $"
-	revision: "$Revision: 96643 $"
+	date: "$Date: 2015-05-20 11:48:26 +0200 (mer., 20 mai 2015) $"
+	revision: "$Revision: 97327 $"
 
 deferred class
 	CMS_RESPONSE
@@ -29,6 +29,7 @@ feature {NONE} -- Initialization
 
 	initialize
 		do
+			initialize_site_url
 			get_theme
 			create menu_system.make
 			initialize_block_region_settings
@@ -36,6 +37,35 @@ feature {NONE} -- Initialization
 			register_hooks
 		end
 
+	initialize_site_url
+				-- Initialize site and base url.
+		local
+			l_url: detachable STRING_8
+			i,j: INTEGER
+		do
+				--| WARNING: do not use `absolute_url' and `url', since it relies on site_url and base_url.
+			if attached setup.site_url as l_site_url and then not l_site_url.is_empty then
+				create l_url.make_from_string (l_site_url)
+			else
+				l_url := request.absolute_script_url ("/")
+			end
+			check is_not_empty: not l_url.is_empty end
+			if l_url [l_url.count] /= '/' then
+				l_url.append_character ('/')
+			end
+			site_url := l_url
+			i := l_url.substring_index ("://", 1)
+			if i > 0 then
+				j := l_url.index_of ('/', i + 3)
+				if j > 0 then
+					base_url := l_url.substring (j, l_url.count)
+				end
+			end
+		ensure
+			site_url_set: site_url /= Void
+			site_url_ends_with_slash: site_url.ends_with_general ("/")
+		end
+
 	register_hooks
 		local
 			l_module: CMS_MODULE
@@ -76,6 +106,15 @@ feature -- Access
 	redirection: detachable READABLE_STRING_8
 			-- Location for eventual redirection.
 
+	location: STRING_8
+			-- Associated cms local location.
+		do
+			create Result.make_from_string (request.percent_encoded_path_info)
+			if not Result.is_empty and then Result[1] = '/' then
+				Result.remove_head (1)
+			end
+		end
+
 feature -- Internationalization (i18n)
 
 	translation (a_text: READABLE_STRING_GENERAL; opts: detachable CMS_API_OPTIONS): STRING_32
@@ -163,16 +202,13 @@ feature -- URL utilities
 			end
 		end
 
-	site_url: READABLE_STRING_8
-		do
-			Result := absolute_host (request, "")
-		end
+	site_url: IMMUTABLE_STRING_8
+			-- Absolute site url.
 
-	base_url: detachable READABLE_STRING_8
+	base_url: detachable IMMUTABLE_STRING_8
 			-- Base url if any.
 			--| Usually it is Void, but it could be
 			--|  /project/demo/
-			--| FIXME: for now, no way to change that. Always at the root "/"
 
 feature -- Access: CMS
 
@@ -183,7 +219,7 @@ feature -- Access: CMS
 
 	front_page_url: READABLE_STRING_8
 		do
-			Result := request.absolute_script_url ("/")
+			Result := absolute_url ("/", Void)
 		end
 
 	values: CMS_VALUE_TABLE
@@ -806,9 +842,9 @@ feature -- Theme
 				create l_info.make_default
 			end
 			if l_info.engine.is_case_insensitive_equal_general ("smarty") then
-				create {SMARTY_CMS_THEME} theme.make (setup, l_info)
+				create {SMARTY_CMS_THEME} theme.make (setup, l_info, site_url)
 			else
-				create {MISSING_CMS_THEME} theme.make (setup)
+				create {MISSING_CMS_THEME} theme.make (setup, l_info, site_url)
 				status_code := {HTTP_STATUS_CODE}.service_unavailable
 				to_implement ("Check how to add the Retry-after, http://tools.ietf.org/html/rfc7231#section-6.6.4 and http://tools.ietf.org/html/rfc7231#section-7.1.3")
 			end
@@ -834,7 +870,7 @@ feature -- Generation
 			lnk: CMS_LINK
 		do
 				-- Menu
-			create {CMS_LOCAL_LINK} lnk.make ("Home", "/")
+			create {CMS_LOCAL_LINK} lnk.make ("Home", "")
 			lnk.set_weight (-10)
 			add_to_primary_menu (lnk)
 			invoke_menu_system_alter (menu_system)
@@ -920,8 +956,8 @@ feature -- Generation
 			end
 
 				-- Variables
-			page.register_variable (request.absolute_script_url (""), "site_url")
-			page.register_variable (request.absolute_script_url (""), "host") -- Same as `site_url'.
+			page.register_variable (absolute_url ("", Void), "site_url")
+			page.register_variable (absolute_url ("", Void), "host") -- Same as `site_url'.
 			page.register_variable (request.is_https, "is_https")
 			if attached current_user_name (request) as l_user then
 				page.register_variable (l_user, "user")
@@ -1029,6 +1065,9 @@ feature -- Generation
 			l_is_active: BOOLEAN
 		do
 			create qs.make_from_string (request.percent_encoded_path_info)
+			if qs.starts_with ("/") then
+				qs.remove_head (1)
+			end
 			l_is_active := qs.same_string (a_lnk.location)
 			if not l_is_active then
 				if attached request.query_string as l_query_string and then not l_query_string.is_empty then
@@ -1102,8 +1141,8 @@ feature {NONE} -- Execution
 --					h.put_location (l_location)
 					response.redirect_now (l_location)
 				else
---					h.put_location (request.absolute_script_url (l_location))
-					response.redirect_now (request.absolute_script_url (l_location))
+--					h.put_location (request.absolute_url (l_location, Void))
+					response.redirect_now (absolute_url (l_location, Void))
 				end
 			else
 				h.put_header_object (header)

src/service/response/error/bad_request_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (request.absolute_script_url (request.path_info), "request")
+			page.register_variable (absolute_url (request.path_info, Void), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.bad_request)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/error/forbidden_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (request.absolute_script_url (request.path_info), "request")
+			page.register_variable (absolute_url (request.path_info, Void), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.forbidden)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/error/internal_server_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (request.absolute_script_url (request.path_info), "request")
+			page.register_variable (absolute_url (request.path_info, Void), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.internal_server_error)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/error/not_found_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (request.absolute_script_url (request.path_info), "request")
+			page.register_variable (absolute_url (request.path_info, Void), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.not_found)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/error/not_implemented_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (request.absolute_script_url (request.path_info), "request")
+			page.register_variable (absolute_url (request.path_info, Void), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.not_implemented)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/message/cms_custom_response_message.e

@@ -0,0 +1,64 @@
+note
+	description: "Custom cms response message."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_CUSTOM_RESPONSE_MESSAGE
+
+inherit
+	CMS_RESPONSE_MESSAGE
+		redefine
+			send_payload_to
+		end
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_code: INTEGER)
+			-- Set `status_code' to `a_code'.
+		require
+			a_code_valid: a_code > 0
+		do
+			initialize
+			status_code := a_code
+		end
+
+feature -- Access
+
+	payload: detachable READABLE_STRING_8
+			-- Optional payload.
+
+feature -- Element change
+
+	set_status_code (a_code: INTEGER)
+			-- Set `status_code' to `a_code'.
+		require
+			a_code_valid: a_code > 0
+		do
+			status_code := a_code
+		end
+
+	set_payload (s: detachable READABLE_STRING_8)
+			-- Set `payload' to `s'.
+		do
+			if s /= Void then
+				payload := s
+				header.put_content_length (s.count)
+			else
+			end
+		end
+
+feature {WSF_RESPONSE} -- Output
+
+	send_payload_to (res: WSF_RESPONSE)
+			-- Send payload data to response `res'.
+		do
+			if attached payload as s then
+				res.put_string (s)
+			end
+		end
+
+end

src/support/cms_pagination_generator.e

@@ -0,0 +1,284 @@
+note
+	description: "Pagination class to generate html pagination links and header summary."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_PAGINATION_GENERATOR
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_resource: READABLE_STRING_8; a_count: NATURAL_64; a_page_size: NATURAL)
+			-- Create an object with a pages of size `a_page_size'.
+			-- If `a_page_size' is zero, use default pagination size.
+		require
+			a_page_size > 0
+		do
+			create resource.make (a_resource)
+			set_page_size (a_page_size)
+			set_upper (a_count)
+			set_current_page_index (1)
+
+			maximum_ith_page_links := 7
+			page_parameter_id := "page"
+			size_parameter_id := "size"
+			set_first_text_id ("<<")
+			set_prev_text_id ("<")
+			set_next_text_id (">")
+			set_last_text_id (">>")
+		end
+
+feature -- Access
+
+	resource: URI_TEMPLATE
+			-- Resource associated with current pager.
+
+	page_size: NATURAL
+			-- Number of items per page.
+
+	upper: NATURAL_64
+			-- number of items.
+			-- if zero, no upper limit.
+
+	current_page_index: INTEGER
+			-- Current page index.
+
+	current_page_offset: NATURAL_64
+			-- Lower index - 1 for current page.
+		do
+			if current_page_index > 1 then
+				Result := (current_page_index - 1).to_natural_32 * page_size
+			else
+				Result := 0
+			end
+		end
+
+feature -- Status report			
+
+	has_upper_limit: BOOLEAN
+			-- Upper limit known?
+		do
+			Result := upper > 0
+		end
+
+	pages_count: INTEGER
+			-- Number of pages.
+			-- If upper is
+		require
+			has_upper_limit: has_upper_limit
+		do
+			Result := (upper // page_size.as_natural_64).to_integer_32
+			if upper \\ page_size.to_natural_64 > 0 then
+				Result := Result + 1
+			end
+		end
+
+feature -- Parameters			
+
+	page_parameter_id: STRING
+			-- Parameter id for page value.
+
+	size_parameter_id: STRING
+			-- Parameter id for size value.
+
+	maximum_ith_page_links: INTEGER
+			-- Maximum number of numeric ith page link.
+			-- ex: max = 6 gives "1 2 3 4 5 6 ... > >>".
+
+	label_first: IMMUTABLE_STRING_32
+	label_previous: IMMUTABLE_STRING_32
+	label_next: IMMUTABLE_STRING_32
+	label_last: IMMUTABLE_STRING_32
+
+feature -- Element change
+
+	set_page_size (a_size: NATURAL)
+			-- Set `page_size' to `a_size'.
+		do
+			page_size := a_size
+		end
+
+	set_upper (a_upper: NATURAL_64)
+			-- Set pages count, or upper limit `upper' to `a_size'.
+		do
+			upper := a_upper
+		end
+
+	set_current_page_index (a_page_index: like current_page_index)
+			-- Set Current page index to `a_page_index'.
+		do
+			current_page_index := a_page_index
+		end
+
+	set_page_parameter_id (a_id: READABLE_STRING_8)
+			-- Set "page" query parameter to `a_id'.
+		do
+			page_parameter_id := a_id
+		end
+
+	set_size_parameter_id (a_id: READABLE_STRING_8)
+			-- Set "size" query parameter to `a_id'.
+		do
+			size_parameter_id := a_id
+		end
+
+	get_setting_from_request (req: WSF_REQUEST)
+			-- Get various pager related settings from request `req' query paramenters.
+			-- Using `page_parameter_id' and `size_parameter_id' value for parameter names.
+		do
+				-- Size
+			if
+				attached {WSF_STRING} req.query_parameter (size_parameter_id) as l_size and then
+				attached l_size.value as l_value and then
+				l_value.is_natural
+			then
+				set_page_size (l_value.to_natural_32)
+			else
+					-- Keep default size
+			end
+
+				-- Page
+			if
+				attached {WSF_STRING} req.query_parameter (page_parameter_id) as l_page and then
+				l_page.is_integer
+			then
+				set_current_page_index (l_page.integer_value)
+			else
+				set_current_page_index (1)
+			end
+		end
+
+	set_first_text_id (s: READABLE_STRING_GENERAL)
+			-- Set label for "First" link to `s'.
+			-- default: "<<"
+		do
+			create label_first.make_from_string_general (s)
+		end
+
+	set_prev_text_id (s: READABLE_STRING_GENERAL)
+			-- Set label for "Prev" link to `s'.
+			-- default: "<"
+		do
+			create label_previous.make_from_string_general (s)
+		end
+
+	set_next_text_id (s: READABLE_STRING_GENERAL)
+			-- Set label for "Next" link to `s'.
+			-- default: ">"
+		do
+			create label_next.make_from_string_general (s)
+		end
+
+	set_last_text_id (s: READABLE_STRING_GENERAL)
+			-- Set label for "Last" link to `s'.
+			-- default: ">>"
+		do
+			create label_last.make_from_string_general (s)
+		end
+
+	set_maximum_ith_page_links (nb: INTEGER)
+			-- Set `maximum_ith_page_links' to `nb'.
+		do
+			maximum_ith_page_links := nb
+		end
+
+feature -- Conversion
+
+	pagination_links: ARRAYED_LIST [CMS_LOCAL_LINK]
+			-- CMS local links related to Current paginations.
+		local
+			lnk: CMS_LOCAL_LINK
+			tb: HASH_TABLE [detachable ANY, STRING_8]
+			curr, max: INTEGER
+			i,j: INTEGER
+		do
+			create Result.make (maximum_ith_page_links)
+
+			curr := current_page_index
+			if has_upper_limit then
+				max := pages_count
+			else
+				max := curr + page_size.to_integer_32
+			end
+
+			create tb.make (2)
+			tb.force (page_size, size_parameter_id)
+			tb.force (1, page_parameter_id)
+			if curr > 1 then
+				create lnk.make (label_first, resource.expanded_string (tb))
+				Result.force (lnk)
+			end
+
+			if curr > 1 then
+				tb.force (curr - 1, "page")
+				create lnk.make (label_previous, resource.expanded_string (tb))
+				Result.force (lnk)
+			end
+			from
+				if curr >= maximum_ith_page_links // 2 then
+					i := curr - (maximum_ith_page_links // 2)
+				else
+					i := 1
+				end
+				j := 0
+			until
+				j >= maximum_ith_page_links or (has_upper_limit and then i > max)
+			loop
+				tb.force (i, "page")
+				create lnk.make (i.out, resource.expanded_string (tb))
+				lnk.set_is_active (i = curr)
+				Result.force (lnk)
+				j := j + 1
+				i := i + 1
+			end
+			if not has_upper_limit or else i < max then
+				tb.force (i, "page")
+				create lnk.make ("...", resource.expanded_string (tb))
+				Result.force (lnk)
+			end
+
+			if curr < max then
+				tb.force (curr + 1, "page")
+				create lnk.make (label_next, resource.expanded_string (tb))
+				Result.force (lnk)
+			end
+
+			if upper > 0 and curr /= max then
+				tb.force (max, "page")
+				create lnk.make (label_last, resource.expanded_string (tb))
+				Result.force (lnk)
+			end
+		end
+
+feature -- Convertion
+
+	append_to_html (a_response: CMS_RESPONSE; a_output: STRING)
+			-- Append html pager to `a_output' in the context of `a_response'.
+			-- note: First, [Prev], [Next], Last.
+		local
+			lnk: CMS_LOCAL_LINK
+		do
+			a_output.append ("<ul class=%"pagination%">%N")
+			across
+				pagination_links as ic
+			loop
+				lnk := ic.item
+				if lnk.is_active then
+					a_output.append ("<li class=%"active%">")
+				elseif lnk.title.same_string (label_previous) then
+					a_output.append ("<li class=%"previous%">")
+				elseif lnk.title.same_string (label_next) then
+					a_output.append ("<li class=%"next%">")
+				else
+					a_output.append ("<li>")
+				end
+				a_output.append (a_response.link (lnk.title, lnk.location, Void))
+				a_output.append ("</li>")
+			end
+			a_output.append ("</ul>")
+		end
+
+end

src/theme/cms_theme.e

@@ -1,7 +1,7 @@
 note
 	description: "Abstract class describing a generic theme"
-	date: "$Date: 2015-02-16 12:52:35 +0100 (lun., 16 févr. 2015) $"
-	revision: "$Revision: 96630 $"
+	date: "$Date: 2015-05-20 11:48:26 +0200 (mer., 20 mai 2015) $"
+	revision: "$Revision: 97327 $"
 
 deferred class
 	CMS_THEME
@@ -9,6 +9,8 @@ deferred class
 inherit
 	CMS_ENCODERS
 
+	CMS_URL_UTILITIES
+
 	REFACTORING_HELPER
 
 
@@ -16,6 +18,12 @@ feature {NONE} -- Access
 
 	setup:  CMS_SETUP
 
+	site_url: IMMUTABLE_STRING_8
+			-- Absolute URL for Current CMS site.
+
+	base_url: detachable IMMUTABLE_STRING_8
+			-- Optional base url of current CMS site.
+
 feature -- Access
 
 	name: STRING
@@ -41,6 +49,31 @@ feature -- Status report
 			Result := across regions as ic some a_region_name.is_case_insensitive_equal (ic.item) end
 		end
 
+feature -- Element change
+
+	set_site_url (a_url: READABLE_STRING_8)
+			-- Set `site_url' to `a_url'.
+		require
+			a_url.ends_with_general ("/")
+		local
+			i,j: INTEGER
+		do
+			base_url := Void
+			if a_url [a_url.count] = '/' then
+				create site_url.make_from_string (a_url)
+			else
+				create site_url.make_from_string (a_url + "/")
+			end
+
+			i := a_url.substring_index ("://", 1)
+			if i > 0 then
+				j := a_url.index_of ('/', i + 3)
+				if j > 0 then
+					create base_url.make_from_string (a_url.substring (j, a_url.count))
+				end
+			end
+		end
+
 feature -- Conversion
 
 	menu_html (a_menu: CMS_MENU; is_horizontal: BOOLEAN; a_options: detachable CMS_HTML_OPTIONS): STRING_8
@@ -133,7 +166,11 @@ feature {NONE} -- Implementation
 			else
 				s.append ("<li class=%""+ cl + "%">")
 			end
-			s.append ("<a href=%"" +  (lnk.location) + "%">" + html_encoded (lnk.title) + "</a>")
+			s.append ("<a href=%"")
+			s.append (url (lnk.location, Void))
+			s.append ("%">")
+			s.append (html_encoded (lnk.title))
+			s.append ("</a>")
 			if
 				(lnk.is_expanded or lnk.is_collapsed) and then
 				attached lnk.children as l_children

src/theme/missing_theme/missing_cms_theme.e

@@ -18,15 +18,19 @@ create
 
 feature {NONE} -- Initialization
 
-	make (a_setup: like setup)
+	make (a_setup: like setup; a_info: like information; abs_site_url: READABLE_STRING_8)
 		do
 			setup := a_setup
+			information := a_info
+			set_site_url (abs_site_url)
 		ensure
 			setup_set: setup = a_setup
 		end
 
 feature -- Access
 
+	information: CMS_THEME_INFORMATION
+
 	name: STRING = "missing theme"
 
 	regions: ARRAY [STRING]

src/theme/smarty_theme/smarty_cms_theme.e

@@ -14,7 +14,7 @@ create
 
 feature {NONE} -- Initialization
 
-	make (a_setup: like setup; a_info: like information;)
+	make (a_setup: like setup; a_info: like information; abs_site_url: READABLE_STRING_8)
 		do
 			setup := a_setup
 			information := a_info
@@ -23,6 +23,7 @@ feature {NONE} -- Initialization
 			else
 				templates_directory := a_setup.theme_location
 			end
+			set_site_url (abs_site_url)
 		ensure
 			setup_set: setup = a_setup
 			information_set: information = a_info

src/theme/wsf/cms_to_wsf_theme.e

@@ -1,10 +1,10 @@
 note
-	description: "Summary description for {WSF_CMS_THEME}."
+	description: "Theme from the EWF framework, but dedicated for the CMS."
 	date: "$Date$"
 	revision: "$Revision$"
 
 class
-	WSF_CMS_THEME
+	CMS_TO_WSF_THEME
 
 inherit
 	WSF_THEME
@@ -25,13 +25,14 @@ feature -- Access
 
 	request: WSF_REQUEST
 
-	response: detachable CMS_RESPONSE
+	response: CMS_RESPONSE
 
 	cms_theme: CMS_THEME
 
 feature -- Element change
 
 	set_response (a_response: CMS_RESPONSE)
+			-- Set `response' to `a_response'.
 		do
 			response := a_response
 		end
@@ -39,20 +40,15 @@ feature -- Element change
 feature -- Core
 
 	site_url: READABLE_STRING_8
+			-- CMS site url.
 		do
-			if attached response as r then
-				Result := r.site_url
-			else
-				Result := request.absolute_script_url ("")
-			end
+			Result := response.site_url
 		end
 
 	base_url: detachable READABLE_STRING_8
 			-- Base url if any.
 		do
-			if attached response as r then
-				Result := r.base_url
-			end
+			Result := response.base_url
 		end
 
 end

src/theme/wsf/wsf_cms_theme.e

@@ -0,0 +1,17 @@
+note
+	description: "Summary description for {WSF_CMS_THEME}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	WSF_CMS_THEME
+
+obsolete "Use CMS_TO_WSF_THEME [2015-May]"
+
+inherit
+	CMS_TO_WSF_THEME
+
+create
+	make
+
+end