Merged branch 'master' into es17.05

When access is denied, also provide when possible and wanted, the needed
permissions so that in the future, user will be able to ask for
permission easily.
Renamed previous user handlers as admin user handlers.
Added non admin user handler /user/{uid} .
Add new `send_...` response to `CMS_API.response_api`, and use them
instead of `create {...RESPONSE}.... ; execute`.
Fixed potential issue with storage mailer initialization if folder does
not exist.
Added utf_8_encoded helpers function on CMS_API interface.
Fixed a few unicode potential issues.
Removed a few obsolete calls.

.gitignore

@@ -4,4 +4,6 @@ EIFGENs
 *.rc
 *.bak
 *.sqlite
+.*.swo
 Thumbs.db
+*.dll

cms-safe.ecf

@@ -1,37 +1,3 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
-	<target name="cms">
-		<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>
-		<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
-		<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="cms_app_env" location=".\library\app_env\app_env-safe.ecf"/>
-		<library name="cms_config" location=".\library\configuration\config-safe.ecf"/>
-		<library name="cms_model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
-		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
-		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-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="i18n" location="$ISE_LIBRARY\library\i18n\i18n-safe.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
-		<library name="kmp_matcher" location="$ISE_LIBRARY\library\text\regexp\kmp_matcher\kmp_matcher-safe.ecf"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
-		<library name="notification_mailer" location="$ISE_LIBRARY\contrib\library\runtime\process\notification_email\notification_email-safe.ecf"/>
-		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf" readonly="false"/>
-		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template-safe.ecf"/>
-		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
-		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
-		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf" readonly="false"/>
-		<cluster name="src" location=".\src\" recursive="true"/>
-	</target>
-</system>
+<redirection xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" message="Obsolete: use cms.ecf !" location="cms.ecf">
+</redirection>

cms.ecf

@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
-	<description>ROC CMS library</description>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
 	<target name="cms">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" void_safety="none" syntax="transitional">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		<option warning="true">
 		</option>
 		<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
@@ -30,6 +28,7 @@
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template.ecf"/>
+		<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>

dev_modules/masquerade_auth/masquerade_api.e

@@ -0,0 +1,87 @@
+note
+	description: "API to manage CMS User session authentication"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	MASQUERADE_API
+
+inherit
+	CMS_AUTH_API_I
+
+	REFACTORING_HELPER
+
+create {MASQUERADE_AUTH_MODULE}
+	make_with_session_api
+
+feature {NONE} -- Initialization
+
+	make_with_session_api (a_api: CMS_API; a_session_api: CMS_SESSION_API)
+		do
+			session_api := a_session_api
+			make (a_api)
+		end
+
+feature -- Access
+
+	session_api: CMS_SESSION_API
+
+feature -- Status report
+
+	has_permission_to_masquerade (a_user: detachable CMS_USER): BOOLEAN
+		local
+			v: STRING
+		do
+			if attached cms_api.setup.string_8_item_or_default ("dev.masquerade", "permission") as s then
+				v := s
+				v.left_adjust
+				v.right_adjust
+				if v.is_case_insensitive_equal_general ("none") then
+				elseif v.is_case_insensitive_equal_general ("all") then
+					Result := True
+				elseif v.is_case_insensitive_equal_general ("permission") then
+					Result := cms_api.user_has_permission (a_user, "masquerade")
+				else
+						-- no!
+				end
+			end
+		end
+
+	is_authenticating (a_response: CMS_RESPONSE): BOOLEAN
+		do
+			if
+				a_response.is_authenticated and then
+				attached a_response.request.cookie (session_api.session_token)
+			then
+				Result := True
+			end
+		end
+
+feature -- Basic operation
+
+	process_user_login (a_user: CMS_USER; req: WSF_REQUEST; res: WSF_RESPONSE)
+		do
+			session_api.process_user_login (a_user, req, res)
+		end
+
+	process_user_logout (a_user: CMS_USER; req: WSF_REQUEST; res: WSF_RESPONSE)
+		do
+			session_api.process_user_logout (a_user, req, res)
+		end
+
+feature -- Access
+
+--	user_by_session_token (a_token: READABLE_STRING_32): detachable CMS_USER
+--			-- Retrieve user by token `a_token', if any.
+--		do
+--			Result := session_auth_storage.user_by_session_token (a_token)
+--		end
+
+--	has_user_token (a_user: CMS_USER): BOOLEAN
+--			-- Has the user `a_user' and associated session token?
+--		do
+--			Result := session_auth_storage.has_user_token (a_user)
+--		end
+
+
+end

dev_modules/masquerade_auth/masquerade_auth-safe.ecf

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<redirection xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" uuid="73DA3649-BA18-426C-91CD-5892D52C811C" message="Obsolete: use masquerade_auth.ecf !" location="masquerade_auth.ecf">
+</redirection>

dev_modules/masquerade_auth/masquerade_auth.ecf

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="masquerade_auth" uuid="73DA3649-BA18-426C-91CD-5892D52C811C" library_target="masquerade_auth">
+	<target name="masquerade_auth">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
+		</file_rule>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms" location="..\..\cms.ecf"/>
+		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
+		<library name="cms_auth_module" location="..\..\modules\auth\auth.ecf" readonly="false"/>
+		<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/>
+		<library name="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth.ecf" readonly="false"/>
+		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
+		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
+		<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\web\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
+		<cluster name="src" location=".\" recursive="true"/>
+	</target>
+</system>

dev_modules/masquerade_auth/masquerade_auth_module.e

@@ -0,0 +1,268 @@
+note
+	description: "[
+			This module allows the use Session Based Authentication using Cookies to restrict access
+			by looking up users in the given providers.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	MASQUERADE_AUTH_MODULE
+
+inherit
+	CMS_AUTH_MODULE_I
+		rename
+			module_api as masquerade_api
+		redefine
+			make,
+			setup_hooks,
+			initialize,
+			install,
+			permissions,
+			masquerade_api,
+			menu_system_alter
+		end
+
+	CMS_HOOK_BLOCK
+
+	CMS_HOOK_MENU_SYSTEM_ALTER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+		do
+			Precursor
+			version := "1.0"
+			description := "Service to easily log as user at development time"
+			package := "debug"
+			disable -- Disabled by default
+			add_dependency ({CMS_SESSION_AUTH_MODULE})
+		end
+
+feature -- Access
+
+	name: STRING = "masquerade_auth"
+
+	permissions: LIST [READABLE_STRING_8]
+			-- List of permission ids, used by this module, and declared.
+		do
+			Result := Precursor
+			Result.extend ("masquerade")
+		end
+
+feature {CMS_API} -- Module Initialization			
+
+	initialize (a_api: CMS_API)
+			-- <Precursor>
+		do
+			Precursor (a_api)
+
+			if attached {CMS_SESSION_API} a_api.module_api ({CMS_SESSION_AUTH_MODULE}) as l_session_api then
+					-- API initialization
+				create masquerade_api.make_with_session_api (a_api, l_session_api)
+			end
+		end
+
+feature {CMS_API} -- Module management
+
+	install (api: CMS_API)
+		do
+			Precursor {CMS_AUTH_MODULE_I} (api) -- Mark it as installed.
+		end
+
+feature {CMS_API} -- Access: API
+
+	masquerade_api: detachable MASQUERADE_API
+			-- <Precursor>	
+
+feature -- Access: auth strategy	
+
+	login_title: STRING = "Masquerade"
+			-- Module specific login title.
+
+	login_location: STRING = "account/auth/roc-masquerade-login"
+
+	logout_location: STRING = "account/auth/roc-masquerade-logout"
+
+	is_authenticating (a_response: CMS_RESPONSE): BOOLEAN
+			-- <Precursor>
+		do
+			if attached masquerade_api as l_masquerade_api then
+				Result := l_masquerade_api.is_authenticating (a_response)
+			end
+		end
+
+feature -- Access: router
+
+	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
+			-- <Precursor>
+		do
+			if attached masquerade_api as l_masquerade_api then
+				a_router.handle ("/" + login_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_login (a_api, ?, ?)), a_router.methods_head_get)
+				a_router.handle ("/" + logout_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_logout (a_api, l_masquerade_api, ?, ?)), a_router.methods_get_post)
+				a_router.handle ("/" + login_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_login_with_masquerade (a_api, l_masquerade_api,?, ?)), a_router.methods_post)
+			end
+		end
+
+feature {NONE} -- Implementation: routes
+
+	handle_login (api: CMS_API; req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			r: CMS_RESPONSE
+		do
+			create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+			if
+				attached masquerade_api as l_masquerade_api and then
+				l_masquerade_api.has_permission_to_masquerade (api.user)
+			then
+				if api.user_is_authenticated then
+					r.add_warning_message ("You are signed.")
+				end
+				r.add_block (login_block ("login", Void, r), "content")
+			else
+				r.add_error_message ("You are not allowed to use masquerade authentication!")
+			end
+			r.execute
+		end
+
+	handle_logout (api: CMS_API; a_masquerade_api: MASQUERADE_API ; req: WSF_REQUEST; res: WSF_RESPONSE)		local
+			r: CMS_RESPONSE
+		do
+			if attached api.user as l_user then
+				a_masquerade_api.process_user_logout (l_user, req, res)
+				create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+			else
+					-- Not loggued in ... redirect to home
+				create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+				r.set_status_code ({HTTP_CONSTANTS}.found)
+			end
+			if
+				attached {WSF_STRING} req.item ("destination") as p_destination and then
+				attached p_destination.value as v and then
+				v.is_valid_as_string_8
+			then
+				r.set_redirection (v.to_string_8)
+			else
+				r.set_redirection (req.absolute_script_url (""))
+			end
+
+			r.execute
+		end
+
+	handle_login_with_masquerade (api: CMS_API; a_masquerade_api: MASQUERADE_API; req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			r: CMS_RESPONSE
+		do
+			if a_masquerade_api.has_permission_to_masquerade (api.user) then
+				if
+					attached {WSF_STRING} req.form_parameter ("username") as l_username
+				then
+					if
+						attached api.user_api.user_by_name (l_username.value) as l_user
+					then
+						a_masquerade_api.process_user_login (l_user, req, res)
+
+						create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+						if
+							attached {WSF_STRING} req.item ("destination") as p_destination and then
+							attached p_destination.value as v and then
+							v.is_valid_as_string_8
+						then
+							r.set_redirection (v.to_string_8)
+						else
+							r.set_redirection ("")
+						end
+					else
+						create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+						r.add_block (login_block ("login", Void, r), "content")
+					end
+				else
+					create {BAD_REQUEST_ERROR_CMS_RESPONSE} r.make (req, res, api)
+					r.add_block (login_block ("login", "Wrong username", r), "content")
+				end
+				r.execute
+			else
+				api.response_api.send_access_denied (Void, req, res)
+			end
+		end
+
+feature -- Hooks configuration
+
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
+			-- Module hooks configuration.
+		do
+			Precursor (a_hooks)
+			a_hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+		end
+
+feature -- Hooks
+
+	block_list: ITERABLE [like {CMS_BLOCK}.name]
+		do
+			Result := <<"?login">>
+		end
+
+	get_block_view (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
+		do
+			if a_block_id.is_case_insensitive_equal_general ("login") then
+				a_response.add_block (login_block (a_block_id, Void, a_response), "content")
+			end
+		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
+			u: detachable CMS_USER
+		do
+			u := a_response.api.user
+			if
+				attached masquerade_api as l_masquerade_api and then
+				l_masquerade_api.has_permission_to_masquerade (u)
+			then
+				Precursor (a_menu_system, a_response)
+				if u /= Void then
+					a_menu_system.navigation_menu.extend (a_response.local_link ("Masquerade", login_location))
+				end
+			end
+		end
+
+feature {NONE} -- Block views
+
+	login_block (a_block_id: READABLE_STRING_8; a_err: detachable READABLE_STRING_8; a_response: CMS_RESPONSE): CMS_CONTENT_BLOCK
+		do
+			create Result.make (a_block_id, Void, login_html (a_err, a_response), Void)
+		end
+
+	login_html (a_err: detachable READABLE_STRING_8; a_response: CMS_RESPONSE): STRING
+		local
+			params: CMS_DATA_QUERY_PARAMETERS
+			u: CMS_USER
+		do
+			create Result.make_from_string ("<div class=%"login-box%">")
+			if a_err /= Void then
+				Result.append ("<div class=%"error%">")
+				Result.append (a_err)
+				Result.append ("</div>")
+			end
+			Result.append ("<form name=%"masquerade_auth%" action=%"" + a_response.site_url + login_location + "%" method=%"POST%">%N")
+			Result.append ("<div><input type=%"text%" name=%"username%" id=%"username%" required value=%"%"><label>Username</label></div>")
+			Result.append ("<button type=%"submit%">Login</button>")
+
+			create params.make (0, a_response.api.user_api.users_count.as_natural_32)
+			across
+				a_response.api.user_api.recent_users (params) as ic
+			loop
+				u := ic.item
+				Result.append ("<li>")
+				Result.append (a_response.html_encoded (a_response.api.user_display_name (u)))
+				Result.append ("</li>%N")
+			end
+			Result.append ("</form></div>")
+		end
+
+end

examples/demo/.gitignore

@@ -0,0 +1,4 @@
+site/db/*
+site/files/*
+site/export/*
+site/import/*

examples/demo/demo-safe.ecf

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="demo" uuid="3643E657-BCBE-46AA-931B-71EAEA877A18" library_target="demo">
-	<description>Example/demo for Eiffel ROC CMS library</description>
-	<target name="common" abstract="true">
-		<root class="DEMO_CMS_SERVER" feature="make_and_launch"/>
-		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
-		<option debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
-			<debug name="dbglog" enabled="true"/>
-		</option>
-		<setting name="concurrency" value="thread"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="cms" location="..\..\cms-safe.ecf" readonly="false">
-			<option>
-				<assertions precondition="true" postcondition="true" supplier_precondition="true"/>
-			</option>
-		</library>
-		<library name="cms_admin_module" location="..\..\modules\admin\admin-safe.ecf" readonly="false"/>
-		<library name="cms_app_env" location="..\..\library\app_env\app_env-safe.ecf" readonly="false"/>
-		<library name="cms_auth_module" location="..\..\modules\auth\auth-safe.ecf" readonly="false"/>
-		<library name="cms_basic_auth_module" location="..\..\modules\basic_auth\basic_auth-safe.ecf" readonly="false"/>
-		<library name="cms_blog_module" location="..\..\modules\blog\cms_blog_module-safe.ecf" readonly="false"/>
-		<library name="cms_demo_module" location="modules\demo\cms_demo_module-safe.ecf" readonly="false"/>
-		<library name="cms_email_service" location="..\..\library\email\email-safe.ecf" readonly="false"/>
-		<library name="cms_feed_aggregator_module" location="..\..\modules\feed_aggregator\feed_aggregator-safe.ecf" readonly="false"/>
-		<library name="cms_google_search_module" location="..\..\modules\google_search\google_search-safe.ecf" readonly="false" use_application_options="true"/>
-		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
-		<library name="cms_node_module" location="..\..\modules\node\node-safe.ecf" readonly="false"/>
-		<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy-safe.ecf" readonly="false"/>
-		<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_recent_changes_module" location="..\..\modules\recent_changes\recent_changes-safe.ecf" readonly="false"/>
-		<library name="persistence_sqlite3" location="..\..\library\persistence\sqlite3\sqlite3-safe.ecf" readonly="false">
-			<option>
-				<assertions/>
-			</option>
-		</library>
-		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-safe.ecf"/>
-		<!--
-		<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-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"/>
-	</target>
-	<target name="demo_any" extends="common">
-		<setting name="concurrency" value="thread"/>
-		<library name="any_launcher" location="..\..\launcher\any-safe.ecf" readonly="false"/>
-		<cluster name="src" location=".\src\" recursive="true"/>
-	</target>
-	<target name="demo_standalone" extends="common">
-		<option debug="true">
-			<debug name="dbglog" enabled="true"/>
-		</option>
-		<setting name="concurrency" value="scoop"/>
-		<variable name="httpd_ssl_disabled" value="true"/>
-		<library name="standalone_launcher" location="..\..\launcher\standalone-safe.ecf" readonly="false"/>
-		<cluster name="src" location=".\src\" recursive="true"/>
-	</target>
-	<target name="demo_standalone_none" extends="demo_standalone">
-		<setting name="concurrency" value="none"/>
-	</target>
-	<target name="demo_standalone_mt" extends="demo_standalone">
-		<setting name="concurrency" value="thread"/>
-	</target>
-	<target name="demo_standalone_scoop" extends="demo_standalone">
-		<setting name="concurrency" value="scoop"/>
-	</target>
-	<target name="demo_cgi" extends="common">
-		<setting name="concurrency" value="none"/>
-		<library name="cgi_launcher" location="..\..\launcher\cgi-safe.ecf" readonly="false"/>
-		<cluster name="src" location=".\src\" recursive="true"/>
-	</target>
-	<target name="demo_libfcgi" extends="common">
-		<setting name="concurrency" value="none"/>
-		<library name="libfcgi_launcher" location="..\..\launcher\libfcgi-safe.ecf" readonly="false"/>
-		<cluster name="src" location=".\src\" recursive="true"/>
-	</target>
-	<target name="demo" extends="demo_standalone">
-	</target>
-</system>

examples/demo/demo.ecf

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="demo" uuid="3643E657-BCBE-46AA-931B-71EAEA877A18" library_target="demo">
+	<description>Example/demo for Eiffel ROC CMS library</description>
+	<target name="common" abstract="true">
+		<root class="DEMO_CMS_SERVER" feature="make_and_launch"/>
+		<file_rule>
+			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
+		</file_rule>
+		<option debug="true" warning="true">
+		</option>
+		<setting name="executable_name" value="demo"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms" location="..\..\cms.ecf" readonly="false">
+			<option>
+				<assertions precondition="true" postcondition="true" supplier_precondition="true"/>
+			</option>
+		</library>
+		<library name="cms_admin_module" location="..\..\modules\admin\admin.ecf" readonly="false"/>
+		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
+		<library name="cms_auth_module" location="..\..\modules\auth\auth.ecf" readonly="false"/>
+		<library name="cms_basic_auth_module" location="..\..\modules\basic_auth\basic_auth.ecf" readonly="false"/>
+		<library name="cms_blog_module" location="..\..\modules\blog\cms_blog_module.ecf" readonly="false"/>
+		<library name="cms_comments_module" location="..\..\modules\comments\comments.ecf" readonly="false"/>
+		<library name="cms_contact_module" location="..\..\modules\contact\contact.ecf" readonly="false"/>
+		<library name="cms_custom_block_module" location="..\..\modules\custom_block\custom_block.ecf" readonly="false"/>
+		<library name="cms_demo_module" location="modules\demo\cms_demo_module.ecf" readonly="false"/>
+		<library name="cms_feed_aggregator_module" location="..\..\modules\feed_aggregator\feed_aggregator.ecf" readonly="false"/>
+		<library name="cms_files_module" location="..\..\modules\files\files.ecf" readonly="false"/>
+		<library name="cms_google_search_20_module" location="..\..\modules\google_search_20\google_search_20"/>
+		<library name="cms_messaging_module" location="..\..\modules\messaging\messaging.ecf"/>
+		<library name="cms_node_module" location="..\..\modules\node\node.ecf" readonly="false"/>
+		<library name="cms_oauth_20_module" location="..\..\modules\oauth20\oauth20.ecf" readonly="false"/>
+		<library name="cms_openid_module" location="..\..\modules\openid\openid.ecf" readonly="false"/>
+		<library name="cms_recent_changes_module" location="..\..\modules\recent_changes\recent_changes.ecf" readonly="false"/>
+		<library name="cms_seo_module" location="..\..\modules\seo\seo.ecf" readonly="false"/>
+		<library name="cms_sitemap_module" location="..\..\modules\sitemap\sitemap.ecf" readonly="false"/>
+		<library name="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth.ecf" readonly="false"/>
+		<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy.ecf" readonly="false"/>
+		<library name="cms_wikitext_module" location="..\..\modules\wikitext\wikitext.ecf" readonly="false"/>
+		<library name="embedded_video_module" location="..\..\modules\embedded_video\embedded_video.ecf" readonly="false"/>
+		<library name="masquerade_auth_module" location="..\..\dev_modules\masquerade_auth\masquerade_auth.ecf" readonly="false"/>
+		<library name="persistence_sqlite3" location="..\..\library\persistence\sqlite3\sqlite3.ecf" readonly="false"/>
+		<!--
+			 By default, commented, since it depends on specific environment settings.
+		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc.ecf"/>
+		<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql.ecf" />
+		-->		
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
+	</target>
+	<target name="demo_any" extends="common">
+		<library name="any_launcher" location="..\..\launcher\any.ecf" readonly="false"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_standalone" extends="common">
+		<option debug="true">
+			<debug name="dbglog" enabled="true"/>
+		</option>
+		<variable name="httpd_ssl_disabled" value="true"/>
+		<library name="standalone_launcher" location="..\..\launcher\standalone.ecf" readonly="false"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_standalone_none" extends="demo_standalone">
+		<capability>
+			<concurrency support="none" use="none"/>
+		</capability>
+	</target>
+	<target name="demo_standalone_mt" extends="demo_standalone">
+		<capability>
+			<concurrency support="thread" use="thread"/>
+		</capability>
+	</target>
+	<target name="demo_standalone_scoop" extends="demo_standalone">
+
+	</target>
+	<target name="demo_standalone_scoop_ssl" extends="demo_standalone_scoop">
+		<capability>
+			<concurrency support="scoop" use="scoop"/>
+		</capability>
+		<variable name="httpd_ssl_enabled" value="true"/>
+		<variable name="libcurl_http_client_disabled" value="true"/>
+		<variable name="net_http_client_disabled" value="false"/>
+		<variable name="netssl_http_client_enabled" value="true"/>
+	</target>
+	<target name="demo_cgi" extends="common">
+		<capability>
+			<concurrency support="none" use="none"/>
+		</capability>
+		<library name="cgi_launcher" location="..\..\launcher\cgi.ecf" readonly="false"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_libfcgi" extends="common">
+		<capability>
+			<concurrency support="none" use="none"/>
+		</capability>
+		<library name="libfcgi_launcher" location="..\..\launcher\libfcgi.ecf" readonly="false"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo" extends="demo_standalone">
+	</target>
+</system>

examples/demo/demo.ini

@@ -1,2 +0,0 @@
-port=9090
-#verbose=true

examples/demo/demo_no_mysql-safe

@@ -0,0 +1,51 @@
+<?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="demo_no_mysql" uuid="F8399C5A-9495-4418-B4DC-F38C22EE4683" library_target="demo_no_mysql">
+	<target name="common" abstract="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="transitional" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="concurrency" value="none"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\..\cms-safe.ecf" readonly="false"/>
+		<library name="cms_demo_module" location="modules\demo\cms_demo_module-safe.ecf" readonly="false"/>
+		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
+		<library name="layout" location="..\..\library\layout\layout-safe.ecf" readonly="false"/>
+		<library name="persistence_sqlite" location="..\..\library\persistence\sqlite\persistence_sqlite-safe.ecf" readonly="false"/>
+		<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"/>
+	</target>
+	<target name="demo_any" extends="common">
+		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
+		<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi-safe.ecf"/>
+		<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi-safe.ecf"/>
+		<library name="nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\nino-safe.ecf"/>
+		<cluster name="launcher" location=".\launcher\any\" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_nino" extends="common">
+		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
+		<setting name="concurrency" value="none"/>
+		<library name="default_nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\nino-safe.ecf"/>
+		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_cgi" extends="common">
+		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
+		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
+		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_libfcgi" extends="common">
+		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
+		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
+		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo" extends="demo_nino">
+	</target>
+</system>

examples/demo/install_modules.bat

@@ -1,15 +1,6 @@
+@echo off
 setlocal
 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\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%
-%ROC_CMD% install --module ..\..\modules\feed_aggregator	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\google_search	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\taxonomy	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --config roc.cfg

examples/demo/launcher/any/application_launcher.e

@@ -1,19 +0,0 @@
-note
-	description: "[
-				Effective class for APPLICATION_LAUNCHER_I
-
-				You can put modification in this class
-			]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
-
-class
-	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
-
-inherit
-	APPLICATION_LAUNCHER_I [G]
-
-feature -- Custom
-
-end
-

examples/demo/launcher/any/application_launcher_i.e

@@ -1,127 +0,0 @@
-note
-	description: "[
-			Specific application launcher
-
-			DO NOT EDIT THIS CLASS
-
-			you can customize APPLICATION_LAUNCHER
-		]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
-
-deferred class
-	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
-
-inherit
-	SHARED_EXECUTION_ENVIRONMENT
-
-feature -- Execution
-
-	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
-		local
-			nature: like launcher_nature
-		do
-			nature := launcher_nature
-			if nature = Void then
-				launch_standalone (opts)
-			elseif nature = nature_standalone then
-				launch_standalone (opts)
-			elseif nature = nature_nino then
-				launch_nino (opts)
-			elseif nature = nature_cgi then
-				launch_cgi (opts)
-			elseif nature = nature_libfcgi then
-				launch_libfcgi (opts)
-			else
-				-- bye bye
-				(create {EXCEPTIONS}).die (-1)
-			end
-		end
-
-feature {NONE} -- Access
-
-	launcher_nature: detachable READABLE_STRING_8
-			-- Initialize the launcher nature
-			-- either cgi, libfcgi, or nino.
-			--| We could extend with more connector if needed.
-			--| and we could use WSF_DEFAULT_SERVICE_LAUNCHER to configure this at compilation time.
-		local
-			p: PATH
-			ext: detachable READABLE_STRING_32
-		do
-			create p.make_from_string (execution_environment.arguments.command_name)
-			if attached p.entry as l_entry then
-				ext := l_entry.extension
-			end
-			if ext /= Void then
-				if ext.same_string (nature_standalone) then
-					Result := nature_standalone
-				end
-				if ext.same_string (nature_nino) then
-					Result := nature_nino
-				end
-				if ext.same_string (nature_cgi) then
-					Result := nature_cgi
-				end
-				if ext.same_string (nature_libfcgi) or else ext.same_string ("fcgi") then
-					Result := nature_libfcgi
-				end
-			end
-			Result := default_nature
-		end
-
-feature {NONE} -- standalone		
-
-	nature_standalone: STRING = "standalone"
-
-	launch_standalone (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
-		local
-			launcher: WSF_STANDALONE_SERVICE_LAUNCHER [G]
-		do
-			create launcher.make_and_launch (opts)
-		end
-
-feature {NONE} -- nino		
-
-	nature_nino: STRING = "nino"
-
-	launch_nino (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
-		local
-			launcher: WSF_NINO_SERVICE_LAUNCHER [G]
-		do
-			create launcher.make_and_launch (opts)
-		end
-
-feature {NONE} -- cgi
-
-	nature_cgi: STRING = "cgi"
-
-	launch_cgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
-		local
-			launcher: WSF_CGI_SERVICE_LAUNCHER [G]
-		do
-			create launcher.make_and_launch (opts)
-		end
-
-feature {NONE} -- libfcgi
-
-	nature_libfcgi: STRING = "libfcgi"
-
-	launch_libfcgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
-		local
-			launcher: WSF_LIBFCGI_SERVICE_LAUNCHER [G]
-		do
-			create launcher.make_and_launch (opts)
-		end
-
-feature -- Default
-
-	default_nature: STRING
-		do
-			Result := nature_standalone
-		end
-
-
-end
-
-

examples/demo/launcher/default/application_launcher.e

@@ -1,19 +0,0 @@
-note
-	description: "[
-				Effective class for APPLICATION_LAUNCHER_I
-
-				You can put modification in this class
-			]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
-
-class
-	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
-
-inherit
-	APPLICATION_LAUNCHER_I [G]
-
-feature -- Custom
-
-end
-

examples/demo/launcher/default/application_launcher_i.e

@@ -1,26 +0,0 @@
-note
-	description: "[
-			Specific application launcher
-
-			DO NOT EDIT THIS CLASS
-
-			you can customize APPLICATION_LAUNCHER
-		]"
-	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
-	revision: "$Revision: 96596 $"
-
-deferred class
-	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
-
-feature -- Execution
-
-	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
-		local
-			launcher: WSF_DEFAULT_SERVICE_LAUNCHER [G]
-		do
-			create launcher.make_and_launch (opts)
-		end
-
-end
-
-

examples/demo/modules/demo/cms_demo_module-safe.ecf

@@ -1,24 +1,3 @@
 <?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="cms_demo_module" uuid="4BB59A54-2544-4C10-BFA6-01D12E541A30" library_target="cms_demo_module">
-	<target name="cms_demo_module">
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
-		</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="cms" location="..\..\..\..\cms-safe.ecf" readonly="false"/>
-		<library name="cms_model" location="..\..\..\..\library\model\cms_model-safe.ecf" readonly="false"/>
-		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
-		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
-		<cluster name="src" location=".\" recursive="true"/>
-	</target>
-</system>
-
+<redirection xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" uuid="4BB59A54-2544-4C10-BFA6-01D12E541A30" message="Obsolete: use cms_demo_module.ecf !" location="cms_demo_module.ecf">
+</redirection>

examples/demo/modules/demo/cms_demo_module.e

@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_DEMO_MODULE}."
 	author: ""
-	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
-	revision: "$Revision: 96616 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	CMS_DEMO_MODULE
@@ -10,7 +10,7 @@ class
 inherit
 	CMS_MODULE
 		redefine
-			register_hooks,
+			setup_hooks,
 			initialize,
 			install
 		end
@@ -70,8 +70,9 @@ CREATE TABLE tb_demo(
 						api.logger.put_error ("Could not initialize database for demo module", generating_type)
 					end
 				end
-				Precursor {CMS_MODULE}(api)
 			end
+				-- For this demo, be flexible, and do not required sql.
+			Precursor {CMS_MODULE}(api)
 		end
 
 feature -- Access: router
@@ -85,10 +86,10 @@ feature -- Access: router
 
 feature -- Hooks
 
-	register_hooks (a_response: CMS_RESPONSE)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 		do
-			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
-			a_response.hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_hooks.subscribe_to_block_hook (Current)
 		end
 
 	block_list: ITERABLE [like {CMS_BLOCK}.name]
@@ -151,7 +152,7 @@ feature -- Mapping helper: uri template
 
 feature -- Mapping helper: uri template agent
 
-	map_uri_template_agent (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; proc: PROCEDURE [ANY, TUPLE [req: WSF_REQUEST; res: WSF_RESPONSE]]; rqst_methods: detachable WSF_REQUEST_METHODS)
+	map_uri_template_agent (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; proc: PROCEDURE [WSF_REQUEST, WSF_RESPONSE]; rqst_methods: detachable WSF_REQUEST_METHODS)
 			-- Map `proc' as handler for `a_tpl' for request methods `rqst_methods'.
 		require
 			a_tpl_attached: a_tpl /= Void

examples/demo/modules/demo/cms_demo_module.ecf

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="cms_demo_module" uuid="4BB59A54-2544-4C10-BFA6-01D12E541A30" library_target="cms_demo_module">
+	<target name="cms_demo_module">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
+		</file_rule>
+		<option warning="true">
+		</option>
+		
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
+		<library name="cms" location="..\..\..\..\cms.ecf" readonly="false"/>
+		<library name="cms_model" location="..\..\..\..\library\model\cms_model.ecf" readonly="false"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
+		<cluster name="src" location=".\" recursive="true"/>
+	</target>
+</system>

examples/demo/roc.cfg

@@ -0,0 +1,32 @@
+{
+	"name": "demo",
+	"project": "demo-safe.ecf",
+	"location": ".",
+	"site_directory": "site",
+	"modules": {
+		"core": 			{ "location": "../../modules/core" },
+		"admin": 			{ "location": "../../modules/admin" },
+		"auth": 			{ "location": "../../modules/auth" },
+		"basic_auth": 		{ "location": "../../modules/basic_auth" },
+		"blog": 			{ "location": "../../modules/blog" },
+		"contact": 			{ "location": "../../modules/contact" },
+		"feed_aggregator": 	{ "location": "../../modules/feed_aggregator" },
+		"google_search": 	{ "location": "../../modules/google_search" },
+		"google_search_20": { "location": "../../modules/google_search_20" },
+		"node": 			{ "location": "../../modules/node" },
+		"oauth20": 			{ "location": "../../modules/oauth20" },	
+		"openid": 			{ "location": "../../modules/openid" },
+		"recent_changes": 	{ "location": "../../modules/recent_changes" },
+		"seo": 				{ "location": "../../modules/seo" },
+		"sitemap": 			{ "location": "../../modules/sitemap" },
+		"session_auth": 	{ "location": "../../modules/session_auth" },
+		"taxonomy": 		{ "location": "../../modules/taxonomy" },
+		"files": 			{ "location": "../../modules/files" },
+		"custom_block": 	{ "location": "../../modules/custom_block" },
+		"embedded_video":	{ "location": "../../modules/embedded_video" },
+		"wikitext": 		{ "location": "../../modules/wikitext" },
+		"messaging": 		{ "location": "../../modules/messaging" },
+		"comments": 		{ "location": "../../modules/comments" },
+		"masquerade": 		{ "location": "../../dev_modules/masquerade" }
+	}
+}

examples/demo/server.crt

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICWDCCAcGgAwIBAgIJAJnXGtV+PtiYMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwHhcNMTUwNDAzMjIxNTA0WhcNMTYwNDAyMjIxNTA0WjBF
+MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
+ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQDFMK6ojzg+KlklhTossR13c51izMgGc3B0z9ttfHIcx2kxra3HtHcKIl5wSUvn
+G8zmSyFAyQTs5LUv65q46FM9qU8tP+vTeFCfNXvjRcIEpouta3J53K0xuUlxz4d4
+4D6qvdDWAez/0AkI4y5etW5zXtg7IQorJhsI9TmfGuruzwIDAQABo1AwTjAdBgNV
+HQ4EFgQUbWpk2HoHa0YqpEwr7CGEatBFTMkwHwYDVR0jBBgwFoAUbWpk2HoHa0Yq
+pEwr7CGEatBFTMkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAi+h4/
+IgEocWkdRZBKHEcTrRxz5WhEDJMoVo9LhnXvCfn1G/4p6Un6sYv7Xzpi9NuSY8uV
+cjfJJXhtF3AtyZ70iTAxWaRWjGaZ03PYOjlledJ5rqJEt6CCn8m+JsfznduZvbxQ
+zQ6jCLXfyD/tvemB+yYEI3NntvRKx5/zt6Q26Q==
+-----END CERTIFICATE-----

examples/demo/server.ini

@@ -0,0 +1,9 @@
+port=9090
+#port=12345
+verbose=true
+socket_timeout=60
+socket_recv_timeout=45
+keep_alive_timeout=25
+ssl_enabled=false
+ssl_ca_key=server.key
+ssl_ca_crt=server.crt

examples/demo/server.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDFMK6ojzg+KlklhTossR13c51izMgGc3B0z9ttfHIcx2kxra3H
+tHcKIl5wSUvnG8zmSyFAyQTs5LUv65q46FM9qU8tP+vTeFCfNXvjRcIEpouta3J5
+3K0xuUlxz4d44D6qvdDWAez/0AkI4y5etW5zXtg7IQorJhsI9TmfGuruzwIDAQAB
+AoGAR5efMg+dieRyLU8rieJcImxVbfOPg9gRsjdtIVkXTR+RL7ow59q7hXBo/Td/
+WU8cm1gXoJ/bK+71YYqWyB+BaLRIWvRWb7Gdw203tu4e136Ca5uuY+71qdbVTVcl
+NQ7J+T+eAQFP+a+DdT3ZQxu9eze87SMbu6i5YSpIk2kusOECQQDunv/DQ+nc+NgR
+DF+Td3sNYUVRT9a1CWi6abAG6reXwp8MS4NobWDf+Ps4JODhEEwlIdq5qL7qqYBZ
+Gc1TJJ53AkEA0404Fn6vAzzegBcS4RLlYTK7nMr0m4pMmDMCI6YzAYdMmKHp1e6f
+IwxSmQrmwyAgwcT01bc0+A8yipcC2BWQaQJBAJ01QZm635OGmos41KsKF5bsE8gL
+SpBBH69Yu/ECqGwie7iU84FUNnO4zIHjwghlPVVlZX3Vz9o4S+fn2N9DC+cCQGyZ
+QyCxGdC0r5fbwHJQS/ZQn+UGfvlVzqoXDVMVn3t6ZES6YZrT61eHnOM5qGqklIxE
+Old3vDZXPt/MU8Zvk3kCQBOgUx2VxvTrHN37hk9/QIDiM62+RenBm1M3ah8xTosf
+1mSeEb6d9Kwb3TgPBmA7YXzJuAQfRIvEPMPxT5SSr6Q=
+-----END RSA PRIVATE KEY-----

examples/demo/site/config/blocks.ini

@@ -2,8 +2,8 @@
 
 #navigation.region=sidebar_first
 #navigation.condition=is_front
-management.conditions[]=path:admin*
-management.conditions[]=is_front
+#management.conditions[]=path:admin*
+#management.conditions[]=is_front
 
 #Feeds
 feed.news.weight=3

examples/demo/site/config/cms.ini

@@ -4,14 +4,38 @@ root-dir=site/www
 #modules-dir=site/modules
 
 [site]
+# General token that could be use for cookies, and related.
+id=_EIFFEL_CMS_
+#debug=true
+
+# Name of the site, for the title, and eventual message.
 name=Eiffel CMS
-email=your@email.com
+
+# Properties used for SEO.
+property[headline]=Eiffel CMS -- the demo
+property[description]=Demo for Eiffel ROC CMS.
+property[keywords]=eiffel,cms,demo
+
+# Email used for notification
+email=noreply@example.com
+
+# Name of website theme. 
 theme=bootstrap
 
+
+[notification]
+# By default, notification.email = site.email
+# you can change here the email that will receive internal messages.
+email=webmaster@example.com
+
 [mailer]
-#smtp=localhost:25
-#sendmail=/usr/bin/sendmail
-output=@stderr
+#The mailer is used mostly used by the CMS to send email messages.
+# you can change the "From:" by  setting mailer.from value"
+subject_prefix=[Eiffel CMS] 
+#from=...
+smtp=localhost:25
+#sendmail=site\bin\roc_sendmail.bat
+output=site\db\mails
 
 [modules]
 # Module status
@@ -20,11 +44,26 @@ output=@stderr
 # Default is "on"
 # for each module, this can be overwritten with
 #  module_name= on or off
-*=all
+#*=on
 
 [blocks]
 @include=blocks.ini
 
-[admin]
+[auth]
+# token, default is $site.id or built-in.
+#token=_ROC_AUTH_TOKEN_
+#session.token=
+#session.max_age=86400
+#openid.token=
+#oauth.token=
+
+
+[administration]
+base_path=/roc-admin
+#theme=admin
 # CMS Installation, are accessible by "all", "none" or uppon "permission". (default is none)
 installation_access=all
+
+[dev]
+# masquerade: all, none, permission. Default is none.
+masquerade=none

examples/demo/site/db/mails/README.md

@@ -0,0 +1 @@
+This directory can be used to keep emails sent by the CMS.

examples/demo/site/modules/admin/files/css/admin.css

@@ -1,34 +1,67 @@
 ul.cms-users {
   list-style-type: none;
   padding: 3px 3px 3px 3px;
-  border: solid 1px #ccc; }
-  ul.cms-users li {
-    border-top: dotted 1px #ccc; }
-    ul.cms-users li:first-child {
-      border-top: none; }
-  ul.cms-users li.cms_user a::before {
-    content: "[users] "; }
+  border: solid 1px #ccc;
+}
+ul.cms-users li {
+  border-top: dotted 1px #ccc;
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+}
+ul.cms-users li:first-child {
+  border-top: none;
+}
+ul.cms-users li span {
+  flex-grow: 1;
+  flex-basis: 20px;
+  padding-left: 2px;
+  text-align: left;
+}
+ul.cms-users li span.identifier a::before {
+  content: "[user] ";
+}
+ul.cms-users li span.roles {
+  color: #090;
+  font-weight: bold;
+}
 
 ul.cms-roles {
   list-style-type: none;
   padding: 3px 3px 3px 3px;
-  border: solid 1px #ccc; }
-  ul.cms-roles li {
-    border-top: dotted 1px #ccc; }
-    ul.cms-roles li:first-child {
-      border-top: none; }
-  ul.cms-roles li.cms_role a::before {
-    content: "[roles] "; }
+  border: solid 1px #ccc;
+}
+ul.cms-roles li {
+  border-top: dotted 1px #ccc;
+}
+ul.cms-roles li:first-child {
+  border-top: none;
+}
+ul.cms-roles li.cms_role a::before {
+  content: "[role] ";
+}
 
 ul.cms-permissions {
   list-style-type: none;
   padding: 3px 3px 3px 3px;
-  border: solid 1px #ccc; }
-  ul.cms-permissions li {
-    border-top: dotted 1px #ccc; }
-    ul.cms-permissions li:first-child {
-      border-top: none; }
-  ul.cms-permissions li.cms_permission a::before {
-    content: "[permission] "; }
+  border: solid 1px #ccc;
+}
+ul.cms-permissions li {
+  border-top: dotted 1px #ccc;
+}
+ul.cms-permissions li:first-child {
+  border-top: none;
+}
+ul.cms-permissions li.cms_permission a::before {
+  content: "[permission] ";
+}
 
-/*# sourceMappingURL=admin.css.map */
+form#modules_collection thead td {
+  font-weight: bold;
+}
+form#modules_collection tr {
+  border-bottom: dotted 1px #ccc;
+}
+form#modules_collection td {
+  padding: 3px;
+}

examples/demo/site/modules/admin/files/scss/admin.scss

@@ -1,5 +1,4 @@
 ul.cms-users {
-	
 	list-style-type: none;
 	padding: 3px 3px 3px 3px;
 	border: solid 1px #ccc;
@@ -9,10 +8,22 @@ ul.cms-users {
 		&:first-child {
 			border-top: none;
 		}
-	}
-
-	li.cms_user a::before {
-		content: "[users] ";
+		display: flex;
+		flex-direction: row;
+		align-items: flex-start;
+		span {
+			flex-grow: 1;
+			flex-basis: 20px;
+			padding-left: 2px;
+			text-align: left;
+			&.identifier a::before {
+				content: "[user] ";
+			}
+			&.roles {
+				color: #090;
+				font-weight: bold;
+			}
+		}
 	}
 }
 
@@ -31,7 +42,7 @@ ul.cms-roles {
 	}
 
 	li.cms_role a::before {
-		content: "[roles] ";
+		content: "[role] ";
 	}
 }
 
@@ -54,6 +65,16 @@ ul.cms-permissions {
 	}
 }
 
-
+form#modules_collection {
+	thead td {
+		font-weight: bold;
+	}
+	tr {
+		border-bottom: dotted 1px #ccc;
+	}
+	td {
+		padding: 3px;
+	}
+}
 
 

examples/demo/site/modules/auth/auth.json

@@ -1,8 +0,0 @@
-{
-	"email": "webmaster@example.com",
-	"subjet_register": "Thank you for regitering with us, activate account",
-	"subjet_activate": "New account ativation token",
-	"subjet_password": "Password Recovery!!!",
-	"subjet_oauth": "Welcome",
-	"smtp": "127.0.0.1"
-}

examples/demo/site/modules/auth/config/auth.json

@@ -0,0 +1,12 @@
+{
+	"subject": "Thank you for contacting us",
+	"forms": {
+		"registration": {
+			"application_description": "Present yourself in a few lines, otherwise your application is likely to be rejected."
+		}
+	},
+	"recaptcha": {
+		"site_key":"6Lex9RMTAAAAAKleC4x6TaRlFcpLbEWgH_U7MSiD",
+		"secret_key":"6Lex9RMTAAAAAAkBczvX5DUiyg_xoM_EthVVgRRx"
+	}	
+}

examples/demo/site/modules/auth/files/css/auth.css

@@ -0,0 +1,28 @@
+ul.cms-temp-users {
+  list-style-type: none;
+  padding: 3px 3px 3px 3px;
+  border: solid 1px #ccc;
+}
+ul.cms-temp-users li {
+  border-top: dotted 1px #ccc;
+}
+ul.cms-temp-users li:first-child {
+  border-top: none;
+}
+ul.cms-temp-users li.cms_temp_user ul.cms_temp_user_details {
+  list-style-type: none;
+  padding: 3px 3px 3px 3px;
+  border: solid 1px #ccc;
+}
+ul.cms-temp-users li.cms_temp_user ul.cms_temp_user_details li {
+  border-top: dotted 1px #ccc;
+}
+ul.cms-temp-users li.cms_temp_user ul.cms_temp_user_details li:first-child {
+  border-top: none;
+}
+ul.cms-temp-users li.cms_temp_user ul.cms_temp_user_details li.cms_temp_user_detail_information::before {
+  content: "[personal information] ";
+}
+ul.cms-temp-users li.cms_temp_user ul.cms_temp_user_details li.cms_temp_user_detail_email::before {
+  content: "[email] ";
+}

examples/demo/site/modules/auth/files/scss/auth.scss

@@ -0,0 +1,37 @@
+ul.cms-temp-users {
+	
+	list-style-type: none;
+	padding: 3px 3px 3px 3px;
+	border: solid 1px #ccc;
+
+	li{
+		border-top: dotted 1px #ccc;
+		&:first-child {
+			border-top: none;
+		}
+	}
+
+	li.cms_temp_user {
+
+		ul.cms_temp_user_details {
+			list-style-type: none;
+			padding: 3px 3px 3px 3px;
+			border: solid 1px #ccc;
+			
+			li{
+				border-top: dotted 1px #ccc;
+				&:first-child {
+					border-top: none;
+				}
+			}
+			li.cms_temp_user_detail_information::before{
+				content: "[personal information] "
+			}
+			li.cms_temp_user_detail_email::before{
+				content: "[email] "
+			}
+		}		
+	}
+}
+
+

examples/demo/site/modules/auth/mail_templates/account_activation.html

@@ -4,15 +4,10 @@
 	  <meta charset="utf-8">
 	  <title>Activation</title>
 	  <meta name="description" content="Activation">
-	  <meta name="author" content="ROC CMS">
+	  <meta name="author" content="$sitename">
 	</head>
-
 	<body>
-		<p>Thank you for registering 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>
+		<p>"$user ($email)", thank you for applying to <a href="$host">$sitename</a>.</p>
+		<p>We will review your application and send you a resolution.<p>
 	</body>
 </html>

examples/demo/site/modules/auth/mail_templates/account_activation_confirmation.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>Activation Confirmation</title>
+	  <meta name="description" content="Activation Confirmation">
+	  <meta name="author" content="$sitename">
+	</head>
+	<body>
+		<p>Your account "$user ($email)" is confirmed at <a href="$host">$sitename</a>.</p>
+		<p>Thank you for joining us.</p>
+	</body>
+</html>

examples/demo/site/modules/auth/mail_templates/account_new_password.html

@@ -4,14 +4,12 @@
 	  <meta charset="utf-8">
 	  <title>New Password</title>
 	  <meta name="description" content="New Password">
-	  <meta name="author" content="ROC CMS">
+	  <meta name="author" content="$sitename">
 	</head>
-
 	<body>
-		<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>
+		<p>You have requested a new password at <a href="$host">$sitename</a>.</p>
+		<p>To complete your request, please click on the following link to generate a new password:
+			<ul><a href="$link">$link</a></ul>
+		</p>
 	</body>
 </html>

examples/demo/site/modules/auth/mail_templates/account_re_activation.html

@@ -4,15 +4,14 @@
 	  <meta charset="utf-8">
 	  <title>New Activation</title>
 	  <meta name="description" content="New Activation token">
-	  <meta name="author" content="ROC CMS">
+	  <meta name="author" content="$sitename">
 	</head>
-
 	<body>
-		<p>You have request a new activation token at <a href="$host">ROC CMS</a></p>
+		<p>You have requested a new activation token at <a href="$host">$sitename</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>To complete your registration, please click on the following link to re-activate your account:
+		<ul><a href="$link">$link</a></ul>
+		</p>
 		<p>Thank you for joining us.</p>
 	</body>
 </html>

examples/demo/site/modules/auth/mail_templates/account_rejected.html

@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>Application Rejected</title>
+	  <meta name="description" content="Application Rejected">
+	  <meta name="author" content="$sitename">
+	</head>
+	<body>
+		<p>Your account application is rejected, it was not respecting the requirements from <a href="$host">$sitename</a>.</p>
+	</body>
+</html>

examples/demo/site/modules/auth/mail_templates/account_welcome.html

@@ -4,10 +4,16 @@
 	  <meta charset="utf-8">
 	  <title>Welcome</title>
 	  <meta name="description" content="Welcome">
-	  <meta name="author" content="ROC CMS">
+	  <meta name="author" content="$sitename">
 	</head>
 	<body>
-		<p>Welcome to<a href="$host">ROC CMS</a></p>
+		<p>Welcome to <a href="$host">$sitename</a>.</p>
+		<p>Your account information:
+		<ul>
+			<li>Email address: "$email" .</li>
+			<li>User name: "$user" .</li>
+		</ul>
+		</p>
 		<p>Thank you for joining us.</p>
 	</body>
 </html>

examples/demo/site/modules/auth/mail_templates/admin_account_evaluation.html

@@ -0,0 +1,26 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Account Evaluation</title>
+  <meta name="description" content="Account Evaluation">
+  <meta name="author" content="$sitename">
+</head>
+
+<body>
+    <h2> Account Evaluation </h2>
+	<p>The user $user ($email) wants to register to the site <a href="$host">$sitename</a></p>
+
+	<blockquote><p>User application:</p>
+	  <p>$application</p>
+	</blockquote>
+
+	<p>To complete the registration, please click on the following link to activate the user account:<p>
+
+	<p><a href="$activation_url">$activation_url</a></p>
+
+	<p>To reject the registration, please click on the following link <p>
+
+	<p><a href="$rejection_url">$rejection_url</a></p>
+</body>
+</html>

examples/demo/site/modules/auth/templates/block_account_edit.tpl

@@ -0,0 +1 @@
+{include file="block_account_info.tpl" /}

examples/demo/site/modules/auth/templates/block_account_info.tpl

@@ -1,62 +1,37 @@
  	<div class="primary-tabs">
 	 {if isset="$user"}
 		<h3>Account Information</h3>
-		<div>
-			<div>
-				<div>	
-			   		<label>Username:</label>  {$user.name/}
-			   	</div>
-			   	<div>	
-			   		<label>Email:</label>  {$user.email/}
-			   	</div>
-			   	<div>	
-			   		<label>Creation Date:</label>  {$user.creation_date/}
-			   	</div>
-			   	<div>	
-			   		<label>Last login:</label>  {$user.last_login_date/}
-			   	</div>	
-			   	<div>
-			   		<form method="get" action="{$site_url/}{$auth_login_strategy/}">
-    					<button type="submit">Logout</button>
-					</form>
-			   	</div>	
+		<ul class="user-information">
+			<div>	
+				<label>Username:</label>  {$user.name/}
 			</div>
-    	</div>
-    	<hr>
-    	{include file="block_change_password.tpl" /}
-       	<hr>
-    	<h4>Roles</h4>
-    	<div>
-    		{foreach item="ic" from="$roles"}
-    			<div>	
-			   		<ul>
-			   			<li>
-			   				<strong>{$ic.name/}</strong>
-			   				<ul>
-			   					<li> <i>permissions</i> 
-				   					<ul>	
-					   					{foreach item="ip" from="$ic.permissions"}
-					   						<li>{$ip/}</li>
-					   					{/foreach}
-					   				</ul>
-					   			</li>	
-			   				</ul>		
-			   			</li>
-			   		</ul>
-			   	</div>
-    		{/foreach}
-    	</div>		
-
-
+			<div>	
+				<label>Email:</label>  {$user.email/}
+			</div>
+			<div>	
+				<label>Profile name:</label>  {$user.profile_name/}
+			</div>
+			<div>	
+				<label>Creation Date:</label>  {$user.creation_date/} (UTC)
+			</div>
+			<div>	
+				<label>Last login:</label>  {$user.last_login_date/} (UTC)
+			</div>	
+			<div>
+				<form method="get" action="{$site_url/}account/roc-logout">
+					<button type="submit">Logout</button>
+				</form>
+			</div>	
+    	</ul>
     	<hr>
     	<h4>Profile</h4>
-    	<div>
+    	<ul class="user-profile">
     		{foreach item="the_value" key="the_name" from="$user.profile"}
-    			<div>	
-			   		<label>{$the_name/}:</label>  {$the_value/} 
-			   	</div>
+    			<li>	
+			   		<label>{$the_name/}:</label><div>{$the_value/}</div>
+			   	</li>
     		{/foreach}
-    	</div>		
+    	</ul>
 	{/if}
 	{unless isset="$user"}
 		<div>

examples/demo/site/modules/auth/templates/block_change_password.tpl

@@ -1,7 +1,7 @@
  <div>
     <form action="{$site_url/}account/change-password" method="post">
         <fieldset>
-            <legend>Change Password Form</legend>
+            <legend>Change Password</legend>
             <div>
                 <input type="password" id="password" name="password" value="" required/>
                 <label for="password">Password</label>

examples/demo/site/modules/auth/templates/block_login.tpl

@@ -1,29 +0,0 @@
- 	<div class="primary-tabs">
- 		{unless isset="$user"}
-			<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
-		<div>
-			<div>	
-			    <form action method="POST">
-					<div>
-						<input type="text" name="username" required>
-						<label>Username</label>
-					</div>
-										
-					<div>
-						<input  type="password" name="password" required>
-						<label>Password</label>
-					</div>
-        
-					<button type="button" onclick="ROC_AUTH.login();">Login</button>
-				</form>
-			</div>
-    	</div>
-		<div>
-			<div>
-				<p>
-					<a href="{$site_url/}account/new-password">Forgot password?</a>
-				</p>
-			</div>
-		</div>	
-		{/unless}
-	</div>

examples/demo/site/modules/auth/templates/block_post_password.tpl

@@ -1,3 +1,3 @@
 <div>
-    <p>We have send you a new token code, check your email to generate a new password</p>
+    <p>We have sent you a new token code, check your email to generate a new password</p>
 </div>

examples/demo/site/modules/auth/templates/block_post_reactivate.tpl

@@ -1,3 +1,3 @@
 <div>
-    <p>We have send you a new activation code, check your email to activate your account.</p>
+    <p>Thanks for your application, we will review it to activate your account.</p>
 </div>

examples/demo/site/modules/auth/templates/block_post_register.tpl

@@ -1,3 +1,3 @@
 <div>
-    <p>Thanks for register, check your email to activate your account.</p>
+    <p>Thanks for your application, we will review it to activate your account.</p>
 </div>

examples/demo/site/modules/auth/templates/block_register.tpl

@@ -1,28 +1,38 @@
- <div>
-    <form action="{$site_url/}account/roc-register" method="post">
-        <fieldset>
-            <legend>Register Form</legend>
-            <div>
-                <input type="text" id="name" name="name"  value="{$name/}" required  autofocus />
-                <label for="name">Name</label>
-                {if isset="$error_name"}
-                    <span><i>{$error_name/}</i></span> <br>
-                {/if}
-            </div>
-            <div>
-                <input type="password" id="password" name="password" value="" required/>
-                <label for="password">Password</label>
-            </div>
-            <div>
-                <input type="email" id="email" name="email"  value="{$email/}"  required/>
-                <label for="email">Email</label>
-                {if isset="$error_email"}
-                    <span><i>{$error_email/}</i></span> <br>
-                {/if}
-            </div>
-            
-            
-            <button type="submit">Register</button>
-        </fieldset>    
-    </form>
+<div>
+	<form action="{$site_url/}account/roc-register" method="post">
+		<fieldset>
+			<legend>Registration</legend>
+			<div>
+				<input type="text" id="name" name="name"  value="{$name/}" required  autofocus />
+				<label for="name">Name</label>
+				{if isset="$error_name"}
+				<span><i>{$error_name/}</i></span> <br>
+				{/if}
+			</div>
+			<div>
+				<input type="password" id="password" name="password" value="" required/>
+				<label for="password">Password</label>
+			</div>
+			<div>
+				<input type="email" id="email" name="email"  value="{$email/}"  required/>
+				<label for="email">Email</label>
+				{if isset="$error_email"}
+				<span><i>{$error_email/}</i></span> <br/>
+				{/if}
+			</div>
+			<div>
+				<textarea rows="4" cols="50" name="personal_information" id="personal_information" required>{$personal_information/}</textarea>
+				<label for="personal_information">Tell us why you want to register an account</label>
+				{if isset="$error_application"}
+				<span><i>{$error_application/}</i></span><br/>
+				{/if}
+				{if isset="$application_description"}
+				<br/>
+				<p class="description">{$application_description/}</p>
+				{/if}
+			</div>
+			{unless isempty="$recaptcha_site_key"}<div class="g-recaptcha" data-sitekey="{$recaptcha_site_key/}"></div><br/>{/unless}
+			<button type="submit">Register</button>
+		</fieldset>
+	</form>
 </div>

examples/demo/site/modules/basic_auth/files/js/roc_basic_auth.js

@@ -1,307 +1,291 @@
 var ROC_AUTH = ROC_AUTH || { };
 
-var loginURL = "/basic_auth_login";
-var logoutURL = "/basic_auth_logoff";
+var loginURL = "/roc-basic-login";
+var logoutURL = "/roc-basic-logoff";
 
 var userAgent = navigator.userAgent.toLowerCase();
 var firstLogIn = true;
  
 ROC_AUTH.login = function() {
-    var form = document.forms['cms_basic_auth'];
-    var username = form.username.value;
-    var password = form.password.value;
-	  //var host = form.host.value;
-  	var origin = window.location.origin.concat(window.location.pathname);
-    var _login = function(){
+	var form = document.forms['cms_basic_auth'];
+	var username = form.username.value;
+	var password = form.password.value;
+	//var host = form.host.value;
+	var origin = window.location.origin + window.location.pathname;
+	var _login = function(){
+		if  (document.getElementById('myModalFormId') !== null ) {
+			ROC_AUTH.remove ('myModalFormId');
+		}
 
- 
-    if  (document.getElementById('myModalFormId') !== null ) {
-        ROC_AUTH.remove ('myModalFormId');
-    }
+		if (username === "" || password === "") {
+			if (document.getElementById('myModalFormId') === null ) {
+				var newdiv = document.createElement('div');
+				newdiv.innerHTML = "<br>Invalid Credentials</br>";
+				newdiv.id = 'myModalFormId';
+				$(".login-box").append(newdiv);
+			} 
+		}else{  
+			//Instantiate HTTP Request
+			var request = ((window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
+			request.open("GET", loginURL, true, username, password);
+			request.send(null);
 
+			//Process Response
+			request.onreadystatechange = function(){
+				if (request.readyState == 4) {
+					if (request.status==200) {
+						delete form;
+						window.location=window.location.origin;
+					} else {
+						if (navigator.userAgent.toLowerCase().indexOf("firefox") != -1){                       
+							// .. ?
+						}
+						if (document.getElementById('myModalFormId') === null ) {
+							var newdiv = document.createElement('div');
+							newdiv.innerHTML = "<br>Invalid Credentials</br>";
+							newdiv.id = 'myModalFormId';
+							$(".login-box").append(newdiv);
+						} 
+					}
+				}
+			}
+		}
+	}
 
-	if (username === "" || password === "") {
-             if (document.getElementById('myModalFormId') === null ) {		
-                    var newdiv = document.createElement('div');
-	                  newdiv.innerHTML = "<br>Invalid Credentials</br>";
-                    newdiv.id = 'myModalFormId';
-                     $(".primary-tabs").append(newdiv);
-               } 
-	}else{  
-         
-          //Instantiate HTTP Request
-          var request = ((window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
-    	    request.open("GET", loginURL, true, username, password);
-	        request.send(null);
-    
-          //Process Response
-          request.onreadystatechange = function(){
-             if (request.readyState == 4) {
-                 if (request.status==200) {
-                        delete form;
-                        window.location=window.location.origin;
-                }
-                else{
-                  if (navigator.userAgent.toLowerCase().indexOf("firefox") != -1){                       
-                     }
-                   
-		  if (document.getElementById('myModalFormId') === null ) {		
-                    var newdiv = document.createElement('div');
-	                   newdiv.innerHTML = "<br>Invalid Credentials</br>";
-                    newdiv.id = 'myModalFormId';
-                    $(".primary-tabs").append(newdiv);
-                   } 
+	var userAgent = navigator.userAgent.toLowerCase();
+	if (userAgent.indexOf("firefox") != -1) { //TODO: check version number
+		if (firstLogIn) {
+			_login();
+		} else {
+			ROC_AUTH.logoff(_login);
+		}
+	} else {
+		_login();
+	}
 
-                  }
-               }
-            }
-        }
-    }
- 
-    var userAgent = navigator.userAgent.toLowerCase();
-    if (userAgent.indexOf("firefox") != -1){ //TODO: check version number
-        if (firstLogIn) _login();
-        else logoff(_login);
-    }
-    else{
-        _login();
-    }
- 
-    if (firstLogIn) firstLogIn = false;
+	if (firstLogIn) {
+		firstLogIn = false;
+	}
 };
 
 
 ROC_AUTH.login_with_redirect = function() {
-    var form = document.forms[2];
-    var username = form.username.value;
-    var password = form.password.value;
-    var host = form.host.value;
-    var _login = function(){
+	var form = document.forms[2];
+	var username = form.username.value;
+	var password = form.password.value;
+	var host = form.host.value;
+	var _login = function(){
+		var redirectURL = form.redirect && form.redirect.value || "";   
+		$("#imgProgressRedirect").show();  
 
-    var redirectURL = form.redirect && form.redirect.value || "";   
+		if  (document.getElementById('myModalFormId') !== null ) {
+			ROC_AUTH.remove ('myModalFormId');
+		}
+		if (username === "" || password === "") {
+			if (document.getElementById('myModalFormId') === null ) {      
+				var newdiv = document.createElement('div');
+				newdiv.innerHTML = "<br>Invalid Credentials</br>";
+				newdiv.id = 'myModalFormId';
+				$(".login-box").append(newdiv);
+				$("#imgProgressRedirect").hide();
+			} 
+		} else {  
+			//Instantiate HTTP Request
+			var request = ((window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
+			request.open("GET", host + loginURL, true, username, password);
+			request.send(null);
 
+			//Process Response
+			request.onreadystatechange = function() {
+				if (request.readyState == 4) {
+					if (request.status==200) {
+						if (redirectURL === "") {   
+							window.location=host + "/";
+						} else {
+							window.location=host + redirectURL;
+						}
+					} else{
+						if (navigator.userAgent.toLowerCase().indexOf("firefox") != -1){                       
+						}
+						if (document.getElementById('myModalFormId') === null ) {     
+							var newdiv = document.createElement('div');
+							newdiv.innerHTML = "<br>Invalid Credentials</br>";
+							newdiv.id = 'myModalFormId';
+							$(".login-box").append(newdiv);
+							$("#imgProgressRedirect").hide();    
+						} 
+					}
+				}
+			}
+		}
+	}
 
-    $("#imgProgressRedirect").show();  
-
-    if  (document.getElementById('myModalFormId') !== null ) {
-        ROC_AUTH.remove ('myModalFormId');
-    }
-
-
-    if (username === "" || password === "") {
-             if (document.getElementById('myModalFormId') === null ) {      
-                    var newdiv = document.createElement('div');
-                      newdiv.innerHTML = "<br>Invalid Credentials</br>";
-                    newdiv.id = 'myModalFormId';
-                    $(".primary-tabs").append(newdiv);
-                     $("#imgProgressRedirect").hide();
-               } 
-    }else{  
-         
-          //Instantiate HTTP Request
-          var request = ((window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
-            request.open("GET", host.concat(loginURL), true, username, password);
-            request.send(null);
-    
-          //Process Response
-          request.onreadystatechange = function(){
-             if (request.readyState == 4) {
-                 if (request.status==200) {
-                     if (redirectURL === "") {   
-                        window.location=host.concat("/");
-                    } else {
-                        window.location=host.concat(redirectURL);
-                    }
-
-        }
-                else{
-                  if (navigator.userAgent.toLowerCase().indexOf("firefox") != -1){                       
-                     }
-                   
-          if (document.getElementById('myModalFormId') === null ) {     
-                    var newdiv = document.createElement('div');
-                       newdiv.innerHTML = "<br>Invalid Credentials</br>";
-                    newdiv.id = 'myModalFormId';
-                    $(".primary-tabs").append(newdiv);
-                    $("#imgProgressRedirect").hide();    
-                   } 
-
-                  }
-               }
-            }
-        }
-    }
- 
-    var userAgent = navigator.userAgent.toLowerCase();
-    if (userAgent.indexOf("firefox") != -1){ //TODO: check version number
-        if (firstLogIn) _login();
-        else logoff(_login);
-    }
-    else{
-        _login();
-    }
- 
-    if (firstLogIn) firstLogIn = false;
+	var userAgent = navigator.userAgent.toLowerCase();
+	if (userAgent.indexOf("firefox") != -1){ //TODO: check version number
+		if (firstLogIn) {
+			_login();
+		} else {
+			ROC_AUTH.logoff(_login);
+		}
+	} else{
+		_login();
+	}
+	if (firstLogIn) {
+		firstLogIn = false;
+	}
 };
 
-
 ROC_AUTH.getQueryParameterByName = function (name) {
-    name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-        results = regex.exec(location.search);
-    return results === null ? " " : decodeURIComponent(results[1].replace(/\+/g, " "));
+	name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+	var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"), results = regex.exec(location.search);
+	return results === null ? " " : decodeURIComponent(results[1].replace(/\+/g, " "));
 } 
  
 ROC_AUTH.logoff = function(callback){
-	   var form = document.forms[0];
-     var host = form.host.value;
-	  
-    if (userAgent.indexOf("msie") != -1) {
-        document.execCommand("ClearAuthenticationCache");
-    }
-    else if (userAgent.indexOf("firefox") != -1){ //TODO: check version number
- 
-        var request1 = new XMLHttpRequest();
-        var request2 = new XMLHttpRequest();
- 
-      //Logout. Tell the server not to return the "WWW-Authenticate" header
-        request1.open("GET", host.concat(logoutURL) + "?prompt=false", true);
-        request1.send("");
-        request1.onreadystatechange = function(){
-            if (request1.readyState == 4) {
- 
-              //Sign in with dummy credentials to clear the auth cache
-                request2.open("GET", host.concat(logoutURL), true, "logout", "logout");
-                request2.send("");
- 
-                request2.onreadystatechange = function(){
-                    if (request2.readyState == 4) {
-                        if (callback!=null) { callback.call();  } else { window.location=host.concat(logoutURL);}
-                    } 
-                }
-                 
-            }
-        }
-    }
-    else {
-        var request = ((window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
-        request.open("GET", host.concat(logoutURL), true, "logout", "logout");
-        request.send("");
-        request.onreadystatechange = function(){
-                   if (request.status==401 || request.status==403 ) { window.location=host.concat(logoutURL);
-                } 
-            }
-    }
+	var form = document.forms[0];
+	var host = form.host.value;
+
+	if (userAgent.indexOf("msie") != -1) {
+		document.execCommand("ClearAuthenticationCache");
+	} else if (userAgent.indexOf("firefox") != -1){ //TODO: check version number
+		var request1 = new XMLHttpRequest();
+		var request2 = new XMLHttpRequest();
+
+		//Logout. Tell the server not to return the "WWW-Authenticate" header
+		request1.open("GET", host + logoutURL + "?prompt=false", true);
+		request1.send("");
+		request1.onreadystatechange = function(){
+			if (request1.readyState == 4) {
+				//Sign in with dummy credentials to clear the auth cache
+				request2.open("GET", host + logoutURL, true, "logout", "logout");
+				request2.send("");
+				request2.onreadystatechange = function(){
+					if (request2.readyState == 4) {
+						if (callback!=null) {
+							callback.call();  
+						} else { 
+							window.location=host + logoutURL;
+						}
+					} 
+				}
+			}
+		}
+	} else {
+		var request = ((window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
+		request.open("GET", host + logoutURL, true, "logout", "logout");
+		request.send("");
+		request.onreadystatechange = function(){
+			if (request.status==401 || request.status==403 ) { 
+				window.location=host + logoutURL;
+			} 
+		}
+	}
 };
 
 
-ROC_AUTH.remove = function (id)
-{
-   var element = document.getElementById(id);
-   element.outerHTML = "";
-   delete element;
-   return;
+ROC_AUTH.remove = function (id) {
+	var element = document.getElementById(id);
+	element.outerHTML = "";
+	delete element;
+	return;
 };
 
 
 
 $(document).ready(function() {
-
-  if (typeof String.prototype.contains != 'function') {
-    String.prototype.contains = function (str){
-      return this.indexOf(str) != -1;
-    };
-  }
-   ROC_AUTH.progressive_loging();
-
+	if (typeof String.prototype.contains != 'function') {
+		String.prototype.contains = function (str){
+			return this.indexOf(str) != -1;
+		};
+	}
+	ROC_AUTH.progressive_loging();
 });
 
 
 ROC_AUTH.progressive_loging = function () {
-
-    ROC_AUTH.login_href();
+	ROC_AUTH.login_href();
 };
 
 
 $(document).keypress(function(e) {
-  if ((e.which === 13) && (e.target.localName === 'input' &&  e.target.id === 'password')) {
-      ROC_AUTH.login();
-  }
+	if ((e.which === 13) && (e.target.localName === 'input' &&  e.target.id === 'password')) {
+		ROC_AUTH.login();
+	}
 });
 
 ROC_AUTH.OnOneClick = function(event) {
-  event.preventDefault();
-  if  ( document.forms[0] === undefined ) {
-    ROC_AUTH.create_form();
-  }
-  return false;
+	event.preventDefault();
+	if  ( document.forms[0] === undefined ) {
+		ROC_AUTH.create_form();
+	}
+	return false;
 };
 
 ROC_AUTH.login_href = function() {
-  var els = document.getElementsByTagName("a");
-  for (var i = 0, l = els.length; i < l; i++) {
-      var el = els[i];
-      if (el.href.contains("/basic_auth_login?destination")) {
-        loginURL = el.href;
-        var OneClick = el;
-        OneClick.addEventListener('click', ROC_AUTH.OnOneClick, false);
-     }
-  }
+	var els = document.getElementsByTagName("a");
+	for (var i = 0, l = els.length; i < l; i++) {
+		var el = els[i];
+		if (el.href.contains(loginURL + "?destination")) {
+//			loginURL = el.href;
+			var OneClick = el;
+			OneClick.addEventListener('click', ROC_AUTH.OnOneClick, false);
+		}
+	}
 };
 
 
 ROC_AUTH.create_form = function() {
 
-    // Fetching HTML Elements in Variables by ID.
-  var createform = document.createElement('form'); // Create New Element Form
-  createform.setAttribute("action", ""); // Setting Action Attribute on Form
-  createform.setAttribute("method", "post"); // Setting Method Attribute on Form
-  $("body").append(createform); 
+	// Fetching HTML Elements in Variables by ID.
+	var createform = document.createElement('form'); // Create New Element Form
+	createform.setAttribute("action", ""); // Setting Action Attribute on Form
+	createform.setAttribute("method", "post"); // Setting Method Attribute on Form
+	$("body").append(createform); 
 
-  var heading = document.createElement('h2'); // Heading of Form
-  heading.innerHTML = "Login Form ";
-  createform.appendChild(heading);
+	var heading = document.createElement('h2'); // Heading of Form
+	heading.innerHTML = "Login Form ";
+	createform.appendChild(heading);
 
-  var line = document.createElement('hr'); // Giving Horizontal Row After Heading
-  createform.appendChild(line);
+	var line = document.createElement('hr'); // Giving Horizontal Row After Heading
+	createform.appendChild(line);
 
-  var linebreak = document.createElement('br');
-  createform.appendChild(linebreak);
+	var linebreak = document.createElement('br');
+	createform.appendChild(linebreak);
 
-  var namelabel = document.createElement('label'); // Create Label for Name Field
-  namelabel.innerHTML = "Username : "; // Set Field Labels
-  createform.appendChild(namelabel);
+	var namelabel = document.createElement('label'); // Create Label for Name Field
+	namelabel.innerHTML = "Username : "; // Set Field Labels
+	createform.appendChild(namelabel);
 
-  var inputelement = document.createElement('input'); // Create Input Field for UserName
-  inputelement.setAttribute("type", "text");
-  inputelement.setAttribute("name", "username");
-  inputelement.setAttribute("required","required");
-  createform.appendChild(inputelement);
+	var inputelement = document.createElement('input'); // Create Input Field for UserName
+	inputelement.setAttribute("type", "text");
+	inputelement.setAttribute("name", "username");
+	inputelement.setAttribute("required","required");
+	createform.appendChild(inputelement);
 
-  var linebreak = document.createElement('br');
-  createform.appendChild(linebreak);
+	var linebreak = document.createElement('br');
+	createform.appendChild(linebreak);
 
-  var passwordlabel = document.createElement('label'); // Create Label for Password Field
-  passwordlabel.innerHTML = "Password : ";
-  createform.appendChild(passwordlabel);
+	var passwordlabel = document.createElement('label'); // Create Label for Password Field
+	passwordlabel.innerHTML = "Password : ";
+	createform.appendChild(passwordlabel);
 
-  var passwordelement = document.createElement('input'); // Create Input Field for Password.
-  passwordelement.setAttribute("type", "password");
-  passwordelement.setAttribute("name", "password");
-  passwordelement.setAttribute("id", "password");
-  passwordelement.setAttribute("required","required");
-  createform.appendChild(passwordelement);
+	var passwordelement = document.createElement('input'); // Create Input Field for Password.
+	passwordelement.setAttribute("type", "password");
+	passwordelement.setAttribute("name", "password");
+	passwordelement.setAttribute("id", "password");
+	passwordelement.setAttribute("required","required");
+	createform.appendChild(passwordelement);
 
 
-  var passwordbreak = document.createElement('br');
-  createform.appendChild(passwordbreak);
+	var passwordbreak = document.createElement('br');
+	createform.appendChild(passwordbreak);
 
 
-  var submitelement = document.createElement('button'); // Append Submit Button
-  submitelement.setAttribute("type", "button");
-  submitelement.setAttribute("onclick", "ROC_AUTH.login();");
-  submitelement.innerHTML = "Sign In ";
-  createform.appendChild(submitelement);
+	var submitelement = document.createElement('button'); // Append Submit Button
+	submitelement.setAttribute("type", "button");
+	submitelement.setAttribute("onclick", "ROC_AUTH.login();");
+	submitelement.innerHTML = "Sign In ";
+	createform.appendChild(submitelement);
 
 };
 
@@ -310,16 +294,16 @@ var password = document.getElementById("password");
 var confirm_password = document.getElementById("confirm_password");
 
 ROC_AUTH.validatePassword =function(){
-  if ((password != null) && (confirm_password != null)) {
-    if(password.value != confirm_password.value) {
-      confirm_password.setCustomValidity("Passwords Don't Match");
-    } else {
-      confirm_password.setCustomValidity('');
-    }
-   } 
+	if ((password != null) && (confirm_password != null)) {
+		if(password.value != confirm_password.value) {
+			confirm_password.setCustomValidity("Passwords Don't Match");
+		} else {
+			confirm_password.setCustomValidity('');
+		}
+	} 
 }
 
 if ((password != null) && (confirm_password != null)) {
-  password.onchange = ROC_AUTH.validatePassword();
-  confirm_password.onkeyup = ROC_AUTH.validatePassword;
-}
+	password.onchange = ROC_AUTH.validatePassword();
+	confirm_password.onkeyup = ROC_AUTH.validatePassword;
+}

examples/demo/site/modules/basic_auth/templates/block_login.tpl

@@ -1,29 +1,24 @@
- 	<div class="primary-tabs">
- 		{unless isset="$user"}
-			<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
+{unless isset="$user"}
+ 	<div class="login-box">
+		<div class="description">The "Basic Auth" relies on the HTTP basic access authentication.<br/>(see also: <a href="https://en.wikipedia.org/wiki/Basic_access_authentication">https://en.wikipedia.org/wiki/Basic_access_authentication</a> )</div>
+		<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
 		<div>
-			<div>	
-			    <form name="cms_basic_auth" action method="POST">
-					<div>
-						<input type="text" name="username" id="username" required>
-						<label>Username</label>
-					</div>
-										
-					<div>
-						<input  type="password" name="password"  id="password" required>
-						<label>Password</label>
-					</div>
-        
-					<button type="button" onclick="ROC_AUTH.login();">Login</button>
-				</form>
-			</div>
+			<form name="cms_basic_auth" action="{$site_url/}roc-basic-login" method="POST">
+				{unless isempty="$site_destination"}<input type="hidden" name="destination" value="{$site_destination/}">{/unless}
+				<input type="hidden" name="host" id="host" value="{$site_url/}">
+				<div>
+					<input type="text" name="username" id="username" required>
+					<label>Username</label>
+				</div>
+				<div>
+					<input type="password" name="password"  id="password" required>
+					<label>Password</label>
+				</div>
+				<button type="button" onclick="ROC_AUTH.login();">Login</button>
+			</form>
     	</div>
 		<div>
-			<div>
-				<p>
-					<a href="{$site_url/}account/new-password">Forgot password?</a>
-				</p>
-			</div>
+			<a href="{$site_url/}account/new-password">Forgot password?</a>
 		</div>	
-		{/unless}
 	</div>
+{/unless}

examples/demo/site/modules/comments/files/css/comments.css

@@ -0,0 +1,18 @@
+div.comments-box div.title {
+  font-size: x-large;
+}
+div.comments-box ul.comments {
+  border-top: solid 1px #eee;
+  padding: 0 0 0 20px;
+  border-left: solid 5px #eee;
+  list-style-type: none;
+}
+div.comments-box ul.comments li.comment {
+  border-bottom: solid 1px #eee;
+}
+div.comments-box ul.comments li.comment > span.author {
+  font-weight: bold;
+}
+div.comments-box ul.comments li.comment > span.info {
+  font-style: italic;
+}

examples/demo/site/modules/comments/files/scss/comments.scss

@@ -0,0 +1,17 @@
+div.comments-box {
+	div.title {
+		font-size: x-large;
+	}
+	ul.comments {
+		border-top: solid 1px #eee;
+		padding: 0 0 0 20px;
+		border-left: solid 5px #eee;
+		list-style-type: none;
+		li.comment {
+			border-bottom: solid 1px #eee;
+			&>span.author { font-weight: bold; }
+			&>span.info { font-style: italic; }
+		}
+	}
+
+}

examples/demo/site/modules/comments/scripts/install.sql

@@ -0,0 +1,13 @@
+CREATE TABLE comments(
+  `cid`	INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT UNIQUE,
+  `content` TEXT,
+  `format` 	VARCHAR(128),
+  `author`	INTEGER,
+  `author_name`	VARCHAR(255),
+  `created`	DATETIME NOT NULL,
+  `changed`	DATETIME NOT NULL,
+  `status`	INTEGER,
+  `parent` INTEGER,
+  `entity` 	VARCHAR(255),		/* Associated entity */
+  `entity_type`	VARCHAR(255) 	/* Type of associated entity */
+);

examples/demo/site/modules/contact/config/contact.json

@@ -0,0 +1,8 @@
+{
+	"--email": "webmaster@example.com",
+	"subjet": "Thank you for contacting us",
+	"recaptcha": {
+		"site_key":"",
+		"secret_key":""
+	}
+}

examples/demo/site/modules/contact/files/css/contact.css

@@ -0,0 +1,124 @@
+.contact-box {
+  background-color: #F2F7F9;
+  width: 465px;
+  padding: 20px;
+  border: 6px solid #8FB5C1;
+  -moz-border-radius: 15px;
+  -webkit-border-radius: 15px;
+  border-radius: 15px;
+  position: relative;
+  /* Remove box shadow firefox, chrome and opera put around required fields. 
+   * It looks rubbish. 
+   */
+  /* Normalize placeholder styles */
+  /* chrome, safari */
+  /* mozilla */
+  /* ie (faux placeholder) */
+}
+.contact-box h1 {
+  font-size: 42px;
+}
+.contact-box h2 {
+  margin-bottom: 15px;
+  font-style: italic;
+  font-weight: normal;
+}
+.contact-box label {
+  font-size: 15px;
+  margin-bottom: 2px;
+  display: block;
+}
+.contact-box input, .contact-box select, .contact-box textarea {
+  width: 100%;
+  font-size: 15px;
+  border: 1px solid #CEE1E8;
+  margin-bottom: 20px;
+  padding: 4px;
+}
+.contact-box input:focus, .contact-box select:focus, .contact-box textarea:focus {
+  border: 1px solid #AFCDD8;
+  background-color: #EBF2F4;
+}
+.contact-box textarea {
+  height: 150px;
+  resize: none;
+}
+.contact-box span.required {
+  font-weight: bold;
+  color: #F00;
+}
+.contact-box input[type=submit] {
+  width: 100px;
+  background-color: #333;
+  color: #FFF;
+  border: none;
+  display: block;
+  float: right;
+  margin-bottom: 0px;
+  margin-right: 6px;
+  background-color: #8FB5C1;
+  -moz-border-radius: 8px;
+}
+.contact-box input[type=submit]:hover {
+  background-color: #A6CFDD;
+}
+.contact-box input[type=submit]:active {
+  position: relative;
+  top: 1px;
+}
+.contact-box .message {
+  width: 95%;
+  margin: 25px 0px;
+  padding: 10px;
+  display: block;
+  border: solid 1px #ccc;
+  border-radius: 8px;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+}
+.contact-box .message.hidden {
+  display: none;
+}
+.contact-box .message.error {
+  border-color: #E58E8E;
+  background-color: #FFE6E6;
+}
+.contact-box .message.error li {
+  padding: 2px;
+  list-style: none;
+}
+.contact-box .message.error li:before {
+  content: ' - ';
+}
+.contact-box .message.error #info {
+  font-weight: bold;
+}
+.contact-box .message.error #info:before {
+  content: '';
+}
+.contact-box .message.success {
+  border-color: #83D186;
+  padding-top: 25px;
+  background-color: #D3EDD3;
+}
+.contact-box .req-field-desc {
+  font-style: italic;
+}
+.contact-box input:required, .contact-box textarea:required {
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  -o-box-shadow: none;
+  box-shadow: none;
+}
+.contact-box ::-webkit-input-placeholder {
+  color: #CCC;
+  font-style: italic;
+}
+.contact-box input:-moz-placeholder, .contact-box textarea:-moz-placeholder {
+  color: #CCC;
+  font-style: italic;
+}
+.contact-box input.placeholder-text, .contact-box textarea.placeholder-text {
+  color: #CCC;
+  font-style: italic;
+}

examples/demo/site/modules/contact/files/scss/contact.scss

@@ -0,0 +1,140 @@
+.contact-box {
+    background-color:#F2F7F9;
+    width:465px;
+    padding:20px;
+    border: 6px solid #8FB5C1;
+    -moz-border-radius:15px;
+    -webkit-border-radius:15px;
+    border-radius:15px;
+    position:relative;
+ 
+	h1 {
+		font-size:42px;
+	}
+	 
+	h2 {
+		margin-bottom:15px;
+		font-style:italic;
+		font-weight:normal;
+	}
+	 
+	label {
+		font-size:15px;
+		margin-bottom:2px;
+		display:block;
+	}
+ 
+	input, select, textarea {
+		width:100%;
+		font-size:15px;
+		border: 1px solid #CEE1E8;
+		margin-bottom:20px;
+		padding:4px;
+		&:focus {
+			border: 1px solid #AFCDD8;
+			background-color: #EBF2F4;
+		}
+	}
+	 
+	textarea {
+		height:150px;
+		resize: none;
+	}
+	 
+	span.required {
+		font-weight:bold;
+		color:#F00;    
+	}
+	 
+	input[type=submit] {
+		width: 100px;
+		background-color:#333;
+		color:#FFF;
+		border:none;
+		display:block;
+		float:right;
+		margin-bottom:0px;
+		margin-right:6px;
+		background-color:#8FB5C1;
+		-moz-border-radius:8px;
+		&:hover {
+			background-color: #A6CFDD;
+		}
+		&:active {
+			position:relative;
+			top:1px;
+		}
+	}
+
+	.message {
+		width:95%;
+		margin:25px 0px;
+		padding:10px;
+		display:block;
+		border:solid 1px #ccc;
+		border-radius:8px;
+		-webkit-border-radius:8px;
+		-moz-border-radius:8px;
+
+		&.hidden {
+			display: none;
+		}
+
+		&.error {
+			border-color: #E58E8E;
+			background-color:#FFE6E6;
+		 
+			li {
+				padding:2px;
+				list-style:none;    
+				&:before { content: ' - ';    }
+			}
+			#info {
+				font-weight:bold;
+				&:before { content: '';    }
+			}
+		}
+
+		&.success {
+			border-color: #83D186;
+			padding-top: 25px;
+			background-color:#D3EDD3;
+		}
+	}
+ 
+	.req-field-desc {
+		font-style:italic;
+	}
+	 
+	/* Remove box shadow firefox, chrome and opera put around required fields. 
+	 * It looks rubbish. 
+	 */
+	input:required, textarea:required {
+		-moz-box-shadow:none;
+		-webkit-box-shadow:none;
+		-o-box-shadow:none;
+		box-shadow:none;
+	}
+	 
+	/* Normalize placeholder styles */
+	 
+	/* chrome, safari */
+	::-webkit-input-placeholder {
+		color:#CCC;
+		font-style:italic;
+	}
+	 
+	/* mozilla */
+	input:-moz-placeholder, textarea:-moz-placeholder {
+		color:#CCC;
+		font-style:italic;
+	}
+	 
+	/* ie (faux placeholder) */
+	input.placeholder-text, textarea.placeholder-text  { 
+		color:#CCC;
+		font-style:italic;
+	}
+
+}
+

examples/demo/site/modules/contact/templates/block_contact.tpl

@@ -0,0 +1,25 @@
+<div class="contact-box clearfix">
+    <h1>Contact us!</h1>
+    <form method="post" action="{$site_url/}contact" id="contact-form">
+        <label for="name">Name: <span class="required">*</span></label>
+        <input type="text" id="name" name="name" value="{$name/}" required="required" autofocus="autofocus" />
+         
+        <label for="email">Email Address: <span class="required">*</span></label>
+        <input type="email" id="email" name="email" value="{$email/}" required="required" />
+         
+        <label for="message">Message: <span class="required">*</span></label>
+        <textarea id="message" name="message" required="required" data-minlength="20" minlength="20" >{$message/}</textarea>
+		{unless isempty="$recaptcha_site_key"}
+        <div class="g-recaptcha" data-sitekey="{$recaptcha_site_key/}"></div>
+        <br/>
+		{/unless}
+        <input type="submit" value="Send" class="submit-button" />
+        <p class="req-field-desc"><span class="required">*</span> indicates a required field</p>
+    </form>
+    {unless isempty="$error_response"}
+        <ul class="message error">
+			{foreach item="item" from="$error_response"}<li class="info">{$item/}</li>{/foreach}
+        </ul>
+        <div class="notice"> Try again later </div>
+    {/unless}        
+</div>

examples/demo/site/modules/contact/templates/block_post_contact.tpl

@@ -0,0 +1,15 @@
+<div class="contact-box">
+{if condition="$has_error"}
+<div class="message error">
+		<strong>Internal Server Error <small>Error 500</small></strong>
+		<p>The page you requested could not be served because the server is down,
+		either contact the webmaster or try again. 
+		Use your browser's <strong>Back</strong> button to navigate to the page you came from.</p>
+		<p><strong>Or you could just press this link:</strong> <a href="{$site_url/}" itemprop="home" rel="home">Take Me Home</a></p> 
+</div>
+{/if}
+{unless condition="$has_error"}
+<p class="message success">Thank you for contacting the Eiffel Programming Language community.<br/>
+We will get back to you promptly on your contact request.</p>	
+{/unless}
+</div>

examples/demo/site/modules/contact/templates/email_message.tpl

@@ -0,0 +1,10 @@
+<p>
+Thank you for contacting {$sitename/}.<br/>
+We will get back to you promptly about your contact message.
+</p>
+<h2>Your contact information:</h2>  
+<div>
+	<strong>Name<strong>: {$name/} <br/>
+	<strong>Email<strong>: {$email/} <br/>
+	<strong>Message<strong>: {$message/} <br/>
+</div>

examples/demo/site/modules/contact/templates/email_notification.tpl

@@ -0,0 +1,6 @@
+<h2>Contact information:</h2>  
+<div>
+	<strong>Name<strong>: {$name/}<br/>
+	<strong>Email<strong>: {$email/} <br/>
+	<strong>Message<strong>: {$message/} <br/>
+</div>

examples/demo/site/modules/core/scripts/core.sql

@@ -1,4 +1,29 @@
 
+CREATE TABLE `logs`(
+  `id` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `category` VARCHAR(255) NOT NULL,
+  `level` INTEGER NOT NULL,
+  `uid` INTEGER,
+  `message` TEXT NOT NULL,
+  `info` TEXT,
+  `link` TEXT,
+  `date` DATETIME NOT NULL
+);
+
+CREATE TABLE `custom_values`(
+  `type` VARCHAR(255) NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` TEXT
+);
+
+CREATE TABLE `path_aliases`(
+  `pid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `source` VARCHAR(255) NOT NULL,
+  `alias` VARCHAR(255) NOT NULL,
+  `lang` VARCHAR(12)
+);
+
+
 CREATE TABLE `users`(
   `uid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
   `name` VARCHAR(100) NOT NULL,
@@ -8,6 +33,7 @@ CREATE TABLE `users`(
   `status` INTEGER,
   `created` DATETIME NOT NULL,
   `signed` DATETIME,
+  `profile_name` VARCHAR(250) NULL,
   CONSTRAINT `name`
     UNIQUE(`name`)
 );
@@ -46,3 +72,18 @@ CREATE TABLE `users_password_recovery` (
   CONSTRAINT `token` UNIQUE  (`token`)
 );
 
+
+CREATE TABLE `auth_temp_users` (
+  `uid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `name` VARCHAR(100) NOT NULL,
+  `password` VARCHAR(100) NOT NULL,
+  `salt` VARCHAR(100) NOT NULL,
+  `email` VARCHAR(250) NOT NULL,
+  `application` TEXT NOT NULL, 
+  CONSTRAINT `name`
+    UNIQUE(`name`)
+);
+
+
+
+

examples/demo/site/modules/core/scripts/updates/core-1.0.0.1.sql

@@ -0,0 +1,2 @@
+ALTER TABLE users ADD profile_name VARCHAR(250) NULL;
+

examples/demo/site/modules/custom_block/config/custom_block.json

@@ -0,0 +1,11 @@
+{
+	"blocks": {
+		"test":	{
+			"title": "Custom block test",
+			"is_raw": "yes",
+			"region": "footer",
+			"weight": 100,
+			"conditions": ["path:demo/*"]
+		}
+	}
+}

examples/demo/site/modules/files/files/css/files.css

@@ -0,0 +1,52 @@
+.uploaded-files table {
+  width: 100%;
+  border-collapse: collapse;
+  border: 1px solid black;
+}
+.uploaded-files table th {
+  padding: 3px 0 3px 5px;
+}
+.uploaded-files table td {
+  padding: 3px 0 3px 5px;
+}
+.uploaded-files a.button {
+  color: black;
+  text-decoration: none;
+  border: solid 1px #999;
+  background-color: #ddd;
+  padding: 2px 4px 2px 4px;
+}
+.uploaded-files a.button:hover {
+  color: black;
+  border: solid 1px #06f;
+  background-color: #cff;
+}
+
+.upload-files .center {
+  text-align: center;
+  padding: 10px;
+}
+.upload-files a.button {
+  margin: auto;
+  width: 100px;
+  color: black;
+  text-decoration: none;
+  border: solid 1px #999;
+  background-color: #ddd;
+  padding: 2px 4px 2px 4px;
+}
+.upload-files a.button:hover {
+  color: black;
+  border: solid 1px #06f;
+  background-color: #cff;
+}
+
+/******************* Drop Zone *******************/
+.dropzone {
+  width: 100%;
+  border: 2px dashed blue;
+  border-radius: 3px;
+  text-align: center;
+  padding-top: 15px;
+  padding-bottom: 15px;
+}

examples/demo/site/modules/files/files/js/src/basic.scss

@@ -0,0 +1,78 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Matias Meno <m@tias.me>
+ */
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+.dropzone, .dropzone * {
+  box-sizing: border-box;
+}
+.dropzone {
+
+  position: relative;
+
+  .dz-preview {
+    position: relative;
+    display: inline-block;
+    width: 120px;
+    margin: 0.5em;
+
+    .dz-progress {
+      display: block;
+      height: 15px;
+      border: 1px solid #aaa;
+      .dz-upload {
+        display: block;
+        height: 100%;
+        width: 0;
+        background: green;
+      }
+    }
+
+    .dz-error-message {
+      color: red;
+      display: none;
+    }
+    &.dz-error {
+      .dz-error-message, .dz-error-mark {
+        display: block;
+      }
+    }
+    &.dz-success {
+      .dz-success-mark {
+        display: block;
+      }
+    }
+
+    .dz-error-mark, .dz-success-mark {
+      position: absolute;
+      display: none;
+      left: 30px;
+      top: 30px;
+      width: 54px;
+      height: 58px;
+      left: 50%;
+      margin-left: -(54px/2);
+    }
+
+
+  }
+
+}

examples/demo/site/modules/files/files/js/src/dropzone.scss

@@ -0,0 +1,413 @@
+/*
+ * The MIT License
+ * Copyright (c) 2012 Matias Meno <m@tias.me>
+ */
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+// of the Software, and to permit persons to whom the Software is furnished to do
+// so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+@mixin keyframes($name) {
+  @-webkit-keyframes #{$name} {
+    @content; 
+  }
+  @-moz-keyframes #{$name} {
+    @content;
+  }
+  @keyframes #{$name} {
+    @content;
+  } 
+}
+
+
+@mixin prefix($map, $vendors: webkit moz ms o) {
+  @each $prop, $value in $map {
+    @if $vendors {
+      @each $vendor in $vendors {
+        #{"-" + $vendor + "-" + $prop}: #{$value};
+      }
+    }
+    // Dump regular property anyway
+    #{$prop}: #{$value};
+  }
+}
+
+
+@include keyframes(passing-through) {
+  
+  0% {
+    opacity: 0;
+    @include prefix((transform: translateY(40px)));
+  }
+
+  30%, 70% {
+    opacity: 1;
+    @include prefix((transform: translateY(0px)));
+  }
+
+  100% {
+    opacity: 0;
+    @include prefix((transform: translateY(-40px)));
+  }
+}
+
+
+@include keyframes(slide-in) {
+  
+  0% {
+    opacity: 0;
+    @include prefix((transform: translateY(40px)));
+  }
+
+  30% {
+    opacity: 1;
+    @include prefix((transform: translateY(0px)));
+  }
+}
+
+
+
+@include keyframes(pulse) {
+  
+  0% { @include prefix((transform: scale(1))); }
+  10% { @include prefix((transform: scale(1.1))); }
+  20% { @include prefix((transform: scale(1))); }
+
+}
+
+
+
+.dropzone, .dropzone * {
+  box-sizing: border-box;
+}
+.dropzone {
+
+  $image-size: 120px;
+
+  $image-border-radius: 20px;
+
+  &.dz-clickable {
+    cursor: pointer;
+
+    * {
+      cursor: default;
+    }
+    .dz-message {
+      &, * {
+        cursor: pointer;
+      }
+    }
+  }
+
+  min-height: 150px;
+  border: 2px solid rgba(0, 0, 0, 0.3);
+  background: white;
+  padding: 20px 20px;
+
+  &.dz-started {
+    .dz-message {
+      display: none;
+    }
+  }
+
+  &.dz-drag-hover {
+    border-style: solid;
+    .dz-message {
+      opacity: 0.5;
+    }
+  }
+  .dz-message {
+    text-align: center;
+    margin: 2em 0;
+
+
+  }
+
+
+
+  .dz-preview {
+    position: relative;
+    display: inline-block;
+
+    vertical-align: top;
+
+    margin: 16px;
+    min-height: 100px;
+
+    &:hover {
+      // Making sure that always the hovered preview element is on top
+      z-index: 1000;
+      .dz-details {
+        opacity: 1;
+      }
+    }
+
+    &.dz-file-preview {
+
+      .dz-image {
+        border-radius: $image-border-radius;
+        background: #999;
+        background: linear-gradient(to bottom, #eee, #ddd);
+      }
+
+      .dz-details {
+        opacity: 1;
+      }
+    }
+
+    &.dz-image-preview {
+      background: white;
+      .dz-details {
+        @include prefix((transition: opacity 0.2s linear));
+      }
+    }
+
+    .dz-remove {
+      font-size: 14px;
+      text-align: center;
+      display: block;
+      cursor: pointer;
+      border: none;
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+
+    &:hover .dz-details {
+      opacity: 1;
+    }
+    .dz-details {
+      $background-color: #444;
+
+      z-index: 20;
+
+      position: absolute;
+      top: 0;
+      left: 0;
+
+      opacity: 0;
+
+      font-size: 13px;
+      min-width: 100%;
+      max-width: 100%;
+      padding: 2em 1em;
+      text-align: center;
+      color: rgba(0, 0, 0, 0.9);
+
+      $width: 120px;
+
+      line-height: 150%;
+
+      .dz-size {
+        margin-bottom: 1em;
+        font-size: 16px;
+      }
+
+      .dz-filename {
+
+        white-space: nowrap;
+
+        &:hover {
+          span {
+            border: 1px solid rgba(200, 200, 200, 0.8);
+            background-color: rgba(255, 255, 255, 0.8);
+          }
+        }
+        &:not(:hover) {
+          span {
+            border: 1px solid transparent;
+          }
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+      }
+
+      .dz-filename, .dz-size {
+        span {
+          background-color: rgba(255, 255, 255, 0.4);
+          padding: 0 0.4em;
+          border-radius: 3px;
+        }
+      }
+
+    }
+
+    &:hover {
+      .dz-image {
+        // opacity: 0.8;
+        img {
+          @include prefix((transform: scale(1.05, 1.05))); // Getting rid of that white bleed-in
+          @include prefix((filter: blur(8px)), webkit); // Getting rid of that white bleed-in
+        }
+      }
+    }
+    .dz-image {
+      border-radius: $image-border-radius;
+      overflow: hidden;
+      width: $image-size;
+      height: $image-size;
+      position: relative;
+      display: block;
+      z-index: 10;
+
+      img {
+        display: block;
+      }
+    }
+
+
+    &.dz-success {
+      .dz-success-mark {
+        @include prefix((animation: passing-through 3s cubic-bezier(0.770, 0.000, 0.175, 1.000)));
+      }
+    }
+    &.dz-error {
+      .dz-error-mark {
+        opacity: 1;
+        @include prefix((animation: slide-in 3s cubic-bezier(0.770, 0.000, 0.175, 1.000)));
+      }
+    }
+
+
+    .dz-success-mark, .dz-error-mark {
+
+      $image-height: 54px;
+      $image-width: 54px;
+
+      pointer-events: none;
+
+      opacity: 0;
+      z-index: 500;
+
+      position: absolute;
+      display: block;
+      top: 50%;
+      left: 50%;
+      margin-left: -($image-width/2);
+      margin-top: -($image-height/2);
+
+      svg {
+        display: block;
+        width: $image-width;
+        height: $image-height;
+      }
+    }
+    
+      
+    &.dz-processing .dz-progress {
+      opacity: 1;
+      @include prefix((transition: all 0.2s linear));
+    }
+    &.dz-complete .dz-progress {
+      opacity: 0;
+      @include prefix((transition: opacity 0.4s ease-in));
+    }
+
+    &:not(.dz-processing) {
+      .dz-progress {
+        @include prefix((animation: pulse 6s ease infinite));
+      }
+    }
+    .dz-progress {
+
+      opacity: 1;
+      z-index: 1000;
+
+      pointer-events: none;
+      position: absolute;
+      height: 16px;
+      left: 50%;
+      top: 50%;
+      margin-top: -8px;
+
+      width: 80px;
+      margin-left: -40px;
+
+      // border: 2px solid #333;
+      background: rgba(255, 255, 255, 0.9);
+
+      // Fix for chrome bug: https://code.google.com/p/chromium/issues/detail?id=157218
+      -webkit-transform: scale(1);
+
+
+      border-radius: 8px;
+
+      overflow: hidden;
+
+      .dz-upload {
+        background: #333;
+        background: linear-gradient(to bottom, #666, #444);
+        position: absolute;
+        top: 0;
+        left: 0;
+        bottom: 0;
+        width: 0;
+        @include prefix((transition: width 300ms ease-in-out));
+      }
+
+    }
+
+    &.dz-error {
+      .dz-error-message {
+        display: block;
+      }
+      &:hover .dz-error-message {
+        opacity: 1;
+        pointer-events: auto;
+      }
+    }
+
+    .dz-error-message {
+      $width: $image-size + 20px;
+      $color: rgb(190, 38, 38);
+
+      pointer-events: none;
+      z-index: 1000;
+      position: absolute;
+      display: block;
+      display: none;
+      opacity: 0;
+      @include prefix((transition: opacity 0.3s ease));
+      border-radius: 8px;
+      font-size: 13px;
+      top: $image-size + 10px;
+      left: -10px;
+      width: $width;
+      background: $color;
+      background: linear-gradient(to bottom, $color, darken($color, 5%));
+      padding: 0.5em 1.2em;
+      color: white;
+
+      // The triangle pointing up
+      &:after {
+        content: '';
+        position: absolute;
+        top: -6px;
+        left: $width / 2 - 6px;
+        width: 0; 
+        height: 0; 
+        border-left: 6px solid transparent;
+        border-right: 6px solid transparent;
+        border-bottom: 6px solid $color;
+      }
+    }
+
+  }
+}
+
+

examples/demo/site/modules/files/files/scss/files.scss

@@ -0,0 +1,63 @@
+.uploaded-files {
+	table {
+		width: 100%;
+		border-collapse: collapse;
+		border: 1px solid black;
+
+		th {
+			padding: 3px 0 3px 5px;
+		}
+
+		td {
+			padding: 3px 0 3px 5px;
+		}
+	}
+
+	a.button{
+		color: black;
+		text-decoration: none;
+		border: solid 1px #999;
+		background-color: #ddd;
+		padding: 2px 4px 2px 4px;
+		&:hover {
+			color: black;
+			border: solid 1px #06f;
+			background-color: #cff;
+		}
+	}
+}
+
+.upload-files {
+	.center {
+		text-align: center;
+		padding: 10px;
+	}
+	a.button{
+		margin: auto;
+		width: 100px;
+
+		color: black;
+		text-decoration: none;
+		border: solid 1px #999;
+		background-color: #ddd;
+		padding: 2px 4px 2px 4px;
+		&:hover {
+			color: black;
+			border: solid 1px #06f;
+			background-color: #cff;
+		}
+	}
+}
+
+
+/******************* Drop Zone *******************/
+
+.dropzone {
+	width: 100%;
+	border: 2px dashed blue;
+	border-radius: 3px;
+	text-align: center;
+	padding-top: 15px;
+	padding-bottom: 15px;
+}
+

examples/demo/site/modules/google_search_20/config/google_search_20.json-dist

@@ -0,0 +1,5 @@
+{
+    "gcse": {
+     		"search_engine_id":""
+          }	
+}

examples/demo/site/modules/google_search_20/templates/block_gcse_search_form.tpl

@@ -0,0 +1,6 @@
+<form action="{$site_url/}gcse20" class="search-form" id="search-form">
+	<div class="form-group has-feedback">
+		<input type="search" class="form-control" name="q" id="search-query" placeholder="search" value="{htmlentities}{$cms_search_query/}{/htmlentities}" >
+		<span class="glyphicon glyphicon-search form-control-feedback"></span>
+	</div>
+</form>

examples/demo/site/modules/google_search_20/templates/block_gcse_search_results.tpl

@@ -0,0 +1,7 @@
+<section>
+  <header>
+    <h2>Results for <kbd>{$cms_search_query/}</kbd></h2>
+  </header>
+  
+   <gcse:searchresults-only></gcse:searchresults-only>
+</section>

examples/demo/site/modules/messaging/files/css/messaging.css

@@ -0,0 +1,15 @@
+.messaging-box fieldset {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  overflow: scroll;
+  height: 50ex;
+  line-height: 2.5ex;
+}
+.messaging-box fieldset div {
+  width: 300px;
+}
+.messaging-box fieldset input[type="checkbox"] {
+  margin-right: 5px;
+  margin-left: 3px;
+}

examples/demo/site/modules/messaging/files/scss/messaging.scss

@@ -0,0 +1,18 @@
+.messaging-box {
+	fieldset {
+		display: flex; 
+		flex-wrap: wrap;
+		align-items: flex-start;
+		div {
+			width: 300px;
+		}
+
+		overflow:scroll; 
+		height:50ex;
+		line-height: 2.5ex;
+		input[type="checkbox"] {
+			margin-right: 5px;
+			margin-left: 3px;
+		}
+	}
+}

examples/demo/site/modules/node/files/css/node.css

@@ -9,6 +9,9 @@ ul.cms-nodes li {
 ul.cms-nodes li:first-child {
   border-top: none;
 }
+ul.cms-nodes li span.author, ul.cms-nodes li span.info {
+  float: right;
+}
 ul.cms-nodes li.cms_type_page a::before {
   content: "[page] ";
 }

examples/demo/site/modules/node/files/scss/node.scss

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

examples/demo/site/modules/node/scripts/node.sql

@@ -8,6 +8,7 @@ CREATE TABLE nodes (
 	`content`	TEXT,
 	`format`	VARCHAR(128),
 	`author`	INTEGER,
+	`editor`	INTEGER,
 	`publish`	DATETIME,
 	`created`	DATETIME NOT NULL,
 	`changed`	DATETIME NOT NULL,
@@ -23,15 +24,9 @@ CREATE TABLE node_revisions (
 	`content`	TEXT,
 	`format`	VARCHAR(128),
 	`author`	INTEGER,
+	`editor`	INTEGER,
 	`changed`	DATETIME NOT NULL,
 	`status`	INTEGER,
 	CONSTRAINT Unique_nid_revision PRIMARY KEY (nid,revision)
 );
 
-CREATE TABLE page_nodes(
-	`nid` INTEGER NOT NULL,
-	`revision` INTEGER NOT NULL,
-	`parent` INTEGER,
-	CONSTRAINT PK_nid_revision PRIMARY KEY (nid,revision)
-);
-

examples/demo/site/modules/node/scripts/page.sql

@@ -0,0 +1,8 @@
+
+CREATE TABLE page_nodes(
+	`nid` INTEGER NOT NULL,
+	`revision` INTEGER NOT NULL,
+	`parent` INTEGER,
+	CONSTRAINT PK_nid_revision PRIMARY KEY (nid,revision)
+);
+

examples/demo/site/modules/node/scripts/updates/node-1.0.0.1.sql

@@ -0,0 +1,7 @@
+ALTER TABLE nodes ADD editor INTEGER ;
+UPDATE nodes SET editor = author;
+
+ALTER TABLE node_revisions ADD editor INTEGER ;
+UPDATE node_revisions SET editor = author;
+
+

examples/demo/site/modules/oauth20/templates/block_login.tpl

@@ -1,7 +1,7 @@
  	<div class="primary-tabs">
  		<div>
 			{foreach item="item" from="$oauth_consumers"}
-				<a href="{$site_url/}account/login-with-oauth/{$item/}">Login with {$item/}</a><br>
+				<a href="{$site_url/}account/auth/login-with-oauth/{$item/}">Login with {$item/}</a><br>
 			{/foreach}	
 		</div>    	
 	</div>

examples/demo/site/modules/session_auth/scripts/install.sql

@@ -0,0 +1,9 @@
+
+CREATE TABLE auth_session (
+   `uid` INTEGER PRIMARY KEY NOT NULL CHECK(`uid`>=0),
+   `access_token` VARCHAR(64)  NOT NULL,
+   `created` DATETIME NOT NULL,
+   CONSTRAINT `uid` UNIQUE(`uid`),
+   CONSTRAINT `access_token` UNIQUE(`access_token`) 
+);
+

examples/demo/site/modules/session_auth/templates/block_login.tpl

@@ -0,0 +1,24 @@
+{unless isset="$user"}
+<div class="login-box">
+	<div class="description">The "Session" is the standard authentication system. (based on cookie)</div>
+	<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
+	<div>
+		<form name="cms_session_auth" action="{$site_url/}account/auth/roc-session-login" method="POST">
+			{unless isempty="$site_destination"}<input type="hidden" name="destination" value="{$site_destination/}">{/unless}
+			<div>
+				<input type="text" name="username" id="username" required value="{$username/}">
+				<label>Username</label>
+			</div>
+			<div>
+				<input  type="password" name="password"  id="password" required >
+				<label>Password</label>
+			</div>
+			<button type="submit">Login</button>
+		</form>
+	</div>
+	<div>
+		<a href="{$site_url/}account/new-password">Forgot password?</a>
+	</div>	
+	{if isset="$error"}<div class="error">{$error/}</div>{/if}
+</div>
+{/unless}

examples/demo/site/modules/sitemap/files/sitemap.xsl

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" 
+                xmlns:html="http://www.w3.org/TR/REC-html40"
+                xmlns:sitemap="http://www.sitemaps.org/schemas/sitemap/0.9"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>
+	<xsl:template match="/">
+		<html xmlns="http://www.w3.org/1999/xhtml">
+			<head>
+				<title>XML Sitemap</title>
+				<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+				<style type="text/css">
+					body {
+						font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
+						font-size: 13px;
+					}	
+
+					#header {
+						text-align: center;
+						padding-top: 14px;
+						padding-bottom: 29px;
+					}				
+					
+					h1 {
+						font-weight: normal;
+						font-size: 24px;
+						line-height: 20px;
+						color: #333333;
+					}
+
+					h2 {
+						font-weight: normal;
+						font-size: 13px;
+						color: #aaaaaa;
+						line-height: 10px;
+					}
+					
+					#content {
+						background: #f8f8f8;
+						border-top: 1px solid #dddddd;
+						padding-top: 50px;
+					}
+
+					#content a:visited,
+					#content tr:hover a:visited {
+						color: #68009c;
+					}
+
+					table {
+						margin: 0 auto;
+						text-align: left;
+					}
+
+					tr#table-header:hover {
+						background: none;
+					}
+
+					tr:hover {
+						background: #ebebeb;
+					}
+
+					#content tr:hover a {
+						color: #6e6e6e;						
+					}
+
+					td {
+						color: #6e6e6e;
+						font-size: 12px;
+						border-bottom: 1px solid #dddddd;
+						padding: 11px 5px 13px;
+					}
+					
+					th {
+						color: #333333;
+						font-size: 12px;
+						border-bottom: 1px solid #dddddd;
+						padding: 5px 50px 17px 5px;
+					}
+					
+					#footer {
+						background: #f8f8f8;
+						font-size: 13px;
+						color: #aaaaaa;
+						padding: 54px 0 20px;
+						text-align: center;						
+					}
+					
+					a {
+						color: #2384c6;
+					}			
+					a:hover {
+						color: #6e6e6e;
+						text-decoration: none;
+					}		
+				</style>
+			</head>
+			<body>
+				<div id="header">
+					<h1>XML Sitemap</h1>
+					<h2>This is a XML Sitemap which is supposed to be processed by <a href="http://www.google.com">Google search engine</a>.</h2>
+				</div>
+				<div id="content">
+					<table cellpadding="5" cellspacing="0">
+						<tr id="table-header">
+							<th>URL</th>
+							<th>Priority</th>
+							<th>Change Frequency</th>
+							<th>LastChange (GMT)</th>
+						</tr>
+						<xsl:variable name="lower" select="'abcdefghijklmnopqrstuvwxyz'"/>
+						<xsl:variable name="upper" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
+						<xsl:for-each select="sitemap:urlset/sitemap:url">
+							<tr>
+								<xsl:if test="position() mod 2 != 1">
+									<xsl:attribute  name="class">high</xsl:attribute>
+								</xsl:if>
+								<td>
+									<xsl:variable name="itemURL">
+										<xsl:value-of select="sitemap:loc"/>
+									</xsl:variable>
+									<a href="{$itemURL}">
+										<xsl:value-of select="sitemap:loc"/>
+									</a>
+								</td>
+								<td>
+									<xsl:value-of select="concat(sitemap:priority*100,'%')"/>
+								</td>
+								<td>
+									<xsl:value-of select="concat(translate(substring(sitemap:changefreq, 1, 1),concat($lower, $upper),concat($upper, $lower)),substring(sitemap:changefreq, 2))"/>
+								</td>
+								<td>
+									<xsl:value-of select="concat(substring(sitemap:lastmod,0,11),concat(' ', substring(sitemap:lastmod,12,5)))"/>
+								</td>
+							</tr>
+						</xsl:for-each>
+					</table>
+				</div>
+			</body>
+		</html>
+	</xsl:template>
+</xsl:stylesheet>

examples/demo/site/modules/taxonomy/files/css/taxonomy.css

@@ -19,3 +19,8 @@ ul.taxonomy li:hover {
   border-bottom: solid 1px #66f;
   background-color: #ddf;
 }
+
+table.taxonomy td {
+  border: solid 1px #ccc;
+  padding: 2px;
+}

examples/demo/site/modules/taxonomy/files/scss/taxonomy.scss

@@ -19,3 +19,9 @@ ul.taxonomy {
 		}
 	}
 }
+table.taxonomy {
+	td {
+		border: solid 1px #ccc;
+		padding: 2px;
+	}
+}

examples/demo/site/modules/wikitext/files/css/wikitext.css

@@ -0,0 +1,15 @@
+#main code, #main e, #main eiffel {
+  display: block;
+  font-family: monospace;
+  white-space: pre-wrap;
+  border: solid 1px #ccc;
+  background-color: #fff;
+  line-height: 1.3;
+  padding: 10px;
+  margin: 2px 0 2px 0;
+}
+#main code.inline, #main e.inline, #main eiffel.inline {
+  display: inline-block;
+  padding: 0 2px 0 2px;
+  margin: 0;
+}

examples/demo/site/modules/wikitext/files/scss/wikitext.scss

@@ -0,0 +1,18 @@
+#main {
+	code, e, eiffel {
+		display: block;
+		font-family: monospace;
+		white-space: pre-wrap;
+		border: solid 1px #ccc;
+		background-color: #fff;
+		line-height: 1.3;
+		padding: 10px;
+		margin: 2px 0 2px 0;
+
+		&.inline {
+			display: inline-block;
+			padding: 0 2px 0 2px;
+			margin: 0;
+		}
+	}
+}

examples/demo/site/scripts/core.sql

@@ -1,23 +0,0 @@
-CREATE TABLE `logs`(
-  `id` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
-  `category` VARCHAR(255) NOT NULL,
-  `level` INTEGER NOT NULL,
-  `uid` INTEGER,
-  `message` TEXT NOT NULL,
-  `info` TEXT,
-  `link` TEXT,
-  `date` DATETIME NOT NULL
-);
-
-CREATE TABLE `custom_values`(
-  `type` VARCHAR(255) NOT NULL,
-  `name` VARCHAR(255) NOT NULL,
-  `value` TEXT
-);
-
-CREATE TABLE `path_aliases`(
-  `pid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
-  `source` VARCHAR(255) NOT NULL,
-  `alias` VARCHAR(255) NOT NULL,
-  `lang` VARCHAR(12)
-);

examples/demo/site/themes/admin/assets/scss/style.scss

@@ -0,0 +1,110 @@
+ul.horizontal {
+	li {
+		display: inline-block;
+	}
+}
+
+#header {
+	#primary.menu {
+		ul {
+			li {
+				color: #555;
+				a { 
+					color: #555; 
+					text-decoration: none;
+					&:hover { color: black; }
+				}
+				background-color: #fff;
+				padding: 10px;
+				margin: 0;
+			}
+			&.horizontal {
+				border-bottom: solid 1px #ddd;
+				li {
+					border-top: solid 3px #fff;
+					&:hover {
+						background-color: #ffe;
+						border-top: solid 3px #999;
+					}
+					&.active {
+						font-weight: bold;
+						border-top: solid 3px #ddd;
+						background-color: #ddd;
+					}
+					&.active:hover {
+						border-top: solid 3px blue;
+					}
+				}
+			}
+		}
+	}
+}
+#content {
+	margin-left: 20px;
+	#highlighted {
+		position: relative;
+		border: solid 1px #ddd;
+		background-color: #ffc;
+		width: 70%;
+		left: 15%;
+		right: 15%;
+		padding: 5px;
+		font-style: italic;
+	}
+	.preview {
+		border: solid 1px red;
+	}
+}
+.sidebar {
+	padding: 5px;
+	margin: 3px;
+	/* border: solid 1px #ccc; */
+	&#sidebar_first {
+		width: 250px;
+		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 {
+		list-style-type: none;
+		li {
+			display: inline;
+			padding: 2px 5px;
+			border: solid 1px #ccf;
+		}
+		li.active {
+			border-color: #99f #99f #ddd;
+			border-style: solid solid none;
+			border-width: 2px 1px 0;
+			padding: 2px 7px 1px;
+		}
+	}
+}
+#message li.error {
+	background-color: #f99;
+	border: solid 1px red;
+	padding: 5px 2px 5px 2px;
+}
+
+table.with_border {
+	thead td {
+		font-weight: bold;
+	}
+	td {
+		border: solid 1px #ccc;
+		padding: 2px 5px 2px 5px;
+	}
+}

examples/demo/site/themes/admin/debug.tpl

@@ -0,0 +1,38 @@
+{assign name="debug_enabled" value="True"/}
+{if condition="$debug_enabled"}
+<!-- start debug -->
+{literal}
+	<style>
+		div.cms-debug>span {
+			position: absolute;
+			bottom: 5px;
+			right: 5px;
+			color: #ccc;
+			padding: 5px;
+		}
+		div.cms-debug:hover>span {
+			color: red;
+		}
+		div.cms-debug>span+ul {
+			display: none;
+			border: solid 2px red;
+			background-color: #ccc;
+			white-space: pre-wrap;
+		}
+		div.cms-debug:hover>span+ul {
+			display: block;
+			position: relative;
+			bottom: 5px;
+			left: 1%; right: 1%;
+			width: 98%;
+		}
+	</style>
+{/literal}
+<div class="cms-debug"><span>Show debug</span>
+<ul>
+{assign name="kpage" value="page"/}{assign name="kregions" value="regions"/}{foreach key="k" item="i" from="$page.variables"}{unless condition="$k ~ $kpage"}{unless condition="$k ~ $kregions"}<li><strong>{$k/}</strong>={htmlentities}{$i/}{/htmlentities}</li>{/unless}{/unless}
+{/foreach}
+</ul>
+</div>
+<!-- end debug -->
+{/if}

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

@@ -47,6 +47,9 @@ ul.horizontal li {
   padding: 5px;
   font-style: italic;
 }
+#content .preview {
+  border: solid 1px red;
+}
 
 .sidebar {
   padding: 5px;
@@ -90,3 +93,11 @@ ul.horizontal li {
   border: solid 1px red;
   padding: 5px 2px 5px 2px;
 }
+
+table.with_border thead td {
+  font-weight: bold;
+}
+table.with_border td {
+  border: solid 1px #ccc;
+  padding: 2px 5px 2px 5px;
+}

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

@@ -51,6 +51,9 @@ ul.horizontal {
 		padding: 5px;
 		font-style: italic;
 	}
+	.preview {
+		border: solid 1px red;
+	}
 }
 .sidebar {
 	padding: 5px;
@@ -95,3 +98,13 @@ ul.horizontal {
 	border: solid 1px red;
 	padding: 5px 2px 5px 2px;
 }
+
+table.with_border {
+	thead td {
+		font-weight: bold;
+	}
+	td {
+		border: solid 1px #ccc;
+		padding: 2px 5px 2px 5px;
+	}
+}

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

@@ -4,11 +4,11 @@
   <meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<!-- EWF CMS -->
-	<link rel="stylesheet" href="{$site_url/}theme/css/style.css">
+	<link rel="stylesheet" href="{$theme_path/}css/style.css">
  
 	<!-- jQuery dep -->
-	<script src="{$site_url/}theme/js/jquery-1.10.2.min.js"></script>
-	<script src="{$site_url/}theme/js/popup_search.js"></script>
+	<script src="{$theme_path/}js/jquery-1.10.2.min.js"></script>
+	<script src="{$theme_path/}js/popup_search.js"></script>
 
 {if isset="$head"}{$head/}{/if}
 {if isset="$styles"}{$styles/}{/if}
@@ -37,17 +37,14 @@
           {$page.primary_nav/}
       {/if}
     </div> 
+	{if isset="$page.regions.search"}
 	<!-- Page search -->
 	<div class="row">
 		<div class="col-md-2 col-md-offset-9">
-			<form action="{$site_url/}gcse" class="search-form" id="gcse_search_form">
-				<div class="form-group has-feedback">
-					<input type="search" class="form-control" name="q" id="gcse_search" placeholder="search">
-					<span class="glyphicon glyphicon-search form-control-feedback"></span>
-				</div>
-			</form>
+			{$page.regions.search/}
 		</div>
 	</div>
+	{/if}
     <!-- General Page Content -->
     <div id='content' class='row-fluid'>
 		<!-- Left Sidebar sidebar_first -->

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

@@ -0,0 +1,6 @@
+			<form action="{$site_url/}search" class="search-form" id="search-form">
+				<div class="form-group has-feedback">
+					<input type="search" class="form-control" name="q" id="search-query" placeholder="search" value="{htmlentities}{$cms_search_query/}{/htmlentities}" >
+					<span class="glyphicon glyphicon-search form-control-feedback"></span>
+				</div>
+			</form>

examples/demo/site/themes/bootstrap/theme.info

@@ -4,6 +4,7 @@ author=jvelilla
 version=0.1
 regions[page_top] = Top
 regions[header] = Header
+regions[search] = Search
 regions[content] = Content
 regions[highlighted] = Highlighted
 regions[help] = Help