Create book.json

Added export of node revisions.

.gitignore

@@ -1,4 +1,7 @@
 EIFGENs
 *.swp
 *.log*
-*.rc
+*.rc
+*.bak
+*.sqlite
+Thumbs.db

README.md

@@ -25,7 +25,10 @@ The goal of the library is to provide the following features.
  - doc  -- Documentation. 	 
 
 **Documentation**
- >[CMS design](https://github.com/EiffelWebFramework/ROC).
- >[CMS concepts](https://github.com/EiffelWebFramework/ROC).
+
+ >[CMS concepts](/doc/concepts.md).
  
-	 
+ >[CMS design](/doc/design.md).
+
+ >[CMS tutorial](/doc/tutorial.md).
+	 

book.json

@@ -0,0 +1 @@
+{}

cms-safe.ecf

@@ -1,33 +1,37 @@
 <?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">
 	<target name="cms">
 		<root all_classes="true"/>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
+		<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
+		<library name="cms_app_env" location=".\library\app_env\app_env-safe.ecf"/>
+		<library name="cms_config" location=".\library\configuration\config-safe.ecf"/>
+		<library name="cms_model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
-		<library name="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="layout" location=".\library\layout\layout-safe.ecf"/>
-		<library name="model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf" readonly="false"/>
-		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
-
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
-		<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\network\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
-		<library name="persistence_mysql" location=".\library\persistence\implementation\mysql\persistence_mysql-safe.ecf" readonly="false"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
+		<library name="i18n" location="$ISE_LIBRARY\library\i18n\i18n-safe.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
+		<library name="kmp_matcher" location="$ISE_LIBRARY\library\text\regexp\kmp_matcher\kmp_matcher-safe.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
+		<library name="notification_mailer" location="$ISE_LIBRARY\contrib\library\runtime\process\notification_email\notification_email-safe.ecf"/>
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf" readonly="false"/>
+		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template-safe.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf" readonly="false"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<cluster name="src" location=".\library\src\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>

cms.ecf

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
+	<description>ROC CMS library</description>
+	<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="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
+		<library name="cms_app_env" location=".\library\app_env\app_env.ecf"/>
+		<library name="cms_config" location=".\library\configuration\config.ecf"/>
+		<library name="cms_model" location=".\library\model\cms_model.ecf" readonly="false"/>
+		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
+		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf" 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="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="kmp_matcher" location="$ISE_LIBRARY\library\text\regexp\kmp_matcher\kmp_matcher.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
+		<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=".\src\" recursive="true"/>
+	</target>
+</system>

doc/concepts.md

@@ -0,0 +1,93 @@
+CMS Concepts
+============
+>Current implemented concepts
+
+##### Table of Contents  
+
+1. [**Theme**](#theme)
+2. [**Regions**](#regions)
+      - [**Default Page Layout**](#page_layout)
+      - [**Regions Holds blocks**](#regions_blocks)
+3. [**Blocks**](#blocks)
+4. [**Modules**](#modules)
+5. [**Hooks**](#hooks)
+
+
+<a name="theme"/>
+Theme
+-----
+In a CMS , a theme is a collection of templates files (HTML, CSS, Images, etc ) that determine how a CMS web site looks.  The goal of a theme is to let you change the look and feel of the site.
+Eiffel CMS is inspired by Drupal, and use the same default region names as default drupal theme.
+
+#### Important Classes
+
+* [CMS_THEME] (/library/src/theme/cms_theme.e):  Abstraction defining the interface of a CMS theme.
+* [SMARTY_CMS_THEME] (/library/src/theme/smarty_theme/smarty_cms_theme.e): Theme implemented using the [Eiffel Smarty library] (https://github.com/eiffelhub/template-smarty).
+* [CMS_TEMPLATE] (/library/src/theme/cms_template.e): Template Abstraction that contains theme, variables needed by template when rendering page as html. At the moment there is only one implementation SMARTY_CMS_PAGE_TEMPLATE.  At the moment there is only one implementation [SMARTY_CMS_PAGE_TEMPLATE] (/library/src/theme/smarty_theme/smarty_cms_page_template.e).
+
+<a name="regions"/>
+Regions
+-------
+The layout of a CMS web page has predefined area called **regions**. The Eiffel CMS uses the same default regions as Drupal, so let's see them in the following image.
+
+<a name="page_layout"/>
+![default page layout](http://themery.com/sites/default/files/figure-15-10.png)
+
+```
+regions[page_top] = Top
+regions[header] = Header
+regions[content] = Content
+regions[highlighted] = Highlighted
+regions[help] = Help
+regions[footer] = Footer
+regions[first_sidebar] = first sidebar
+regions[second_sidebar] = second sidebar
+regions[page_bottom] = Bottom
+```
+<a name="regions_blocks"/>
+**A Region holds blocks**
+
+**What goes inside regions?**
+Generally, regions hold smaller piece of content called blocks.  Blocks hold chunks of content, like the user login form, navigation menu or the information for the footer.
+
+Regions are defined in a configuration file theme.info.
+
+
+<a name="blocks"/>
+CMS_BLOCK
+---------
+**What is a cms block?** 
+Blocks are chunk of content that can be created to display whatever you want, and then can be placed in various resgions in your template (theme) layout. 
+
+#### Important Classes
+
+* [CMS_BLOCK] (/library/src/kernel/content/cms_block.e): The deferred class CMS_BLOCK provides an abstraction to describe content to be placed inside Regions.
+* [CMS_CONTENT_BLOCK] (/library/src/kernel/content/cms_content_block.e): The class CMS_CONTENT_BLOCK describe how to provide generic content. 
+* [CMS_MENU_BLOCK](/library/src/kernel/content/cms_menu_block.e): The class CMS_MENU_BLOCK describe how to provides a menu of navigational links.
+* [CMS_SMARTY_TEMPLATE_BLOCK] (/library/src/kernel/content/cms_smarty_templateblock.e) The class CMS_SMARTY_TEMPLATE_BLOCK describe how to use a CMS block with smarty template file content.
+
+
+<a name="modules"/>
+CMS_MODULES
+-----------
+**What is a cms module?**
+Modules are piece of code that adds one or more features to your web site. 
+Modules can be plugged and combined to provide a web site customized to your needs. There are modules for many purposes, for example Administratiton, Basic Authentication, etc.
+
+#### Important Classes
+* [CMS_MODULE] (/library/src/modules/cms_module.e): The deferred class CMS_MODULE provides an abstraction to describe a generic module that add features to your web site.
+* [CMS_RESPONSE](/library/src/service/response/cms_response.e). The deferred class CMS_RESPONSE provide an abstraction to builds the content to get process to render the output. 
+
+
+<a name="hooks">
+CMS_HOOK
+--------
+Hooks is a mechanism which provide a way for modules to interact with each other and extending blocks of the current CMS.
+
+* [CMS_HOOK] (/library/src/hooks/cms_hook.e): The deferred class CMS_HOOK is a marker interface for CMS Hook
+* [CMS_HOOK_AUTO_REGISTER] (/library/src/hooks/cms_hook_auto_register.e): The deferred class provides an abstraction that when inheriting from this class, the declared hooks are automatically registered, otherwise, each descendant has to add it to the cms service	itself.
+* [CMS_HOOK_BLOCK](/library/src/hooks/cms_hook_block.e): The class CMS_HOOK_BLOCK describe a hook providing a way to alter a generic block.
+* [CMS_HOOK_FORM_ALTER](/library/src/hooks/cms_hook_form_alter.e): The class CMS_HOOK_FORM_ATLER describe a hook providing a way to alter a form.
+* [CMS_HOOK_MENU_ALTER](/library/src/hooks/cms_hook_menu_alter.e): The class CMS_HOOK_MENU_ATLER describe a hook providing a way to alter a menu.
+* [CMS_HOOK_MENU_SYSTEM_ALTER](/library/src/hooks/cms_hook_menu_system_alter.e): The class CMS_HOOK_MENU_SYSTEM_ALTER describe a hook providing a way to alter the CMS menu system.
+* [CMS_HOOK_VALUE_TABLE_ALTER](/library/src/hooks/cms_hook_value_table_alter.e):: The class CMS_HOOK_VALUE_TABLE_ALTER describe a hook providing a way to alter the value table for a response.

doc/tutorial.md

@@ -0,0 +1,121 @@
+CMS Tutorial
+============
+[Work in progress]
+
+##### Table of Contents  
+[Getting Started](#init)  
+[Building your module](#module)  
+[Lifecycle](#cycle)  
+
+
+<a name="init"/>
+Getting Started
+-------------
+
+
+<a name="module"/>
+Building your own module
+------------------------
+A [Module](/doc/concepts.md#modules) as we already describe it, enable us to add functionallity based on your needs.
+
+Here we will describe the basics steps to write your own modules.
+
+ * The first thing to do is inherit from the class [CMS_MODULE] () and redefine the register_hooks (2) feature.
+ * Implement (via inheritance) the needed [Hooks] (/doc/concepts.md#hooks).
+ * Define the module API through route definition. (1)
+ * Define the list of block to be handle by the current module (3).
+ * Render the block (4) (could be defined in Eiffel itself or using a template file (smarty)). 
+ * API implementation (5).
+ 
+```
+  class  MY_NEW_MODULE
+
+  inherit
+
+	CMS_MODULE
+  		redefine
+  			register_hooks
+  		end
+
+	CMS_HOOK_BLOCK   
+
+	CMS_HOOK_MENU_SYSTEM_ALTER
+
+
+ create
+  make
+
+feature {NONE} -- Initialization
+
+	make
+			-- Create current module
+		do
+			name := "new module"
+			version := "1.0"
+			description := "Eiffel new module"
+			package := "example"
+		end
+
+feature -- Access: router
+
+	router (a_api: CMS_API): WSF_ROUTER
+			-- (1) Node router.
+		do  
+			create Result.make (1)
+			Result.handle_with_request_methods ("/demo", create {WSF_URI_AGENT_HANDLER}.make (agent handle_demo (a_api, ?, ?)), Result.methods_head_get)
+		end
+
+feature -- Hooks
+
+	register_hooks (a_response: CMS_RESPONSE)
+		do
+		        -- (2)
+			a_response.subscribe_to_menu_system_alter_hook (Current)
+			a_response.subscribe_to_block_hook (Current)
+		end
+
+	block_list: ITERABLE [like {CMS_BLOCK}.name]
+		do
+		    --  (3) List of block names, managed by current object.
+		end
+
+	get_block_view (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
+		do
+		    --  (4) Get block object identified by `a_block_id' and associate with `a_response'.
+		end
+
+	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
+		local
+			lnk: CMS_LOCAL_LINK
+		do
+			create lnk.make ("Demo", "/demo/")
+			a_menu_system.primary_menu.extend (lnk)
+		end
+
+feature -- Handler
+
+	handle_demo (a_api: CMS_API; req: WSF_REQUEST; res: WSF_RESPONSE;)
+		local
+			r: NOT_IMPLEMENTED_ERROR_CMS_RESPONSE
+		do
+		       -- (5)
+			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.execute
+		end
+
+end
+
+```
+
+
+
+
+
+<a name="cycle"/>
+Lifecycle
+---------
+
+
+

examples/demo/demo-safe.ecf

@@ -1,47 +1,83 @@
 <?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">
+		<root class="DEMO_CMS_SERVER" feature="make_and_launch"/>
 		<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" location="..\..\cms-safe.ecf" readonly="false">
+			<option>
+				<assertions precondition="true" postcondition="true" supplier_precondition="true"/>
+			</option>
+		</library>
+		<library name="cms_admin_module" location="..\..\modules\admin\admin-safe.ecf" readonly="false"/>
+		<library name="cms_app_env" location="..\..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="cms_auth_module" location="..\..\modules\auth\auth-safe.ecf" readonly="false"/>
+		<library name="cms_basic_auth_module" location="..\..\modules\basic_auth\basic_auth-safe.ecf" readonly="false"/>
+		<library name="cms_blog_module" location="..\..\modules\blog\cms_blog_module-safe.ecf" readonly="false"/>
 		<library name="cms_demo_module" location="modules\demo\cms_demo_module-safe.ecf" readonly="false"/>
-		<library name="layout" location="..\..\library\layout\layout-safe.ecf" readonly="false"/>
+		<library name="cms_email_service" location="..\..\library\email\email-safe.ecf" readonly="false"/>
+		<library name="cms_feed_aggregator_module" location="..\..\modules\feed_aggregator\feed_aggregator-safe.ecf" readonly="false"/>
+		<library name="cms_google_search_module" location="..\..\modules\google_search\google_search-safe.ecf" readonly="false" use_application_options="true"/>
+		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
+		<library name="cms_node_module" location="..\..\modules\node\node-safe.ecf" readonly="false"/>
+		<library name="cms_oauth_20_module" location="..\..\modules\oauth20\oauth20-safe.ecf" readonly="false"/>
+		<library name="cms_openid_module" location="..\..\modules\openid\openid-safe.ecf" readonly="false"/>
+		<library name="cms_recent_changes_module" location="..\..\modules\recent_changes\recent_changes-safe.ecf" readonly="false"/>
+		
+		<library name="persistence_sqlite3" location="..\..\library\persistence\sqlite3\sqlite3-safe.ecf" readonly="false">
+			<option>
+				<assertions/>
+			</option>
+		</library>
+		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-safe.ecf" />
+		<!--
+		<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-safe.ecf" />
+		-->
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 	</target>
 	<target name="demo_any" extends="common">
-		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
-		<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi-safe.ecf"/>
-		<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi-safe.ecf"/>
-		<library name="nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\nino-safe.ecf"/>
-		<cluster name="launcher" location=".\launcher\any\" recursive="true"/>
+		<setting name="concurrency" value="thread"/>
+		<library name="any_launcher" location="..\..\launcher\any-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
-	<target name="demo_nino" extends="common">
-		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
-		<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"/>
+	<target name="demo_standalone" extends="common">
+		<option debug="true">
+			<debug name="dbglog" enabled="true"/>
+		</option>
+		<setting name="concurrency" value="scoop"/>
+		<variable name="httpd_ssl_disabled" value="true"/>
+		<library name="standalone_launcher" location="..\..\launcher\standalone-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
+	<target name="demo_standalone_none" extends="demo_standalone">
+		<setting name="concurrency" value="none"/>
+	</target>
+	<target name="demo_standalone_mt" extends="demo_standalone">
+		<setting name="concurrency" value="thread"/>
+	</target>
+	<target name="demo_standalone_scoop" extends="demo_standalone">
+		<setting name="concurrency" value="scoop"/>
+	</target>
 	<target name="demo_cgi" extends="common">
-		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
-		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
-		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<setting name="concurrency" value="none"/>
+		<library name="cgi_launcher" location="..\..\launcher\cgi-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 	<target name="demo_libfcgi" extends="common">
-		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
-		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
-		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<setting name="concurrency" value="none"/>
+		<library name="libfcgi_launcher" location="..\..\launcher\libfcgi-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
-	<target name="demo" extends="demo_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/install_modules.bat

@@ -0,0 +1,14 @@
+setlocal
+set ROC_CMD=call %~dp0..\..\tools\roc.bat
+set ROC_CMS_DIR=%~dp0
+
+%ROC_CMD% install --module ..\..\modules\admin	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\auth	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\basic_auth	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\blog	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\node	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\oauth20	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\openid	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\recent_changes	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\feed_aggregator	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\google_search	--dir %ROC_CMS_DIR%

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/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,9 @@ class
 inherit
 	CMS_MODULE
 		redefine
-			register_hooks
+			register_hooks,
+			initialize,
+			install
 		end
 
 	CMS_HOOK_MENU_SYSTEM_ALTER
@@ -24,34 +26,74 @@ 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
+
+	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
+				Precursor {CMS_MODULE}(api)
+			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
 
 	register_hooks (a_response: CMS_RESPONSE)
 		do
-			a_response.subscribe_to_menu_system_alter_hook (Current)
-			a_response.subscribe_to_block_hook (Current)
+			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_response.hooks.subscribe_to_block_hook (Current)
 		end
 
 	block_list: ITERABLE [like {CMS_BLOCK}.name]
 		do
-			Result := <<"demo-info">>
+			Result := <<"?demo-info">>
 		end
 
 	get_block_view (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
@@ -61,12 +103,12 @@ feature -- Hooks
 			m: CMS_MENU
 			lnk: CMS_LOCAL_LINK
 		do
-			if a_block_id.is_case_insensitive_equal_general ("demo-info") then
-				if a_response.request.request_uri.starts_with ("/demo/") then
+			if a_block_id.same_string ("demo-info") then
+				if a_response.location.starts_with_general ("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 +121,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 +133,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.percent_encoded_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/blocks.ini

@@ -0,0 +1,25 @@
+### Blocks settings
+
+#navigation.region=sidebar_first
+#navigation.condition=is_front
+management.conditions[]=path:admin*
+management.conditions[]=is_front
+
+#Feeds
+feed.news.weight=3
+feed.news.region=feed_news
+feed.news.region=content
+feed.news.condition=is_front
+
+feed.forum.weight=2
+feed.forum.region=feed_forum
+feed.forum.region=content
+feed.forum.condition=is_front
+feed.forum.options[size]=5
+
+#Updates
+recent_changes.region=content
+recent_changes.condition=is_front
+recent_changes.title=Updates
+recent_changes.options[size]=4
+

examples/demo/site/config/cms.ini

@@ -1,6 +1,30 @@
-engine=smarty
-site.name=EWF Web CMS
-site.email=your@email.com
-var-dir=var
-files-dir=files
+[layout]
+root-dir=site/www
+#themes-dir=site/themes
+#modules-dir=site/modules
+
+[site]
+name=Eiffel CMS
+email=your@email.com
 theme=bootstrap
+
+[mailer]
+#smtp=localhost:25
+#sendmail=/usr/bin/sendmail
+output=@stderr
+
+[modules]
+# Module status
+#   *=on  -> modules are enabled by default
+#   *=off -> modules are disabled by default
+# Default is "on"
+# for each module, this can be overwritten with
+#  module_name= on or off
+*=all
+
+[blocks]
+@include=blocks.ini
+
+[admin]
+# CMS Installation, are accessible by "all", "none" or uppon "permission". (default is none)
+installation_access=all

examples/demo/site/config/demo.json

@@ -0,0 +1,44 @@
+{
+	"database": {
+		"datasource": {
+			"driver": "sqlite3",
+			"environment": "sqlite3",
+			"-driver": "odbc",
+			"-environment": "odbc-sqlite"
+		},
+		"environments": {
+			"sqlite3": {
+				"connection_string":"Database=./site/database.sqlite3;"
+			},
+			"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/admin/files/css/admin.css

@@ -0,0 +1,34 @@
+ul.cms-users {
+  list-style-type: none;
+  padding: 3px 3px 3px 3px;
+  border: solid 1px #ccc; }
+  ul.cms-users li {
+    border-top: dotted 1px #ccc; }
+    ul.cms-users li:first-child {
+      border-top: none; }
+  ul.cms-users li.cms_user a::before {
+    content: "[users] "; }
+
+ul.cms-roles {
+  list-style-type: none;
+  padding: 3px 3px 3px 3px;
+  border: solid 1px #ccc; }
+  ul.cms-roles li {
+    border-top: dotted 1px #ccc; }
+    ul.cms-roles li:first-child {
+      border-top: none; }
+  ul.cms-roles li.cms_role a::before {
+    content: "[roles] "; }
+
+ul.cms-permissions {
+  list-style-type: none;
+  padding: 3px 3px 3px 3px;
+  border: solid 1px #ccc; }
+  ul.cms-permissions li {
+    border-top: dotted 1px #ccc; }
+    ul.cms-permissions li:first-child {
+      border-top: none; }
+  ul.cms-permissions li.cms_permission a::before {
+    content: "[permission] "; }
+
+/*# sourceMappingURL=admin.css.map */

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

@@ -0,0 +1,59 @@
+ul.cms-users {
+	
+	list-style-type: none;
+	padding: 3px 3px 3px 3px;
+	border: solid 1px #ccc;
+
+	li{
+		border-top: dotted 1px #ccc;
+		&:first-child {
+			border-top: none;
+		}
+	}
+
+	li.cms_user a::before {
+		content: "[users] ";
+	}
+}
+
+
+ul.cms-roles {
+	
+	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_role a::before {
+		content: "[roles] ";
+	}
+}
+
+
+ul.cms-permissions {
+	
+	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_permission a::before {
+		content: "[permission] ";
+	}
+}
+
+
+
+

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="$host">ROC CMS</a></p>
+
+		<p>To complete your request, please click on this link to genereate a new password:<p>
+
+		<p><a href="$link">$link</a></p>
+	</body>
+</html>

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="$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_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="$host">ROC CMS</a></p>
+		<p>Thank you for joining us.</p>
+	</body>
+</html>

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

@@ -0,0 +1,67 @@
+ 	<div class="primary-tabs">
+	 {if isset="$user"}
+		<h3>Account Information</h3>
+		<div>
+			<div>
+				<div>	
+			   		<label>Username:</label>  {$user.name/}
+			   	</div>
+			   	<div>	
+			   		<label>Email:</label>  {$user.email/}
+			   	</div>
+			   	<div>	
+			   		<label>Creation Date:</label>  {$user.creation_date/}
+			   	</div>
+			   	<div>	
+			   		<label>Last login:</label>  {$user.last_login_date/}
+			   	</div>	
+			   	<div>
+			   		<form method="get" action="{$site_url/}{$auth_login_strategy/}">
+    					<button type="submit">Logout</button>
+					</form>
+			   	</div>	
+			</div>
+    	</div>
+    	<hr>
+    	{include file="block_change_password.tpl" /}
+       	<hr>
+    	<h4>Roles</h4>
+    	<div>
+    		{foreach item="ic" from="$roles"}
+    			<div>	
+			   		<ul>
+			   			<li>
+			   				<strong>{$ic.name/}</strong>
+			   				<ul>
+			   					<li> <i>permissions</i> 
+				   					<ul>	
+					   					{foreach item="ip" from="$ic.permissions"}
+					   						<li>{$ip/}</li>
+					   					{/foreach}
+					   				</ul>
+					   			</li>	
+			   				</ul>		
+			   			</li>
+			   		</ul>
+			   	</div>
+    		{/foreach}
+    	</div>		
+
+
+    	<hr>
+    	<h4>Profile</h4>
+    	<div>
+    		{foreach item="the_value" key="the_name" from="$user.profile"}
+    			<div>	
+			   		<label>{$the_name/}:</label>  {$the_value/} 
+			   	</div>
+    		{/foreach}
+    	</div>		
+	{/if}
+	{unless isset="$user"}
+		<div>
+			<p> You are not logged in </p>
+				<a href="{$site_url/}account/roc-login">Go to the login page</a>
+		</div>	
+	{/unless}
+	</div>

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

@@ -0,0 +1,21 @@
+ <div>
+    <form action="{$site_url/}account/change-password" method="post">
+        <fieldset>
+            <legend>Change Password Form</legend>
+            <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/auth/templates/block_login.tpl

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

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

@@ -0,0 +1,32 @@
+ <div>
+    <form action="{$site_url/}account/new-password" method="post">
+        <fieldset>
+            <legend>Request new password by email</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>
+    <hr>
+    <form action="{$site_url/}account/new-password" method="post">
+        <fieldset>
+            <legend>Request new password by username</legend>
+            <div>
+                <input type="text" id="username" name="username"  value="{$username/}"  required/>
+                <label for="username">Username</label>
+                {if isset="$error_username"}
+                    <span><i>{$error_username/}</i></span> <br>
+                {/if}
+                <br>
+            </div>
+            <button type="submit">Send</button>
+        </fieldset>    
+    </form>
+
+</div>

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

@@ -0,0 +1,3 @@
+<div>
+    <p>You new password has been saved!, Login again</p>
+</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="{$site_url/}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="{$site_url/}account/roc-register" method="post">
+        <fieldset>
+            <legend>Register Form</legend>
+            <div>
+                <input type="text" id="name" name="name"  value="{$name/}" required  autofocus />
+                <label for="name">Name</label>
+                {if isset="$error_name"}
+                    <span><i>{$error_name/}</i></span> <br>
+                {/if}
+            </div>
+            <div>
+                <input type="password" id="password" name="password" value="" required/>
+                <label for="password">Password</label>
+            </div>
+            <div>
+                <input type="email" id="email" name="email"  value="{$email/}"  required/>
+                <label for="email">Email</label>
+                {if isset="$error_email"}
+                    <span><i>{$error_email/}</i></span> <br>
+                {/if}
+            </div>
+            
+            
+            <button type="submit">Register</button>
+        </fieldset>    
+    </form>
+</div>

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

@@ -0,0 +1,28 @@
+ <div>
+    <form action="{$site_url/}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/basic_auth/files/js/roc_basic_auth.js

@@ -0,0 +1,325 @@
+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['cms_basic_auth'];
+    var username = form.username.value;
+    var password = form.password.value;
+	  //var host = form.host.value;
+  	var origin = window.location.origin.concat(window.location.pathname);
+    var _login = function(){
+
+ 
+    if  (document.getElementById('myModalFormId') !== null ) {
+        ROC_AUTH.remove ('myModalFormId');
+    }
+
+
+	if (username === "" || password === "") {
+             if (document.getElementById('myModalFormId') === null ) {		
+                    var newdiv = document.createElement('div');
+	                  newdiv.innerHTML = "<br>Invalid Credentials</br>";
+                    newdiv.id = 'myModalFormId';
+                     $(".primary-tabs").append(newdiv);
+               } 
+	}else{  
+         
+          //Instantiate HTTP Request
+          var request = ((window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
+    	    request.open("GET", loginURL, true, username, password);
+	        request.send(null);
+    
+          //Process Response
+          request.onreadystatechange = function(){
+             if (request.readyState == 4) {
+                 if (request.status==200) {
+                        delete form;
+                        window.location=window.location.origin;
+                }
+                else{
+                  if (navigator.userAgent.toLowerCase().indexOf("firefox") != -1){                       
+                     }
+                   
+		  if (document.getElementById('myModalFormId') === null ) {		
+                    var newdiv = document.createElement('div');
+	                   newdiv.innerHTML = "<br>Invalid Credentials</br>";
+                    newdiv.id = 'myModalFormId';
+                    $(".primary-tabs").append(newdiv);
+                   } 
+
+                  }
+               }
+            }
+        }
+    }
+ 
+    var userAgent = navigator.userAgent.toLowerCase();
+    if (userAgent.indexOf("firefox") != -1){ //TODO: check version number
+        if (firstLogIn) _login();
+        else 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';
+                    $(".primary-tabs").append(newdiv);
+                     $("#imgProgressRedirect").hide();
+               } 
+    }else{  
+         
+          //Instantiate HTTP Request
+          var request = ((window.XMLHttpRequest) ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP"));
+            request.open("GET", host.concat(loginURL), true, username, password);
+            request.send(null);
+    
+          //Process Response
+          request.onreadystatechange = function(){
+             if (request.readyState == 4) {
+                 if (request.status==200) {
+                     if (redirectURL === "") {   
+                        window.location=host.concat("/");
+                    } else {
+                        window.location=host.concat(redirectURL);
+                    }
+
+        }
+                else{
+                  if (navigator.userAgent.toLowerCase().indexOf("firefox") != -1){                       
+                     }
+                   
+          if (document.getElementById('myModalFormId') === null ) {     
+                    var newdiv = document.createElement('div');
+                       newdiv.innerHTML = "<br>Invalid Credentials</br>";
+                    newdiv.id = 'myModalFormId';
+                    $(".primary-tabs").append(newdiv);
+                    $("#imgProgressRedirect").hide();    
+                   } 
+
+                  }
+               }
+            }
+        }
+    }
+ 
+    var userAgent = navigator.userAgent.toLowerCase();
+    if (userAgent.indexOf("firefox") != -1){ //TODO: check version number
+        if (firstLogIn) _login();
+        else logoff(_login);
+    }
+    else{
+        _login();
+    }
+ 
+    if (firstLogIn) firstLogIn = false;
+};
+
+
+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");
+var confirm_password = document.getElementById("confirm_password");
+
+ROC_AUTH.validatePassword =function(){
+  if ((password != null) && (confirm_password != null)) {
+    if(password.value != confirm_password.value) {
+      confirm_password.setCustomValidity("Passwords Don't Match");
+    } else {
+      confirm_password.setCustomValidity('');
+    }
+   } 
+}
+
+if ((password != null) && (confirm_password != null)) {
+  password.onchange = ROC_AUTH.validatePassword();
+  confirm_password.onkeyup = ROC_AUTH.validatePassword;
+}

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

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

examples/demo/site/modules/blog/files/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/modules/blog/files/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/modules/feed_aggregator/config/feeds.json

@@ -0,0 +1,28 @@
+{
+	"ids": ["news", "forum"],
+	"feeds": { 
+		"news": {
+			"title": "Eiffel related posts", 
+			"expiration": "21600",
+			"size": 5,
+			"locations": [
+					"https://bertrandmeyer.com/feed/",
+					"https://room.eiffel.com/blog/feed",
+					"https://room.eiffel.com/article/feed",
+					"https://room.eiffel.com/library/feed"
+					]
+			, "categories": ["Eiffel"]
+			,"option_description": "enabled"
+			},
+		"forum": {
+			"title": "Eiffel Forum",
+			"expiration": "21600",
+			"size": 5,
+			"locations": [
+					"https://groups.google.com/forum/feed/eiffel-users/msgs/atom.xml?num=15",
+					"http://stackoverflow.com/feeds/tag?tagnames=eiffel&sort=newest"
+				]
+			,"option_description": "enabled"
+		}
+	}
+}

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

@@ -0,0 +1,53 @@
+div.feed ul {
+  list-style: none;
+  position: relative;
+  padding: 0;
+  margin: 0;
+  width: 99%;
+}
+div.feed li {
+  /* border-top: solid 1px #ddd; */
+  padding: 0;
+  margin: 0 0 5px 0;
+}
+div.feed li a {
+  font-weight: bold;
+}
+div.feed li .date {
+  font-weight: bold;
+  font-size: small;
+}
+div.feed li .category {
+  margin-left: 20px;
+  font-size: 8px;
+  height: 9px;
+  overflow: hidden;
+  color: #999;
+}
+div.feed li .description {
+  margin-left: 20px;
+  font-size: small;
+  height: 18px;
+  overflow: hidden;
+  color: #999;
+}
+div.feed li:hover {
+  margin-bottom: 23px;
+}
+div.feed li:hover .description {
+  padding: 5px;
+  position: absolute;
+  height: auto;
+  overflow-y: scroll;
+  overflow-x: scroll;
+  color: #000;
+  background-color: #fff;
+  border: solid 1px #000;
+  z-index: 10;
+}
+div.feed li:hover:last-child {
+  margin-bottom: 28px;
+}
+div.feed li .description::after {
+  content: "...";
+}

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

@@ -0,0 +1,54 @@
+div.feed {
+	ul {
+		list-style: none;
+		position: relative;
+		padding: 0;
+		margin: 0;
+		width: 99%;
+	}
+	li {
+		/* border-top: solid 1px #ddd; */
+		padding: 0;
+		margin: 0 0 5px 0;
+
+		a {
+			font-weight: bold;
+		}
+		.date {
+			font-weight: bold;
+			font-size: small;
+		}
+		.category {
+			margin-left: 20px;
+			font-size: 8px;
+			height: 9px;
+			overflow: hidden;
+			color: #999;
+		}
+		.description {
+			margin-left: 20px;
+			font-size: small;
+			height: 18px;
+			overflow: hidden;
+			color: #999;
+		}
+		&:hover {
+			margin-bottom: 23px;
+			.description {
+				padding: 5px;
+				position: absolute;
+				height: auto;
+				overflow-y: scroll;
+				overflow-x: scroll;
+				color: #000;
+				background-color: #fff;
+				border: solid 1px #000;
+				z-index: 10;
+			}
+			&:last-child {
+				margin-bottom: 28px;
+			}
+		}
+		.description::after { content: "..."; }
+	}
+}

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

@@ -0,0 +1,6 @@
+{
+    "gcse": {
+     		"cx":"",
+     		"secret_key":""
+     }	
+}

examples/demo/site/modules/google_search/templates/block_search.tpl

@@ -0,0 +1,40 @@
+<section>
+  <header>
+    <h2>Results for <kbd>{$result.current_page.search_terms/}</kbd></h2>
+  </header>
+  
+  <!-- list of results -->
+  <ol start="{$result.current_page.start_index/}">
+  
+    <!-- Item result -->
+    {foreach from="$result.items" item="item"}
+    <li>
+      <article>
+        <header>
+          <h3>
+            <cite>
+              <a href="{$item.link/}">{$item.title/}</a>
+            </cite>
+          </h3>
+        </header>
+        <blockquote cite="{$item.link/}">
+          <p>{$item.html_snippet/}</p>
+          <footer>
+            <p><abbr title="Uniform Resource Locator">Source</abbr> <a href="{$item.link/}">{$item.display_link/}</a></p>
+          </footer>
+        </blockquote>
+      </article>
+    </li>
+    {/foreach} 
+
+    
+  </ol>  
+  <ul class="cms-page-links">
+      {if isset="$result.previous_page"}
+        <li><a href="{$site_url/}gcse/?q={$result.previous_page.search_terms/}&amp;start={$result.previous_page.start_index/}&amp;num={$result.previous_page.count/}">Previous</a></li>
+      {/if}
+      {if isset="$result.next_page"}
+        <li><a href="{$site_url/}gcse/?q={$result.next_page.search_terms/}&amp;start={$result.next_page.start_index/}&amp;num={$result.next_page.count/}">Next</a></li>
+      {/if}
+  </ul>
+</section>

examples/demo/site/modules/node/files/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/modules/node/files/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/modules/node/scripts/node.sql

@@ -0,0 +1,37 @@
+
+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,
+	CONSTRAINT Unique_nid_revision UNIQUE (nid,revision)
+);
+
+CREATE TABLE node_revisions (
+	`nid`	INTEGER NOT NULL,
+	`revision`	INTEGER NOT NULL,
+	`title`	VARCHAR(255) NOT NULL,
+	`summary`	TEXT,
+	`content`	TEXT,
+	`format`	VARCHAR(128),
+	`author`	INTEGER,
+	`changed`	DATETIME NOT NULL,
+	`status`	INTEGER,
+	CONSTRAINT Unique_nid_revision PRIMARY KEY (nid,revision)
+);
+
+CREATE TABLE page_nodes(
+	`nid` INTEGER NOT NULL,
+	`revision` INTEGER NOT NULL,
+	`parent` INTEGER,
+	CONSTRAINT PK_nid_revision PRIMARY KEY (nid,revision)
+);
+

examples/demo/site/modules/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,13 @@
+
+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,
+   `email` TEXT NOT NULL,
+   CONSTRAINT `uid`
+    UNIQUE(`uid`),
+   CONSTRAINT `email`
+    UNIQUE(`email`) 
+   );
+

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

@@ -0,0 +1,32 @@
+	<hr>
+		{unless isempty="$oauth_associated"}
+    	<h4>Un-Associate Account with Oauth Consumer</h4>
+    	<div>
+    		{foreach item="consumer" from="$oauth_associated"}
+    			<div>
+    				<form method="post" action="{$site_url/}account/oauth-un-associate">
+						<input type="hidden" name="consumer" value="{$consumer/}"/>
+          				<div>
+                			<button type="submit">Unlink {$consumer/}</button>
+              			</div>
+          			</form>	
+			   	</div>
+    		{/foreach}
+    	</div>
+		{/unless}
+		{unless isempty="$oauth_not_associated"}
+    	<h4>Associate Account with Oauth Consumer</h4>
+    	<div>
+    		{foreach item="consumer" from="$oauth_not_associated"}
+    			<div>
+    				<form method="post" action="{$site_url/}account/oauth-associate">
+						<input type="hidden" name="consumer" value="{$consumer/}"/>
+          				<div>
+          				  <input type="email" id="email" name="email"  value="{$email/}"  required/>	
+                		  <button type="submit">Link with {$consumer/}</button>
+              			</div>  
+					</form>	
+			   	</div>
+    		{/foreach}
+    	</div>		
+		{/unless}

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/modules/openid/scripts/openid_consumers.sql

@@ -0,0 +1,11 @@
+
+CREATE TABLE openid_consumers(
+   `cid` INTEGER PRIMARY KEY NOT NULL CHECK(`cid`>=0),
+   `name` VARCHAR(255) NOT NULL,
+   `endpoint`  VARCHAR (255) NOT NULL,
+   CONSTRAINT `cid`
+    UNIQUE(`cid`),
+   CONSTRAINT `name`
+    UNIQUE(`name`)
+   );
+

examples/demo/site/modules/openid/scripts/openid_consumers_initialize.sql

@@ -0,0 +1,4 @@
+	-- Change the values TO_COMPLETE based on your API.
+	-- API SECTET KEY AND API PUBLIC KEY 
+INSERT INTO openid_consumers (name, endpoint) 
+VALUES ('yahoo', 'https://me.yahoo.com/');

examples/demo/site/modules/openid/scripts/openid_items.sql

@@ -0,0 +1,11 @@
+
+CREATE TABLE openid_items (
+   `uid` INTEGER PRIMARY KEY NOT NULL CHECK(`uid`>=0),
+   `identity` TEXT  NOT NULL,
+   `created` DATETIME NOT NULL,
+   CONSTRAINT `uid`
+    UNIQUE(`uid`),
+    CONSTRAINT `identity`
+    UNIQUE(`identity`)
+   );
+

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

@@ -0,0 +1,18 @@
+ <div>
+ 	<form action="{$site_url/}account/roc-openid-login" id="openid-login" method="POST">
+		<div>
+				<strong><label for="openid">OpenID identifier</label></strong><br/>
+				<input type="text" name="openid" value="" size="50"/>
+		</div>
+		<div><input type="submit" name="op" value="Validate"/></div>
+		<div hgv vtid="openid">Login with 			
+			{foreach item="item" from="$openid_consumers"}
+				<a href="{$site_url/}account/login-with-openid/{$item/}">{$item/}</a><br>
+			{/foreach}	
+	</form>
+	<div>
+	  {if isset="$error"}
+       <span><i>{$error/}</i></span> <br>
+      {/if}
+     </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/style.css

@@ -0,0 +1,92 @@
+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;
+  position: fixed;
+  top: 45px;
+  left: 0;
+  bottom: 0;
+  width: 200px;
+  border-right: solid 1px #ddd;
+}
+.sidebar#sidebar_second {
+  width: 250px;
+  float: right;
+}
+.sidebar + .main {
+  margin-left: 200px;
+}
+
+#primary-tabs ul.horizontal {
+  list-style-type: none;
+}
+#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;
+}
+
+#message li.error {
+  background-color: #f99;
+  border: solid 1px red;
+  padding: 5px 2px 5px 2px;
+}

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

@@ -0,0 +1,8 @@
+     $(document).ready(function() {
+       $('#gcse_search_form').submit(function() {
+           window.open('', 'formpopup', 'width=600,height=600,resizeable,scrollbars');
+           this.target = 'formpopup';
+       });
+   });
+
+

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

@@ -0,0 +1,97 @@
+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;
+		position: fixed;
+		top: 45px;
+		left: 0;
+		bottom: 0;
+		width: 200px;
+		border-right: solid 1px #ddd;
+	}
+	&#sidebar_second {
+		width: 250px;
+		float: right;
+	}
+
+	&+.main {
+		margin-left: 200px;
+	}
+}
+#primary-tabs {
+	ul.horizontal {
+		list-style-type: none;
+		li {
+			display: inline;
+			padding: 2px 5px;
+			border: solid 1px #ccf;
+		}
+		li.active {
+			border-color: #99f #99f #ddd;
+			border-style: solid solid none;
+			border-width: 2px 1px 0;
+			padding: 2px 7px 1px;
+		}
+	}
+}
+#message li.error {
+	background-color: #f99;
+	border: solid 1px red;
+	padding: 5px 2px 5px 2px;
+}

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,101 @@
+<!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">
+ 
+	<!-- jQuery dep -->
+	<script src="{$site_url/}theme/js/jquery-1.10.2.min.js"></script>
+	<script src="{$site_url/}theme/js/popup_search.js"></script>
+
+{if isset="$head"}{$head/}{/if}
+{if isset="$styles"}{$styles/}{/if}
+{if isset="$scripts"}{$scripts/}{/if}
+{if isset="$head_lines"}{$head_lines/}{/if}	
+
+	<!-- 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> 
+	<!-- Page search -->
+	<div class="row">
+		<div class="col-md-2 col-md-offset-9">
+			<form action="{$site_url/}gcse" class="search-form" id="gcse_search_form">
+				<div class="form-group has-feedback">
+					<input type="search" class="form-control" name="q" id="gcse_search" placeholder="search">
+					<span class="glyphicon glyphicon-search form-control-feedback"></span>
+				</div>
+			</form>
+		</div>
+	</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 id='main' 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/}   
+		  {if condition="$page.is_front"}
+			  {if isset="$page.region_feed_news"}
+				<div class="column" style="width: 45%; float: left">{$page.region_feed_news/}</div>
+			  {/if}
+			  {if isset="$page.region_feed_forum"}
+				<div class="column" style="width: 45%; float: left">{$page.region_feed_forum/}</div>
+			  {/if}
+		  {/if}
+          </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/themes/bootstrap/theme.info

@@ -8,7 +8,7 @@ regions[content] = Content
 regions[highlighted] = Highlighted
 regions[help] = Help
 regions[footer] = Footer
-regions[first_sidebar] = first sidebar
-regions[second_sidebar] = second sidebar
+regions[sidebar_first] = first sidebar
+regions[sidebar_second] = second sidebar
 regions[page_bottom] = Bottom
-navigation=default_nav
+navigation=default_nav

examples/demo/site/www/static/css/dashboard.css

@@ -1,357 +0,0 @@
-/*
- * Base structure
- */
-
-/* Move down content because we have a fixed navbar that is 36px tall on small screen */
-body {
-	padding-top: 40px;
-}
-/* On large screen, we give it more space and the navbar is 30px tall. */
-@media (min-width: 768px) {
-	body {
-		padding-top: 45px;
-	}
-}
-
-
-/*
- * Global add-ons
- */
-
-h1 {
-	margin-top: initial;
-	margin-bottom: 5px;
-}
-
-h2.sub-header{
-	margin-top: 1px;
-	margin-bottom: 1px;
-	border-bottom: 1px solid #eee;
-}
-
-
-.container .jumbotron {
-	padding: 10px;
-	text-align: center;
-}
-
-
-/*
- * Sidebar
- */
-
-/* Hide for mobile, show later */
-.sidebar {
-	display: none;
-}
-@media (min-width: 768px) {
-	.sidebar {
-		position: fixed;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		z-index: 1000;
-		display: block;
-		padding: 70px 20px 20px;
-		background-color: #f5f5f5;
-		border-right: 1px solid #eee;
-	}
-}
-
-/* Sidebar navigation */
-.nav-sidebar {
-	margin-left: -20px;
-	margin-right: -21px; /* 20px padding + 1px border */
-	margin-bottom: 20px;
-}
-.nav-sidebar > li > a {
-	padding-left: 20px;
-	padding-right: 20px;
-}
-.nav-sidebar > .active > a {
-	color: #fff;
-	background-color: #428bca;
-}
-
-
-/*
- * Main content
- */
-
-.main {
-	padding: 3px;
-}
-@media (min-width: 768px) {
-	.main {
-		padding-left: 15px;
-		padding-right: 15px;
-	}
-}
-.main .page-header {
-	margin-top: 0;
-}
-
-
-/*
- * Placeholder dashboard ideas
- */
-
-.placeholders {
-	margin-bottom: 30px;
-	text-align: center;
-}
-.placeholders h4 {
-	margin-bottom: 0;
-}
-.placeholder {
-	margin-bottom: 20px;
-}
-.placeholder img {
-	border-radius: 50%;
-}
-
-.navbar-default {
-	background-color:#194573;
-	border-color: #400040;
-}
-.navbar-default .navbar-brand {
-	color: #ffffff;
-}
-.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
-	color: #ffffff;
-}
-.navbar-default .navbar-text {
-	color: #ffffff;
-}
-.navbar-default .navbar-nav > li > a {
-	color: #ffffff;
-}
-.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
-	color: #ffffff;
-}
-.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
-	color: #ffffff;
-	background-color: #400040;
-}
-.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
-	color: #ffffff;
-	background-color: #400040;
-}
-.navbar-default .navbar-toggle {
-	border-color: #400040;
-}
-.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
-	background-color: #400040;
-}
-.navbar-default .navbar-toggle .icon-bar {
-	background-color: #ffffff;
-}
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
-	border-color: #ffffff;
-}
-.navbar-default .navbar-link {
-	color: #ffffff;
-}
-.navbar-default .navbar-link:hover {
-	color: #ffffff;
-}
-
-@media (max-width: 767px) {
-	.navbar-default .navbar-nav .open .dropdown-menu > li > a {
-		color: #ffffff;
-	}
-	.navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-		color: #ffffff;
-	}
-	.navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-		color: #ffffff;
-		background-color: #400040;
-	}
-}
-
-.navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;}
-.navbar {min-height:30px !important}
-
-.navbar-brand {
-	float: left;
-	padding: 15px;
-	padding-top: 5px;
-	padding-right: 15px;
-	padding-bottom: 5px;
-	padding-left: 15px;
-	font-size: 18px;
-	line-height: 18px;
-	height: 30px;
-}
-
-
-/* Tooltips */
-.blue-tooltip + .tooltip > .tooltip-inner {background-color: #FF;}
-.blue-tooltip + .tooltip > .tooltip-arrow { border-bottom-color:#FF; }
-
-
-.tooltip.top .tooltip-arrow {
-	bottom: 0;
-	left: 50%;
-	margin-left: -5px;
-	border-top-color: #000000;
-	border-width: 5px 5px 0;
-}
-.tooltip-inner {
-	text-align: left;
-	color: #000;
-	background: #fff;
-	border: solid 1px #000000;
-	max-width: 450px
-}
-
-.tooltip.bottom .tooltip-arrow {
-	top: 0;
-	left: 50%;
-	margin-left: -5px;
-	border-bottom-color: #000000;
-	border-width: 0 5px 5px;
-}
-
-/* pre */
-pre {
-	word-wrap: code;
-	white-space: pre-wrap;
-	background-color:white;
-}
-
-
-/* Container -Fluid */
-.container-fluid {
-	padding: 0 2px;
-}
-@media (min-width: 768px) {
-	.container-fluid {
-		padding: 0 5px;
-	}
-}
-
-.container-fluid .row {
-	margin: 0px;
-}
-
-.row-padding {
-	margin-top: 25px;
-	margin-bottom: 25px;
-}
-
-/* Width for the text field to enter a bug report number in the reports page.
- * We put a maximum width to override the width value coming from `form-control'. */
-.form-bug-number-entry {
-	max-width: 100px;
-}
-
-/* Default width for the entries in a table like layout. */
-.form-inline .form-control {
-	width: 95%;
-}
-
-.form-inline .checkbox {
-	font-weight: initial;
-	vertical-align: top;
-}
-
-/* Note that there is also a class called label. */
-label {
-	padding-right: 5px;
-}
-
-.label {
-	padding: 0px;
-	padding-right: 5px;
-}
-
-.label-primary-api-default {
-	display: inline-block;
-	width: 105px;
-	text-align: left;
-	background: #fff;
-	color: #000;
-	font-size: 100%;
-	text-align: right;
-}
-
-
-.label-primary-api-interactions {
-	display: inline-block;
-	padding-right: 5px;
-	text-align: left;
-	color: #000;
-	font-size: 100%;
-}
-
-
-pre {
-	padding: 1.5px;
-	display: block;
-	margin: 0 0 10px;
-	font-size: 12px;
-	font-family: monospace;
-	line-height: 1.428571429;
-	word-break: break-word;
-	word-wrap: break-word;
-	color: #333;
-	border: 0px; 
-	border-radius: 4px;
-}
-
-
-/* No padding, so that nested columns are always properly aligned. */
-.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12 {
-	padding-left: 0px;
-	padding-right: 0px;
-}
-
-.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td {
-	padding:2px;
-	vertical-align: middle;
-}
-
-.form-control{
-	height:inherit;
-	padding: 1px 2px;
-	margin: 1px;
-}
-
-.btn {
-	padding: 1px 12px;
-	margin: 1px;
-	min-width: 100px;
-}
-
-.dropdown-toggle, .login {
-	cursor: pointer;
-}
-
-.pager {
-	margin:10px 0;
-}
-
-.pager li>a,.pager li>span {
-	padding:1px 12px;
-	border-radius:8px;
-}
-
-.well {
-	padding: 9px;
-	margin-bottom: 10px;
-	min-height: 44px;
-}
-
-.panel-heading {
-	background-color: #ddeaf2 !important;
-}
-
-.private-panel-border {
-	border: solid 1px #DBA458 !important;
-}
-
-.private-panel {
-	background-color: #f2eadd !important;
-}

examples/demo/site/www/static/js/roc.js

@@ -1,108 +0,0 @@
-/*
- * EWF CMS javascript based on JQuery
- */
-
-/**
- * Override jQuery.fn.init to guard against XSS attacks.
- *
- * See http://bugs.jquery.com/ticket/9521
- */
-
-(function () {
-  var jquery_init = jQuery.fn.init;
-  jQuery.fn.init = function (selector, context, rootjQuery) {
-    // If the string contains a "#" before a "<", treat it as invalid HTML.
-    if (selector && typeof selector === 'string') {
-      var hash_position = selector.indexOf('#');
-      if (hash_position >= 0) {
-        var bracket_position = selector.indexOf('<');
-        if (bracket_position > hash_position) {
-          throw 'Syntax error, unrecognized expression: ' + selector;
-        }
-      }
-    }
-    return jquery_init.call(this, selector, context, rootjQuery);
-  };
-  jQuery.fn.init.prototype = jquery_init.prototype;
-})();
-
-
-var ROC = ROC || { };
-
-$('body').on('click',"a[rel='node']",function(e){
-
-  e.preventDefault();
-  /*
-  if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
-  if commented, html5 nonsupported browers will reload the page to the specified link.
-  */
-
-  //get the link location that was clicked
-  pageurl = $(this).attr('href');
-
-  spinner = "<span class='loading'><h3>Loading content..</h3><img src='/static/images/ajax-loader.gif' alt='loading...' class='spinner'></span>";  
-  //to get the ajax content and display in div with class 'main'
-  $.ajax({url:pageurl+'?rel=node',success: function(data){
-  $('.main').html(data);
-  }});
-
-  //to change the browser URL to the given link location
-  //if(pageurl!=window.location){
-  //window.history.pushState({path:pageurl},'',pageurl);
-  //}
-  //stop refreshing to the page given in
-  return false;
-});
-
-$('body').on('click',"a[rel='register']",function(e){
-
-  e.preventDefault();
-  /*
-  if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
-  if commented, html5 nonsupported browers will reload the page to the specified link.
-  */
-
-  //get the link location that was clicked
-  pageurl = $(this).attr('href');
-
-  spinner = "<span class='loading'><h3>Loading content..</h3><img src='/static/images/ajax-loader.gif' alt='loading...' class='spinner'></span>";  
-  //to get the ajax content and display in div with class 'main'
-  $.ajax({url:pageurl+'?rel=node',success: function(data){
-  $('.main').html(data);
-  }});
-
-  //to change the browser URL to the given link location
-  //if(pageurl!=window.location){
-  //window.history.pushState({path:pageurl},'',pageurl);
-  //}
-  //stop refreshing to the page given in
-  return false;
-});
-
-
-
-$("a[rel='node']").click(function(e){
-	e.preventDefault();
-	/*
-	if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
-	if commented, html5 nonsupported browers will reload the page to the specified link.
-	*/
-
-	//get the link location that was clicked
-	pageurl = $(this).attr('href');
-
-	spinner = "<span class='loading'><h3>Loading content..</h3><img src='/static/images/ajax-loader.gif' alt='loading...' class='spinner'></span>";  
-	//to get the ajax content and display in div with class 'main'
-	$.ajax({url:pageurl+'?rel=node',success: function(data){
-	$('.main').html(data);
-	}});
-
-	//to change the browser URL to the given link location
-	//if(pageurl!=window.location){
-	//window.history.pushState({path:pageurl},'',pageurl);
-	//}
-	//stop refreshing to the page given in
-	return false;
-});
-
-

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/block/header_block.tpl

@@ -1,7 +0,0 @@
-	<div class='navbar navbar-inverse'>
-      <div class='navbar-inner nav-collapse' style="height: auto;">
-        <ul class="nav">
-          {$header_block/}
-        </ul>
-      </div>
-    </div>  

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>