Keep the until date in the form data, so that new filter will remember the until date.

Simplified the add child mechanism, by using a query parameter ?parent=nid
(instead of specific node/{nid}/add_child/page url) Fixed implementation of `CMS_NODE_API.is_node_a_parent_of (..)', and improved parent validity checking against cycle.
2015-09-09 23:12:52 +02:00 · 2015-09-09 23:04:08 +02:00 · 2015-09-09 22:10:13 +02:00 · 2015-09-09 22:05:23 +02:00 · 2015-09-09 21:58:16 +02:00 · 2015-09-09 16:53:37 +02:00
65 changed files with 1708 additions and 568 deletions
--- a/examples/demo/demo-safe.ecf
+++ b/examples/demo/demo-safe.ecf
@@ -24,6 +24,7 @@
 		<library name="cms_oauth_20_module" location="..\..\modules\oauth20\oauth20-safe.ecf" readonly="false"/>
 		<library name="cms_openid_module" location="..\..\modules\openid\openid-safe.ecf" readonly="false"/>
 		<library name="cms_admin_module" location="..\..\modules\admin\admin-safe.ecf" readonly="false"/>
+		<library name="cms_recent_changes_module" location="..\..\modules\recent_changes\recent_changes-safe.ecf" readonly="false"/>
 		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-safe.ecf" readonly="false"/>
 		<!--
 		<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-safe.ecf" readonly="false"/>
--- a/examples/demo/install_modules.bat
+++ b/examples/demo/install_modules.bat
@@ -1,9 +1,12 @@
 setlocal
-set ROC_CMD=%~dp0..\..\tools\roc.exe
+set ROC_CMD=call %~dp0..\..\tools\roc.bat
 set ROC_CMS_DIR=%~dp0

+%ROC_CMD% install --module ..\..\modules\admin	--dir %ROC_CMS_DIR%
 %ROC_CMD% install --module ..\..\modules\auth	--dir %ROC_CMS_DIR%
 %ROC_CMD% install --module ..\..\modules\basic_auth	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\node	--dir %ROC_CMS_DIR%
 %ROC_CMD% install --module ..\..\modules\blog	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\node	--dir %ROC_CMS_DIR%
 %ROC_CMD% install --module ..\..\modules\oauth20	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\openid	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\recent_changes	--dir %ROC_CMS_DIR%
--- a/examples/demo/modules/demo/cms_demo_module.e
+++ b/examples/demo/modules/demo/cms_demo_module.e
@@ -87,8 +87,8 @@ feature -- Hooks

 	register_hooks (a_response: CMS_RESPONSE)
 		do
-			a_response.subscribe_to_menu_system_alter_hook (Current)
-			a_response.subscribe_to_block_hook (Current)
+			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_response.hooks.subscribe_to_block_hook (Current)
 		end

 	block_list: ITERABLE [like {CMS_BLOCK}.name]
--- a/examples/demo/site/config/cms.ini
+++ b/examples/demo/site/config/cms.ini
@@ -31,6 +31,9 @@ node=on
 oauth20=on
 openid=on

+[blocks]
+#navigation.region=sidebar_first
+
 [admin]
 # CMS Installation, are accessible by "all", "none" or uppon "permission". (default is none)
 installation_access=permission
--- a/examples/demo/site/modules/auth/mail_templates/account_new_password.html
+++ b/examples/demo/site/modules/auth/mail_templates/account_new_password.html
@@ -8,10 +8,10 @@
 	</head>

 	<body>
-		<p>You have required a new password at <a href="...">ROC CMS</a></p>
+		<p>You have required a new password at <a href="$host">ROC CMS</a></p>

 		<p>To complete your request, please click on this link to genereate a new password:<p>

 		<p><a href="$link">$link</a></p>
 	</body>
-</html>
+</html>
--- a/examples/demo/site/modules/auth/mail_templates/account_re_activation.html
+++ b/examples/demo/site/modules/auth/mail_templates/account_re_activation.html
@@ -8,11 +8,11 @@
 	</head>

 	<body>
-		<p>You have request a new activation token at<a href="...">ROC CMS</a></p>
+		<p>You have request a new activation token at <a href="$host">ROC CMS</a></p>

 		<p>To complete your registration, please click on this link to activate your account:<p>

 		<p><a href="$link">$link</a></p>
 		<p>Thank you for joining us.</p>
 	</body>
-</html>
+</html>
--- a/examples/demo/site/modules/auth/mail_templates/account_welcome.html
+++ b/examples/demo/site/modules/auth/mail_templates/account_welcome.html
@@ -7,7 +7,7 @@
 	  <meta name="author" content="ROC CMS">
 	</head>
 	<body>
-		<p>Welcome to<a href="...">ROC CMS</a></p>
+		<p>Welcome to<a href="$host">ROC CMS</a></p>
 		<p>Thank you for joining us.</p>
 	</body>
-</html>
+</html>
--- a/examples/demo/site/modules/auth/templates/block_login.tpl
+++ b/examples/demo/site/modules/auth/templates/block_login.tpl
@@ -25,5 +25,5 @@
 				</p>
 			</div>
 		</div>	
-	{/unless}
-</div>
+		{/unless}
+	</div>
--- a/examples/demo/site/modules/basic_auth/files/js/roc_basic_auth.js
+++ b/examples/demo/site/modules/basic_auth/files/js/roc_basic_auth.js
@@ -25,7 +25,7 @@ ROC_AUTH.login = function() {
                    var newdiv = document.createElement('div');
 	                  newdiv.innerHTML = "<br>Invalid Credentials</br>";
                    newdiv.id = 'myModalFormId';
-                     $("body").append(newdiv);
+                     $(".primary-tabs").append(newdiv);
               } 
 	}else{  
         
@@ -49,7 +49,7 @@ ROC_AUTH.login = function() {
                    var newdiv = document.createElement('div');
 	                   newdiv.innerHTML = "<br>Invalid Credentials</br>";
                    newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
+                    $(".primary-tabs").append(newdiv);
                   } 

                  }
@@ -93,7 +93,7 @@ ROC_AUTH.login_with_redirect = function() {
                    var newdiv = document.createElement('div');
                      newdiv.innerHTML = "<br>Invalid Credentials</br>";
                    newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
+                    $(".primary-tabs").append(newdiv);
                     $("#imgProgressRedirect").hide();
               } 
    }else{  
@@ -122,8 +122,8 @@ ROC_AUTH.login_with_redirect = function() {
                    var newdiv = document.createElement('div');
                       newdiv.innerHTML = "<br>Invalid Credentials</br>";
                    newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
-                     $("#imgProgressRedirect").hide();    
+                    $(".primary-tabs").append(newdiv);
+                    $("#imgProgressRedirect").hide();    
                   } 

                  }
--- a/examples/demo/site/modules/basic_auth/templates/block_login.tpl
+++ b/examples/demo/site/modules/basic_auth/templates/block_login.tpl
@@ -5,12 +5,12 @@
 			<div>	
 			    <form name="cms_basic_auth" action method="POST">
 					<div>
-						<input type="text" name="username" required>
+						<input type="text" name="username" id="username" required>
 						<label>Username</label>
 					</div>
 										
 					<div>
-						<input  type="password" name="password" required>
+						<input  type="password" name="password"  id="password" required>
 						<label>Password</label>
 					</div>
        
@@ -25,10 +25,5 @@
 				</p>
 			</div>
 		</div>	
-		<div>
-			{foreach item="item" from="$oauth_consumers"}
-				<a href="{$site_url/}account/login-with-oauth/{$item/}">Login with {$item/}</a><br>
-			{/foreach}	
-		</div>    	
 		{/unless}
 	</div>
--- a/examples/demo/site/themes/bootstrap/assets/css/style.css
+++ b/examples/demo/site/themes/bootstrap/assets/css/style.css
@@ -51,16 +51,24 @@ ul.horizontal li {
 .sidebar {
  padding: 5px;
  margin: 3px;
-  border: solid 1px #ccc;
+  /* border: solid 1px #ccc; */
 }
 .sidebar#sidebar_first {
  width: 250px;
-  float: left;
+  position: fixed;
+  top: 45px;
+  left: 0;
+  bottom: 0;
+  width: 200px;
+  border-right: solid 1px #ddd;
 }
 .sidebar#sidebar_second {
  width: 250px;
  float: right;
 }
+.sidebar + .main {
+  margin-left: 200px;
+}

 #primary-tabs ul.horizontal {
  list-style-type: none;
--- a/examples/demo/site/themes/bootstrap/assets/scss/style.scss
+++ b/examples/demo/site/themes/bootstrap/assets/scss/style.scss
@@ -55,15 +55,24 @@ ul.horizontal {
 .sidebar {
 	padding: 5px;
 	margin: 3px;
-	border: solid 1px #ccc;
+	/* border: solid 1px #ccc; */
 	&#sidebar_first {
 		width: 250px;
-		float: left;
+		position: fixed;
+		top: 45px;
+		left: 0;
+		bottom: 0;
+		width: 200px;
+		border-right: solid 1px #ddd;
 	}
 	&#sidebar_second {
 		width: 250px;
 		float: right;
 	}
+
+	&+.main {
+		margin-left: 200px;
+	}
 }
 #primary-tabs {
 	ul.horizontal {
--- a/examples/demo/site/themes/bootstrap/page.tpl
+++ b/examples/demo/site/themes/bootstrap/page.tpl
@@ -49,7 +49,7 @@
 		{/unless}

        <!-- Highlighted, Help, Content -->      
-        <div class='span8 main'>
+        <div id='main' class='span8 main'>
          <!-- Highlighted Section -->
          {unless isempty="$page.region_highlighted"}
 		  <div id="highlighted">{$page.region_highlighted/}</div>
--- a/examples/demo/site/themes/bootstrap/theme.info
+++ b/examples/demo/site/themes/bootstrap/theme.info
@@ -8,7 +8,7 @@ regions[content] = Content
 regions[highlighted] = Highlighted
 regions[help] = Help
 regions[footer] = Footer
-regions[first_sidebar] = first sidebar
-regions[second_sidebar] = second sidebar
+regions[sidebar_first] = first sidebar
+regions[sidebar_second] = second sidebar
 regions[page_bottom] = Bottom
-navigation=default_nav
+navigation=default_nav
--- a/examples/demo/src/ewf_roc_server_execution.e
+++ b/examples/demo/src/ewf_roc_server_execution.e
@@ -78,6 +78,11 @@ feature -- CMS setup
 			create {CMS_BLOG_MODULE} m.make
 			a_setup.register_module (m)

+				-- Recent changes
+			create {CMS_RECENT_CHANGES_MODULE} m.make
+			a_setup.register_module (m)
+
+
 				-- Miscellanious
 			create {CMS_DEBUG_MODULE} m.make
 			a_setup.register_module (m)
--- a/modules/admin/cms_admin_module.e
+++ b/modules/admin/cms_admin_module.e
@@ -90,6 +90,7 @@ feature -- Security
 			Result.force ("admin users")
 			Result.force ("admin roles")
 			Result.force ("admin modules")
+			Result.force ("install modules")
 		end

 feature -- Hooks
@@ -97,8 +98,8 @@ feature -- Hooks
 	register_hooks (a_response: CMS_RESPONSE)
 			-- <Precursor>
 		do
-			a_response.subscribe_to_menu_system_alter_hook (Current)
-			a_response.subscribe_to_response_alter_hook (Current)
+			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_response.hooks.subscribe_to_response_alter_hook (Current)
 		end

 	response_alter (a_response: CMS_RESPONSE)
@@ -117,7 +118,7 @@ feature -- Hooks
 					-- TODO: we should probably use more side menu and less primary_menu.
 				create lnk.make ("Admin", "admin")
 				lnk.set_permission_arguments (<<"manage " + {CMS_ADMIN_MODULE}.name>>)
-				a_menu_system.primary_menu.extend (lnk)
+				a_menu_system.management_menu.extend (lnk)
 			end
 		end

--- a/modules/admin/handler/role/cms_role_form_response.e
+++ b/modules/admin/handler/role/cms_role_form_response.e
@@ -84,7 +84,7 @@ feature -- Process Edit
 		do
 			create b.make_empty
 			f := new_edit_form (a_role, url (request.percent_encoded_path_info, Void), "edit-user")
-			invoke_form_alter (f, fd)
+			hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.validation_actions.extend (agent edit_form_validate(?,a_role, b))
 				f.submit_actions.extend (agent edit_form_submit(?, a_role, b))
@@ -117,7 +117,7 @@ feature -- Process Delete
 		do
 			create b.make_empty
 			f := new_delete_form (a_role, url (request.percent_encoded_path_info, Void), "edit-user")
-			invoke_form_alter (f, fd)
+			hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.process (Current)
 				fd := f.last_data
@@ -149,7 +149,7 @@ feature -- Process New
 		do
 			create b.make_empty
 			f := new_edit_form (l_role, url (request.percent_encoded_path_info, Void), "create-role")
-			invoke_form_alter (f, fd)
+			hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.validation_actions.extend (agent new_form_validate(?, b))
 				f.submit_actions.extend (agent edit_form_submit(?, l_role, b))
--- a/modules/admin/handler/user/cms_user_form_response.e
+++ b/modules/admin/handler/user/cms_user_form_response.e
@@ -86,7 +86,7 @@ feature -- Process Edit
 		do
 			create b.make_empty
 			f := new_edit_form (a_user, url (location, Void), "edit-user")
-			invoke_form_alter (f, fd)
+			hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.submit_actions.extend (agent edit_form_submit (?, a_user, b))
 				f.process (Current)
@@ -118,7 +118,7 @@ feature -- Process Delete
 		do
 			create b.make_empty
 			f := new_delete_form (a_user, url (location, Void), "edit-user")
-			invoke_form_alter (f, fd)
+			hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.process (Current)
 				fd := f.last_data
@@ -151,7 +151,7 @@ feature -- Process New
 		do
 			create b.make_empty
 			f := new_edit_form (l_user, url (location, Void), "create-user")
-			invoke_form_alter (f, fd)
+			hooks.invoke_form_alter (f, fd, Current)
 			if request.is_post_request_method then
 				f.validation_actions.extend (agent new_form_validate (?, b))
 				f.submit_actions.extend (agent edit_form_submit (?, l_user, b))
--- a/modules/auth/cms_authentication_module.e
+++ b/modules/auth/cms_authentication_module.e
@@ -95,8 +95,8 @@ feature -- Hooks configuration
 			-- Module hooks configuration.
 		do
 			auto_subscribe_to_hooks (a_response)
-			a_response.subscribe_to_block_hook (Current)
-			a_response.subscribe_to_value_table_alter_hook (Current)
+			a_response.hooks.subscribe_to_block_hook (Current)
+			a_response.hooks.subscribe_to_value_table_alter_hook (Current)
 		end

 	value_table_alter (a_value: CMS_VALUE_TABLE; a_response: CMS_RESPONSE)
--- a/modules/basic_auth/cms_basic_auth_module.e
+++ b/modules/basic_auth/cms_basic_auth_module.e
@@ -105,8 +105,8 @@ feature -- Hooks configuration
 			-- Module hooks configuration.
 		do
 			auto_subscribe_to_hooks (a_response)
-			a_response.subscribe_to_block_hook (Current)
-			a_response.subscribe_to_value_table_alter_hook (Current)
+			a_response.hooks.subscribe_to_block_hook (Current)
+			a_response.hooks.subscribe_to_value_table_alter_hook (Current)
 		end

 feature -- Hooks
--- a/modules/basic_auth/handler/cms_basic_auth_logoff_handler.e
+++ b/modules/basic_auth/handler/cms_basic_auth_logoff_handler.e
@@ -47,6 +47,7 @@ feature -- HTTP Methods
 			l_page: CMS_RESPONSE
 			l_url: STRING
 			i: INTEGER
+			l_message: STRING
 		do
 			api.logger.put_information (generator + ".do_get Processing basic auth logoff", Void)
 			if attached req.query_parameter ("prompt") as l_prompt then
@@ -72,6 +73,10 @@ feature -- HTTP Methods
 					l_page.set_status_code ({HTTP_STATUS_CODE}.found)
 					l_page.set_redirection (l_url)
 				end
+				create l_message.make_from_string (logout_message)
+				l_message.replace_substring_all ("$site_login", req.absolute_script_url ("/account/roc-login"))
+				l_message.replace_substring_all ("$site_home", req.absolute_script_url (""))
+				l_page.set_main_content (l_message)
 				l_page.execute
 			end
 		end
@@ -113,4 +118,15 @@ feature -- HTTP Methods
            end
        end

+
+ feature {NONE}-- Lougout Message
+
+	logout_message: STRING = "[
+		<div class="cms-logout-message">
+			<h2>You are now signed out</h2>
+			<p>You can <a href="$site_login">log</a> in again, or go to the <a href="$site_home">front page</a>.</p>
+		</div>
+	]"
+
+
 end
--- a/modules/basic_auth/site/files/js/roc_basic_auth.js
+++ b/modules/basic_auth/site/files/js/roc_basic_auth.js
@@ -25,7 +25,7 @@ ROC_AUTH.login = function() {
                    var newdiv = document.createElement('div');
 	                  newdiv.innerHTML = "<br>Invalid Credentials</br>";
                    newdiv.id = 'myModalFormId';
-                     $("body").append(newdiv);
+                     $(".primary-tabs").append(newdiv);
               } 
 	}else{  
         
@@ -49,7 +49,7 @@ ROC_AUTH.login = function() {
                    var newdiv = document.createElement('div');
 	                   newdiv.innerHTML = "<br>Invalid Credentials</br>";
                    newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
+                    $(".primary-tabs").append(newdiv);
                   } 

                  }
@@ -93,7 +93,7 @@ ROC_AUTH.login_with_redirect = function() {
                    var newdiv = document.createElement('div');
                      newdiv.innerHTML = "<br>Invalid Credentials</br>";
                    newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
+                    $(".primary-tabs").append(newdiv);
                     $("#imgProgressRedirect").hide();
               } 
    }else{  
@@ -122,8 +122,8 @@ ROC_AUTH.login_with_redirect = function() {
                    var newdiv = document.createElement('div');
                       newdiv.innerHTML = "<br>Invalid Credentials</br>";
                    newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
-                     $("#imgProgressRedirect").hide();    
+                    $(".primary-tabs").append(newdiv);
+                    $("#imgProgressRedirect").hide();    
                   } 

                  }
--- a/modules/basic_auth/site/templates/block_login.tpl
+++ b/modules/basic_auth/site/templates/block_login.tpl
@@ -5,12 +5,12 @@
 			<div>	
 			    <form name="cms_basic_auth" action method="POST">
 					<div>
-						<input type="text" name="username" required>
+						<input type="text" name="username" id="username" required>
 						<label>Username</label>
 					</div>
 										
 					<div>
-						<input  type="password" name="password" required>
+						<input  type="password" name="password"  id="password" required>
 						<label>Password</label>
 					</div>
        
--- a/modules/blog/cms_blog_module.e
+++ b/modules/blog/cms_blog_module.e
@@ -151,8 +151,8 @@ feature -- Hooks

 	register_hooks (a_response: CMS_RESPONSE)
 		do
-			a_response.subscribe_to_menu_system_alter_hook (Current)
-			a_response.subscribe_to_response_alter_hook (Current)
+			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_response.hooks.subscribe_to_response_alter_hook (Current)
 		end

 	response_alter (a_response: CMS_RESPONSE)
--- a/modules/blog/cms_node_storage_sql_blog_extension.e
+++ b/modules/blog/cms_node_storage_sql_blog_extension.e
@@ -136,11 +136,13 @@ feature {NONE} -- Implementation
 					check unique_data: n = 0 end
 				end
 			end
+		ensure
+			accepted_revision: Result /= Void implies Result.revision <= a_node.revision
 		end

 feature -- SQL

-	sql_select_node_data: STRING = "SELECT nid, revision, tags FROM blog_post_nodes WHERE nid =:nid AND revision<=:revision ORDER BY revision DESC LIMIT 1;"
+	sql_select_node_data: STRING = "SELECT nid, revision, tags FROM blog_post_nodes WHERE nid=:nid AND revision<=:revision ORDER BY revision DESC LIMIT 1;"
 	sql_insert_node_data: STRING = "INSERT INTO blog_post_nodes (nid, revision, tags) VALUES (:nid, :revision, :tags);"
 	sql_update_node_data: STRING = "UPDATE blog_post_nodes SET nid=:nid, revision=:revision, tags=:tags WHERE nid=:nid AND revision=:revision;"

--- a/modules/node/cms_node_api.e
+++ b/modules/node/cms_node_api.e
@@ -236,28 +236,43 @@ feature -- Access: Node
 		end

 	recent_nodes (params: CMS_DATA_QUERY_PARAMETERS): ITERABLE [CMS_NODE]
-			-- List of the `a_rows' most recent nodes starting from  `a_offset'.
+			-- List of most recent nodes according to `params.offset' and `params.size'.
 		do
 			Result := node_storage.recent_nodes (params.offset.to_integer_32, params.size.to_integer_32)
 		end

+	recent_node_changes_before (params: CMS_DATA_QUERY_PARAMETERS; a_date: DATE_TIME): ITERABLE [CMS_NODE]
+			-- List of recent changes, before `a_date', according to `params' settings.
+		do
+			Result := node_storage.recent_node_changes_before (params.offset.to_integer_32, params.size.to_integer_32, a_date)
+		end
+
 	node (a_id: INTEGER_64): detachable CMS_NODE
 			-- Node by ID.
 		do
 			debug ("refactor_fixme")
 				fixme ("Check preconditions")
 			end
-			Result := full_node (node_storage.node_by_id (a_id))
+			Result := safe_full_node (node_storage.node_by_id (a_id))
 		end

 	revision_node (a_node_id: INTEGER_64; a_revision_id: INTEGER_64): detachable CMS_NODE
 		do
-			Result := full_node (node_storage.node_by_id_and_revision (a_node_id, a_revision_id))
+			Result := safe_full_node (node_storage.node_by_id_and_revision (a_node_id, a_revision_id))
 		end

-	full_node (a_node: detachable CMS_NODE): detachable CMS_NODE
+	safe_full_node (a_node: detachable CMS_NODE): detachable CMS_NODE
+		do
+			if a_node /= Void then
+				Result := full_node (a_node)
+			end
+		end
+
+	full_node (a_node: CMS_NODE): CMS_NODE
 			-- If `a_node' is partial, return the full node from `a_node',
 			-- otherwise return directly `a_node'.
+		require
+			a_node_set: a_node /= Void
 		do
 			if attached {CMS_PARTIAL_NODE} a_node as l_partial_node then
 				if attached node_type_for (l_partial_node) as ct then
@@ -266,14 +281,17 @@ feature -- Access: Node
 				else
 					Result := l_partial_node
 				end
+					-- Update link with aliasing.
+				if Result /= Void and then Result.has_id then
+					Result.set_link (node_link (Result))
+				end
 			else
 				Result := a_node
+				if Result.has_id and Result.link = Void then
+					Result.set_link (node_link (Result))
+				end
 			end
-
-				-- Update link with aliasing.
-			if a_node /= Void and then a_node.has_id then
-				a_node.set_link (node_link (a_node))
-			end
+			check has_link: Result.has_id implies attached Result.link as lnk and then lnk.location.same_string (node_link (Result).location) end

 				-- Update partial user if needed.
 			if
@@ -312,6 +330,47 @@ feature -- Access: Node
 			end
 		end

+feature -- Access: page/book outline
+
+	children (a_node: CMS_NODE): detachable LIST [CMS_NODE]
+			-- Children of node `a_node'.
+			-- note: this is the partial version of the nodes.
+		do
+			Result := node_storage.children (a_node)
+		end
+
+	available_parents_for_node (a_node: CMS_NODE): LIST [CMS_NODE]
+			-- Potential parent nodes for node `a_node'.
+			-- Ensure no cycle exists.
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+			across node_storage.available_parents_for_node (a_node) as ic loop
+				check distinct: not a_node.same_node (ic.item) end
+				if not is_node_a_parent_of (a_node, ic.item) then
+					Result.force (ic.item)
+				end
+			end
+		ensure
+			no_cycle: across Result as c all not is_node_a_parent_of (a_node, c.item) end
+		end
+
+	is_node_a_parent_of (a_node: CMS_NODE; a_child: CMS_NODE): BOOLEAN
+			-- Is `a_node' a direct or indirect parent of node `a_child'?
+		require
+			distinct_nodes: not a_node.same_node (a_child)
+		do
+			if
+				attached {CMS_PAGE} full_node (a_child) as l_child_page and then
+				attached l_child_page.parent as l_parent
+			then
+				if l_parent.same_node (a_node) then
+					Result := True
+				else
+					Result := is_node_a_parent_of (a_node, l_parent)
+				end
+			end
+		end
+
 feature -- Permission Scope: Node

 	has_permission_for_action_on_node (a_action: READABLE_STRING_8; a_node: CMS_NODE; a_user: detachable CMS_USER; ): BOOLEAN
@@ -350,6 +409,7 @@ feature -- Change: Node

 	delete_node (a_node: CMS_NODE)
 			-- Delete `a_node'.
+			--! remove the node from the storage.
 		do
 			reset_error
 			if a_node.has_id then
@@ -368,7 +428,7 @@ feature -- Change: Node

 	trash_node (a_node: CMS_NODE)
 			-- Trash node `a_node'.
-			--! remove the node from the storage.
+			-- Soft delete
 		do
 			reset_error
 			node_storage.trash_node (a_node)
--- a/modules/node/cms_node_module.e
+++ b/modules/node/cms_node_module.e
@@ -23,6 +23,8 @@ inherit

 	CMS_HOOK_BLOCK

+	CMS_RECENT_CHANGES_HOOK
+
 create
 	make

@@ -168,9 +170,12 @@ feature -- Access
 						Result.force ("trash own " + l_type_name)
 						Result.force ("restore own " + l_type_name)

+						Result.force ("view unpublished " + l_type_name)
+
 						Result.force ("view revisions own " + l_type_name)
 					end
 				end
+				Result.force ("view trash")
 			end
 		end

@@ -222,9 +227,12 @@ feature -- Hooks
 	register_hooks (a_response: CMS_RESPONSE)
 			-- <Precursor>
 		do
-			a_response.subscribe_to_menu_system_alter_hook (Current)
-			a_response.subscribe_to_block_hook (Current)
-			a_response.subscribe_to_response_alter_hook (Current)
+			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_response.hooks.subscribe_to_block_hook (Current)
+			a_response.hooks.subscribe_to_response_alter_hook (Current)
+
+				-- Module specific hook, if available.
+			a_response.hooks.subscribe_to_hook (Current, {CMS_RECENT_CHANGES_HOOK})
 		end

 	response_alter (a_response: CMS_RESPONSE)
@@ -250,16 +258,99 @@ feature -- Hooks
 	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
 		local
 			lnk: CMS_LOCAL_LINK
+			perms: ARRAYED_LIST [READABLE_STRING_8]
 		do
 			debug
 				create lnk.make ("List of nodes", "nodes")
-				a_menu_system.primary_menu.extend (lnk)
+				a_menu_system.navigation_menu.extend (lnk)
 			end
 			create lnk.make ("Trash", "trash")
-			a_menu_system.primary_menu.extend (lnk)
+			a_menu_system.navigation_menu.extend (lnk)
+			lnk.set_permission_arguments (<<"view trash">>)

 			create lnk.make ("Create ..", "node")
-			a_menu_system.primary_menu.extend (lnk)
+			a_menu_system.navigation_menu.extend (lnk)
+			if attached node_api as l_node_api then
+				create perms.make (2)
+				perms.force ("create any node")
+				across
+					l_node_api.content_types as ic
+				loop
+					perms.force ("create " + ic.item.name)
+				end
+				lnk.set_permission_arguments (perms)
+			end
+		end
+
+	recent_changes_sources: detachable LIST [READABLE_STRING_8]
+			-- <Precursor>
+		local
+			lst: ARRAYED_LIST [READABLE_STRING_8]
+		do
+			if
+				attached node_api as l_node_api and then
+				attached l_node_api.content_types as l_types and then
+				not l_types.is_empty
+			then
+				create lst.make (l_types.count)
+				across
+					l_types as ic
+				loop
+					lst.force (ic.item.name)
+				end
+				Result := lst
+			end
+		end
+
+	populate_recent_changes (a_changes: CMS_RECENT_CHANGE_CONTAINER; a_current_user: detachable CMS_USER)
+		local
+			params: CMS_DATA_QUERY_PARAMETERS
+			ch: CMS_RECENT_CHANGE_ITEM
+			n: CMS_NODE
+			l_info: STRING_8
+			l_src: detachable READABLE_STRING_8
+			l_nodes: ITERABLE [CMS_NODE]
+			l_date: detachable DATE_TIME
+		do
+			create params.make (0, a_changes.limit)
+			if attached node_api as l_node_api then
+				l_src := a_changes.source
+				l_date := a_changes.date
+				if l_date = Void then
+					create l_date.make_now_utc
+				end
+				l_nodes := l_node_api.recent_node_changes_before (params, l_date)
+				across l_nodes as ic loop
+					n := ic.item
+					if l_src = Void or else l_src.is_case_insensitive_equal_general (n.content_type) then
+						if l_node_api.has_permission_for_action_on_node ("view", n, a_current_user) then
+							n := l_node_api.full_node (n)
+							create ch.make (n.content_type, create {CMS_LOCAL_LINK}.make (n.title, "node/" + n.id.out), n.modification_date)
+							if n.creation_date ~ n.modification_date then
+								l_info := "new"
+								if not n.is_published then
+									l_info.append (" (unpublished)")
+								end
+							else
+								if n.is_trashed then
+									l_info := "deleted"
+								else
+									l_info := "updated"
+									if not n.is_published then
+										l_info.append (" (unpublished)")
+									end
+								end
+							end
+							ch.set_information (l_info)
+							ch.set_author (n.author)
+							a_changes.force (ch)
+						else
+							-- Forbidden
+							-- FIXME: provide a visual indication!
+						end
+					end
+				end
+			end
 		end

 end
--- a/modules/node/content/cms_node.e
+++ b/modules/node/content/cms_node.e
@@ -10,7 +10,7 @@ deferred class
 	CMS_NODE

 inherit
-
+	DEBUG_OUTPUT
 	REFACTORING_HELPER

 feature{NONE} -- Initialization
@@ -166,6 +166,23 @@ feature -- Access: menu
 	link: detachable CMS_LOCAL_LINK
 			-- Associated menu link.

+feature -- Status report
+
+	debug_output: STRING_32
+			-- <Precursor>
+		do
+			create Result.make_from_string_general ("#")
+			Result.append_integer_64 (id)
+			Result.append_character (' ')
+			Result.append_character ('<')
+			Result.append_string_general (content_type)
+			Result.append_character ('>')
+			Result.append_character (' ')
+			Result.append_character ('%"')
+			Result.append (title)
+			Result.append_character ('%"')
+		end
+
 feature -- Element change

 	set_content (a_content: like content; a_summary: like summary; a_format: like format)
--- a/modules/node/handler/cms_node_type_webform_manager.e
+++ b/modules/node/handler/cms_node_type_webform_manager.e
@@ -62,14 +62,14 @@ feature -- Forms ...
 				sum.set_text_value (a_node.summary)
 			end
 			sum.set_label ("Summary")
-			sum.set_description ("This is the summary")
+			sum.set_description ("Text displayed in short view.")
 			sum.set_is_required (False)

 			create fset.make

 				-- Add summary
 			fset.extend (sum)
-			fset.extend_html_text("<br />")
+			fset.extend_html_text("<br/>")

 				-- Add content
 			fset.extend (ta)
@@ -274,10 +274,10 @@ feature -- Output


 				if a_node.status = {CMS_NODE_API}.trashed then
-					create lnk.make ("Trash", node_api.node_path (a_node) + "/trash")
+					create lnk.make ("Delete", node_api.node_path (a_node) + "/delete")
 					lnk.set_weight (2)
 					a_response.add_to_primary_tabs (lnk)
-				elseif a_node /= Void and then a_node.has_id then
+				elseif a_node.has_id then
 						-- 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)
@@ -291,15 +291,16 @@ feature -- Output
 					end

 					if
-						node_api.has_permission_for_action_on_node ("delete", a_node, l_user)
+						node_api.has_permission_for_action_on_node ("trash", a_node, l_user)
 					then
-						create lnk.make ("Delete", node_api.node_path (a_node) + "/delete")
+						create lnk.make ("Move to trash", node_api.node_path (a_node) + "/trash")
 						lnk.set_weight (3)
 						a_response.add_to_primary_tabs (lnk)
 					end
 				end
 			end
 			create s.make_empty
+			s.append ("<div class=%"cms-node node-" + a_node.content_type + "%">")
 			s.append ("<div class=%"info%"> ")
 			if attached a_node.author as l_author then
 				s.append (" by ")
@@ -339,6 +340,7 @@ feature -- Output

 				s.append ("</p>")
 			end
+			s.append ("</div>")

 			a_response.set_title (a_node.title)
 			a_response.set_main_content (s)
--- a/modules/node/handler/cms_page_node_type_webform_manager.e
+++ b/modules/node/handler/cms_page_node_type_webform_manager.e
@@ -10,7 +10,10 @@ inherit
 	CMS_NODE_TYPE_WEBFORM_MANAGER [CMS_PAGE]
 		redefine
 			content_type,
-			append_html_output_to
+			append_html_output_to,
+			populate_form,
+			new_node,
+			update_node
 		end

 create
@@ -21,140 +24,117 @@ feature -- Access
 	content_type: CMS_PAGE_NODE_TYPE
 			-- Associated content type.	

-feature -- Forms ...		
+feature -- Forms ...

--	fill_edit_form (response: NODE_RESPONSE; f: CMS_FORM; a_node: detachable CMS_NODE)
--		local
--			ti: WSF_FORM_TEXT_INPUT
--			fset: WSF_FORM_FIELD_SET
--			ta: WSF_FORM_TEXTAREA
--			tselect: WSF_FORM_SELECT
--			opt: WSF_FORM_SELECT_OPTION
--		do
--			create ti.make ("title")
--			ti.set_label ("Title")
--			ti.set_size (70)
--			if a_node /= Void then
--				ti.set_text_value (a_node.title)
--			end
--			ti.set_is_required (True)
--			f.extend (ti)
+	populate_form (response: NODE_RESPONSE; f: CMS_FORM; a_node: detachable CMS_NODE)
+		local
+			ti: WSF_FORM_NUMBER_INPUT
+			fs: WSF_FORM_FIELD_SET
+			l_parent_id, nid: INTEGER_64
+		do
+			Precursor (response, f, a_node)

--			f.extend_html_text ("<br/>")
+			if attached {CMS_PAGE} a_node as l_page then
+				create fs.make
+				fs.set_legend ("Pages structure")
+				fs.set_collapsible (True)
+				f.extend (fs)
+				create ti.make ("select_parent_node")
+				ti.set_label ("Parent page")
+				ti.set_description ("The parent page is the book structure.")
+				if attached l_page.parent as l_parent_node then
+					l_parent_id := l_parent_node.id
+					fs.extend_html_text ("<div><strong>Currently, the parent page is </strong> ")
+					fs.extend_html_text (response.node_html_link (l_parent_node,  l_parent_node.title))
+					fs.extend_html_text ("</div>")
+				end
+				ti.set_validation_action (agent parent_validation (response, ?))
+				fs.extend (ti)

--			create ta.make ("body")
--			ta.set_rows (10)
--			ta.set_cols (70)
--			if a_node /= Void then
--				ta.set_text_value (a_node.content)
--			end
----			ta.set_label ("Body")
--			ta.set_description ("This is the main content")
--			ta.set_is_required (False)
+				-- FIXME: add notion of "weight"

--			create fset.make
--			fset.set_legend ("Body")
--			fset.extend (ta)
+				if
+					attached {WSF_STRING} response.request.query_parameter ("parent") as p_parent and then
+					p_parent.is_integer
+				then
+					l_parent_id := p_parent.integer_value.to_integer_64
+				end
+				if l_parent_id > 0 then
+					ti.set_default_value (l_parent_id.out)
+				end
+			end
+		end

--			fset.extend_html_text ("<br/>")
+	update_node	(a_response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: CMS_NODE)
+			-- <Precursor>
+		local
+			l_parent_id: INTEGER_64
+		do
+			Precursor (a_response, fd, a_node)
+			if attached {CMS_PAGE} a_node as l_page then
+				if attached fd.integer_item ("select_parent_node") as i_parent_node then
+					l_parent_id := i_parent_node.to_integer_64
+				end
+				if
+					l_parent_id > 0 and then
+					attached {CMS_PAGE} a_response.node_api.node (l_parent_id) as l_parent_page
+				then
+					l_page.set_parent (l_parent_page)
+				elseif l_parent_id = -1	then
+						-- Set parent to Void
+					l_page.set_parent (Void)
+				end
+			end
+		end

--			create tselect.make ("format")
--			tselect.set_label ("Body's format")
--			tselect.set_is_required (True)
--			across
--				 content_type.available_formats as c
--			loop
--				create opt.make (c.item.name, c.item.title)
--				if attached c.item.html_help as f_help then
--					opt.set_description ("<ul>" + f_help + "</ul>")
--				end
--				tselect.add_option (opt)
--			end
--			if a_node /= Void and then attached a_node.format as l_format then
--				tselect.set_text_by_value (l_format)
--			end
+	new_node (response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: detachable like new_node): like content_type.new_node
+			-- <Precursor>
+		do
+			Result := Precursor (response, fd, a_node)
+			if attached fd.integer_item ("select_parent_node") as l_parent_id then
+				if l_parent_id = -1 then
+					Result.set_parent (Void)
+				elseif attached {CMS_PAGE} response.node_api.node (l_parent_id) as l_parent then
+					Result.set_parent (l_parent)
+				end
+			end
+		end

--			fset.extend (tselect)
-
--			f.extend (fset)
-
--		end
-
--	change_node	(response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: like new_node)
--		local
--			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
--				check a_node.id = l_id end
--			end
--			if attached fd.string_item ("title") as l_title then
--				a_node.set_title (l_title)
--			end
-
--			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
--				f := f_format
--			else
--				f := response.api.formats.default_format
--			end
--			if b /= Void then
--				a_node.set_content (b, Void, f.name) -- FIXME: summary
--			end
--		end
-
--	new_node (response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: detachable like new_node): CMS_PAGE
--			-- <Precursor>
--		local
--			b: detachable READABLE_STRING_8
--			f: detachable CONTENT_FORMAT
--			l_node: detachable like new_node
--		do
--			l_node := a_node
--			if attached fd.integer_item ("id") as l_id and then l_id > 0 then
--				if l_node /= Void then
--					check l_node.id = l_id end
--				else
--					if attached {like new_node} response.node_api.node (l_id) as n then
--						l_node := n
--					else
--						-- FIXME: Error
--					end
--				end
--			end
--			if attached fd.string_item ("title") as l_title then
--				if l_node = Void then
--					l_node := content_type.new_node (Void)
--					l_node.set_title (l_title)
--				else
--					l_node.set_title (l_title)
--				end
--			else
--				if l_node = Void then
--					l_node := content_type.new_node_with_title ("...", Void)
--				end
--			end
--			l_node.set_author (response.user)
-
--			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
--				f := f_format
--			else
--				f := response.api.formats.default_format
--			end
--			if b /= Void then
--				l_node.set_content (b, Void, f.name)
--			end
--			Result := l_node
--		end
+	parent_validation (a_response: NODE_RESPONSE; fd: WSF_FORM_DATA)
+		local
+			l_selected: BOOLEAN
+			node_api: CMS_NODE_API
+			l_parent_id: INTEGER_64
+			nid: INTEGER_64
+			l_parent_node: detachable CMS_NODE
+		do
+			node_api := a_response.node_api
+			if attached fd.integer_item ("select_parent_node") as s_parent_node then
+				l_parent_id := s_parent_node.to_integer_64
+			else
+				l_parent_id := 0
+			end
+			if l_parent_id > 0 then
+				l_parent_node := node_api.node (l_parent_id)
+				if l_parent_node = Void then
+					fd.report_invalid_field ("select_parent_node", "Invalid parent, not found id #" + l_parent_id.out)
+				else
+					nid := a_response.node_id_path_parameter
+					if
+						nid > 0 and then
+						attached node_api.node (nid) as l_node and then
+						node_api.is_node_a_parent_of (l_node, l_parent_node)
+					then
+						fd.report_invalid_field ("select_parent_node", "Invalid parent due to cycle (node #" + nid.out + " is already a parent of node #" + l_parent_id.out)
+					end
+				end
+			elseif l_parent_id = -1 or else l_parent_id = 0 then
+					-- -1 is Used to unassign a parent node
+					-- 0 is not taken into account, any other input value is considered invalid.
+			else
+				fd.report_invalid_field ("select_parent_node", "Invalid node id")
+			end
+		end

 feature -- Output

@@ -162,8 +142,20 @@ feature -- Output
 			-- <Precursor>
 		local
 			s: STRING
+			node_api: CMS_NODE_API
+			lnk: CMS_LOCAL_LINK
 		do
+			node_api := a_response.node_api
 			Precursor (a_node, a_response)
+
+			if a_node.has_id and then not a_node.is_trashed then
+				if node_api.has_permission_for_action_on_node ("create", a_node, a_response.user) then
+					create lnk.make ("Add Child", "node/add/page?parent=" + a_node.id.out)
+					lnk.set_weight (3)
+					a_response.add_to_primary_tabs (lnk)
+				end
+			end
+
 			if attached a_response.main_content as l_main_content then
 				s := l_main_content
 			else
@@ -171,11 +163,22 @@ feature -- Output
 			end

 			if attached {CMS_PAGE} a_node as l_node_page then
+				s.append ("<ul class=%"page-navigation%">")
 				if attached l_node_page.parent as l_parent_node then
-					s.append ("<div>Parent page is ")
-					s.append (a_response.link (l_parent_node.title + " (#" + l_parent_node.id.out + ")", a_response.node_api.node_path (l_parent_node), Void))
-					s.append ("</div>")
+					s.append ("<li class=%"page-parent%">Go to parent page ")
+					s.append (a_response.link (l_parent_node.title, a_response.node_api.node_path (l_parent_node), Void))
+					s.append ("</li>")
 				end
+				if attached node_api.children (a_node) as l_children then
+					across
+						l_children as ic
+					loop
+						s.append ("<li>")
+						s.append (a_response.link (ic.item.title, a_response.node_api.node_path (ic.item), Void))
+						s.append ("</li>")
+					end
+				end
+				s.append ("</ul>")
 			end

 			a_response.set_main_content (s)
--- a/modules/node/handler/node_form_response.e
+++ b/modules/node/handler/node_form_response.e
@@ -37,91 +37,30 @@ feature -- Execution
 			-- Computed response message.
 		local
 			b: STRING_8
-			f: like new_edit_form
-			fd: detachable WSF_FORM_DATA
 			nid: INTEGER_64
 		do
 			create b.make_empty
-			nid := node_id_path_parameter (request)
+			nid := node_id_path_parameter
 			if
 				nid > 0 and then
 				attached node_api.node (nid) as l_node
 			then
 				if attached node_api.node_type_for (l_node) as l_type then
- 					fixme ("refactor: process_edit, process_create process edit")
 					if
 						location.ends_with_general ("/edit") and then
 						node_api.has_permission_for_action_on_node ("edit", l_node, user)
 					then
-						f := new_edit_form (l_node, url (location, Void), "edit-" + l_type.name, l_type)
-						invoke_form_alter (f, fd)
-						if request.is_post_request_method then
-							f.validation_actions.extend (agent edit_form_validate (?, b))
-							f.submit_actions.extend (agent edit_form_submit (?, l_node, l_type, b))
-							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) + " saved")
-						else
-							set_title (formatted_string (translation ("Edit $1 #$2", Void), [l_type.title, l_node.id]))
-							f.append_to_html (wsf_theme, b)
-						end
+						edit_node (l_node, l_type, b)
 					elseif
 						location.ends_with_general ("/delete") and then
 						node_api.has_permission_for_action_on_node ("delete", l_node, user)
 					then
-						f := new_delete_form (l_node, url (location, 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
+						delete_node (l_node, l_type, b)
 					elseif
 						location.ends_with_general ("/trash") and then
 						node_api.has_permission_for_action_on_node ("trash", l_node, user)
 					then
-						f := new_trash_form (l_node, url (location, 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
+						trash_node (l_node, l_type, b)
 					else
 						b.append ("<h1>")
 						b.append (translation ("Access denied", Void))
@@ -135,29 +74,8 @@ feature -- Execution
 				attached node_api.node_type (p_type.value) as l_type
 			then
 				if has_permissions (<<"create any", "create " +  l_type.name>>) then
-					if attached l_type.new_node (Void) as l_node then
-						f := new_edit_form (l_node, url (location, Void), "edit-" + l_type.name, l_type)
-						invoke_form_alter (f, fd)
-						if request.is_post_request_method then
-							f.validation_actions.extend (agent edit_form_validate (?, b))
-							f.submit_actions.extend (agent edit_form_submit (?, l_node, l_type, b))
-							f.process (Current)
-							fd := f.last_data
-						end
-
-						set_title ("Edit " + html_encoded (l_type.title) + " #" + l_node.id.out)
-
-						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)
-						end
-
-						f.append_to_html (wsf_theme, b)
-					else
-						b.append ("<h1>")
-						b.append (translation ("Server error", Void))
-						b.append ("</h1>")
-					end
+						-- create new node
+					create_new_node (l_type, b)
 				else
 					b.append ("<h1>")
 					b.append (translation ("Access denied", Void))
@@ -185,6 +103,126 @@ feature -- Execution
 			set_main_content (b)
 		end

+
+feature {NONE} -- Create a new node
+
+	create_new_node (a_type: CMS_NODE_TYPE [CMS_NODE]; b: STRING_8)
+		local
+			f: like new_edit_form
+			fd: detachable WSF_FORM_DATA
+		do
+			if attached a_type.new_node (Void) as l_node then
+					-- create new node
+				f := new_edit_form (l_node, url (location, Void), "edit-" + a_type.name, a_type)
+				hooks.invoke_form_alter (f, fd, Current)
+				if request.is_post_request_method then
+					f.validation_actions.extend (agent edit_form_validate (?, b))
+					f.submit_actions.extend (agent edit_form_submit (?, l_node, a_type, b))
+					f.process (Current)
+					fd := f.last_data
+				end
+
+				if l_node.has_id then
+					set_title ("Edit " + html_encoded (a_type.title) + " #" + l_node.id.out)
+					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)
+				else
+					set_title ("New " + html_encoded (a_type.title))
+				end
+				f.append_to_html (wsf_theme, b)
+			else
+				b.append ("<h1>")
+				b.append (translation ("Server error", Void))
+				b.append ("</h1>")
+			end
+		end
+
+
+	edit_node (a_node: CMS_NODE; a_type: CMS_NODE_TYPE [CMS_NODE]; b: STRING_8)
+		local
+			f: like new_edit_form
+			fd: detachable WSF_FORM_DATA
+		do
+			f := new_edit_form (A_node, url (location, Void), "edit-" + a_type.name, a_type)
+			hooks.invoke_form_alter (f, fd, Current)
+			if request.is_post_request_method then
+				f.validation_actions.extend (agent edit_form_validate (?, b))
+				f.submit_actions.extend (agent edit_form_submit (?, a_node, a_type, b))
+				f.process (Current)
+				fd := f.last_data
+			end
+			if a_node.has_id then
+				add_to_menu (node_local_link (a_node, translation ("View", Void)), primary_tabs)
+				add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), node_api.node_path (a_node) + "/edit"), primary_tabs)
+				add_to_menu (create {CMS_LOCAL_LINK}.make ("Delete", node_api.node_path (a_node) + "/delete"), primary_tabs)
+			end
+
+			if attached redirection as l_location then
+					-- FIXME: Hack for now
+				set_title (a_node.title)
+				b.append (html_encoded (a_type.title) + " saved")
+			else
+				set_title (formatted_string (translation ("Edit $1 #$2", Void), [a_type.title, a_node.id]))
+				f.append_to_html (wsf_theme, b)
+			end
+		end
+
+
+	delete_node (a_node: CMS_NODE; a_type: CMS_NODE_TYPE [CMS_NODE]; b: STRING_8)
+		local
+			f: like new_edit_form
+			fd: detachable WSF_FORM_DATA
+		do
+			f := new_delete_form (a_node, url (location, Void), "delete-" + a_type.name, a_type)
+			hooks.invoke_form_alter (f, fd, Current)
+			if request.is_post_request_method then
+				f.process (Current)
+				fd := f.last_data
+			end
+			if a_node.has_id then
+				add_to_menu (node_local_link (a_node, translation ("View", Void)), primary_tabs)
+				add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), node_api.node_path (a_node) + "/edit"), primary_tabs)
+				add_to_menu (create {CMS_LOCAL_LINK}.make ("Delete", node_api.node_path (a_node) + "/delete"), primary_tabs)
+			end
+
+			if attached redirection as l_location then
+					-- FIXME: Hack for now
+				set_title (a_node.title)
+				b.append (html_encoded (a_type.title) + " deleted")
+			else
+				set_title (formatted_string (translation ("Delete $1 #$2", Void), [a_type.title, a_node.id]))
+				f.append_to_html (wsf_theme, b)
+			end
+		end
+
+
+	trash_node (a_node: CMS_NODE; a_type: CMS_NODE_TYPE [CMS_NODE]; b: STRING_8)
+		local
+			f: like new_edit_form
+			fd: detachable WSF_FORM_DATA
+		do
+			f := new_trash_form (a_node, url (location, Void), "trash-" + a_type.name, a_type)
+			hooks.invoke_form_alter (f, fd, Current)
+			if request.is_post_request_method then
+				f.process (Current)
+				fd := f.last_data
+			end
+			if a_node.has_id then
+				add_to_menu (node_local_link (a_node, translation ("View", Void)), primary_tabs)
+				add_to_menu (create {CMS_LOCAL_LINK}.make ("Trash", node_api.node_path (a_node) + "/Trash"), primary_tabs)
+			end
+
+			if attached redirection as l_location then
+					-- FIXME: Hack for now
+				set_title (a_node.title)
+				b.append (html_encoded (a_type.title) + " trashed")
+			else
+				set_title (formatted_string (translation ("Trash $1 #$2", Void), [a_type.title, a_node.id]))
+				f.append_to_html (wsf_theme, b)
+			end
+		end
+
+
 feature -- Form	

 	edit_form_validate (fd: WSF_FORM_DATA; b: STRING)
@@ -221,6 +259,7 @@ feature -- Form
 			s: STRING
 			l_path_alias: detachable READABLE_STRING_8
 		do
+			fixme ("Refactor code per operacion: Preview, Save")
 			l_preview := attached {WSF_STRING} fd.item ("op") as l_op and then l_op.same_string ("Preview")
 			if not l_preview then
 				debug ("cms")
@@ -250,6 +289,7 @@ feature -- Form

 				fixme ("for now, publishing is not implemented, so let's assume any node saved is published.") -- FIXME
 				l_node.mark_published
+
 				node_api.save_node (l_node)
 				if attached user as u then
 					api.log ("node",
@@ -290,7 +330,6 @@ feature -- Form
 			th: WSF_FORM_HIDDEN_INPUT
 		do
 			create f.make (a_url, a_name)
-
 			create th.make ("node-id")
 			if a_node /= Void then
 				th.set_text_value (a_node.id.out)
@@ -300,8 +339,8 @@ feature -- Form
 			f.extend (th)

 			populate_form (a_node_type, f, a_node)
-			f.extend_html_text ("<br/>")

+			f.extend_html_text ("<br/>")
 			create ts.make ("op")
 			ts.set_default_value ("Save")
 			f.extend (ts)
@@ -336,7 +375,7 @@ feature -- Form
 					ts.set_default_value (translation ("Delete"))
 					]")
 				f.extend (ts)
-				fixme ("wsf_html: add support for HTML5 input attributes!!! ")
+				to_implement ("Refactor code to use the new wsf_html HTML5 support")
 				f.extend_html_text("<input type='submit' value='Cancel' formmethod='GET', formaction='/node/"+a_node.id.out+"'>" )
 			end

--- a/modules/node/handler/node_handler.e
+++ b/modules/node/handler/node_handler.e
@@ -99,6 +99,15 @@ feature -- HTTP Methods
 				edit_response.execute
 			elseif req.percent_encoded_path_info.ends_with ("/revision") then
 				do_revisions (req, res)
+--			elseif req.percent_encoded_path_info.ends_with ("/add_child/page") then
+--					-- Add child node
+--				l_nid := node_id_path_parameter (req)
+--				if l_nid > 0 then
+--						-- create a new child node with node id `l_id' as parent.
+--					create_new_node (req, res)
+--				else
+--					send_not_found (req, res)
+--				end
 			else
 					-- Display existing node
 				l_nid := node_id_path_parameter (req)
@@ -117,15 +126,29 @@ feature -- HTTP Methods
 					then
 						l_node := node_api.revision_node (l_nid, l_rev)
 					end
-					if
-						l_node /= Void and then (l_rev > 0 or else l_node.is_published)
-					then
-						create view_response.make (req, res, api, node_api)
-						view_response.set_node (l_node)
-						view_response.set_revision (l_rev)
-						view_response.execute
-					else
+					if l_node = Void then
 						send_not_found (req, res)
+					else
+						if
+							l_rev > 0 or else l_node.is_published
+						then
+							create view_response.make (req, res, api, node_api)
+							view_response.set_node (l_node)
+							view_response.set_revision (l_rev)
+							view_response.execute
+						elseif
+							attached current_user (req) as l_user and then
+							(	node_api.is_author_of_node (l_user, l_node)
+								or else api.user_api.user_has_permission (l_user, "view unpublished " + l_node.content_type)
+							)
+						then
+							create view_response.make (req, res, api, node_api)
+							view_response.set_node (l_node)
+							view_response.set_revision (l_rev)
+							view_response.execute
+						else
+							send_access_denied (req, res)
+						end
 					end
 				else
 --					redirect_to (req.absolute_script_url ("/node/"), res) -- New node.
@@ -166,6 +189,9 @@ feature -- HTTP Methods
 			elseif req.percent_encoded_path_info.starts_with ("/node/add/") then
 				create edit_response.make (req, res, api, node_api)
 				edit_response.execute
+			elseif req.percent_encoded_path_info.ends_with ("/add_child/page") then
+				create edit_response.make (req, res, api, node_api)
+				edit_response.execute
 			else
 				to_implement ("REST API")
 				send_not_implemented ("REST API not yet implemented", req, res)
@@ -179,8 +205,8 @@ feature -- HTTP Methods
 			send_not_implemented ("REST API not yet implemented", req, res)
 		end

-	do_delete (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- <Precursor>
+	do_trash (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Trash a node, soft delete.
 		do
 			if attached current_user (req) as l_user then
 				if attached {WSF_STRING} req.path_parameter ("id") as l_id then
@@ -188,8 +214,8 @@ feature -- HTTP Methods
 						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 ("delete", l_node, current_user (req)) then
-							node_api.delete_node (l_node)
+						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)
@@ -214,8 +240,8 @@ feature -- HTTP Methods

 feature {NONE} -- Trash:Restore

-	do_trash (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Trash a node from the database.
+	do_delete (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Delete 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
@@ -223,8 +249,8 @@ feature {NONE} -- Trash:Restore
 						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)
+						if node_api.has_permission_for_action_on_node ("delete", l_node, current_user (req)) then
+							node_api.delete_node (l_node)
 							res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (req.absolute_script_url ("")))
 						else
 							send_access_denied (req, res)
@@ -274,7 +300,6 @@ feature {NONE} -- Trash:Restore
 			r: GENERIC_VIEW_CMS_RESPONSE
 			b: STRING
 			n: CMS_NODE
-			l_link: CMS_LOCAL_LINK
 		do
 			if attached {WSF_STRING} req.path_parameter ("id") as l_id then
 				if
@@ -356,5 +381,4 @@ feature {NONE} -- Node
 				send_bad_request (req, res)
 			end
 		end
-
 end
--- a/modules/node/handler/node_response.e
+++ b/modules/node/handler/node_response.e
@@ -27,12 +27,12 @@ feature -- Access

 feature -- Helpers

-	node_id_path_parameter (req: WSF_REQUEST): INTEGER_64
-			-- Node id passed as path parameter for request `req'.
+	node_id_path_parameter: INTEGER_64
+			-- Node id passed as path parameter for request `request'.
 		local
 			s: STRING
 		do
-			if attached {WSF_STRING} req.path_parameter ("id") as p_nid then
+			if attached {WSF_STRING} request.path_parameter ("id") as p_nid then
 				s := p_nid.value
 				if s.is_integer_64 then
 					Result := s.to_integer_64
--- a/modules/node/handler/node_view_response.e
+++ b/modules/node/handler/node_view_response.e
@@ -56,13 +56,12 @@ feature -- Execution
 	process
 			-- Computed response message.
 		local
-			b: detachable STRING_8
 			nid: INTEGER_64
 			l_node: like node
 		do
 			l_node := node
 			if l_node = Void then
-				nid := node_id_path_parameter (request)
+				nid := node_id_path_parameter
 				if nid > 0 then
 					l_node := node_api.node (nid)
 				end
@@ -85,6 +84,8 @@ feature -- Execution
 			if l_node /= Void and revision > 0 then
 				set_title ("Revision #" + revision.out + " of " + html_encoded (l_node.title))
 			end
+
+
 		end

 end
--- a/modules/node/node-safe.ecf
+++ b/modules/node/node-safe.ecf
@@ -13,6 +13,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="cms" location="..\..\cms-safe.ecf"/>
 		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
+		<library name="cms_recent_changes_module" location="..\..\modules\recent_changes\recent_changes-safe.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
 		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
--- a/modules/node/node.ecf
+++ b/modules/node/node.ecf
@@ -13,6 +13,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
 		<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/>
+		<library name="cms_recent_changes_module" location="..\..\modules\recent_changes\recent_changes.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
 		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
--- a/modules/node/persistence/cms_node_storage_i.e
+++ b/modules/node/persistence/cms_node_storage_i.e
@@ -90,6 +90,11 @@ feature -- Access
 		deferred
 		end

+	recent_node_changes_before (a_lower: INTEGER; a_count: INTEGER; a_date: DATE_TIME): LIST [CMS_NODE]
+			-- List of recent changes, before `a_date', according to `params' settings.
+		deferred
+		end
+
 	node_by_id (a_id: INTEGER_64): detachable CMS_NODE
 			-- Retrieve node by id `a_id', if any.
 		require
@@ -112,6 +117,21 @@ feature -- Access
 		deferred
 		end

+feature -- Access: outline
+
+	children (a_node: CMS_NODE): detachable LIST [CMS_NODE]
+			-- Children of node `a_node'.
+			-- note: this is the partial version of the nodes.
+		deferred
+		end
+
+	available_parents_for_node (a_node: CMS_NODE): LIST [CMS_NODE]
+			-- Given the node `a_node', return the list of possible parent nodes id
+		deferred
+		ensure
+			a_node_excluded: across Result as ic all not a_node.same_node (ic.item) end
+		end
+
 feature -- Change: Node

 	save_node (a_node: CMS_NODE)
--- a/modules/node/persistence/cms_node_storage_null.e
+++ b/modules/node/persistence/cms_node_storage_null.e
@@ -59,6 +59,12 @@ feature -- Access: node
 			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
 		end

+	recent_node_changes_before (a_lower: INTEGER; a_count: INTEGER; a_date: DATE_TIME): LIST [CMS_NODE]
+			-- List of recent changes, before `a_date', according to `params' settings.
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+		end
+
 	node_by_id (a_id: INTEGER_64): detachable CMS_NODE
 			-- <Precursor>
 		do
@@ -80,6 +86,19 @@ feature -- Access: node
 			create {ARRAYED_LIST [CMS_USER]} Result.make (0)
 		end

+feature -- Access: outline		
+
+	children (a_node: CMS_NODE): detachable LIST [CMS_NODE]
+			-- <Precursor>
+		do
+		end
+
+	available_parents_for_node (a_node: CMS_NODE): LIST [CMS_NODE]
+			-- <Precursor>
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+		end
+
 feature -- Node

 	new_node (a_node: CMS_NODE)
--- a/modules/node/persistence/cms_node_storage_sql.e
+++ b/modules/node/persistence/cms_node_storage_sql.e
@@ -128,7 +128,7 @@ feature -- Access

 			from
 				create l_parameters.make (2)
-				l_parameters.put (a_count, "rows")
+				l_parameters.put (a_count, "size")
 				l_parameters.put (a_lower, "offset")
 				sql_query (sql_select_recent_nodes, l_parameters)
 				sql_start
@@ -142,6 +142,34 @@ feature -- Access
 			end
 		end

+	recent_node_changes_before (a_lower: INTEGER; a_count: INTEGER; a_date: DATE_TIME): LIST [CMS_NODE]
+			-- List of recent changes, before `a_date', according to `params' settings.
+		local
+			l_parameters: STRING_TABLE [detachable ANY]
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+
+			error_handler.reset
+			write_information_log (generator + ".nodes")
+
+			from
+				create l_parameters.make (3)
+				l_parameters.put (a_count, "size")
+				l_parameters.put (a_lower, "offset")
+				l_parameters.put (a_date, "date")
+
+				sql_query (sql_select_recent_node_changes_before, 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
+
 	node_by_id (a_id: INTEGER_64): detachable CMS_NODE
 			-- Retrieve node by id `a_id', if any.
 		local
@@ -227,6 +255,58 @@ feature -- Access
 --			end
 		end

+feature -- Access: outline
+
+	children (a_node: CMS_NODE): detachable 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 + ".children")
+
+			from
+				create l_parameters.make (1)
+				l_parameters.put (a_node.id, "nid")
+				sql_query (sql_select_children_of_node, 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
+
+	available_parents_for_node (a_node: CMS_NODE): 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 + ".available_parents_for_node")
+
+			from
+				create l_parameters.make (1)
+				l_parameters.put (a_node.id, "nid")
+				sql_query (sql_select_available_parents_for_node, 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 -- Change: Node

 	new_node (a_node: CMS_NODE)
@@ -241,7 +321,7 @@ feature -- Change: Node
 			store_node (a_node)
 		end

-	delete_node_by_id (a_id: INTEGER_64)
+	trash_node_by_id (a_id: INTEGER_64)
 			-- Remove node by id `a_id'.
 		local
 			l_parameters: STRING_TABLE [ANY]
@@ -253,10 +333,10 @@ feature -- Change: Node
 			l_parameters.put (create {DATE_TIME}.make_now_utc, "changed")
 			l_parameters.put ({CMS_NODE_API}.trashed, "status")
 			l_parameters.put (a_id, "nid")
-			sql_change (sql_delete_node, l_parameters)
+			sql_change (sql_trash_node, l_parameters)
 		end

-	trash_node_by_id (a_id: INTEGER_64)
+	 delete_node_by_id (a_id: INTEGER_64)
 			-- <Precursor>
 		local
 			l_parameters: STRING_TABLE [ANY]
@@ -268,7 +348,7 @@ feature -- Change: Node
 			error_handler.reset
 			create l_parameters.make (1)
 			l_parameters.put (a_id, "nid")
-			sql_change (sql_trash_node, l_parameters)
+			sql_change (sql_delete_node, l_parameters)
 		end

 	restore_node_by_id (a_id: INTEGER_64)
@@ -402,7 +482,9 @@ feature {NONE} -- Queries

 	sql_select_node_by_id_and_revision: STRING = "SELECT nodes.nid, node_revisions.revision, nodes.type, node_revisions.title, node_revisions.summary, node_revisions.content, node_revisions.format, node_revisions.author, nodes.publish, nodes.created, node_revisions.changed, node_revisions.status FROM nodes INNER JOIN node_revisions ON nodes.nid = node_revisions.nid WHERE nodes.nid = :nid AND node_revisions.revision = :revision ORDER BY node_revisions.revision DESC;"

-	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 ;"
+	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 :size OFFSET :offset ;"
+
+	sql_select_recent_node_changes_before: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM nodes WHERE changed <= :date ORDER BY changed DESC, nid DESC LIMIT :size OFFSET :offset ;"

 	sql_insert_node: STRING = "INSERT INTO nodes (revision, type, title, summary, content, format, publish, created, changed, status, author) VALUES (:revision, :type, :title, :summary, :content, :format, :publish, :created, :changed, :status, :author);"
 			-- SQL Insert to add a new node.
@@ -410,10 +492,10 @@ feature {NONE} -- Queries
 	sql_update_node : STRING = "UPDATE nodes SET revision=:revision, type=:type, title=:title, summary=:summary, content=:content, format=:format, publish=:publish, changed=:changed, status=:status, author=:author WHERE nid=:nid;"
 			-- SQL update node.

-	sql_delete_node: STRING = "UPDATE nodes SET changed=:changed, status =:status WHERE nid=:nid"
+	sql_trash_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"
+	sql_delete_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"
@@ -426,6 +508,18 @@ feature {NONE} -- Queries
 	Sql_last_insert_node_revision: STRING = "SELECT MAX(revision) FROM node_revisions;"
 	Sql_last_insert_node_revision_for_nid: STRING = "SELECT MAX(revision) FROM node_revisions WHERE nid=:nid;"

+	sql_select_available_parents_for_node : STRING = "[
+			SELECT node.nid, node.revision, node.type, title, summary, content, format, author, publish, created, changed, status 
+			FROM nodes node LEFT JOIN page_nodes pn ON node.nid = pn.nid AND node.nid != :nid 
+			WHERE node.nid != :nid AND pn.parent != :nid AND node.status != -1 GROUP BY node.nid, node.revision;
+		]"
+
+	sql_select_children_of_node: STRING = "[
+			SELECT node.nid, node.revision, node.type, title, summary, content, format, author, publish, created, changed, status
+			FROM nodes node LEFT JOIN page_nodes pn ON node.nid = pn.nid
+			WHERE pn.parent = :nid AND node.status != -1 GROUP BY node.nid, node.revision;
+		]"
+
 feature {NONE} -- Sql Queries: USER_ROLES collaborators, author

 	Select_user_author: STRING = "SELECT uid, name, password, salt, email, users.status, users.created, signed FROM nodes INNER JOIN users ON nodes.author=users.uid AND nodes.nid = :nid AND nodes.revision = :revision;"
--- a/modules/node/persistence/cms_node_storage_sql_page_extension.e
+++ b/modules/node/persistence/cms_node_storage_sql_page_extension.e
@@ -55,7 +55,7 @@ feature -- Persistence
 			error_handler.reset
 				-- Check existing record, if any.
 			if attached node_data (a_node) as d then
-				l_update := True
+				l_update := a_node.revision = d.revision
 				l_previous_parent_id := d.parent_id
 			end
 			if not has_error then
@@ -114,7 +114,7 @@ feature -- Persistence

 feature {NONE} -- Implementation

-	node_data (a_node: CMS_NODE): detachable TUPLE [parent_id: INTEGER_64]
+	node_data (a_node: CMS_NODE): detachable TUPLE [revision: INTEGER_64; parent_id: INTEGER_64]
 			-- Node extension data for node `a_node' as tuple.
 		local
 			l_parameters: STRING_TABLE [ANY]
@@ -129,16 +129,18 @@ feature {NONE} -- Implementation
 				n := sql_rows_count
 				if n = 1 then
 						-- nid, revision, parent
-					Result := [sql_read_integer_64 (3)]
+					Result := [sql_read_integer_64 (2), sql_read_integer_64 (3)]
 				else
 					check unique_data: n = 0 end
 				end
 			end
+		ensure
+			accepted_revision: Result /= Void implies Result.revision <= a_node.revision
 		end

 feature -- SQL

-	sql_select_node_data: STRING = "SELECT nid, revision, parent FROM page_nodes WHERE nid =:nid AND revision<=:revision ORDER BY revision DESC LIMIT 1;"
+	sql_select_node_data: STRING = "SELECT nid, revision, parent FROM page_nodes WHERE nid=:nid AND revision<=:revision ORDER BY revision DESC LIMIT 1;"
 	sql_insert_node_data: STRING = "INSERT INTO page_nodes (nid, revision, parent) VALUES (:nid, :revision, :parent);"
 	sql_update_node_data: STRING = "UPDATE page_nodes SET nid=:nid, revision=:revision, parent=:parent WHERE nid=:nid AND revision=:revision;"

--- a/modules/oauth20/cms_oauth_20_module.e
+++ b/modules/oauth20/cms_oauth_20_module.e
@@ -192,8 +192,8 @@ feature -- Hooks configuration
 			-- Module hooks configuration.
 		do
 			auto_subscribe_to_hooks (a_response)
-			a_response.subscribe_to_block_hook (Current)
-			a_response.subscribe_to_value_table_alter_hook (Current)
+			a_response.hooks.subscribe_to_block_hook (Current)
+			a_response.hooks.subscribe_to_value_table_alter_hook (Current)
 		end

 feature -- Hooks
--- a/modules/openid/cms_openid_module.e
+++ b/modules/openid/cms_openid_module.e
@@ -170,8 +170,8 @@ feature -- Hooks configuration
 			-- Module hooks configuration.
 		do
 			auto_subscribe_to_hooks (a_response)
-			a_response.subscribe_to_block_hook (Current)
-			a_response.subscribe_to_value_table_alter_hook (Current)
+			a_response.hooks.subscribe_to_block_hook (Current)
+			a_response.hooks.subscribe_to_value_table_alter_hook (Current)
 		end

 feature -- Hooks
--- a/modules/recent_changes/cms_recent_change_container.e
+++ b/modules/recent_changes/cms_recent_change_container.e
@@ -0,0 +1,82 @@
+note
+	description: "Container of recent change items, and associated parameters."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_RECENT_CHANGE_CONTAINER
+
+inherit
+	ITERABLE [CMS_RECENT_CHANGE_ITEM]
+
+create
+	make
+
+feature -- Initialization
+
+	make (a_limit: NATURAL_32; a_date: detachable DATE_TIME; a_source: detachable READABLE_STRING_8)
+		do
+			limit := a_limit
+			date := a_date
+			source := a_source
+			create items.make (a_limit.to_integer_32)
+		end
+
+feature -- Settings
+
+	limit: NATURAL_32
+
+	date: detachable DATE_TIME
+
+	source: detachable READABLE_STRING_8
+
+feature -- Access
+
+	items: ARRAYED_LIST [CMS_RECENT_CHANGE_ITEM]
+			-- List of recent events.	
+
+	count: INTEGER
+			-- Number of change items.
+		do
+			Result := items.count
+		end
+
+feature -- Access
+
+	new_cursor: ITERATION_CURSOR [CMS_RECENT_CHANGE_ITEM]
+			-- <Precursor>
+		do
+			Result := items.new_cursor
+		end
+
+feature -- Change
+
+	force (a_item: CMS_RECENT_CHANGE_ITEM)
+			-- Add `a_item'.
+		do
+			items.force (a_item)
+		end
+
+feature -- Sorting
+
+	sort
+			-- Sort `items' from older, to newer.
+		do
+			change_item_sorter.sort (items)
+		end
+
+	reverse_sort
+			-- Sort `items' from newer to older.
+		do
+			change_item_sorter.reverse_sort (items)
+		end
+
+feature {NONE} -- Implementation
+
+	change_item_sorter: QUICK_SORTER [CMS_RECENT_CHANGE_ITEM]
+			-- New change item sorter.
+		once
+			create Result.make (create {COMPARABLE_COMPARATOR [CMS_RECENT_CHANGE_ITEM]})
+		end
+
+end
--- a/modules/recent_changes/cms_recent_change_item.e
+++ b/modules/recent_changes/cms_recent_change_item.e
@@ -0,0 +1,77 @@
+note
+	description: "Information related to change event."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_RECENT_CHANGE_ITEM
+
+inherit
+	COMPARABLE
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_source: READABLE_STRING_8; lnk: CMS_LOCAL_LINK; a_date_time: DATE_TIME)
+		do
+			source := a_source
+			link := lnk
+			date := a_date_time
+		end
+
+feature -- Access
+
+	link: CMS_LOCAL_LINK
+			-- Local link associated with the resource.
+
+	date: DATE_TIME
+			-- Time of the event item.
+
+	author_name: detachable READABLE_STRING_32
+			-- Optional author name.
+			-- It is possible to have author_name /= Void and author = Void.
+
+	author: detachable CMS_USER
+			-- Optional author.
+
+	source: READABLE_STRING_8
+			-- Source of Current event.
+
+	information: detachable READABLE_STRING_8
+			-- Optional information related to Current event.
+			--| For instance: creation, trashed, modified, ...
+
+feature -- Element change
+
+	set_author_name (n: like author_name)
+			-- Set `author_name' to `n'.
+		do
+			author_name := n
+		end
+
+	set_author (u: like author)
+			-- Set `author' to `u'.
+		do
+			author := u
+			if u /= Void and author_name = Void then
+				set_author_name (u.name)
+			end
+		end
+
+	set_information (a_info: like information)
+			-- Set `information' to `a_info'.
+		do
+			information := a_info
+		end
+
+feature -- Comparison
+
+	is_less alias "<" (other: like Current): BOOLEAN
+			-- <Precursor>
+		do
+			Result := date < other.date
+		end
+
+end
--- a/modules/recent_changes/cms_recent_changes_hook.e
+++ b/modules/recent_changes/cms_recent_changes_hook.e
@@ -0,0 +1,24 @@
+note
+	description: "Hook provided by module {CMS_RECENT_CHANGES_MODULE}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+deferred class
+	CMS_RECENT_CHANGES_HOOK
+
+inherit
+	CMS_HOOK
+
+feature -- Invocation
+
+	recent_changes_sources: detachable LIST [READABLE_STRING_8]
+			-- Source provided by Current hook.
+		deferred
+		end
+
+	populate_recent_changes (a_changes: CMS_RECENT_CHANGE_CONTAINER; a_current_user: detachable CMS_USER)
+			-- Populate recent changes inside `a_changes' according to associated parameters.
+		deferred
+		end
+
+end
--- a/modules/recent_changes/cms_recent_changes_module.e
+++ b/modules/recent_changes/cms_recent_changes_module.e
@@ -0,0 +1,299 @@
+note
+	description: "CMS module that bring support for recent changes."
+	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
+	revision: "$Revision: 96616 $"
+
+class
+	CMS_RECENT_CHANGES_MODULE
+
+inherit
+	CMS_MODULE
+		rename
+			module_api as recent_changes_api
+		redefine
+			register_hooks,
+			permissions
+		end
+
+	CMS_HOOK_MENU_SYSTEM_ALTER
+
+	CMS_HOOK_RESPONSE_ALTER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+			-- Create Current module, disabled by default.
+		do
+			version := "1.0"
+			description := "Service to access recent changes"
+			package := "notification"
+		end
+
+feature -- Access
+
+	name: STRING = "recent_changes"
+
+	permissions: LIST [READABLE_STRING_8]
+			-- List of permission ids, used by this module, and declared.
+		do
+			Result := Precursor
+			Result.force ("view recent changes")
+		end
+
+feature -- Access: router
+
+	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
+			-- <Precursor>
+		do
+			a_router.handle ("/recent_changes/", create {WSF_URI_AGENT_HANDLER}.make (agent handle_recent_changes (a_api, ?, ?)), a_router.methods_head_get)
+		end
+
+feature -- Handler
+
+	handle_recent_changes (api: CMS_API; req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			r: CMS_RESPONSE
+			l_changes: CMS_RECENT_CHANGE_CONTAINER
+			l_sources: ARRAYED_LIST [READABLE_STRING_8]
+			dt,	prev_dt: detachable DATE_TIME
+			prev_info: detachable READABLE_STRING_8
+			ch: detachable CMS_RECENT_CHANGE_ITEM
+			htdate: HTTP_DATE
+			l_content: STRING
+			l_form: CMS_FORM
+			l_select: WSF_FORM_SELECT
+			l_size_field: WSF_FORM_NUMBER_INPUT
+			l_date_field: WSF_FORM_HIDDEN_INPUT
+			l_submit: WSF_FORM_SUBMIT_INPUT
+			l_until_date: detachable DATE_TIME
+			l_until_date_timestamp: INTEGER_64
+			l_filter_source: detachable READABLE_STRING_8
+			l_size: NATURAL_32
+			l_query: STRING
+			opt: WSF_FORM_SELECT_OPTION
+			l_user: detachable CMS_USER
+			i: INTEGER
+		do
+			if attached {WSF_STRING} req.query_parameter ("date") as p_until_date then
+				l_until_date_timestamp := p_until_date.value.to_integer_64
+				create htdate.make_from_timestamp (l_until_date_timestamp)
+				l_until_date := htdate.date_time
+--				l_until_date.second_add (-1)
+			end
+			if attached {WSF_STRING} req.query_parameter ("source") as p_filter then
+				l_filter_source := p_filter.url_encoded_value
+				if l_filter_source.is_empty then
+					l_filter_source := Void
+				end
+			end
+			if attached {WSF_STRING} req.query_parameter ("size") as p_size then
+				l_size := p_size.integer_value.to_natural_32
+			end
+			if l_size = 0 then
+				l_size := 25
+			end
+
+			create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+			if r.has_permission ("view recent changes") then
+				l_user := r.user
+				create l_changes.make (l_size, l_until_date, l_filter_source)
+
+				create l_content.make (1024)
+				if attached r.hooks.subscribers ({CMS_RECENT_CHANGES_HOOK}) as lst then
+					create l_sources.make (lst.count)
+
+					across
+						lst as ic
+					loop
+						if attached {CMS_RECENT_CHANGES_HOOK} ic.item as h then
+							if attached h.recent_changes_sources as h_sources then
+								l_sources.append (h_sources)
+								if
+									l_filter_source = Void
+									or else across h_sources as h_ic some h_ic.item.is_case_insensitive_equal (l_filter_source) end
+								then
+									h.populate_recent_changes (l_changes, l_user)
+								end
+							end
+						end
+					end
+					create l_form.make (req.percent_encoded_path_info, "recent-changes")
+					l_form.set_method_get
+					create l_select.make ("source")
+					l_select.set_label ("Sources")
+					create opt.make ("", "Any source")
+					l_select.add_option (opt)
+					across
+						l_sources as ic
+					loop
+						create opt.make (ic.item, ic.item)
+						if l_filter_source /= Void and then ic.item.is_case_insensitive_equal (l_filter_source) then
+							opt.set_is_selected (True)
+						end
+						l_select.add_option (opt)
+					end
+					l_form.extend (l_select)
+
+					create l_size_field.make_with_text ("size", l_size.out)
+					l_size_field.set_size (25)
+					l_size_field.set_label ("Items per page")
+					l_form.extend (l_size_field)
+
+					if l_until_date /= Void then
+						create l_date_field.make_with_text ("date", l_until_date_timestamp.out)
+						l_form.extend (l_date_field)
+					end
+					
+					create l_submit.make_with_text ("op", "Filter")
+					l_form.extend (l_submit)
+					l_form.extend_html_text ("<br/>")
+					l_form.append_to_html (create {CMS_TO_WSF_THEME}.make (r, r.theme), l_content)
+				end
+
+				l_changes.reverse_sort
+				l_content.append ("<table class=%"recent-changes%">")
+				l_content.append ("<thead>")
+				l_content.append ("<tr>")
+				l_content.append ("<th>Date</th>")
+				l_content.append ("<th>Source</th>")
+				l_content.append ("<th>Resource</th>")
+				l_content.append ("<th>User</th>")
+				l_content.append ("<th>Information</th>")
+				l_content.append ("</tr>")
+				l_content.append ("</thead>")
+				l_content.append ("<tbody>")
+
+				across
+					l_changes as ic
+				loop
+					ch := ic.item
+					dt := ch.date
+					if prev_dt = Void or else dt.date /~ prev_dt.date then
+						l_content.append ("<tr>")
+						l_content.append ("<td class=%"title%" colspan=%"5%">")
+						l_content.append (dt.date.formatted_out ("ddd, dd mmm yyyy"))
+						l_content.append ("</td>")
+						l_content.append ("</tr>")
+					end
+					l_content.append ("<tr>")
+					l_content.append ("<td class=%"date%">")
+					if dt /~ prev_dt then
+						create htdate.make_from_date_time (dt)
+						htdate.append_to_rfc1123_string (l_content)
+					else
+						l_content.append ("<span class=%"same-value%">''</span>")
+					end
+					l_content.append ("</td>")
+
+					l_content.append ("<td class=%"source%">" + ch.source + "</td>")
+					l_content.append ("<td class=%"resource%">")
+					l_content.append (r.link (ch.link.title, ch.link.location, Void))
+					l_content.append ("</td>")
+					l_content.append ("<td class=%"user%">")
+					if attached ch.author as u then
+						l_content.append (r.link (u.name, "user/" + u.id.out, Void))
+					elseif attached ch.author_name as un then
+						l_content.append (r.html_encoded (un))
+					end
+					l_content.append ("</td>")
+					l_content.append ("<td class=%"info%">")
+					if attached ch.information as l_info and then not l_info.is_empty then
+						if prev_dt ~ dt and prev_info ~ l_info then
+							l_content.append ("<span class=%"same-value%">''</span>")
+						else
+							i := l_info.index_of ('%N', 1)
+							if i > 0 and i < l_info.count then
+								l_content.append (l_info.substring (1, i - 1))
+								l_content.append ("<span class=%"tooltip%">")
+								l_content.append (l_info.substring (i, l_info.count))
+								l_content.append ("</span>")
+							else
+								l_content.append (l_info)
+							end
+						end
+						prev_info := l_info
+					else
+						prev_info := Void
+					end
+					l_content.append ("</td>")
+					l_content.append ("</tr>%N")
+					prev_dt := dt
+				end
+				l_content.append ("</tbody>")
+				l_content.append ("</table>%N")
+
+				if ch /= Void then
+					if l_until_date /= Void then
+						l_content.append (" <a href=%"")
+						l_content.append (r.url (r.location, Void))
+						l_content.append ("?size=" + l_size.out + "%">&lt;&lt;</a> ")
+					end
+
+					if l_until_date /~ ch.date then
+						create htdate.make_from_date_time (ch.date)
+						create l_query.make_from_string ("size=" + l_size.out)
+						l_query.append ("&date=")
+						l_query.append (htdate.timestamp.out)
+						if l_filter_source /= Void then
+							l_query.append ("&filter=")
+							l_query.append (l_filter_source)
+						end
+						l_content.append ("<a href=%"")
+						l_content.append (r.url (r.location, create {CMS_API_OPTIONS}.make_from_manifest (<<["query", l_query]>>)))
+						l_content.append ("%">More  ...</a>")
+					end
+				end
+
+				r.set_main_content (l_content)
+				if l_until_date = Void then
+					r.set_title ("Recent changes")
+				else
+					create htdate.make_from_date_time (l_until_date)
+					r.set_title ("Recent changes before " + htdate.string)
+				end
+			else
+				create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
+			end
+
+			r.execute
+		end
+
+feature -- Hooks configuration
+
+	register_hooks (a_response: CMS_RESPONSE)
+			-- Module hooks configuration.
+		do
+			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_response.hooks.subscribe_to_response_alter_hook (Current)
+		end
+
+feature -- Hook
+
+	response_alter (a_response: CMS_RESPONSE)
+		do
+			a_response.add_additional_head_line ("[
+					<style>
+						table.recent-changes th { padding: 3px; }
+						table.recent-changes td { padding: 3px; border: dotted 1px #ddd; }
+						table.recent-changes td.date { padding-left: 15px; }
+						table.recent-changes td.title { font-weight: bold; }
+						</style>
+				]", True)
+		end
+
+	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
+			-- Hook execution on collection of menu contained by `a_menu_system'
+			-- for related response `a_response'.
+		local
+			lnk: CMS_LOCAL_LINK
+		do
+			create lnk.make ("Recent changes", "recent_changes/")
+			lnk.set_permission_arguments (<<"view recent changes">>)
+			a_menu_system.navigation_menu.extend (lnk)
+		end
+
+
+end
--- a/modules/recent_changes/recent_changes-safe.ecf
+++ b/modules/recent_changes/recent_changes-safe.ecf
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="recent_changes" uuid="1C3893A3-46FC-4E60-86AE-37CB7939BC7F" library_target="recent_changes">
+	<target name="recent_changes">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="cms" location="..\..\cms-safe.ecf"/>
+		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
+		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-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"/>
+		<cluster name="src" location=".\" recursive="true"/>
+	</target>
+</system>
--- a/src/hooks/cms_hook.e
+++ b/src/hooks/cms_hook.e
@@ -8,4 +8,7 @@ note
 deferred class
 	CMS_HOOK

+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/hooks/cms_hook_auto_register.e
+++ b/src/hooks/cms_hook_auto_register.e
@@ -17,24 +17,27 @@ inherit
 feature -- Hook

 	auto_subscribe_to_hooks (a_response: CMS_RESPONSE)
+		local
+			l_manager: CMS_HOOK_CORE_MANAGER
 		do
+			l_manager := a_response.hooks
 			if attached {CMS_HOOK_MENU_SYSTEM_ALTER} Current as h_menu_system_alter then
-				a_response.subscribe_to_menu_system_alter_hook (h_menu_system_alter)
+				l_manager.subscribe_to_menu_system_alter_hook (h_menu_system_alter)
 			end
 			if attached {CMS_HOOK_MENU_ALTER} Current as h_menu_alter then
-				a_response.subscribe_to_menu_alter_hook (h_menu_alter)
+				l_manager.subscribe_to_menu_alter_hook (h_menu_alter)
 			end
 			if attached {CMS_HOOK_BLOCK} Current as h_block then
-				a_response.subscribe_to_block_hook (h_block)
+				l_manager.subscribe_to_block_hook (h_block)
 			end
 			if attached {CMS_HOOK_FORM_ALTER} Current as h_form then
-				a_response.subscribe_to_form_alter_hook (h_form)
+				l_manager.subscribe_to_form_alter_hook (h_form)
 			end
 			if attached {CMS_HOOK_VALUE_TABLE_ALTER} Current as h_value then
-				a_response.subscribe_to_value_table_alter_hook (h_value)
+				l_manager.subscribe_to_value_table_alter_hook (h_value)
 			end
 			if attached {CMS_HOOK_RESPONSE_ALTER} Current as h_resp then
-				a_response.subscribe_to_response_alter_hook (h_resp)
+				l_manager.subscribe_to_response_alter_hook (h_resp)
 			end
 		end

--- a/src/hooks/cms_hook_core_manager.e
+++ b/src/hooks/cms_hook_core_manager.e
@@ -0,0 +1,160 @@
+note
+	description: "[
+			Hook manager specific for Core hooks.
+				- Value Table Alter
+				-
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_HOOK_CORE_MANAGER
+
+inherit
+	CMS_HOOK_MANAGER
+
+create
+	make
+
+feature -- Hook: value alter
+
+	subscribe_to_value_table_alter_hook (h: CMS_HOOK_VALUE_TABLE_ALTER)
+			-- Add `h' as subscriber of value table alter hooks CMS_HOOK_VALUE_TABLE_ALTER.		
+		do
+			subscribe_to_hook (h, {CMS_HOOK_VALUE_TABLE_ALTER})
+		end
+
+	invoke_value_table_alter (a_table: CMS_VALUE_TABLE; a_response: CMS_RESPONSE)
+			-- Invoke value table alter hook for table `a_table'.		
+		do
+			if attached subscribers ({CMS_HOOK_VALUE_TABLE_ALTER}) as lst then
+				across
+					lst as ic
+				loop
+					if attached {CMS_HOOK_VALUE_TABLE_ALTER} ic.item as h then
+						h.value_table_alter (a_table, a_response)
+					end
+				end
+			end
+		end
+
+feature -- Hook: response
+
+	subscribe_to_response_alter_hook (h: CMS_HOOK_RESPONSE_ALTER)
+			-- Add `h' as subscriber of response alter hooks CMS_HOOK_RESPONSE_ALTER.		
+		do
+			subscribe_to_hook (h, {CMS_HOOK_RESPONSE_ALTER})
+		end
+
+	invoke_response_alter (a_response: CMS_RESPONSE)
+			-- Invoke response alter hook for response `a_response'.		
+		do
+			if attached subscribers ({CMS_HOOK_RESPONSE_ALTER}) as lst then
+				across
+					lst as ic
+				loop
+					if attached {CMS_HOOK_RESPONSE_ALTER} ic.item as h then
+						h.response_alter (a_response)
+					end
+				end
+			end
+		end
+
+feature -- Hook: menu_system_alter
+
+	subscribe_to_menu_system_alter_hook (h: CMS_HOOK_MENU_SYSTEM_ALTER)
+			-- Add `h' as subscriber of menu system alter hooks CMS_HOOK_MENU_SYSTEM_ALTER.	
+		do
+			subscribe_to_hook (h, {CMS_HOOK_MENU_SYSTEM_ALTER})
+		end
+
+	invoke_menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
+			-- Invoke menu system alter hook for menu `a_menu_system', and response `a_response'.	
+		do
+			if attached subscribers ({CMS_HOOK_MENU_SYSTEM_ALTER}) as lst then
+				across
+					lst as ic
+				loop
+					if attached {CMS_HOOK_MENU_SYSTEM_ALTER} ic.item as h then
+						h.menu_system_alter (a_menu_system, a_response)
+					end
+				end
+			end
+		end
+
+feature -- Hook: menu_alter
+
+	subscribe_to_menu_alter_hook (h: CMS_HOOK_MENU_ALTER)
+			-- Add `h' as subscriber of menu alter hooks CMS_HOOK_MENU_ALTER.
+		do
+			subscribe_to_hook (h, {CMS_HOOK_MENU_ALTER})
+		end
+
+	invoke_menu_alter (a_menu: CMS_MENU; a_response: CMS_RESPONSE)
+			-- Invoke menu alter hook for menu `a_menu', and response `a_response'.
+		do
+			if attached subscribers ({CMS_HOOK_MENU_ALTER}) as lst then
+				across
+					lst as c
+				loop
+					if attached {CMS_HOOK_MENU_ALTER} c.item as h then
+						h.menu_alter (a_menu, a_response)
+					end
+				end
+			end
+		end
+
+
+feature -- Hook: form_alter
+
+	subscribe_to_form_alter_hook (h: CMS_HOOK_FORM_ALTER)
+			-- Add `h' as subscriber of form alter hooks CMS_HOOK_FORM_ALTER,
+			-- and response `a_response'.
+		do
+			subscribe_to_hook (h, {CMS_HOOK_MENU_ALTER})
+		end
+
+	invoke_form_alter (a_form: CMS_FORM; a_form_data: detachable WSF_FORM_DATA; a_response: CMS_RESPONSE)
+			-- Invoke form alter hook for form `a_form' and associated data `a_form_data'
+		do
+			if attached subscribers ({CMS_HOOK_FORM_ALTER}) as lst then
+				across
+					lst as c
+				loop
+					if attached {CMS_HOOK_FORM_ALTER} c.item as h then
+						h.form_alter (a_form, a_form_data, a_response)
+					end
+				end
+			end
+		end
+
+feature -- Hook: block		
+
+	subscribe_to_block_hook (h: CMS_HOOK_BLOCK)
+			-- Add `h' as subscriber of hooks CMS_HOOK_BLOCK.
+		do
+			subscribe_to_hook (h, {CMS_HOOK_BLOCK})
+		end
+
+	invoke_block (a_response: CMS_RESPONSE)
+			-- Invoke block hook for response `a_response' in order to get block from modules.
+		do
+			if attached subscribers ({CMS_HOOK_BLOCK}) as lst then
+				across
+					lst as c
+				loop
+					if attached {CMS_HOOK_BLOCK} c.item as h then
+						across
+							h.block_list as blst
+						loop
+							h.get_block_view (blst.item, a_response)
+						end
+					end
+				end
+			end
+		end
+
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
--- a/src/hooks/cms_hook_manager.e
+++ b/src/hooks/cms_hook_manager.e
@@ -0,0 +1,55 @@
+note
+	description: "Hooks manager."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_HOOK_MANAGER
+
+create
+	make
+
+feature {NONE} -- Initialization	
+
+	make
+		do
+			create all_subscribers.make (0)
+		end
+
+feature -- Access
+
+	subscribers (a_type: TYPE [CMS_HOOK]): detachable LIST [CMS_HOOK]
+			-- Subscribers of hook typed `a_type'.
+		do
+			Result := all_subscribers.item (a_type)
+		end
+
+feature -- Change
+
+	subscribe_to_hook (h: CMS_HOOK; a_hook_type: TYPE [CMS_HOOK])
+			-- Subscribe `h' to hooks identified by `a_hook_type'.
+		local
+			lst: detachable LIST [CMS_HOOK]
+		do
+			lst := all_subscribers.item (a_hook_type)
+			if lst = Void then
+				create {ARRAYED_LIST [CMS_HOOK]} lst.make (1)
+				all_subscribers.force (lst, a_hook_type)
+			end
+			if not lst.has (h) then
+				lst.force (h)
+			end
+		end
+
+feature {NONE} -- Implementation
+
+	all_subscribers: HASH_TABLE [LIST [CMS_HOOK], TYPE [CMS_HOOK]]
+
+invariant
+	all_subscribers /= Void
+
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
+
--- a/src/kernel/content/cms_block.e
+++ b/src/kernel/content/cms_block.e
@@ -23,7 +23,12 @@ feature -- Access
 	html_options: detachable CMS_HTML_OPTIONS
 			-- Optional addition html options.

-feature -- status report
+feature -- Status report
+
+	is_empty: BOOLEAN
+			-- Is current block empty?
+		deferred
+		end

 	is_enabled: BOOLEAN
 			-- Is current block enabled?
@@ -93,4 +98,7 @@ feature -- Status report
 			end
 		end

+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/kernel/content/cms_block_region.e
+++ b/src/kernel/content/cms_block_region.e
@@ -21,11 +21,10 @@ feature {NONE} -- Initialization
 feature -- Access

 	name: READABLE_STRING_8
-		-- Block region name.
+			-- Block region name.

 	blocks: ARRAYED_LIST [CMS_BLOCK]
-		-- List of blocks.
-
+			-- List of blocks.

 feature -- Element change

@@ -35,8 +34,15 @@ feature -- Element change
 			blocks.force (b)
 		end

-;note
-	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
+	remove (b: CMS_BLOCK)
+		require
+			has_block_b: blocks.has (b)
+		do
+			blocks.prune_all (b)
+		end
+
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/src/kernel/content/cms_content_block.e
+++ b/src/kernel/content/cms_content_block.e
@@ -49,6 +49,12 @@ feature -- Access

 feature -- Status report

+	is_empty: BOOLEAN
+			-- Is current block empty?
+		do
+			Result := is_raw and content.is_empty
+		end
+
 	is_raw: BOOLEAN assign set_is_raw
 			-- Is raw?
 			-- If True, do not get wrapped it with block specific div	
@@ -87,7 +93,7 @@ feature -- Conversion
 			end
 		end
 note
-	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/src/kernel/content/cms_file_block.e
+++ b/src/kernel/content/cms_file_block.e
@@ -57,12 +57,39 @@ feature -- Access
 	root_path: detachable PATH
 			-- Root location for files universe.

+	resolved_location: PATH
+			-- Path of related file, taking into account `root_path' and `location'.
+		do
+				-- Process html generation
+			if attached root_path as l_root_path then
+				Result := l_root_path.extended_path (location)
+			else
+				Result := location
+			end
+		end
+
 feature -- Status report

+	is_empty: BOOLEAN
+			-- Is current block empty?
+		do
+			Result := not exists
+			debug ("cms")
+				Result := True
+			end
+		end
+
 	is_raw: BOOLEAN
 			-- Is raw?
 			-- If True, do not get wrapped it with block specific div	

+	exists: BOOLEAN
+		local
+			ut: FILE_UTILITIES
+		do
+			Result := ut.file_path_exists (resolved_location)
+		end
+
 feature -- Element change

 	set_is_raw (b: BOOLEAN)
@@ -94,11 +121,7 @@ feature -- Conversion
 			ut: FILE_UTILITIES
 		do
 				-- Process html generation
-			if attached root_path as l_root_path then
-				p := l_root_path.extended_path (location)
-			else
-				p := location
-			end
+			p := resolved_location
 			if ut.file_path_exists (p) then
 				create f.make_with_path (p)
 				if f.exists and then f.is_access_readable then
@@ -145,4 +168,7 @@ feature -- Debug
 			end
 			Result.append ("%N")
 		end
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/kernel/content/cms_menu_block.e
+++ b/src/kernel/content/cms_menu_block.e
@@ -31,6 +31,12 @@ feature -- Access

 feature -- Status report

+	is_empty: BOOLEAN
+			-- Is current block empty?
+		do
+			Result := menu.is_empty
+		end
+
 	is_horizontal: BOOLEAN assign set_is_horizontal
 		-- Is horizontal layout for the menu?

@@ -72,4 +78,7 @@ feature -- Conversion
 			Result := a_theme.menu_html (menu, is_horizontal, html_options)
 		end

+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/kernel/content/cms_smarty_template_block.e
+++ b/src/kernel/content/cms_smarty_template_block.e
@@ -69,6 +69,9 @@ feature -- Access

 feature -- Status report

+	is_empty: BOOLEAN = False
+			-- Is current block empty?
+
 	is_raw: BOOLEAN
 			-- Is raw?
 			-- If True, do not get wrapped it with block specific div	
@@ -192,4 +195,7 @@ feature -- Debug
 			end
 			Result.append ("%N}")
 		end
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/kernel/form/cms_editor.e
+++ b/src/kernel/form/cms_editor.e
@@ -8,6 +8,7 @@ deferred class
 	CMS_EDITOR

 feature -- Initialisation
+
 	load_assets : STRING
 			-- Loads all assest needed to show the editor
 		deferred
@@ -15,57 +16,55 @@ feature -- Initialisation

 feature -- Javascript

-	javascript_replace_textarea (a_textarea : WSF_FORM_TEXTAREA) : STRING
+	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_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_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))
+			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_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
+			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)))
+			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,
+										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),
+										javascript_replace_textarea (a_textarea),

 											-- Otherwise restore it
-											javascript_restore_textarea(a_textarea)
+										javascript_restore_textarea (a_textarea)
 										)
 									)

 			Result := initial_replace_code + " " + on_select_replace_code
 		end

-	javascript_init_editor_variable(a_textarea : WSF_FORM_TEXTAREA) : STRING
+	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) + "; "
+			Result := "var " + editor_variable (a_textarea) + "; "
 		end

-
-
-	javascript_if_selected(a_select_field : WSF_FORM_SELECT; a_value : STRING; a_code : STRING) : STRING
+	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 + " }"
+			Result := "if($('#" + field_id (a_select_field) + "').val() == %"" + a_value + "%"){ " + a_code + " }"
 		end

 	javascript_ready (a_code : STRING) : STRING
@@ -77,8 +76,8 @@ feature -- Javascript
 	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) +
+			Result := "$('#" + field_id (a_select_field) + "').change(function(){" +
+					javascript_if_selected (a_select_field, a_value, a_then) +
 				"else{" +
 					a_else +
 				"}" +
@@ -100,7 +99,10 @@ feature -- Helper
 	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
+			Result := "cms_ckeditor_" + a_textarea.name
 		end

+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/kernel/form/cms_editor_ckeditor.e
+++ b/src/kernel/form/cms_editor_ckeditor.e
@@ -23,15 +23,20 @@ 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 + "' );"
+				-- Replaces the textarea with an editor instance. Save the instance in a variable
+			Result := "$(%"textarea[name="+ a_textarea.name +"]%").each(function() {"
+			Result.append (editor_variable (a_textarea) + " = CKEDITOR.replace(this);")
+			Result.append ("});")
 		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();"
+				-- 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

+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/kernel/form/cms_form.e
+++ b/src/kernel/form/cms_form.e
@@ -19,7 +19,7 @@ feature -- Basic operation

 	prepare (a_response: CMS_RESPONSE)
 		do
-			a_response.invoke_form_alter (Current, Void)
+			a_response.hooks.invoke_form_alter (Current, Void, a_response)
 		end

 	process (a_response: CMS_RESPONSE)
@@ -29,7 +29,7 @@ feature -- Basic operation

 	on_prepared (a_response: CMS_RESPONSE; fd: WSF_FORM_DATA)
 		do
-			a_response.invoke_form_alter (Current, fd)
+			a_response.hooks.invoke_form_alter (Current, fd, a_response)
 		end

 	on_processed (a_response: CMS_RESPONSE; fd: WSF_FORM_DATA)
@@ -39,4 +39,7 @@ feature -- Basic operation
 			end
 		end

+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/kernel/form/cms_form_textarea.e
+++ b/src/kernel/form/cms_form_textarea.e
@@ -24,15 +24,15 @@ feature -- Initialisation
 	make (a_name: like name)
 			-- <Precursor>
 		do
-			precursor(a_name)
+			Precursor (a_name)

 				-- By default we don't replace the textarea by an editor
-			editor := False;
+			editor_activated := False;
 		end

 feature -- Access

-	editor : BOOLEAN
+	editor_activated : BOOLEAN
 			-- True if the textarea should be replaced by the editor. Default is false.

 	format_field : detachable WSF_FORM_SELECT
@@ -45,13 +45,13 @@ feature -- Editor
 	show_as_editor
 			-- The textarea will be replaced by a wysiwyg editor
 		do
-			editor := True
+			editor_activated := 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
+			editor_activated := True
 			format_field := a_select_field
 			condition_value := a_value
 		end
@@ -61,8 +61,8 @@ 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
+			Precursor (a_theme, a_html)
+			if editor_activated 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/src/modules/cms_debug_module.e
+++ b/src/modules/cms_debug_module.e
@@ -51,7 +51,7 @@ feature -- Hooks configuration
 			-- Module hooks configuration.
 		do
 			auto_subscribe_to_hooks (a_response)
-			a_response.subscribe_to_block_hook (Current)
+			a_response.hooks.subscribe_to_block_hook (Current)
 		end

 feature -- Hooks
--- a/src/persistence/cms_storage_null.e
+++ b/src/persistence/cms_storage_null.e
@@ -101,7 +101,19 @@ feature -- Custom

 	custom_value (a_name: READABLE_STRING_GENERAL; a_type: detachable READABLE_STRING_8): detachable READABLE_STRING_32
 			-- Data for name `a_name' and type `a_type' (or default if none).
+		local
+			s: STRING_32
 		do
+			if attached api as l_api then
+				create s.make_from_string_general ("custom_values")
+				if a_type /= Void then
+					s.append_character ('.')
+					s.append_string_general (a_type)
+				end
+				s.append_character ('.')
+				s.append_string_general (a_name)
+				Result := l_api.setup.text_item (s)
+			end
 		end


--- a/src/service/response/cms_response.e
+++ b/src/service/response/cms_response.e
@@ -33,7 +33,7 @@ feature {NONE} -- Initialization
 			get_theme
 			create menu_system.make
 			initialize_block_region_settings
-			create hook_subscribers.make (0)
+			create hooks.make
 			register_hooks
 		end

@@ -403,19 +403,26 @@ feature -- Blocks initialization
 			create regions.make_caseless (5)

 			create l_table.make_caseless (10)
-			l_table["top"] := "top"
-			l_table["header"] := "header"
-			l_table["highlighted"] := "highlighted"
-			l_table["help"] := "help"
-			l_table["content"] := "content"
-			l_table["footer"] := "footer"
-			l_table["management"] := "first_sidebar"
-			l_table["navigation"] := "first_sidebar"
-			l_table["user"] := "first_sidebar"
-			l_table["bottom"] := "page_bottom"
+			l_table["top"] := block_region_preference ("top", "top")
+			l_table["header"] := block_region_preference ("header", "header")
+			l_table["highlighted"] := block_region_preference ("highlighted", "highlighted")
+			l_table["help"] := block_region_preference ("help", "help")
+			l_table["content"] := block_region_preference ("content", "content")
+			l_table["footer"] := block_region_preference ("footer", "footer")
+			l_table["management"] := block_region_preference ("management", "sidebar_first")
+			l_table["navigation"] := block_region_preference ("navigation", "sidebar_first")
+			l_table["user"] := block_region_preference ("user", "sidebar_first")
+			l_table["bottom"] := block_region_preference ("bottom", "page_bottom")
+
 			block_region_settings := l_table
 		end

+	block_region_preference (a_block_id: READABLE_STRING_8; a_default_region: READABLE_STRING_8): READABLE_STRING_8
+			-- Region associated with `a_block_id' in configuration, if any.
+		do
+			Result := setup.text_item_or_default ("blocks." + a_block_id + ".region", a_default_region)
+		end
+
 feature -- Blocks regions

 	regions: STRING_TABLE [CMS_BLOCK_REGION]
@@ -430,12 +437,15 @@ feature -- Blocks regions
 		do
 			l_region_name := block_region_settings.item (b.name)
 			if l_region_name = Void then
-				if a_default_region /= Void then
+				if attached setup.text_item ("blocks." + b.name + ".region") as l_setup_name then
+					l_region_name := l_setup_name.as_string_8 -- FIXME: potential truncated string 32.
+						-- Remember for later.
+					block_region_settings.force (l_region_name, b.name)
+				elseif a_default_region /= Void then
 					l_region_name := a_default_region
 				else
 						-- Default .. put it in same named region
 						-- Maybe a bad idea
-
 					l_region_name := b.name.as_lower
 				end
 			end
@@ -474,16 +484,16 @@ feature -- Blocks
 			add_block (content_block, "content")

 			if attached management_menu_block as l_block then
-				add_block (l_block, "first_sidebar")
+				add_block (l_block, "sidebar_first")
 			end
 			if attached navigation_menu_block as l_block then
-				add_block (l_block, "first_sidebar")
+				add_block (l_block, "sidebar_first")
 			end
 			if attached user_menu_block as l_block then
-				add_block (l_block, "first_sidebar")
+				add_block (l_block, "sidebar_second")
 			end

-			invoke_block
+			hooks.invoke_block (Current)
 			debug ("cms")
 				add_block (create {CMS_CONTENT_BLOCK}.make ("made_with", Void, "Made with <a href=%"http://www.eiffel.com/%">EWF</a>", Void), "footer")
 			end
@@ -596,159 +606,8 @@ feature -- Blocks

 feature -- Hooks

-	hook_subscribers: HASH_TABLE [LIST [CMS_HOOK], TYPE [CMS_HOOK]]
-			-- Hook indexed by hook identifier.
-
-	subscribe_to_hook (h: CMS_HOOK; a_hook_type: TYPE [CMS_HOOK])
-			-- Subscribe `h' to hooks identified by `a_hook_type'.
-		local
-			lst: detachable LIST [CMS_HOOK]
-		do
-			lst := hook_subscribers.item (a_hook_type)
-			if lst = Void then
-				create {ARRAYED_LIST [CMS_HOOK]} lst.make (1)
-				hook_subscribers.force (lst, a_hook_type)
-			end
-			if not lst.has (h) then
-				lst.force (h)
-			end
-		end
-
-feature -- Hook: value alter
-
-	subscribe_to_value_table_alter_hook (h: CMS_HOOK_VALUE_TABLE_ALTER)
-			-- Add `h' as subscriber of value table alter hooks CMS_HOOK_VALUE_TABLE_ALTER.		
-		do
-			subscribe_to_hook (h, {CMS_HOOK_VALUE_TABLE_ALTER})
-		end
-
-	invoke_value_table_alter (a_table: CMS_VALUE_TABLE)
-			-- Invoke value table alter hook for table `a_table'.		
-		do
-			if attached hook_subscribers.item ({CMS_HOOK_VALUE_TABLE_ALTER}) as lst then
-				across
-					lst as c
-				loop
-					if attached {CMS_HOOK_VALUE_TABLE_ALTER} c.item as h then
-						h.value_table_alter (a_table, Current)
-					end
-				end
-			end
-		end
-
-feature -- Hook: response
-
-	subscribe_to_response_alter_hook (h: CMS_HOOK_RESPONSE_ALTER)
-			-- Add `h' as subscriber of response alter hooks CMS_HOOK_RESPONSE_ALTER.		
-		do
-			subscribe_to_hook (h, {CMS_HOOK_RESPONSE_ALTER})
-		end
-
-	invoke_response_alter (a_response: CMS_RESPONSE)
-			-- Invoke value table alter hook for table `a_table'.		
-		do
-			if attached hook_subscribers.item ({CMS_HOOK_RESPONSE_ALTER}) as lst then
-				across
-					lst as c
-				loop
-					if attached {CMS_HOOK_RESPONSE_ALTER} c.item as h then
-						h.response_alter (a_response)
-					end
-				end
-			end
-		end
-
-feature -- Hook: menu_system_alter
-
-	subscribe_to_menu_system_alter_hook (h: CMS_HOOK_MENU_SYSTEM_ALTER)
-			-- Add `h' as subscriber of menu system alter hooks CMS_HOOK_MENU_SYSTEM_ALTER.	
-		do
-			subscribe_to_hook (h, {CMS_HOOK_MENU_SYSTEM_ALTER})
-		end
-
-	invoke_menu_system_alter (a_menu_system: CMS_MENU_SYSTEM)
-			-- Invoke menu system alter hook for menu `a_menu_system'.	
-		do
-			if attached hook_subscribers.item ({CMS_HOOK_MENU_SYSTEM_ALTER}) as lst then
-				across
-					lst as c
-				loop
-					if attached {CMS_HOOK_MENU_SYSTEM_ALTER} c.item as h then
-						h.menu_system_alter (a_menu_system, Current)
-					end
-				end
-			end
-		end
-
-feature -- Hook: menu_alter
-
-	subscribe_to_menu_alter_hook (h: CMS_HOOK_MENU_ALTER)
-			-- Add `h' as subscriber of menu alter hooks CMS_HOOK_MENU_ALTER.
-		do
-			subscribe_to_hook (h, {CMS_HOOK_MENU_ALTER})
-		end
-
-	invoke_menu_alter (a_menu: CMS_MENU)
-			-- Invoke menu alter hook for menu `a_menu'.
-		do
-			if attached hook_subscribers.item ({CMS_HOOK_MENU_ALTER}) as lst then
-				across
-					lst as c
-				loop
-					if attached {CMS_HOOK_MENU_ALTER} c.item as h then
-						h.menu_alter (a_menu, Current)
-					end
-				end
-			end
-		end
-
-feature -- Hook: form_alter
-
-	subscribe_to_form_alter_hook (h: CMS_HOOK_FORM_ALTER)
-			-- Add `h' as subscriber of form alter hooks CMS_HOOK_FORM_ALTER.
-		do
-			subscribe_to_hook (h, {CMS_HOOK_MENU_ALTER})
-		end
-
-	invoke_form_alter (a_form: CMS_FORM; a_form_data: detachable WSF_FORM_DATA)
-			-- Invoke form alter hook for form `a_form' and associated data `a_form_data'
-		do
-			if attached hook_subscribers.item ({CMS_HOOK_FORM_ALTER}) as lst then
-				across
-					lst as c
-				loop
-					if attached {CMS_HOOK_FORM_ALTER} c.item as h then
-						h.form_alter (a_form, a_form_data, Current)
-					end
-				end
-			end
-		end
-
-feature -- Hook: block		
-
-	subscribe_to_block_hook (h: CMS_HOOK_BLOCK)
-			-- Add `h' as subscriber of hooks CMS_HOOK_BLOCK.
-		do
-			subscribe_to_hook (h, {CMS_HOOK_BLOCK})
-		end
-
-	invoke_block
-			-- Invoke block hook in order to get block from modules.
-		do
-			if attached hook_subscribers.item ({CMS_HOOK_BLOCK}) as lst then
-				across
-					lst as c
-				loop
-					if attached {CMS_HOOK_BLOCK} c.item as h then
-						across
-							h.block_list as blst
-						loop
-							h.get_block_view (blst.item, Current)
-						end
-					end
-				end
-			end
-		end
+	hooks: CMS_HOOK_CORE_MANAGER
+			-- Manager handling hook subscriptions.

 feature -- Menu: change

@@ -771,9 +630,6 @@ feature -- Menu: change

 	add_to_menu (lnk: CMS_LINK; m: CMS_MENU)
 		do
--			if attached {CMS_LOCAL_LINK} lnk as l_local then
--				l_local.get_is_active (request)
--			end
 			m.extend (lnk)
 		end

@@ -882,13 +738,15 @@ feature -- Generation
 	prepare (page: CMS_HTML_PAGE)
 		local
 			lnk: CMS_LINK
+			l_region: CMS_BLOCK_REGION
 			l_menu_list_prepared: ARRAYED_LIST [CMS_LINK_COMPOSITE]
+			l_empty_blocks: detachable ARRAYED_LIST [CMS_BLOCK]
 		do
 				-- Menu
 			create {CMS_LOCAL_LINK} lnk.make ("Home", "")
 			lnk.set_weight (-10)
 			add_to_primary_menu (lnk)
-			invoke_menu_system_alter (menu_system)
+			hooks.invoke_menu_system_alter (menu_system, Current)

 			if api.enabled_modules.count = 0 then
 				add_to_primary_menu (create {CMS_LOCAL_LINK}.make ("Install", "admin/install"))
@@ -900,14 +758,29 @@ feature -- Generation
 			across
 				regions as reg_ic
 			loop
+				l_region := reg_ic.item
 				across
-					reg_ic.item.blocks as ic
+					l_region.blocks as ic
 				loop
 					if attached {CMS_MENU_BLOCK} ic.item as l_menu_block then
 						l_menu_list_prepared.force (l_menu_block.menu)
 						prepare_links (l_menu_block.menu)
+						if l_menu_block.menu.is_empty then
+							if l_empty_blocks = Void then
+								create l_empty_blocks.make (1)
+							end
+							l_empty_blocks.force (l_menu_block)
+						end
 					end
 				end
+				if l_empty_blocks /= Void then
+					across
+						l_empty_blocks as ic
+					loop
+						l_region.remove (ic.item)
+					end
+					l_empty_blocks := Void
+				end
 			end

 				-- Prepare menu not in a block.
@@ -931,10 +804,10 @@ feature -- Generation
 			custom_prepare (page)

 				-- Cms response
-			invoke_response_alter (Current)
+			hooks.invoke_response_alter (Current)

 				-- Cms values
-			invoke_value_table_alter (values)
+			hooks.invoke_value_table_alter (values, Current)

 				-- Predefined values
 			page.register_variable (page, "page") -- DO NOT REMOVE
--- a/tools/roc.bat
+++ b/tools/roc.bat
@@ -0,0 +1,39 @@
+@echo off
+setlocal
+
+if "%ROC_TOOL_PATH%" == "" goto LOCAL_ROC_TOOL
+goto start
+
+:LOCAL_ROC_TOOL
+if exist "%~dp0roc.exe" set ROC_TOOL_PATH=%~dp0
+
+if "%ROC_TOOL_PATH%" == "" goto SEARCH_ROC_TOOL
+goto START
+
+:SEARCH_ROC_TOOL
+for %%f in (roc.exe) do (
+    if exist "%%~dp$PATH:f" set ROC_TOOL_PATH="%%~dp$PATH:f"
+ )
+if "%ROC_TOOL_PATH%" == "" goto BUILD_ROC_TOOL
+echo Using roc.exe from %ROC_TOOL_PATH%
+goto START
+
+:BUILD_ROC_TOOL
+set ROC_SRCDIR=%~dp0roc
+set ROC_COMPDIR=%~dp0.roc-comp
+mkdir %ROC_COMPDIR%
+call ecb -config %ROC_SRCDIR%\roc.ecf -finalize -c_compile -project_path %ROC_COMPDIR%
+copy %ROC_COMPDIR%\EIFGENs\roc\F_code\roc.exe %~dp0roc.exe
+rd /q/s %ROC_COMPDIR%
+
+set ROC_TOOL_PATH=%~dp0
+goto START
+
+:START
+echo Calling %ROC_TOOL_PATH%roc.exe %*
+call %ROC_TOOL_PATH%roc.exe %*
+goto END
+
+:END
+endlocal
+exit /B 0
Author	SHA1	Message	Date
Jocelyn Fiat	f9ecd4956f	Keep the until date in the form data, so that new filter will remember the until date.	2015-09-09 23:12:52 +02:00
Jocelyn Fiat	18e159ad3c	Simplified the add child mechanism, by using a query parameter ?parent=nid (instead of specific node/{nid}/add_child/page url) Fixed implementation of `CMS_NODE_API.is_node_a_parent_of (..)', and improved parent validity checking against cycle.	2015-09-09 23:04:08 +02:00
Jocelyn Fiat	438259033a	Renamed link "Trash" to "Move to trash".	2015-09-09 22:10:13 +02:00
Jocelyn Fiat	62e74ea6cd	Refactor notion of trash and delete. - Trash a node now does a soft delete (move to trash container). - Delete a node now remove it from the storage (no undo). Signed-off-by: jvelilla <javier.hector@gmail.com>	2015-09-09 22:05:23 +02:00
Jocelyn Fiat	32a409b7e9	Refactored add child feature, to have all the page specific code in CMS_PAGE_NODE_TYPE_WEBFORM_MANAGER (and not in the general node code). Note that ideally PAGE could be a separated page node module (as it is for blog). Added listing of children for each "page".	2015-09-09 21:58:16 +02:00
jvelilla	eb70af6f19	CMS_NODE_API.available_parents_for_node - Fixed comment. - added check to know if there are potencial cycles - added postcondition to ensure the list of potencial parent will not produce a cycle. CMS_PAGE_NODE_TYPE_WEBFORM_MANAGER.update_node - Updated code to handle unassing parent from a node when the user - submit a -1 value. NODE_FORM_RESPONSE.edit_form_validation - Added validation for node_parent, check if the input is valid and then - if exist a valid node in the list of available parents for the current node. Signed-off-by: jvelilla <javier.hector@gmail.com>	2015-09-09 16:53:37 +02:00
Jocelyn Fiat	5f4eb2cf10	Correct implementation of node extension save operation.	2015-09-08 20:44:00 +02:00
Jocelyn Fiat	88bc52fffb	Updated roc script, install module for the examples, and updated demo site folder.	2015-09-08 16:03:36 +02:00
jvelilla	544e6540ed	Add child page support. - Add support to create a new node as a child of an existing node. - Update or add a parent for a given node. Fix delete and trash behavior: when a node is not published only the - author or admin see it. Fix Node and Page node Revisions.	2015-09-08 15:57:17 +02:00
Jocelyn Fiat	2431d7af6c	Improved the recent changes modules: - extracted from populate_recent_changes, the recent_changes_sources that enables to filter early. Added author_name to the CMS_RECENT_CHANGE_ITEM to support author which is not related to any CMS_USER. Implemented the simple filtering on source and add parameters size and date.	2015-09-03 14:47:17 +02:00
jvelilla	0d55bd67a2	Updated Basic Auth Module: remove the escaping from the logout message	2015-09-01 12:56:26 -03:00
jvelilla	e1727cc445	Merge branch 'jvelilla-roc_logout'	2015-09-01 11:50:37 -03:00
jvelilla	634a078282	Updated Loging form: Display invalid credentials message inside the primary-tabs div. Added support to submit the form using <Enter>.	2015-09-01 11:41:50 -03:00
jvelilla	2f65a084ac	Updated logout message. Change message and added a div to make it easier style the site	2015-09-01 11:15:25 -03:00
jvelilla	13df6fd593	Added Logout message	2015-09-01 10:55:28 -03:00
Jocelyn Fiat	ad4f020d0e	The NULL storage may look into the CMS configuration file. This allows to run the CMS without any database.	2015-08-21 19:16:31 +02:00
Jocelyn Fiat	7a13b47131	Fixed cms library compilation. CMS_FILE_BLOCK was missing `is_empty' implementation.	2015-08-19 12:34:35 +02:00
Jocelyn Fiat	923089baa1	Better js code to apply CKEditor.replace, mainly to select only textarea.name=$name. code cleaning.	2015-08-18 19:24:18 +02:00
Jocelyn Fiat	cfec9dc7f8	Do not include empty blocks, this way, we avoid empty sidebars if not needed.	2015-08-18 10:58:31 +02:00
Jocelyn Fiat	b5e7d5d201	Require "view recent changes" permission to see the recent changes.	2015-08-17 17:40:55 +02:00
Jocelyn Fiat	e1bdcb965c	Added permission arguments to "trash" and "Create" links. Added blocks configuration settings via the cms.ini and "blocks" section ex: [blocks] navigation.region=sidebar_first This enables the site to change default block location, and even hides it easily, if the theme does not include associated region name.	2015-08-13 00:44:16 +02:00
Jocelyn Fiat	0061afcbe8	use "deleted" instead of "trashed" .	2015-08-12 19:03:40 +02:00
Jocelyn Fiat	6a9bc8aa42	Updated admin and recent_changes module permissions declaration.	2015-08-12 19:00:17 +02:00
Jocelyn Fiat	1d7d79d69e	Cleaned up hooks related code, and always go via CMS_RESPONSE.hooks	2015-08-12 17:50:23 +02:00
Jocelyn Fiat	46014da3d8	Added recent_changes module. Revisited hooks management, and added new CMS_HOOK_MANAGER. Added admin, and other link into navigation menu that goes into first sidebar. Fixed theme info, and template for sidebar ids. Better css class name for cms node content.	2015-08-12 17:30:07 +02:00