Provided a CMS_EMAIL, and CMS_API.process_email (CMS_EMAIL)

Added CMS_SETUP.mailer
Updated implementation of email_service to use notification_email library

.gitignore

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

cms-safe.ecf

@@ -2,31 +2,34 @@
 <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" 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="cms_app_env" location=".\library\app_env\app_env-safe.ecf"/>
+		<library name="cms_model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="config" location=".\library\configuration\config-safe.ecf"/>
 		<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="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
+		<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="layout" location=".\library\layout\layout-safe.ecf"/>
-		<library name="model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
+		<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=".\library\src\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
+		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>

cms.ecf

@@ -1,33 +1,36 @@
 <?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" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
+<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>
 	<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" void_safety="none" 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.ecf"/>
+		<library name="cms_app_env" location=".\library\app_env\app_env.ecf"/>
+		<library name="cms_model" location=".\library\model\cms_model.ecf" readonly="false"/>
+		<library name="config" location=".\library\configuration\config.ecf"/>
 		<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" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
-		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
+		<library name="i18n" location="$ISE_LIBRARY\library\i18n\i18n.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
-		<library name="config" location=".\library\configuration\config.ecf"/>
-		<library name="layout" location=".\library\layout\layout.ecf"/>
-		<library name="model" location=".\library\model\cms_model.ecf" readonly="false"/>
-		<library name="persistence_mysql" location=".\library\persistence\implementation\mysql\persistence_mysql.ecf" readonly="false"/>
+		<library name="notification_mailer" location="$ISE_LIBRARY\contrib\library\runtime\process\notification_email\notification_email.ecf"/>
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
 		<library name="wsf_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"/>
-		<cluster name="src" location=".\library\src\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
+		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>

examples/demo/demo-safe.ecf

@@ -1,49 +1,84 @@
 <?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" uuid="3643E657-BCBE-46AA-931B-71EAEA877A18" library_target="demo">
+<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">
 		<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 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"/>
+		<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_oauth_20_module" location="..\..\modules\oauth20\oauth20-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="persistence_mysql" location="..\..\library\persistence\implementation\mysql\persistence_mysql-safe.ecf" readonly="false"/>
-
-		<library name="layout" location="..\..\library\layout\layout-safe.ecf" readonly="false"/>
+		<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="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-safe.ecf" readonly="false"/>
+		-->
+		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-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"/>
+		<setting name="concurrency" value="thread"/>
 		<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"/>
+		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone-safe.ecf"/>
 		<cluster name="launcher" location=".\launcher\any\" recursive="true"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
+	<target name="demo_standalone" extends="common">
+		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
+		<option debug="true">
+			<debug name="dbglog" enabled="true"/>
+		</option>
+		<setting name="concurrency" value="thread"/>
+		<variable name="httpd_ssl_disabled" value="true"/>
+		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
+		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<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_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"/>
+		<setting name="concurrency" value="none"/>
 		<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"/>
+		<setting name="concurrency" value="none"/>
 		<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 name="demo" extends="demo_standalone">
 	</target>
 </system>

examples/demo/demo.ini

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

examples/demo/launcher/any/application_launcher.e

@@ -8,10 +8,10 @@ note
 	revision: "$Revision: 36 $"
 
 class
-	APPLICATION_LAUNCHER
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
 
 inherit
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G]
 
 feature -- Custom
 

examples/demo/launcher/any/application_launcher_i.e

@@ -10,24 +10,28 @@ note
 	revision: "$Revision: 36 $"
 
 deferred class
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
 
 inherit
 	SHARED_EXECUTION_ENVIRONMENT
 
 feature -- Execution
 
-	launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
 			nature: like launcher_nature
 		do
 			nature := launcher_nature
-			if nature = Void or else nature = nature_nino then
-				launch_nino (a_service, opts)
+			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 (a_service, opts)
+				launch_cgi (opts)
 			elseif nature = nature_libfcgi then
-				launch_libfcgi (a_service, opts)
+				launch_libfcgi (opts)
 			else
 				-- bye bye
 				(create {EXCEPTIONS}).die (-1)
@@ -43,14 +47,16 @@ feature {NONE} -- Access
 			--| and we could use WSF_DEFAULT_SERVICE_LAUNCHER to configure this at compilation time.
 		local
 			p: PATH
-			l_entry_name: READABLE_STRING_32
 			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 
+				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
@@ -61,39 +67,58 @@ feature {NONE} -- Access
 					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 (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch_nino (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_NINO_SERVICE_LAUNCHER
+			launcher: WSF_NINO_SERVICE_LAUNCHER [G]
 		do
-			create launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end
 
 feature {NONE} -- cgi
 
 	nature_cgi: STRING = "cgi"
 
-	launch_cgi (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch_cgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_CGI_SERVICE_LAUNCHER
+			launcher: WSF_CGI_SERVICE_LAUNCHER [G]
 		do
-			create launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end
 
 feature {NONE} -- libfcgi
 
 	nature_libfcgi: STRING = "libfcgi"
 
-	launch_libfcgi (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch_libfcgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_LIBFCGI_SERVICE_LAUNCHER
+			launcher: WSF_LIBFCGI_SERVICE_LAUNCHER [G]
 		do
-			create launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
+		end
+
+feature -- Default
+
+	default_nature: STRING
+		do
+			Result := nature_standalone
 		end
 
 

examples/demo/launcher/default/application_launcher.e

@@ -8,10 +8,10 @@ note
 	revision: "$Revision: 36 $"
 
 class
-	APPLICATION_LAUNCHER
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
 
 inherit
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G]
 
 feature -- Custom
 

examples/demo/launcher/default/application_launcher_i.e

@@ -6,19 +6,19 @@ note
 
 			you can customize APPLICATION_LAUNCHER
 		]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
+	revision: "$Revision: 96596 $"
 
 deferred class
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
 
 feature -- Execution
 
-	launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_SERVICE_LAUNCHER
+			launcher: WSF_DEFAULT_SERVICE_LAUNCHER [G]
 		do
-			create {WSF_DEFAULT_SERVICE_LAUNCHER} launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end
 
 end

examples/demo/modules/blog/cms_blog.e

@@ -0,0 +1,112 @@
+note
+	description: "Summary description for {CMS_BLOG}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_BLOG
+
+inherit
+	CMS_NODE
+		redefine
+			make_empty,
+			import_node
+		end
+
+create
+	make_empty,
+	make
+
+feature {NONE} -- Initialization
+
+	make_empty
+		do
+			Precursor
+		end
+
+feature -- Conversion
+
+	import_node (a_node: CMS_NODE)
+			-- <Precursor>
+		do
+			Precursor (a_node)
+			if attached {CMS_BLOG} a_node as l_blog then
+				if attached l_blog.tags as l_tags then
+					across
+						l_tags as ic
+					loop
+						add_tag (ic.item)
+					end
+				end
+			end
+		end
+
+feature -- Access
+
+	content_type: READABLE_STRING_8
+		once
+			Result := {CMS_BLOG_NODE_TYPE}.name
+		end
+
+feature -- Access: node
+
+	summary: detachable READABLE_STRING_8
+			-- A short summary of the node.
+
+	content: detachable READABLE_STRING_8
+			-- Content of the node.
+
+	format: detachable READABLE_STRING_8
+			-- Format associated with `content' and `summary'.
+			-- For example: text, mediawiki, html, etc
+
+feature -- Access: blog
+
+	tags: detachable ARRAYED_LIST [READABLE_STRING_32]
+			-- Optional tags
+
+feature -- Element change: node
+
+	set_content (a_content: like content; a_summary: like summary; a_format: like format)
+		do
+			content := a_content
+			summary := a_summary
+			format := a_format
+		end
+
+feature -- Element change: blog		
+
+	add_tag (a_tag: READABLE_STRING_32)
+			-- Set `parent' to `a_page'
+		require
+			not a_tag.is_whitespace
+		local
+			l_tags: like tags
+		do
+			l_tags := tags
+			if l_tags = Void then
+				create l_tags.make (1)
+				tags := l_tags
+			end
+			l_tags.force (a_tag)
+		end
+
+	set_tags_from_string (a_tags: READABLE_STRING_32)
+		local
+			t: STRING_32
+		do
+			tags := Void
+			across
+				a_tags.split (',') as ic
+			loop
+				t := ic.item
+				t.left_adjust
+				t.right_adjust
+				if not t.is_whitespace then
+					add_tag (t)
+				end
+			end
+		end
+
+end
+

examples/demo/modules/blog/cms_blog_api.e

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

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

@@ -0,0 +1,28 @@
+<?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_blog_module" uuid="C92F6E1E-2222-4414-9B6E-AA680E324D42" library_target="cms_blog_module">
+	<target name="cms_blog_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="cms_node_module" location="..\..\..\..\modules\node\node-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="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="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf"/>
+		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
+		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
+		<cluster name="src" location=".\" recursive="true"/>
+	</target>
+</system>
+

examples/demo/modules/blog/cms_blog_module.e

@@ -0,0 +1,153 @@
+note
+	description: "Displays all posts (pages with type blog). It's possible to list posts by user."
+	author: "Dario B<>sch <daboesch@student.ethz.ch>"
+	date: "$Date: 2015-05-22 15:13:00 +0100 (lun., 18 mai 2015) $"
+	revision: "$Revision 96616$"
+
+class
+	CMS_BLOG_MODULE
+
+inherit
+	CMS_MODULE
+		rename
+			module_api as blog_api
+		redefine
+			register_hooks,
+			initialize,
+			install,
+			blog_api
+		end
+
+	CMS_HOOK_MENU_SYSTEM_ALTER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+		do
+			version := "1.0"
+			description := "Service to demonstrate new node for blog"
+			package := "demo"
+		end
+
+feature -- Access
+
+	name: STRING = "blog"
+
+feature {CMS_API} -- Module Initialization			
+
+	initialize (api: CMS_API)
+			-- <Precursor>
+		local
+			ct: CMS_BLOG_NODE_TYPE
+		do
+			Precursor (api)
+
+			if attached {CMS_NODE_API} api.module_api ({NODE_MODULE}) as l_node_api then
+				create blog_api.make (api, l_node_api)
+
+				node_api := l_node_api
+					-- Depends on {NODE_MODULE}
+				create ct
+				l_node_api.add_content_type (ct)
+				l_node_api.add_content_type_webform_manager (create {CMS_BLOG_NODE_TYPE_WEBFORM_MANAGER}.make (ct))
+					-- Add support for CMS_BLOG, which requires a storage extension to store the optional "tags" value
+					-- For now, we only have extension based on SQL statement.
+				if attached {CMS_NODE_STORAGE_SQL} l_node_api.node_storage as l_sql_node_storage then
+					l_sql_node_storage.register_node_storage_extension (create {CMS_NODE_STORAGE_SQL_BLOG_EXTENSION}.make (l_sql_node_storage))
+				end
+			end
+		end
+
+feature {CMS_API} -- Module management
+
+	install (api: CMS_API)
+		local
+			sql: STRING
+		do
+				-- Schema
+			if attached {CMS_STORAGE_SQL_I} api.storage as l_sql_storage then
+				if not l_sql_storage.sql_table_exists ("blog_post_nodes") then
+					sql := "[
+CREATE TABLE blog_post_nodes(
+  `nid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL CHECK("nid">=0),
+  `revision` INTEGER,
+  `tags` VARCHAR(255)
+);
+					]"
+					l_sql_storage.sql_execute_script (sql, Void)
+					if l_sql_storage.has_error then
+						api.logger.put_error ("Could not initialize database for blog module", generating_type)
+					end
+				end
+				Precursor (api)
+			end
+		end
+
+feature {CMS_API} -- Access: API
+
+	blog_api: detachable CMS_BLOG_API
+			-- <Precursor>
+
+	node_api: detachable CMS_NODE_API
+
+feature -- Access: router
+
+	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
+			-- <Precursor>
+		do
+			if attached blog_api as l_blog_api then
+				configure_web (a_api, l_blog_api, a_router)
+			else
+					-- Issue with api/dependencies,
+					-- thus Current module should not be used!
+					-- thus no url mapping
+			end
+		end
+
+	configure_web (a_api: CMS_API; a_blog_api: CMS_BLOG_API; a_router: WSF_ROUTER)
+			-- Configure router mapping for web interface.
+		local
+			l_blog_handler: BLOG_HANDLER
+			l_blog_user_handler: BLOG_USER_HANDLER
+			l_uri_mapping: WSF_URI_MAPPING
+		do
+				-- TODO: for now, focused only on web interface, add REST api later. [2015-May-18]
+			create l_blog_handler.make (a_api, a_blog_api)
+			create l_blog_user_handler.make (a_api, a_blog_api)
+
+				-- Let the class BLOG_HANDLER handle the requests on "/blogs"
+			create l_uri_mapping.make_trailing_slash_ignored ("/blogs", l_blog_handler)
+			a_router.map (l_uri_mapping, a_router.methods_get)
+
+				-- We can add a page number after /blogs/ to get older posts
+			a_router.handle ("/blogs/page/{page}", l_blog_handler, a_router.methods_get)
+
+				-- If a user id is given route with blog user handler
+				--| FIXME: maybe /user/{user}/blogs/  would be better.
+			a_router.handle ("/blogs/user/{user}", l_blog_user_handler, a_router.methods_get)
+
+				-- If a user id is given we also want to allow different pages
+				--| FIXME: what about /user/{user}/blogs/?page={page} ?
+			a_router.handle ("/blogs/user/{user}/page/{page}", l_blog_user_handler, a_router.methods_get)
+
+		end
+
+feature -- Hooks
+
+	register_hooks (a_response: CMS_RESPONSE)
+		do
+			a_response.subscribe_to_menu_system_alter_hook (Current)
+		end
+
+	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
+		local
+			lnk: CMS_LOCAL_LINK
+		do
+				-- Add the link to the blog to the main menu
+			create lnk.make ("Blogs", "blogs/")
+			a_menu_system.primary_menu.extend (lnk)
+		end
+end

examples/demo/modules/blog/cms_blog_node_type.e

@@ -0,0 +1,64 @@
+note
+	description: "Summary description for {CMS_BLOG_NODE_TYPE}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_BLOG_NODE_TYPE
+
+inherit
+	CMS_NODE_TYPE [CMS_BLOG]
+		redefine
+			default_create
+		end
+
+feature {NONE} -- Initialization
+
+	default_create
+		do
+			Precursor
+			create {ARRAYED_LIST [like available_formats.item]} available_formats.make (4)
+			available_formats.extend (create {PLAIN_TEXT_CONTENT_FORMAT})
+			available_formats.extend (create {FILTERED_HTML_CONTENT_FORMAT})
+			available_formats.extend (create {FULL_HTML_CONTENT_FORMAT})
+			available_formats.extend (create {CMS_EDITOR_CONTENT_FORMAT})
+		end
+
+feature -- Access
+
+	name: STRING = "blog"
+			-- Internal name.
+
+	title: STRING_32 = "Blog"
+			-- Human readable name.
+
+	description: STRING_32 = "Content published as a blog post."
+			-- Optional description
+
+feature -- Access
+
+	available_formats: LIST [CONTENT_FORMAT]
+			-- Available formats for Current type.
+
+feature -- Factory
+
+	new_node_with_title (a_title: READABLE_STRING_32; a_partial_node: detachable CMS_NODE): like new_node
+			-- New node with `a_title' and fill from partial `a_partial_node' if set.
+		do
+			create Result.make (a_title)
+			if a_partial_node /= Void then
+				Result.import_node (a_partial_node)
+				Result.set_title (a_title)
+			end
+		end
+
+	new_node (a_partial_node: detachable CMS_NODE): CMS_BLOG
+			-- New node based on partial `a_partial_node', or from none.
+		do
+			create Result.make_empty
+			if a_partial_node /= Void then
+				Result.import_node (a_partial_node)
+			end
+		end
+
+end

examples/demo/modules/blog/cms_blog_node_type_webform_manager.e

@@ -0,0 +1,109 @@
+note
+	description: "Summary description for {CMS_BLOG_NODE_TYPE_WEBFORM_MANAGER}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_BLOG_NODE_TYPE_WEBFORM_MANAGER
+
+inherit
+	CMS_NODE_TYPE_WEBFORM_MANAGER [CMS_BLOG]
+		redefine
+			content_type,
+			populate_form,
+			update_node,
+			new_node,
+			append_html_output_to
+		end
+
+create
+	make
+
+feature -- Access
+
+	content_type: CMS_BLOG_NODE_TYPE
+			-- Associated content type.	
+
+feature -- form			
+
+	populate_form (response: NODE_RESPONSE; f: CMS_FORM; a_node: detachable CMS_NODE)
+		local
+			ti: WSF_FORM_TEXT_INPUT
+			s: STRING_32
+		do
+			Precursor (response, f, a_node)
+			create ti.make ("tags")
+			ti.set_label ("Tags")
+			ti.set_size (70)
+			if
+				a_node /= Void and then
+				attached {CMS_BLOG} a_node as a_blog and then
+			 	attached a_blog.tags as l_tags
+			 then
+				create s.make_empty
+				across
+					l_tags as ic
+				loop
+					if not s.is_empty then
+						s.append_character (',')
+					end
+					s.append (ic.item)
+				end
+				ti.set_text_value (s)
+			end
+			ti.set_is_required (False)
+			f.extend (ti)
+		end
+
+	update_node	(response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: CMS_NODE)
+		do
+			Precursor (response, fd, a_node)
+			if attached fd.string_item ("tags") as l_tags then
+				if attached {CMS_BLOG} a_node as l_blog then
+					l_blog.set_tags_from_string (l_tags)
+				end
+			end
+		end
+
+	new_node (response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: detachable like new_node): like content_type.new_node
+			-- <Precursor>
+		do
+			Result := Precursor (response, fd, a_node)
+			if attached fd.string_item ("tags") as l_tags then
+				Result.set_tags_from_string (l_tags)
+			end
+		end
+
+feature -- Output
+
+	append_html_output_to (a_node: CMS_NODE; a_response: NODE_RESPONSE)
+			-- <Precursor>
+		local
+			s: STRING
+		do
+			Precursor (a_node, a_response)
+			if attached a_response.main_content as l_main_content then
+				s := l_main_content
+			else
+				create s.make_empty
+			end
+
+			if attached {CMS_BLOG} a_node as l_blog_post then
+				if attached l_blog_post.tags as l_tags then
+					s.append ("<div><strong>Tags:</strong> ")
+					across
+						l_tags as ic
+					loop
+						s.append ("<span class=%"tag%">")
+						s.append (a_response.html_encoded (ic.item))
+						s.append ("</span> ")
+					end
+					s.append ("</div>")
+				end
+			end
+			a_response.set_main_content (s)
+		end
+
+
+
+end

examples/demo/modules/blog/cms_node_storage_sql_blog_extension.e

@@ -0,0 +1,115 @@
+note
+	description: "Storage extension for Blog nodes."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_NODE_STORAGE_SQL_BLOG_EXTENSION
+
+inherit
+	CMS_NODE_STORAGE_EXTENSION [CMS_BLOG]
+
+	CMS_PROXY_STORAGE_SQL
+		rename
+			sql_storage as node_storage
+		redefine
+			node_storage
+		end
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	node_storage: CMS_NODE_STORAGE_SQL
+			-- <Precursor>
+
+feature -- Access
+
+	content_type: STRING
+		once
+			Result := {CMS_BLOG_NODE_TYPE}.name
+		end
+
+feature -- Persistence
+
+	store (a_node: CMS_BLOG)
+		local
+			l_parameters: STRING_TABLE [detachable ANY]
+			l_new_tags: detachable STRING_32
+			l_previous_tags: detachable STRING_32
+			l_update: BOOLEAN
+		do
+			error_handler.reset
+			if attached api as l_api then
+				l_api.logger.put_information (generator + ".store", Void)
+			end
+
+			create l_parameters.make (2)
+			l_parameters.put (a_node.id, "nid")
+			l_parameters.put (a_node.revision, "revision")
+
+			sql_query (sql_select_blog_data, l_parameters)
+			if not has_error then
+				if sql_rows_count = 1 then
+					l_previous_tags := sql_read_string_32 (3)
+					l_update := True
+				end
+				if attached a_node.tags as l_tags and then not l_tags.is_empty then
+					create l_new_tags.make (0)
+					across
+						l_tags as ic
+					loop
+						if not l_new_tags.is_empty then
+							l_new_tags.append_character (',')
+						end
+						l_new_tags.append (ic.item)
+					end
+				else
+					l_new_tags := Void
+				end
+				l_parameters.put (l_new_tags, "tags")
+				if l_update and l_new_tags /~ l_previous_tags then
+					sql_change (sql_update_blog_data, l_parameters)
+				elseif l_new_tags /= Void then
+					sql_change (sql_insert_blog_data, l_parameters)
+				else
+					-- no blog data, means everything is empty.
+				end
+			end
+		end
+
+	load (a_node: CMS_BLOG)
+		local
+			l_parameters: STRING_TABLE [ANY]
+			n: INTEGER
+		do
+			error_handler.reset
+			create l_parameters.make (2)
+			l_parameters.put (a_node.id, "nid")
+			l_parameters.put (a_node.revision, "revision")
+			sql_query (sql_select_blog_data, l_parameters)
+			if not has_error then
+				n := sql_rows_count
+				if n = 1 then
+						-- nid, revision, parent
+					if
+						attached sql_read_string_32 (3) as l_tags and then
+						not l_tags.is_whitespace
+					then
+							-- FIXME: find a simple way to access the declared content types.
+						a_node.set_tags_from_string (l_tags)
+					end
+				else
+					check unique_data: n = 0 end
+				end
+			end
+		end
+
+feature -- SQL
+
+	sql_select_blog_data: STRING = "SELECT nid, revision, tags FROM blog_post_nodes WHERE nid =:nid AND revision=:revision;"
+	sql_insert_blog_data: STRING = "INSERT INTO blog_post_nodes (nid, revision, tags) VALUES (:nid, :revision, :tags);"
+	sql_update_blog_data: STRING = "UPDATE blog_post_nodes SET nid=:nid, revision=:revision, tags=:tags WHERE nid=:nid AND revision=:revision;"
+
+end

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,7 @@
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="standard">
+		<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"/>

examples/demo/modules/demo/cms_demo_module.e

@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_DEMO_MODULE}."
 	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
+	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
+	revision: "$Revision: 96616 $"
 
 class
 	CMS_DEMO_MODULE
@@ -10,7 +10,10 @@ class
 inherit
 	CMS_MODULE
 		redefine
-			register_hooks
+			register_hooks,
+			initialize,
+			is_installed,
+			install
 		end
 
 	CMS_HOOK_MENU_SYSTEM_ALTER
@@ -24,21 +27,67 @@ feature {NONE} -- Initialization
 
 	make
 		do
-			name := "Demo module"
 			version := "1.0"
 			description := "Service to demonstrate and test cms system"
 			package := "demo"
 		end
 
+feature -- Access
+
+	name: STRING = "demo"
+
+feature {CMS_API} -- Module Initialization			
+
+	initialize (api: CMS_API)
+			-- <Precursor>
+		do
+			Precursor (api)
+
+				-- Add support for CMS_PAGE, which requires a storage extension to store the optional "parent" id.
+				-- For now, we only have extension based on SQL statement.
+--			if attached {CMS_NODE_STORAGE_SQL} l_node_api.node_storage as l_sql_node_storage then
+--				l_sql_node_storage.register_node_storage_extension (create {CMS_NODE_STORAGE_SQL_PAGE_EXTENSION}.make (l_sql_node_storage))
+--			end
+		end
+
+feature {CMS_API} -- Module management
+
+	is_installed (api: CMS_API): BOOLEAN
+			-- Is Current module installed?
+		do
+			Result := attached api.storage.custom_value ("is_initialized", "module-" + name) as v and then v.is_case_insensitive_equal_general ("yes")
+		end
+
+	install (api: CMS_API)
+		local
+			sql: STRING
+		do
+				-- Schema
+			if attached {CMS_STORAGE_SQL_I} api.storage as l_sql_storage then
+				if not l_sql_storage.sql_table_exists ("tb_demo") then
+					sql := "[
+CREATE TABLE tb_demo(
+  `demo_id` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL CHECK("demo_id">=0),
+  `name` VARCHAR(100) NOT NULL,
+  `value` TEXT
+);
+					]"
+					l_sql_storage.sql_execute_script (sql, Void)
+					if l_sql_storage.has_error then
+						api.logger.put_error ("Could not initialize database for demo module", generating_type)
+					end
+				end
+				api.storage.set_custom_value ("is_initialized", "module-" + name, "yes")
+			end
+		end
+
 feature -- Access: router
 
-	router (a_api: CMS_API): WSF_ROUTER
-			-- Node router.
+	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
+			-- <Precursor>
 		do
-			create Result.make (2)
-
-			map_uri_template_agent (Result, "/demo/", agent handle_demo (?,?,a_api))
-			map_uri_template_agent (Result, "/demo/{id}", agent handle_demo_entry (?,?,a_api))
+			map_uri_template_agent (a_router, "/demo/", agent handle_demo (?,?,a_api), Void)
+			map_uri_template_agent (a_router, "/demo/{id}", agent handle_demo_entry (?,?,a_api), Void)
 		end
 
 feature -- Hooks
@@ -64,9 +113,9 @@ feature -- Hooks
 			if a_block_id.is_case_insensitive_equal_general ("demo-info") then
 				if a_response.request.request_uri.starts_with ("/demo/") then
 					create m.make_with_title (a_block_id, "Demo", 2)
-					create lnk.make ("/demo/abc", a_response.url ("/demo/abc", Void))
+					create lnk.make ("demo: abc", "demo/abc")
 					m.extend (lnk)
-					create lnk.make ("/demo/123", a_response.url ("/demo/123", Void))
+					create lnk.make ("demo: 123", "demo/123")
 					m.extend (lnk)
 					create mb.make (m)
 					a_response.add_block (mb, "sidebar_second")
@@ -79,7 +128,7 @@ feature -- Hooks
 			lnk: CMS_LOCAL_LINK
 --			perms: detachable ARRAYED_LIST [READABLE_STRING_8]
 		do
-			create lnk.make ("Demo", "/demo/")
+			create lnk.make ("Demo", "demo/")
 			a_menu_system.primary_menu.extend (lnk)
 		end
 
@@ -91,49 +140,31 @@ feature -- Handler
 			r: NOT_IMPLEMENTED_ERROR_CMS_RESPONSE
 		do
 			create r.make (req, res, a_api)
-			r.set_main_content ("NODE module does not yet implement %"" + req.path_info + "%" ...")
-			r.add_error_message ("NODE Module: not yet implemented")
+			r.set_main_content ("DEMO module does not yet implement %"" + req.path_info + "%" ...")
+			r.add_error_message ("DEMO Module: not yet implemented")
 			r.execute
 		end
 
 feature -- Mapping helper: uri template
 
-	map_uri_template (a_router: WSF_ROUTER; a_tpl: STRING; h: WSF_URI_TEMPLATE_HANDLER)
-			-- Map `h' as handler for `a_tpl'
-		require
-			a_tpl_attached: a_tpl /= Void
-			h_attached: h /= Void
-		do
-			map_uri_template_with_request_methods (a_router, a_tpl, h, Void)
-		end
-
-	map_uri_template_with_request_methods (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; h: WSF_URI_TEMPLATE_HANDLER; rqst_methods: detachable WSF_REQUEST_METHODS)
+	map_uri_template (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; h: WSF_URI_TEMPLATE_HANDLER; rqst_methods: detachable WSF_REQUEST_METHODS)
 			-- Map `h' as handler for `a_tpl' for request methods `rqst_methods'.
 		require
 			a_tpl_attached: a_tpl /= Void
 			h_attached: h /= Void
 		do
-			a_router.map_with_request_methods (create {WSF_URI_TEMPLATE_MAPPING}.make (a_tpl, h), rqst_methods)
+			a_router.map (create {WSF_URI_TEMPLATE_MAPPING}.make (a_tpl, h), rqst_methods)
 		end
 
 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]])
-			-- Map `proc' as handler for `a_tpl'
-		require
-			a_tpl_attached: a_tpl /= Void
-			proc_attached: proc /= Void
-		do
-			map_uri_template_agent_with_request_methods (a_router, a_tpl, proc, Void)
-		end
-
-	map_uri_template_agent_with_request_methods (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 [ANY, TUPLE [req: WSF_REQUEST; res: 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
 			proc_attached: proc /= Void
 		do
-			map_uri_template_with_request_methods (a_router, a_tpl, create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (proc), rqst_methods)
+			map_uri_template (a_router, a_tpl, create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (proc), rqst_methods)
 		end
 
 end

examples/demo/site/config/application_configuration.json

@@ -1,32 +0,0 @@
-{
-	"database": {
-		"datasource": {
-			"driver": "MySQL",
-			"environment": "development"
-		},
-		"environments": {
-			"test": {
-                "connection_string":"Server=localhost;Port=3306;Database=cms_dev;Uid=root;Pwd=;"
-			},
-			"development": {
-				"connection_string":"Server=localhost;Port=3306;Database=cms_dev;Uid=root;Pwd=;"
-				 },
-			"production": {
-				"connection_string":""
-			}
-		}
-	},
-	"smtp": {
-		"server": "localhost"
-		},
-	"logger": { 
-			"level":"debug",
-			"backup_count":"4"
-		},
-	"server": { 
-			"mode":"html"
-		}
-			
-}
-
-	

examples/demo/site/config/cms.ini

@@ -1,11 +1,14 @@
 [layout]
 root-dir=site/www
-themes-dir=site/themes
+#themes-dir=site/themes
+#modules-dir=site/modules
 
 [site]
 name=Eiffel CMS
 email=your@email.com
 theme=bootstrap
 
-[misc]
-smtp=localhost
+[mailer]
+smtp=localhost:25
+#sendmail=/usr/bin/sendmail
+#output=@stderr

examples/demo/site/config/demo.json

@@ -0,0 +1,39 @@
+{
+	"database": {
+		"datasource": {
+			"driver": "odbc",
+			"environment": "odbc-sqlite"
+		},
+		"environments": {
+			"odbc-sqlite": {
+				"connection_string":"Driver=SQLite3 ODBC Driver;Database=./site/database.sqlite;LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;"
+			},
+			"odbc-mysql": {
+				"connection_string":"Driver=mysql ODBC Driver;Server=localhost;Port=3306;Database=roc;Uid=roc;Pwd=roc;"
+			},
+			"mysql": {
+				"connection_string":"Driver=mysql;Server=localhost;Port=3306;Database=roc;Uid=roc;Pwd=roc;"
+			},
+			"development": {
+				"connection_string":"Server=localhost;Port=3306;Database=cms_dev;Uid=root;Pwd=;"
+				 },
+			"production": {
+				"connection_string":""
+			}
+		}
+	},
+	"smtp": {
+		"server": "localhost"
+		},
+	"logger": { 
+			"level":"error",
+			"type":"stderr",
+			"backup_count":"4"
+		},
+	"server": { 
+			"mode":"html"
+		}
+			
+}
+
+	

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

@@ -0,0 +1,8 @@
+{
+	"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/mail_templates/account_activation.html

@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>Activation</title>
+	  <meta name="description" content="Activation">
+	  <meta name="author" content="ROC CMS">
+	</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>
+	</body>
+</html>

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

@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>New Password</title>
+	  <meta name="description" content="New Password">
+	  <meta name="author" content="ROC CMS">
+	</head>
+
+	<body>
+		<p>You have required a new password at <a href="...">ROC CMS</a></p>
+
+		<p>To complete your request, please click on this link to genereate a new password:<p>
+
+		<p><a href="$link">$link</a></p>
+	</body>
+</html>

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

@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>New Activation</title>
+	  <meta name="description" content="New Activation token">
+	  <meta name="author" content="ROC CMS">
+	</head>
+
+	<body>
+		<p>You have request a new activation token at<a href="...">ROC CMS</a></p>
+
+		<p>To complete your registration, please click on this link to activate your account:<p>
+
+		<p><a href="$link">$link</a></p>
+		<p>Thank you for joining us.</p>
+	</body>
+</html>

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

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>Welcome</title>
+	  <meta name="description" content="Welcome">
+	  <meta name="author" content="ROC CMS">
+	</head>
+	<body>
+		<p>Welcome to<a href="...">ROC CMS</a></p>
+		<p>Thank you for joining us.</p>
+	</body>
+</html>

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

@@ -0,0 +1,7 @@
+{
+	"api_secret":"ADD_YOUR_SECRET_KEY",
+	"api_key":"ADD_YOUR_PUBLIC_KEY",
+	"scope": "email",
+	"api_revoke":"https://accounts.google.com/o/oauth2/revoke?token=$ACCESS_TOKEN",	
+	"protected_resource_url":"https://www.googleapis.com/plus/v1/people/me"
+}

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

@@ -0,0 +1,34 @@
+ 	<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>	
+		<div>
+			{foreach item="item" from="$oauth_consumers"}
+				<a href="{$site_url/}account/login-with-oauth/{$item/}">Login with {$item/}</a><br>
+			{/foreach}	
+		</div>    	
+		{/unless}
+	</div>

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

@@ -0,0 +1,16 @@
+ <div>
+    <form action="/account/new-password" method="post">
+        <fieldset>
+            <legend>Require new password</legend>
+            <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}
+                <br>
+            </div>
+            <button type="submit">Send</button>
+        </fieldset>    
+    </form>
+</div>

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

@@ -0,0 +1,3 @@
+<div>
+    <p>We have send 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

@@ -0,0 +1,3 @@
+<div>
+    <p>We have send you a new activation code, check your email to activate your account.</p>
+</div>

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

@@ -0,0 +1,3 @@
+<div>
+    <p>Thanks for register, check your email to activate your account.</p>
+</div>

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

@@ -0,0 +1,3 @@
+<div>
+    <p>You new password has been saved!</p>
+</div>

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

@@ -0,0 +1,19 @@
+ <div>
+    <form action="/account/reactivate" method="post">
+        <fieldset>
+            <legend>Reactivate Form</legend>
+            <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}
+                <br>
+                {if isset="$is_active"}
+                    <span><i>{$is_active/}</i></span> <br>
+                {/if}
+            </div>
+            <button type="submit">Reactivate</button>
+        </fieldset>    
+    </form>
+</div>

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

@@ -0,0 +1,28 @@
+ <div>
+    <form action="/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>

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

@@ -0,0 +1,28 @@
+ <div>
+    <form action="/account/reset-password" method="post">
+        <fieldset>
+            <legend>Generate New Password Form</legend>
+            <div>
+                <input type="text" id="token" name="token"  value="{$token/}" required />
+                <label for="token">Token</label>
+                {if isset="$error_token"}
+                    <span><i>{$error_token/}</i></span> <br>
+                {/if}
+            </div>
+            <div>
+                <input type="password" id="password" name="password" value="" required/>
+                <label for="password">Password</label>
+            </div>
+            <div>
+                <input type="password" id="confirm_password" name="confirm_password" value="" required/>
+                <label for="password">Confirm Password</label>
+            </div>
+            
+            <button type="submit">Confirm</button>
+            {if isset="$error_password"}
+              <span><i>{$error_password/}</i></span> <br>
+            {/if}
+ 
+        </fieldset>    
+    </form>
+</div>

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

@@ -0,0 +1,22 @@
+
+CREATE TABLE nodes (
+	`nid`	INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT UNIQUE,
+	`revision`	INTEGER,
+	`type`	TEXT NOT NULL,
+	`title`	VARCHAR(255) NOT NULL,
+	`summary`	TEXT,
+	`content`	TEXT,
+	`format`	VARCHAR(128),
+	`author`	INTEGER,
+	`publish`	DATETIME,
+	`created`	DATETIME NOT NULL,
+	`changed`	DATETIME NOT NULL,
+	`status`	INTEGER
+);
+
+CREATE TABLE page_nodes(
+  `nid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `revision` INTEGER,
+  `parent` INTEGER
+);
+

examples/demo/site/modules/oauth20/scripts/oauth2_consumers.sql

@@ -0,0 +1,18 @@
+
+CREATE TABLE oauth2_consumers(
+   `cid` INTEGER PRIMARY KEY NOT NULL CHECK(`cid`>=0),
+   `name` VARCHAR(255) NOT NULL,
+   `api_secret` TEXT  NOT NULL,
+   `api_key` TEXT NOT NULL,
+   `scope` VARCHAR (100) NOT NULL,
+   `protected_resource_url` VARCHAR (255) NOT NULL,
+   `callback_name` VARCHAR(255) NOT NULL,
+   `extractor` VARCHAR(50) NOT NULL,
+   `authorize_url` VARCHAR (255) NOT NULL,
+   `endpoint`  VARCHAR (255) NOT NULL,
+   CONSTRAINT `cid`
+    UNIQUE(`cid`),
+   CONSTRAINT `name`
+    UNIQUE(`name`)
+   );
+

examples/demo/site/modules/oauth20/scripts/oauth2_consumers_initialize.sql

@@ -0,0 +1,7 @@
+	-- Change the values TO_COMPLETE based on your API.
+	-- API SECTET KEY AND API PUBLIC KEY 
+INSERT INTO oauth2_consumers (name, api_secret, api_key, scope, protected_resource_url, callback_name, extractor, authorize_url, endpoint) 
+VALUES ('google', 'TO-COMPLETE', 'TO-COMPLETE', 'email', 'https://www.googleapis.com/plus/v1/people/me', 'callback_google', 'json','https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=$CLIENT_ID&redirect_uri=$REDIRECT_URI','https://accounts.google.com/o/oauth2/token');
+
+INSERT INTO oauth2_consumers (name, api_secret, api_key, scope, protected_resource_url, callback_name, extractor, authorize_url, endpoint ) 
+VALUES ('facebook', 'TO-COMPLETE', 'TO-COMPLETE', 'email', 'https://graph.facebook.com/me', 'callback_facebook','text','https://www.facebook.com/dialog/oauth?response_type=code&client_id=$CLIENT_ID&redirect_uri=$REDIRECT_URI','https://graph.facebook.com/oauth/access_token');

examples/demo/site/modules/oauth20/scripts/oauth2_table.sql.tpl

@@ -0,0 +1,10 @@
+
+CREATE TABLE $table_name (
+   `uid` INTEGER PRIMARY KEY NOT NULL CHECK(`uid`>=0),
+   `access_token` TEXT  NOT NULL,
+   `created` DATETIME NOT NULL,
+   `details` TEXT NOT NULL,
+   CONSTRAINT `uid`
+    UNIQUE(`uid`)
+   );
+

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

@@ -0,0 +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>
+			{/foreach}	
+		</div>    	
+	</div>

examples/demo/site/scripts/core.sql

@@ -0,0 +1,23 @@
+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/scripts/user.sql

@@ -0,0 +1,48 @@
+
+CREATE TABLE `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,
+  `status` INTEGER,
+  `created` DATETIME NOT NULL,
+  `signed` DATETIME,
+  CONSTRAINT `name`
+    UNIQUE(`name`)
+);
+
+CREATE TABLE `roles`(
+  `rid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `name` VARCHAR(100) NOT NULL,
+  CONSTRAINT `name`
+    UNIQUE(`name`)
+);
+
+CREATE TABLE `users_roles`(
+  `uid` INTEGER NOT NULL CHECK(`uid`>=0),
+  `rid` INTEGER NOT NULL CHECK(`rid`>=0)
+);
+
+CREATE TABLE `role_permissions`(
+  `rid` INTEGER NOT NULL,
+  `permission` VARCHAR(255) NOT NULL,
+  `module` VARCHAR(255)
+);
+
+CREATE TABLE `users_activations` (
+  `aid` INTEGER  PRIMARY KEY AUTO_INCREMENT NOT NULL CHECK (`aid` >= 0),
+  `token` VARCHAR(255) NOT NULL,
+  `uid` INTEGER NOT NULL CHECK (`uid` >= 0),
+  `created` DATETIME NOT NULL,
+  CONSTRAINT `token` UNIQUE  (`token`)
+);
+
+CREATE TABLE `users_password_recovery` (
+  `aid` INTEGER  PRIMARY KEY AUTO_INCREMENT NOT NULL CHECK (`aid` >= 0),
+  `token` VARCHAR(255) NOT NULL,
+  `uid` INTEGER NOT NULL CHECK (`uid` >= 0),
+  `created` DATETIME NOT NULL,
+  CONSTRAINT `token` UNIQUE  (`token`)
+);
+

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

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

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

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

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

@@ -0,0 +1,78 @@
+ul.horizontal li {
+  display: inline-block;
+}
+
+#header #primary.menu ul li {
+  color: #555;
+  background-color: #fff;
+  padding: 10px;
+  margin: 0;
+}
+#header #primary.menu ul li a {
+  color: #555;
+  text-decoration: none;
+}
+#header #primary.menu ul li a:hover {
+  color: black;
+}
+#header #primary.menu ul.horizontal {
+  border-bottom: solid 1px #ddd;
+}
+#header #primary.menu ul.horizontal li {
+  border-top: solid 3px #fff;
+}
+#header #primary.menu ul.horizontal li:hover {
+  background-color: #ffe;
+  border-top: solid 3px #999;
+}
+#header #primary.menu ul.horizontal li.active {
+  font-weight: bold;
+  border-top: solid 3px #ddd;
+  background-color: #ddd;
+}
+#header #primary.menu ul.horizontal li.active:hover {
+  border-top: solid 3px blue;
+}
+
+#content {
+  margin-left: 20px;
+}
+#content #highlighted {
+  position: relative;
+  border: solid 1px #ddd;
+  background-color: #ffc;
+  width: 70%;
+  left: 15%;
+  right: 15%;
+  padding: 5px;
+  font-style: italic;
+}
+
+.sidebar {
+  padding: 5px;
+  margin: 3px;
+  border: solid 1px #ccc;
+}
+.sidebar#sidebar_first {
+  width: 250px;
+  float: left;
+}
+.sidebar#sidebar_second {
+  width: 250px;
+  float: right;
+}
+
+#primary-tabs ul.horizontal {
+  list-style-type: none;
+}
+#primary-tabs ul.horizontal li {
+  display: inline;
+  padding: 2px 5px;
+  border: solid 1px #ccf;
+}
+#primary-tabs ul.horizontal li.active {
+  border-color: #99f #99f #ddd;
+  border-style: solid solid none;
+  border-width: 2px 1px 0;
+  padding: 2px 7px 1px;
+}

examples/demo/site/themes/bootstrap/assets/js/roc_auth.js

@@ -0,0 +1,321 @@
+var ROC_AUTH = ROC_AUTH || { };
+
+var loginURL = "/basic_auth_login";
+var logoutURL = "/basic_auth_logoff";
+
+var userAgent = navigator.userAgent.toLowerCase();
+var firstLogIn = true;
+ 
+ROC_AUTH.login = function() {
+    var form = document.forms[0];
+    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(){
+
+ 
+    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';
+                     $("body").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=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';
+                    $("body").append(newdiv);
+                   } 
+
+                  }
+               }
+            }
+        }
+    }
+ 
+    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;
+};
+
+
+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 redirectURL = form.redirect && form.redirect.value || "";   
+
+
+    $("#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';
+                    $("body").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';
+                    $("body").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;
+};
+
+
+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, " "));
+} 
+ 
+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);
+                } 
+            }
+    }
+};
+
+
+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();
+
+});
+
+
+ROC_AUTH.progressive_loging = function () {
+
+    ROC_AUTH.login_href();
+};
+
+
+$(document).keypress(function(e) {
+  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;
+};
+
+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);
+     }
+  }
+};
+
+
+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); 
+
+  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 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 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 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 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 password = document.getElementById("password")
+  , confirm_password = document.getElementById("confirm_password");
+
+ROC_AUTH.validatePassword =function(){
+  if(password.value != confirm_password.value) {
+    confirm_password.setCustomValidity("Passwords Don't Match");
+  } else {
+    confirm_password.setCustomValidity('');
+  }
+}
+
+password.onchange = ROC_AUTH.validatePassword();
+confirm_password.onkeyup = ROC_AUTH.validatePassword;

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

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

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

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

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

@@ -0,0 +1,83 @@
+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;
+	}
+}
+.sidebar {
+	padding: 5px;
+	margin: 3px;
+	border: solid 1px #ccc;
+	&#sidebar_first {
+		width: 250px;
+		float: left;
+	}
+	&#sidebar_second {
+		width: 250px;
+		float: right;
+	}
+}
+#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;
+		}
+	}
+}

examples/demo/site/themes/bootstrap/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/page.tpl

@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <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="{$site_url/}theme/css/node.css">
+
+	<!-- CMS Blog Module -->
+	<link rel="stylesheet" href="{$site_url/}theme/css/blog.css">
+
+	<script src="{$site_url/}theme/js/jquery-1.10.2.min.js"></script>
+	<script src="{$site_url/}theme/js/roc_auth.js"></script>
+
+	<!-- bootstrap framework -->
+	<!-- Latest compiled and minified CSS -->
+	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+	<!-- Optional theme -->
+	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
+
+	<title>{$head_title/}</title>
+</head>
+<body>
+  <!-- Page Top -->
+  {if isset="$region_top"}
+    {$region_top/}
+  {/if}
+  <!-- Body -->
+  <div class='container-fluid'>
+    
+    <!-- Page Header -->
+    <div id="header">
+      {if isset="$page.primary_nav"}
+          {$page.primary_nav/}
+      {/if}
+    </div> 
+    
+    <!-- General Page Content -->
+    <div id='content' class='row-fluid'>
+		<!-- Left Sidebar sidebar_first -->
+		{unless isempty="$page.region_sidebar_first"}
+		<div id="sidebar_first" class="sidebar">{$page.region_sidebar_first/}</div>
+		{/unless}
+		<!-- Right Sidebar sidebar_second-->
+		{unless isempty="$page.region_sidebar_second"}
+		<div id="sidebar_second" class="sidebar">{$page.region_sidebar_second/}</div>
+		{/unless}
+
+        <!-- Highlighted, Help, Content -->      
+        <div class='span8 main'>
+          <!-- Highlighted Section -->
+          {unless isempty="$page.region_highlighted"}
+		  <div id="highlighted">{$page.region_highlighted/}</div>
+		  {/unless}
+          <!-- Help Section -->
+          {unless isempty="$page.region_help"}
+		  <div id="help">{$page.region_help/}</div>
+		  {/unless}
+
+          <!-- Main Content Section -->
+		  {unless isempty="$page_title"}<h1 class="page-title">{$page_title/}</h1>{/unless}
+          {$page.region_content/}   
+          </div>
+
+
+      </div>
+    </div>
+
+  <!--Page footer -->
+  {$page.region_footer/}
+
+  <!-- Page Bottom -->
+  {$page.region_bottom/}
+
+<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+<!-- Latest compiled and minified JavaScript -->
+	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+
+{include file="debug.tpl"/}
+</body>
+</html>

examples/demo/site/www/themes/api/layout.tpl

@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	{include file="master2/head.tpl"/}
-</head>
-<body>
-	
-		<!-- Site Navigation -->
-	{include file="master2/site_navigation.tpl"/}	
-	
-	<div class="container">
-		<hr>
-		<div class="row">
-			<main class="main">
-				{include file="master2/content.tpl"/}		
-			</main>
-		</div>
-	</div>
-
-	<div id="footer">
-		<footer class="site-footer">
-			{include file="master2/footer.tpl"/}			
-		</footer>
-	</div>
-
-	{if condition="$web"}	
-		{include file="master2/optional_enhancement_js.tpl"/}
-	{/if}
-
-	{if condition="$html"}	
-		{include file="master2/optional_enhancement_js.tpl"/}
-	{/if}
-	
-</body>
-
-</html>

examples/demo/site/www/themes/api/layout2.tpl

@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	{include file="master2/head.tpl"/}
-</head>
-<body>
-	
-		<!-- Site Navigation -->
-	{include file="master2/site_navigation.tpl"/}	
-	
-	<!--<header class="main-navi">
-		{include file="master2/header.tpl"/}	
-	</header> -->
-
-	<div class="container">
-		<hr>
-		<div class="row">
-			<main class="main">
-				{include file="master2/content.tpl"/}		
-			</main>
-		</div>
-	</div>
-
-	<div id="footer">
-		<footer class="site-footer">
-			{include file="master2/footer.tpl"/}			
-		</footer>
-	</div>
-
-	{if condition="$web"}	
-		{include file="master2/optional_enhancement_js.tpl"/}
-	{/if}
-
-	{if condition="$html"}	
-		{include file="master2/optional_enhancement_js.tpl"/}
-	{/if}
-	
-</body>
-
-</html>

examples/demo/site/www/themes/api/master2/basic_auth/logoff.tpl

@@ -1,5 +0,0 @@
-<p>You have successfully signed out</p>
-
-You may want to return
-
-Press this neat little button:<a href="{$host/}/">Take Me Home </a>

examples/demo/site/www/themes/api/master2/content.tpl

@@ -1,11 +0,0 @@
-
-<div itemscope itemtype="http://schema.org/ItemList">
-  <h2 itemprop="name">Top most recent nodes</h2><br>
-  <meta itemprop="itemListOrder" content="Descending" />
-
-	{foreach from="$nodes" item="item"}
-	<div class="page-header">
-	    <h3><span itemprop="itemListElement"><a href="{$host/}/node/{$item.id/}" rel="node"><strong>{$item.title/}</strong></a></span> <small>{$item.summary/} - {$item.publication_date_output/} </small></h3>
-	</div>
-	{/foreach}
-</div>

examples/demo/site/www/themes/api/master2/error.tpl

@@ -1,18 +0,0 @@
-<h3> Error: {$code/} </h3>
-
-{assign name="status400" value="400"/}
-{assign name="status404" value="404"/}
-{assign name="status500" value="500"/}
-
-{if condition="$code ~ $status500"}
-	<p>Internal server error,  for the request <strong>{$request/}</string>  </p>
-{/if}
-
-
-{if condition="$code ~ $status404"}
-	<p>  Resourse not found,  for the request <strong>{$request/}</string>  </p>
-{/if}
-
-{if condition="$code ~ $status400"}
-	<p> Bad request, the request <strong>{$request/}</string> is not valid</p>
-{/if}	

examples/demo/site/www/themes/api/master2/footer.tpl

@@ -1,7 +0,0 @@
-	<small>
-		<center>
-			<p class="text-muted"><a href="#" target="_blank" class="info">API Documentation </a>&nbsp;&nbsp;&nbsp;
-			<a href="#" target="_blank" class="info">Questions? Comments? Let us know! </a></p>
-			<p>© Copyright 2014 Eiffel Software -- <a href="#" target="_blank" class="info">Privacy Policy</a>
-		</center>
-	</small>

examples/demo/site/www/themes/api/master2/head.tpl

@@ -1,10 +0,0 @@
-<meta charset="utf-8">
-<link rel="icon" href="{$host/}/static/images/favicon.ico">
-<title>Eiffel RESTonCMS</title>
-{if condition="$web"}	
-	{include file="master2/optional_styling_css.tpl"/}
-{/if}	
-{if condition="$html"}	
-	{include file="master2/optional_styling_css.tpl"/}
-{/if}	
-

examples/demo/site/www/themes/api/master2/header.tpl

@@ -1,2 +0,0 @@
-	<h1>RESTonCMS</h1>
-	<p>Tagline</p>				

examples/demo/site/www/themes/api/master2/main_navigation.tpl

@@ -1,5 +0,0 @@
-	<!--<ul>
-		<li class="main-navi-item"><a href="">Nav1</a></li>
-		<li><a href="">Nav2</a></li>
-	</ul>
-	-->

examples/demo/site/www/themes/api/master2/optional_enhancement_js.tpl

@@ -1,5 +0,0 @@
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-<script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-{if condition="$web"}	
-	<script src="{$host/}/static/js/roc.js"></script>
-{/if}

examples/demo/site/www/themes/api/master2/optional_styling_css.tpl

@@ -1,9 +0,0 @@
-{if condition="$html"}
-	<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-	<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
-	<link rel="stylesheet" href="http://getbootstrap.com/assets/css/docs.min.css">
-{/if}
-{if condition="$web"}
-	<link rel="stylesheet" href="{$host/}/static/css/bootstrap.css">
-	<link rel="stylesheet" href="{$host/}/static/css/dashboard.css">
-{/if}

examples/demo/site/www/themes/api/master2/site_navigation.tpl

@@ -1,27 +0,0 @@
-<nav id="" class="navbar navbar-default navbar-inverse navbar-fixed-top" role="navigation">
-	  <div class="container">
-	  	<div class="navbar-header">
-	  	      <a class="navbar-brand" href="{$host/}" rel="home">Rest on CMS</a>
-	  	</div>	
-
-		 <div class="collapse navbar-collapse" id="navbarCollapse">
-	         <ul class="nav navbar-nav">
-	        	<li class="ListOfNodes"><a title="Nodes" href="{$host/}/nodes" rel="node">List of Nodes</a></li>
-	      	</ul>
-	      	 <ul class="nav navbar-nav navbar-right">
-	      	 	{if isset="$user"}
-	      	 		<li><a>{$user/}</a></li>
-		      		<li><a title="Node" href="{$host/}/node" rel="node">New Node</a></li>
-					<li><a title="Logoff" href="{$host/}/basic_auth_logoff" rel="logoff">Logoff</a></li>
-				{/if}	
-				{unless isset="$user"}
-					<li><a title="Login" href="{$host/}/basic_auth_login" rel="login">Login</a></li>
-					<li><a title="Register" href="{$host/}/user" rel="register">Register</a></li>
-				{/unless}
-            </ul>
-	     </div>
-	  </div>   
-</nav>
-
-
-   

examples/demo/site/www/themes/api/modules/navigation.tpl

@@ -1,8 +0,0 @@
-{if isset="$user"}
-	<a title="Logoff" class="" href="{$host/}/logoff">Logoff</a>
-{/if}	
-{unless isset="$user"}
-	<a title="Login" class="" href="{$host/}/login">Login</a>
-	<a title="Register" class="" href="{$host/}/Register">Register</a>
-{/unless}
-<a title="Nodes" class="" href="{$host/}/nodes">List of Nodes</a>	

examples/demo/site/www/themes/api/modules/node.tpl

@@ -1,174 +0,0 @@
-{if condition="html"}
-  <!DOCTYPE html>
-  <html lang="en">
-  <head>
-    {include file="master2/head.tpl"/}
-  </head>
-  <body>
-{/if}
-
-{unless condition="$web"} 
-    <!-- Site Navigation -->
-  {include file="master2/site_navigation.tpl"/} 
-{/unless}
-
-
-{if condition="html"}
-
-<div class="container">
-    <hr>
-    <div class="row">
-      <main class="main">
-{/if}
-
-
-<div class="bs-docs-example">
-    {if condition="$web"}
-      <ul id="myTab" class="nav nav-tabs" role="tablist">
-        <li class=""><a href="#view" role="tab" data-toggle="tab">View</a></li>
-        <li class="active"><a href="#edit" role="tab" data-toggle="tab">Edit</a></li>
-        <li class=""><a href="#delete" role="tab" data-toggle="tab">Delete</a></li>
-      </ul>
-     {/if}
-     {if condition="$html"}
-      <ul id="myTab" class="nav nav-tabs" role="tablist">
-        <li class=""><a href="#view" role="tab" data-toggle="tab">View</a></li>
-        <li class="active"><a href="#edit" role="tab" data-toggle="tab">Edit</a></li>
-        <li class=""><a href="#delete" role="tab" data-toggle="tab">Delete</a></li>
-      </ul>
-     {/if}  
-    <div id="myTabContent" class="tab-content">
-      <div class="tab-pane" id="view">
-          {if isset="$node"}
-          <hr>
-          <div class="container-fluid">
-            <div class="row" itemscope itemtype="http://schema.org/Article">
-              <div class="row"> 
-                <div class="col-sm-6 col-md-4 col-lg-3"><h1><span itemprop="name">{$node.title/}</span></h1></div>
-              </div>  
-              <div class="row">
-                <div class="col-sm-6 col-md-4 col-lg-3"><span itemprop="text">{$node.content/}<span></div> 
-              </div>
-            </div>
-          </div>  
-          {/if}
-      </div>
-      
-      <div class="tab-pane fade active in" id="edit">
-          {if isset="$user"}
-          <hr>
-          <div class="container-fluid">
-            <div class="col-xs-12" itemscope itemtype="http://schema.org/Article">
-            {if isset="$node"}
-              <form class="form-inline well" action="{$host/}/node/{$node.id/}" itemprop="url" method="POST">
-              <input type="hidden" name="method" value="PUT"> 
-            {/if}
-            {unless isset="$node"}
-              <form class="form-inline well" action="{$host/}/node" itemprop="url" method="POST">
-            {/unless/}
-                  <fieldset>
-                    <legend>Edit Node</legend>
-                    <div class="span3">
-                      <p>Add or Edit a Node</p>
-                    </div>
-
-                    <div class="row">
-                      <div class="col-xs-1">
-                        {if isset="$node"}
-                          <label><span itemprop="name"><a href="{$host/}/node/{$node.id/}/title" rel="node">Title:</a></span></label>
-                        {/if}
-                        {unless isset="$node"}    
-                          <label><span itemprop="name">Title:</span> </label>
-                        {/unless} 
-                      </div>
-                      <div class="col-xs-7">
-                              <input id="title" type="text" class="form-control" name="title" placeholder="Title" required value="{$node.title/}"/>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                      <div class="col-xs-1">
-                        {if isset="$node"}
-                          <label> <span itemprop="description"><a href="{$host/}/node/{$node.id/}/summary" rel="node">Summary:</a></span></label>
-                        {/if}
-                        {unless isset="$node"}
-                          <label> <span itemprop="description">Summary:</span></label>
-                        {/unless} 
-                      </div>
-                      <div class="col-xs-7">
-                              <textarea id="summary" rows="3" class="form-control" cols="100" name="summary" placeholder="Node summary" required>{$node.summary/}</textarea>  
-                        </div>
-                    </div>
-
-                    <div class="row">
-                      <div class="col-xs-1">
-                        {if isset="$node"}
-                          <label> <span itemprop="text"><a href="{$host/}/node/{$node.id/}/content" rel="node">Content</a></span>   </label>
-                        {/if}
-                        {unless isset="$node"}
-                          <label> <span itemprop="text">Content:</span>   </label>
-                        {/unless} 
-                      </div>
-                      <div class="col-xs-7">
-                              <textarea id="content" rows="25" cols="100" class="form-control" name="content" placeholder="Node content" required>{$node.content/}</textarea>     
-                        </div>
-                    </div>
-
-                     <div>
-                        <label>
-                            <span>&nbsp;</span> 
-                            <input type="Submit" value="Send" /> 
-                        </label>
-                    </div>    
-                  </fieldset>
-              </form>
-          </div>    
-          {/if}                  
-      </div>  
-    </div>    
-      <div class="tab-pane" id="delete">
-          {if isset="$user"}
-          <hr>
-          <div class="container-fluid">
-      
-          {if isset="$node"}
-            <form action="{$host/}/node/{$node.id/}" method="POST" class="">
-              <input type="hidden" name="method" value="DELETE">
-              <fieldset>
-                <legend>Delete Node</legend>
-
-                <div>
-                      <label>
-                          <span>&nbsp;</span> 
-                          <input type="Submit" value="Delete" /> 
-                      </label>
-                </div>
-              </fieldset>     
-            </form> 
-            {/if}
-          </div>
-         {/if}   
-      </div>   
-    </div>
-</div>
-
-{if condition="html"}
-      </main>
-    </div>
-  </div>
-{/if}
-
-
-{if condition="html"}
-  <div id="footer">
-      <footer class="site-footer">
-        {include file="master2/footer.tpl"/}      
-      </footer>
-    </div>
-
-
-      {include file="master2/optional_enhancement_js.tpl"/}
-    
-  </body>
-  </html>
-{/if}                  

examples/demo/site/www/themes/api/modules/node_content.tpl

@@ -1,70 +0,0 @@
-{if condition="html"}
-	<!DOCTYPE html>
-	<html lang="en">
-	<head>
-		{include file="master2/head.tpl"/}
-	</head>
-	<body>
-{/if}
-
-{unless condition="$web"}	
-		<!-- Site Navigation -->
-	{include file="master2/site_navigation.tpl"/}	
-{/unless}
-
-{if condition="html"}
-
-<div class="container">
-		<hr>
-		<div class="row">
-			<main class="main">
-{/if}
-
-
-<div class="container-fluid">
-	<div class="col-xs-12" itemscope itemtype="http://schema.org/Article">
-		<form class="form-inline well"  action="{$host/}/node/{$id/}/content" method="POST" class="">
-			<input type="hidden" name="method" value="PUT">	
-			<fieldset>
-				<legend>Edit Node Content</legend>
-
-					<div class="row">
-						<div class="col-xs-1">
-							<label> <span itemprop="text">Content:</span>   </label>
-						</div>
-						<div class="col-xs-7">
-					        	<textarea id="content" rows="25" cols="100" class="form-control" name="content" placeholder="Node content" required>{$node_content/}</textarea>			
-					   	</div>
-					</div>
-
-			   <div>
-				    <label>
-				        <span>&nbsp;</span> 
-				        <input type="Submit" value="Update" /> 
-				    </label>
-				</div>    
-			</fieldset>      
-		</form> 
-	</div>
-</div>
-{if condition="html"}
-
-			</main>
-		</div>
-	</div>
-{/if}
-
-
-{if condition="html"}
-	<div id="footer">
-			<footer class="site-footer">
-				{include file="master2/footer.tpl"/}			
-			</footer>
-		</div>
-
-
-			{include file="master2/optional_enhancement_js.tpl"/}
-		
-	</body>
-	</html>
-{/if}	             			              

examples/demo/site/www/themes/api/modules/node_summary.tpl

@@ -1,71 +0,0 @@
-{if condition="html"}
-	<!DOCTYPE html>
-	<html lang="en">
-	<head>
-		{include file="master2/head.tpl"/}
-	</head>
-	<body>
-{/if}
-
-
-	{unless condition="$web"}	
-		<!-- Site Navigation -->
-		{include file="master2/site_navigation.tpl"/}	
-	{/unless}
-
-{if condition="html"}
-
-<div class="container">
-		<hr>
-		<div class="row">
-			<main class="main">
-{/if}
-
-	<div class="container-fluid">
-		<div class="col-xs-12" itemscope itemtype="http://schema.org/Article">
-			<form class="form-inline well" action="{$host/}/node/{$id/}/summary" method="POST">
-				<input type="hidden" name="method" value="PUT">	
-				<fieldset>
-					<legend>Edit Node Summary</legend>
-
-					<div class="row">
-						<div class="col-xs-1">
-							<label> <span itemprop="text">Summary:</span>   </label>
-						</div>
-						<div class="col-xs-7">
-					        	<textarea id="summary" rows="3" cols="80" name="summary" placeholder="Node summary" required>{$node_summary/}</textarea>	
-					   	</div>
-					</div>
-		
-				   <div>
-					    <label>
-					        <span>&nbsp;</span> 
-					        <input type="Submit" value="Send" /> 
-					    </label>
-					</div>    
-				</fieldset>      
-			</form>
-		</div>
-	</div>	 
-
-{if condition="html"}
-
-			</main>
-		</div>
-	</div>
-{/if}
-
-
-{if condition="html"}
-	<div id="footer">
-			<footer class="site-footer">
-				{include file="master2/footer.tpl"/}			
-			</footer>
-		</div>
-
-
-			{include file="master2/optional_enhancement_js.tpl"/}
-		
-	</body>
-	</html>
-{/if}	             	              

examples/demo/site/www/themes/api/modules/node_title.tpl

@@ -1,70 +0,0 @@
-{if condition="html"}
-	<!DOCTYPE html>
-	<html lang="en">
-	<head>
-		{include file="master2/head.tpl"/}
-	</head>
-	<body>
-{/if}
-
-	{unless condition="$web"}	
-		<!-- Site Navigation -->
-		{include file="master2/site_navigation.tpl"/}	
-	{/unless}
-
-
-{if condition="html"}
-
-<div class="container">
-		<hr>
-		<div class="row">
-			<main class="main">
-{/if}
-
-<div class="container-fluid">
-	<div class="col-xs-12" itemscope itemtype="http://schema.org/Article">
-		<form class="form-inline well" action="{$host/}/node/{$id/}/title" method="POST">
-			<input type="hidden" name="method" value="PUT">		
-			<fieldset>
-				<legend>Edit Node Title</legend>
-
-				<div class="row">
-					<div class="col-xs-1">
-						<label> <span itemprop="text">Title:</span>   </label>
-					</div>
-					<div class="col-xs-7">
-				       	<input id="title" type="text" name="title" placeholder="Title" required value="{$node_title/}"/>
-				   	</div>
-				</div>
-
-			   <div>
-				    <label>
-				        <span>&nbsp;</span> 
-				        <input type="Submit" value="Send" /> 
-				    </label>
-				</div>    
-			</fieldset>      
-		</form>
-	</div>
-</div>		
-{if condition="html"}
-
-			</main>
-		</div>
-	</div>
-{/if}
-
-
-{if condition="html"}
-	<div id="footer">
-			<footer class="site-footer">
-				{include file="master2/footer.tpl"/}			
-			</footer>
-		</div>
-
-
-			{include file="master2/optional_enhancement_js.tpl"/}
-		
-	</body>
-	</html>
-{/if}	             

examples/demo/site/www/themes/api/modules/nodes.tpl

@@ -1,52 +0,0 @@
-{if condition="html"}
-	<!DOCTYPE html>
-	<html lang="en">
-	<head>
-		{include file="master2/head.tpl"/}
-	</head>
-	<body>
-{/if}
-	
-{unless condition="$web"}	
-		<!-- Site Navigation -->
-	{include file="master2/site_navigation.tpl"/}	
-{/unless}
-
-{if condition="html"}
-
-<div class="container">
-		<hr>
-		<div class="row">
-			<main class="main">
-{/if}
-				<div itemscope itemtype="http://schema.org/ItemList">
-				  <h2 itemprop="name">List nodes</h2><br>	
-				  <meta itemprop="itemListOrder" content="Descending" />
-
-					{foreach from="$nodes" item="item"}
-					<div class="page-header">
-					    <h3><span itemprop="itemListElement"><a href="{$host/}/node/{$item.id/}" rel="node"><strong>{$item.title/}</strong></a></span> <small>{$item.summary/} -{$item.publication_date_output/} </small></h3>
-					</div>
-					{/foreach}
-				</div>
-
-{if condition="html"}
-			</main>
-		</div>
-	</div>
-{/if}
-
-
-{if condition="html"}
-	<div id="footer">
-			<footer class="site-footer">
-				{include file="master2/footer.tpl"/}			
-			</footer>
-		</div>
-
-
-			{include file="master2/optional_enhancement_js.tpl"/}
-		
-	</body>
-	</html>
-{/if}

examples/demo/site/www/themes/api/modules/register.tpl

@@ -1,100 +0,0 @@
-{if condition="html"}
-	<!DOCTYPE html>
-	<html lang="en">
-	<head>
-		{include file="master2/head.tpl"/}
-	</head>
-	<body>
-{/if}
-
-
-{unless condition="$web"} 
-    <!-- Site Navigation -->
-  {include file="master2/site_navigation.tpl"/} 
-{/unless}
-
-{if condition="html"}
-
-<div class="container">
-		<hr>
-		<div class="row">
-			<main class="main">
-{/if}
-
-
-<div class="container-fluid">
-    <div class="col-xs-12" itemscope itemtype="http://schema.org/Person">	
-		<form class="form-inline well" action="{$host/}/user" data-rel="user-register" method="POST" >
-			<fieldset>
-				<legend>Register</legend>
-				<div class="span3">
-                    <p>Register new user</p>
-                </div>
-
-				<div class="row">
-                     <div class="col-xs-2">
-                        <label><span itemprop="name">Username:</span> </label>
-                      </div>  
-                      <div class="col-xs-7">
-					       <input id="username" type="text" name="username" placeholder="Username" required/>
-					  </div>
-				 </div>
-	
-				<div class="row" itemscope itemtype="http://schema.org/Text">
-                    <div class="col-xs-2">
-				       <label><span itemprop="accessCode">Password:</span> </label>
-				    </div>  
-				    <div class="col-xs-7">
-					    <input id="password" type="password" name="password" placeholder="Password" required/>
-				    </div>
-				</div>
-
-				<div class="row" itemscope itemtype="http://schema.org/Text">
-                    <div class="col-xs-2">
-                        <label><span itemprop="accessCode">Re-type Password:</span> </label>
-				     </div>   
-				     <div class="col-xs-7">
-					   	<input id="check_password" type="password" name="check_password" placeholder="Password" required/>
-					</div>
-				</div>
-
-				<div class="row">
-                    <div class="col-xs-2">
-				       <label><span itemprop="email">Email:</span> </label>
-				    </div>   
-				    <div class="col-xs-7">
-					    <input id="email" type="email" name="email" placeholder="Email" required/>
-				    </div>
-				s</div>
-				
-			   <div>
-				    <label>
-				        <span>&nbsp;</span> 
-				        <input type="Submit" value="Send" /> 
-				    </label>
-				</div>    
-			</fieldset>      
-		</form>
-	</div>
-</div>
-
-{if condition="html"}
-			</main>
-		</div>
-	</div>
-{/if}
-
-
-{if condition="html"}
-	<div id="footer">
-			<footer class="site-footer">
-				{include file="master2/footer.tpl"/}			
-			</footer>
-		</div>
-
-
-			{include file="master2/optional_enhancement_js.tpl"/}
-		
-	</body>
-	</html>
-{/if}		               

examples/demo/site/www/themes/api/theme.info

@@ -1,9 +0,0 @@
-name=api
-engine=smarty
-author=jvelilla
-version=0.1
-regions[header] = Header
-regions[content] = Content
-regions[footer] = Footer
-regions[first_sidebar] = first sidebar
-regions[second_sidebar] = second sidebar

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

@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>ROC- Layout with defualt Regions</title>
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css">
-
-    <style type="text/css">
-        
-    </style>
-
-    <!-- Latest compiled and minified CSS -->
-
-  <!-- Optional theme -->
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap-theme.min.css">
-
-    <!-- Latest compiled and minified JavaScript -->
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
-    <script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
-</head>
-<body>
-<head>
-<title>{$head_title/}</title>
-</head>
-<body>
-  <!-- Page Top -->
-  {if isset="$region_top"}
-    {$region_top/}
-  {/if}
-  <!-- Body -->
-  <div class='container-fluid'>
-    
-    <!-- Page Header -->
-    <div id="header">
-      {if isset="$page.primary_nav"}
-          {$page.primary_nav/}
-      {/if}
-    </div> 
-    
-    <!-- General Page Content -->
-    <div id='content' class='row-fluid'>
-		<!-- Left Sidebar sidebar_first -->
-		{unless empty="$page.region_sidebar_first"}
-		<div style="float: left;">
-		{$page.region_sidebar_first/}
-		</div>
-		{/unless}
-
-
-        <!-- Highlighted, Help, Content -->      
-        <div class='span8 main'>
-          <!-- Highlighted Section -->
-          {$page.region_highlighted/}
- 
-          <!-- Help Section -->
-          {$page.region_help/}
-
-          <!-- Main Content Section -->
-		  {unless empty="$page_title"}<h1 class="page-title">{$page_title/}</h1>{/unless}
-          {$page.region_content/}   
-        </div>
-
-		<!-- Right Sidebar sidebar_second-->
-		{unless empty="$page.region_sidebar_second"}
-		<div style="float: right;">
-		{$page.region_sidebar_second/}
-		</div>
-		{/unless}
-
-      </div>
-    </div>
-
-  <!--Page footer -->
-  {$page.region_footer/}
-
-  <!-- Page Bottom -->
-  {$page.region_bottom/}
-</body>
-<script type="text/javascript">
-
-</script>
-</body>
-</html>

examples/demo/site/www/themes/bootstrap/roc_template -2.html

@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>ROC- Layout with defualt Regions</title>
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
-    <style type="text/css">
-        
-    </style>
-    <script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
-    <script src="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
-</head>
-<body>
-<head>
-<title>ROC CMS - A responsive layout</title>
-</head>
-<body>
-  <!-- Page Top -->
-  <!-- Page Header -->
-  <div class='container-fluid'>
-    <h1>ROC Layout with Defaul Regions</h1>
-      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-          </button>
-          <a class="navbar-brand" href="https://www2.eiffel.com/beta" itemprop="home" rel="home">Eiffel Support Site</a>
-        </div>
-        <div class="navbar-collapse collapse" itemscope="itemscope" itemtype="https://www2.eiffel.com/beta/profile/esa_api.xml#report" >
-          <ul class="nav navbar-nav navbar-left">
-            <li><a href="https://www2.eiffel.com/beta/reports" class="active" itemprop="all" rel="all">Reports</a></li>
-              
-          </ul>
-          <ul class="nav navbar-nav navbar-right">
-            
-            
-              <li><a href="https://www2.eiffel.com/beta/register" itemprop="register" rel="register">Register</a></li>
-            
-
-            
-            
-              <!--<li><a class="login pull-right" data-toggle="modal" data-target="#myModalSignIn">Sign In</a></li> <! Custome Modal -->
-              <li id="login_pe" ><a href="https://www2.eiffel.com/beta/login" itemprop="login" rel="login">Sign In</a></li> <!--  Custome Modal -->
-            
-          </ul>
-          <!--form class="navbar-form navbar-right">
-            <input type="text" class="form-control" placeholder="Search..."/>
-          </form -->
-        </div>
-      </div>
- 
-
-    <div id='content' class='row-fluid'>
-             <!-- Highlighted--> 
-    
-
-      <!-- Left Side Bard sidebar_first -->
-      <div class='span2 sidebar'>
-        <h3>Left Sidebar</h3>
-        <ul class="nav nav-tabs nav-stacked">
-          <li><a href='#'>Another Link 1</a></li>
-          <li><a href='#'>Another Link 2</a></li>
-          <li><a href='#'>Another Link 3</a></li>
-        </ul>
-      </div>
-
-        <!-- Highlighted, Help, Content -->      
-        <div class='span8 main'>
-          <h1>Highlighted Section</h1>
-          <h2>Help Section</h2>
-
-          <h2>Main Content Section</h2>
-          <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum.<p> 
-
-          <p>Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum.</p>
-        </div>
-
-         <!-- Left Side Bard sidebar_second-->
-        <div class='span2 sidebar'>
-          <h3>Right Sidebar</h3>
-          <ul class="nav nav-tabs nav-stacked">
-            <li><a href='#'>Another Link 1</a></li>
-            <li><a href='#'>Another Link 2</a></li>
-            <li><a href='#'>Another Link 3</a></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-
-  <!--Page footer -->
-  <div id="footer">
-    <small>
-    <center>
-      <p class="text-muted"><a href="#" target="_blank" class="info">ROC Documentation </a>&nbsp;&nbsp;&nbsp;
-      <a href="http://www.eiffel.com/company/contact/" target="_blank" class="info">Questions? Comments? Let us know! </a></p>
-      <p>© Copyright 2014 Eiffel Software -- <a href="#" target="_blank" class="info">Privacy Policy</a>
-    </center>
-   </small>
-  </div>
-
-  <!-- Page Bottom -->
-</body>
-<script type="text/javascript">
-
-</script>
-</body>
-</html>

examples/demo/site/www/themes/bootstrap/roc_template.html

@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>ROC- Layout with defualt Regions</title>
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css">
-
-    <style type="text/css">
-        
-    </style>
-
-    <!-- Latest compiled and minified CSS -->
-
-  <!-- Optional theme -->
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap-theme.min.css">
-
-    <!-- Latest compiled and minified JavaScript -->
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
-    <script src="http://code.jquery.com/jquery-1.10.2.min.js"></script>
-</head>
-<body>
-<head>
-<title>ROC CMS - A responsive layout</title>
-</head>
-<body>
-  <!-- Page Top -->
-  <!-- Page Header -->
-<!--  <div class='container-fluid'>
-        <div class="container-fluid">  
-            <div class="navbar-header">
-                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  </button> <a class="navbar-brand" href="#">Eiffel ROC</a>
-            </div>
-            <ul class="nav navbar-nav navbar-left">
-              <li> <a href="#about">Home</a>
-              </li>
-          </ul>
-            <ul class="nav navbar-nav navbar-right">
-              <li> <a href="#about">About</a>
-              </li>
-              <li> <a href="#services">Service</a>
-              </li>
-              <li> <a href="#portfolio" class="">Portfolio</a>
-              </li>
-          </ul>
-        </div>  
--->
-<div class="container-fluid">
-  <div class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="sr-only">Toggle navigation</span>
-      </button>
-      <a class="navbar-brand" href="https://www2.eiffel.com/beta" itemprop="home" rel="home">Eiffel Support Site</a>
-    </div>
-    
-    <div class="navbar-collapse collapse" itemscope="itemscope" itemtype="https://www2.eiffel.com/beta/profile/esa_api.xml#report" >
-      <ul class="nav navbar-nav navbar-left">
-        <li><a href="https://www2.eiffel.com/beta/reports" class="active" itemprop="all" rel="all">Reports</a></li>
-          
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        
-        
-          <li><a href="https://www2.eiffel.com/beta/register" itemprop="register" rel="register">Register</a></li>
-          <li id="login_pe" ><a href="https://www2.eiffel.com/beta/login" itemprop="login" rel="login">Sign In</a></li> <!--  Custome Modal -->
-        
-      </ul>
-    </div>
-
-  </div>
-</div>
-
-
-    <div id='content' class='row-fluid'>
-             <!-- Highlighted--> 
-    
-
-      <!-- Left Side Bard sidebar_first -->
-      <div class="sidebar col-sm-2 col-md-2">
-        <h3>Left Sidebar</h3>
-        <ul class="nav nav-tabs nav-stacked">
-          <li><a href="#">Another Link 1</a></li>
-          <li><a href="#">Another Link 2</a></li>
-          <li><a href="#">Another Link 3</a></li>
-        </ul>
-      </div>
-
-        <!-- Highlighted, Help, Content -->      
-         <div class="main col-sm-8 col-md-8">
-          <h1>Highlighted Section</h1>
-          <h2>Help Section</h2>
-
-          <h2>Main Content Section</h2>
-          <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum.<p> 
-
-          <p>Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum.</p>
-        </div>
-
-         <!-- Left Side Bard sidebar_second-->
-     
-         <div class="sidebar col-sm-2 col-md-2">
-          <h3>Right Sidebar</h3>
-          <ul class="nav nav-tabs nav-stacked">
-            <li><a href="#">Another Link 1</a></li>
-            <li><a href="#">Another Link 2</a></li>
-            <li><a href="#">Another Link 3</a></li>
-          </ul>
-        </div> 
-
-      </div>
-    </div>
-
-  <!--Page footer -->
-  <div id="footer">
-    <small>
-    <center>
-      <p class="text-muted"><a href="#" target="_blank" class="info">ROC Documentation </a>&nbsp;&nbsp;&nbsp;
-      <a href="http://www.eiffel.com/company/contact/" target="_blank" class="info">Questions? Comments? Let us know! </a></p>
-      <p>© Copyright 2014 Eiffel Software -- <a href="#" target="_blank" class="info">Privacy Policy</a>
-    </center>
-   </small>
-  </div>
-
-  <!-- Page Bottom -->
-</body>
-<script type="text/javascript">
-
-</script>
-</body>
-</html>

examples/demo/site/www/themes/smarty/front-page.tpl

@@ -1,12 +0,0 @@
-{include file="tpl/page-header.tpl"/}
-		<div id="main-wrapper">
-			<div id="main">
-				<div id="first_sidebar" class="sidebar {if isset="$first_sidebar_css_class"}{$first_sidebar_css_class/}{/if}">{if isset="$first_sidebar"}{$first_sidebar/}{/if}</div>
-				<div id="content" class="{if isset="$content_css_class"}{$content_css_class/}{/if}">
-					Welcome ... this is the front page
-					{if isset="$content"}{$content/}{/if}
-				</div>
-				<div id="second_sidebar" class="sidebar {if isset="$second_sidebar_css_class"}{$second_sidebar_css_class/}{/if}">{if isset="$second_sidebar"}{$second_sidebar/}{/if}</div>
-			</div>
-		</div>
-{include file="tpl/page-footer.tpl"/}