pass the user to the cms uploaded file.

Todo: implement metadata storage for uploaded files.

.gitignore

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

cms-safe.ecf

@@ -1,5 +1,5 @@
 <?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"/>
 		<file_rule>
@@ -12,17 +12,23 @@
 		</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="config" location=".\library\configuration\config-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
+		<library name="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"/>

cms.ecf

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
+	<description>ROC CMS library</description>
 	<target name="cms">
 		<root all_classes="true"/>
 		<file_rule>
@@ -12,20 +13,26 @@
 		</option>
 		<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="config" location=".\library\configuration\config.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="cms_app_env" location=".\library\app_env\app_env.ecf"/>
-		<library name="cms_model" location=".\library\model\cms_model.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_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
+		<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

@@ -1,93 +0,0 @@
-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/readme.md

@@ -0,0 +1,396 @@
+ROC CMS Documentation
+=====================
+
+[TOC]
+
+## Overview
+
+**ROC CMS** stands for "REST On CMS", however, until now, no particular focus was done on the REST API approach, and so far a more pragmatic approach dominated.
+
+Part of the design is inspired by Drupal (blocks, hooks, Role-based access control, ...), and other parts related to Eiffel. Priorities, modules and related have been driven by concrete need, in order to fulfill the https://eiffel.org/ websites. Also a contribution (as student projects, or others) helped build various modules or functionality.
+
+Currently, **ROC CMS** is a library or **framework** that provides components, tools and resources to build a CMS (Content Management System). It is not currently a CMS product, one can install and customize without any code.
+
+Thus, it will be interesting for people willing to build a website using **Eiffel**. This will enable to reuse other Eiffel components, better integration with other Eiffel projects, and of course benefit from all the goodies of the Eiffel technologies (Eiffel language, DbC, re-usability, portability, IDE, debugger,...).
+
+It depends on the **Eiffel Web Framework** (known as "Eiffel Web" or "EWF"), and thus can be executed as standalone, or CGI, libFCGI mode on Apache2 for instance, and on any Windows or Linux platform).
+
+The main notions are:
+- CMS Execution
+- CMS APIs
+- CMS Response
+- CMS Modules
+- CMS Hooks
+- CMS Theme, blocks, links, ...
+
+Those points will be described later in appropriated sections.
+
+## Setup
+
+
+The ROC CMS source is available either with the latest EiffelStudio release under the locations:
+- $ISE_LIBRARY\unstable\library\web\cms
+- or from github project https://github.com/EiffelWebFramework/ROC branch v0 for now.
+```
+git clone https://github.com/EiffelWebFramework/ROC -b v0
+```
+
+Note that if you use the source code from the github repository, you will need to use the latest release of EiffelStudio as it relieѕ on recent version of various libraries such as EWF, sqlite3, ....
+And using the "master" branch, even the trunk version of EiffelStudio libraries. So for now, we encourage you to use the ROC CMS shipped with your EiffelStudio.
+
+Once you have the source code, you should compile project <code>cms/example/demo/demo-safe.ecf</code> target "demo_standalone".
+```
+# from Command line
+cd example
+cd demo
+ec -config demo-safe.ecf -c_compile -finalize
+cp ./EIFGENs/demo_standalone/F_Code/demo.exe demo.exe
+demo.exe
+# or launch EiffelStudio, and open that project, compile and execute it inside the debugger for instance.
+````
+
+This demo includes all the official ROC CMS modules, files, and use libsqlite3 as default storage engine. So you should be able to execute it easily. The **standalone** target is configured to listen on port 9090 by default. (Mostly to avoid conflict on other app that my listen on port 80 or 8080).
+
+In the directory <code>site</code> you will find all the expected files that should be in the root directory.
+* config/ : it contains the various configuration files, especially the **cms.ini**.
+* modules/ : files associated with each installed ROC CMS module.
+* scripts/ : common scripts used mainly to initialize SQL databases.
+* themes/ : folder containing the available ROC CMS themes.
+* files/ : folder containing files available from the ROC CMS app.
+* And also demo.ini that contains the settings for the web launcher, (in our case, the standalone Eiffel server), such as port_number.
+
+Now that you know how to compile, execute, and see the related configuration files, let's describes the main notions of the ROC CMS, first from 
+* an admin point of view (dev using ROC CMS to build its site),
+* and then from a developer point of view (in case you want to contribute to ROC CMS).
+
+## Usage
+
+### Main entries
+As a CMS administrator, you will need to setup your CMS application (here the demo example). For this purpose, the main entry points are the CMS_EXECUTION interface, and then the <code>site/</code> files (configuration, themes, templates, ...).
+
+### CMS initialization/Execution
+The `CMS_EXECUTION` interface is deferred, and your CMS application needs to inherit from it and define `setup_storage`, `initial_cms_setup` and `setup_modules`. See for instance `DEMO_CMS_EXECUTION`.
+
+So, the descendant of `CMS_EXECUTION` (`DEMO_CMS_EXECUTION` in the example), is creating the `CMS_SETUP`, declares the available **storage** builders (for persistency), and declares the available **modules**.
+
+#### Persistence/Storage
+Depending on the **configuration**, the CMS engine will instantiate and use a specific **CMS_STORAGE** (the default is based on `Eiffel sqlite3`, otherwise `EiffelStore+MySQL` and `EiffelStore+ODBC` are available). The storage solution is used to implement the persistence layer, and thus store and load CMS data to disk, or database.
+
+The CMS provides, for now, storage based on
+* EiffelStore + MySQL
+* EiffelStore + ODBC (could be used for MySQL, sqlite, SQLserver, ...)
+* Eiffel sqlite3 : that one is the default storage, since it is convenient for testing, but it is recommended to use EiffelStore+MySQL in production CMS site.
+A typical implementation of <code>setup_storage</code> is:
+```eiffel
+	setup_storage (a_setup: CMS_SETUP)
+		do
+			a_setup.storage_drivers.force (create {CMS_STORAGE_SQLITE3_BUILDER}.make, "sqlite3")
+--			a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_ODBC_BUILDER}.make, "odbc")
+		end
+```
+And the CMS decides which storage should be used. It depends on the application configuration. See the **configuration** section.
+
+Those data could be user information (login, email, password, ...), custom values, logs, emails, path aliases, ... and any data modules may need to store (for instance node content, for the `node` module.)
+
+#### Modules
+
+The `setup_module` is used to declare available **modules** (instances of `CMS_MODULE` effective types).
+The modular design provides a simple way to extend or alter the CMS functionalities/behaviors.
+Most of the CMS features are implemented by modules, and each module relies on the core of the CMS core.
+This **core** contains the `CMS_API`, `CMS_USER_API`, and various internal mechanisms such as mailer, logger, ...
+
+Use `setup_module (a_setup: CMS_SETUP)` to customize the `CMS_SETUP` object created by `initial_cms_setup`.
+For your convenience, ROC CMS provides a `CMS_DEFAULT_SETUP` that import configuration from `site/config/cms.ini`
+
+So far, what you need to remember is `CMS_EXECUTION` class and descendants are used to set up the ROC CMS application, for storage, modules, and also how to load configuration.
+
+Note that a module can have 3 states:
+- not installed,
+- installed and enabled,
+- installed and disabled.
+
+At first, to install the modules, open your browser at location `https://hostname:port/admin/install` and click the associated button.
+(Note: for new module addition, you also need to install them, using the same link, in the future, there will be a proper module management interface, in the admin front-end.)
+
+To enable or disable a module, you will need to use the `cms.ini` configuration file, please see the **configuration** section.
+
+Existing modules:
+- **admin**: basic administration pages, to manage modules, roles, permissions, users, caches, ... (note: it is still very basic, and need effort to improve it.)
+- authentication modules based on **auth**:
+    - **basic_auth**: account signing using basic HTTP Authorization solution
+    - **oauth20**: sign using a thirdparty OAuth2.0 account (such as Google, Facebook, github, ...)
+    - **openid**: sign using an OpenID account.
+- **node**: the base of node management, include **Page** content type.
+- **blog**: extends the **node** module with a **blog** content type.
+- **recent_changes**: compute recent changes of CMS (integration with **node** management, and any modules that implement the `CMS_RECENT_CHANGES_HOOK`).
+- **feed_aggregator**: aggregate one or many feeds (rss, atom, ...), and provide associated pages or blocks.
+- **google_search**: provides search facilities using the Google Custom Search API.
+
+### Configuration
+When `CMS_DEFAULT_SETUP` is used, the CMS configuration is loaded from `site/config/cms.ini`.
+That file contains a few sections:
+- **site**: to set the `name`, `email` and the name of the `theme`. (See "Themes" section pour information.)
+- **layout**: the application layout (or environment) can precise the `root-dir`, `themes-dir`, `modules-dir`. If not defined, the values are computed from Current working directory.
+- **mailer**: the CMS can send email notification for various reasons, such as new users, or reset password functionalities, ... In this section, you can use
+    - `smtp` settings to precise an SMTP server (+ port), 
+    - or `sendmail` to use an external script using the sendmail usage,
+    - or just an `output` file such as @stderr, or a path to a file on disk.
+- **modules**: used to enable or disable modules.
+    - `*=on`  -> modules are enabled by default
+    - `*=off` -> modules are disabled by default
+    - Note the default value is `on`
+    - For each module, this can be overwritten with  `module_name=on|off`
+- **blocks**: settings for blocks (See Themes, Blocks sections for more information on the block). A few parameters are available to customize blocks. The general form is `block-name.param=value` (note that "foo.bar" is a value block name.)
+    - `block-name.region`: assign the block `block-name` to a specific region. A block can be assigned to **only one region**.
+    - `block-name.title`: used to overwrite the block title (with <none> , the title is hidden).
+    - `block-name.weight`: used to order blocks in the same region (blocks with lower weight goes first).
+	- `block-name.expiration`: used to provide a basic cache system based on expiration. The value is a number of seconds before the cache expires (-1: never expires, 0: never cache, n: cache expires after `n` seconds).
+    - `block-name.condition`, or `block-name.conditions[]`: include `block-name` only under specific condition(s). The condition can be 
+        - `is_front`: which is True only for the front page, usually at url "/"
+        - `path:foo/bar`, `path:foo/*/bar`: True only for CMS location matching the patterns after "path:"
+        - `<none>`: related block is disabled.
+        - *note: There can be multiple conditions processed as any of the conditions (i.e: "or").*
+    - `block-name.options[varname]: pass a table of options `varname => value` to the related block. This can be used to pass parameters for block builder (for instance, recent_changes modules accept parameters "size" to know how many changes should be included.)
+    - To be able to include a block content into multiple region, it is possible to use aliases feature. For instance `&aliases[new_block]=block-name`, in this case, a `new_block` is declared, and it has same content as `block-name`, on this alias, the parameters `region, condition(s), title, weight` are supported, but not `options[]`.
+- **admin**: various admin related settings such as
+    - `installation_access` which accepts 3 values: "all", "none" or "permission", to precise who has access to the modules installation page; either "all" for anyone, "none" to disable installation of new modules, or "permission" to use the CMS permissions solution to determine if the current user can install a new module.
+    
+Then, the configuration `cms.ini` can also define other parameters, and sections, that may be used by specific modules.
+Note it is also possible to include another ini file with instruction `@include=path-to-file.ini`.
+
+Check the `example/demo/site/cms.ini` for example.
+
+### User management
+The CMS core includes the notion of user, via interface `CMS_USER`, which has an id, a name, a password, ... and profile. Without any module, the CMS does not include any mean to authenticate, but still the CMS has the support for user management, and permissions system for current user. To be able to sign into the CMS, the site should include the module `auth`, and one or many of:
+- `basic_auth`: authentication using the HTTP Authorization header.
+- `oauth20`: being able to sign with an OAuth2.0 account (such as Google, Facebook, ...)
+- `OpenID`: being able to sign with an OpenID account.
+
+Whatever authentication solution is used, when a user is signed-in, there is an instance of `CMS_USER` representing the associated CMS user account.
+
+There is a predefined user `admin` who is the administrator of the CMS, and by definition, this **admin** has all the permissions. It is initialized by default with username `admin` and password `istrator#`.
+
+The access control is role-based permissions system. This means, a user can have one or many *roles*, and each *role* includes a list of *permissions*.
+There are two built-in roles:
+- **anonymous**: when no user is signed in (typically anonymous visitors).
+- **authenticated**: when a user is signed in the CMS.
+With those 2 built-ins roles, and any custom role the admin will create, it is possible to give specific permissions, to a group of users. 
+The CMS core defines a few permissions, and each module can also define their own permissions, for instance: "view any page", "create page", "edit page", "delete page", "clear cache", "install modules", ... (when the administrator is signed-in, go to url `/admin/role/1/edit` to see all the available permissions).
+
+### Modules
+A module is the way to extend the CMS engine.
+First via the inherited `CMS_MODULE` interface that enables a module to:
+- have a custom `install` and `uninstall` procedure by redefining the related routines.
+- add its **routes**  via `setup_router`. (i.e associated url or template of url with a specific request handler).
+- register itself to hooks via `register_hooks`.
+- declare new permissions by redefining `permissions`.
+- provide a specific module api by redefining `module_api`.
+- add its **filters** by redefining `filters`.
+
+Using the `hooks` system, a module can be deeply integrated with the CMS engine, and even alter behaviors (for instance, add link, add css, javascript, ...). See related developer documentation on hooks.
+
+It is simple to create your own modules (check the developer documentation).
+The ROC CMS library provides a few modules for now, for instance: basic_auth, oauth20, openid, node, blog, feed_aggregator, recent_changes, google_search, ... and others (the list keeps growing...).
+
+**Reminder**: to include a module to your CMS site, you need to 
+- include the associated .ecf file in your CMS site .ecf file.
+- and also declare them in your descendant of CMS_EXECUTION.
+- copy the eventual resources, configuration, ... files in the corresponding `site`.
+Note: a tool **roc** is under development to ease such operations, for now it only copies needed files from module to site location. In the future, it should also update .ecf files, associated CMS_EXECUTION effective class.
+
+### Themes
+When talking about CMS, a major topic is how a request is rendered in a web browser. Here comes the notion of **theme** which is a collection of templates, accepting various values as input (including the content of the blocks), and renders as an html5 page. It also includes various assets such as css, javascript, icons, images, ...
+The ROC CMS theming is inspired by Drupal, with the notion of **region** and **block**.
+
+Note: for now, there is no simple "theme" module or similar, and the common way to start your CMS site is to copy an existing project such as the one available with the demo example (i.e: copying the source code, but also the `site` folder).
+
+Currently the default theme  of the demo example `SMARTY_CMS_THEME` is based on Eiffel **smarty** template library (Check [smarty doc](https://svn.eiffel.com/eiffelstudio/trunk/Src/contrib/library/text/template/smarty/README.md) for syntax and functionalities).
+
+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.
+
+```
+		+----------------------------------------------------------+
+		|                        Page_top                          |
+		+----------------------------------------------------------+
+		|                         Header                           |
+		+---------------+-------------------------+----------------+
+		|               |      Highlighted        |                |
+		| Sidebar_first +-------------------------+ Sidebar_second |
+		|               |          Help           |                |
+		|               +-------------------------+                |
+		|               |                         |                |
+		|               |         Content         |                |
+		|               |                         |                |
+		+---------------+-------------------------+----------------+
+		|                         Footer                           |
+		+----------------------------------------------------------+
+		|                      Page_bottom                         |
+		+----------------------------------------------------------+
+```
+
+The regions available for a theme, are defined in a configuration file `theme.info` located in the theme directory. For example:
+```
+name=default_theme
+engine=smarty
+version=0.1
+regions[page_top] = Top
+regions[header] = Header
+regions[content] = Content
+regions[highlighted] = Highlighted
+regions[help] = Help
+regions[footer] = Footer
+regions[sidebar_first] = first sidebar
+regions[sidebar_second] = second sidebar
+regions[page_bottom] = Bottom
+```
+Note: the value for each region is the human readable region name.
+
+Note the regions may be disposed with other layout (two sidebars on the left, or right, ... and so on), responsive design or not, and so on. But on the CMS side, a *block* can be inserted into a *region*, and depending if the region is included in the theme, the related block content will be displayed or not.
+To sort *block* inside a region, the CMS is using the `weight` property (that can be set via code, and/or overridden via configuration, i.e: `cms.ini`).
+This is how a site can support many themes, using the region as content holders, and theme for the layout and style.
+
+Internally the block contents are stored in the values associated with each region.
+The theme also has access to specific `values` such as
+- `site_url`: the absolute url of the CMS website.
+- `host`: the host name.
+- `is_https`: True if the connection is using https://
+- `user`: contains the username of the signed user, if any.
+- `site_title`: site title.
+- `page_title`: per page title.
+- and also `page: CMS_HTML_PAGE` which represents the CMS page to render with the theme.
+    - `page` provides values via expression, such as `$page.type`, `$page.is_front`, `$page.is_https`, `$page.title`, ...
+    - and also a smart expression for region via `$page.region_xyz` for region `xyz` if any, ... (note the region are also available with expression like `$region_xyz` or `$page.region_xyz` ...)
+
+==Note for developers: internally, the deferred class `CMS_RESPONSE` provides an abstraction to render the response for the request using the **theme**, in fact, the theme is controlled by the CMS_RESPONSE implementation (to set value, build expected theme, and finally render as html).==
+
+### Blocks
+As previously said, a region holds smaller piece of content called blocks.
+Blocks hold chunks of content, like the user login form, navigation menu, information for the footer, or anything provided by each module.
+For instance the `feed_aggregator` module provides a block to display the latest elements of a aggregated feed.
+
+Currently there are different kind of `CMS_BLOCK`:
+- `CMS_CONTENT_BLOCK`: it holds a simple text to render as it is on the page.
+- `CMS_MENU_BLOCK`: it holds a `CMS_MENU` as a collection of `CMS_LINK` generally used to hold a menu, or set of links such as navigation or management menus.
+- `CMS_SMARTY_TEMPLATE_BLOCK`: it holds a simple text to render as it is in the page.
+
+Internally, there are two other kinds of block:
+- `CMS_ALIAS_BLOCK`: being the alias of another block, but with specific properties.
+- `CMS_CACHE_BLOCK`: there is a simple cache solution for blocks, based on expiration. See the configuration section to know how to define the expiration for a block.
+
+For now, creating a block is only possible via block, an evolution of ROC CMS should allow the administrator to add new block without coding.
+
+### Persistence
+The persistence or storage layer is used by the CMS to store custom values, path aliases, logs, emails, user information, but it is also used by module (unless a module wants to use its own persistence solution, disk, cloud, ...).
+
+Currently, there are only SQL based implementations of that `CMS_STORAGE`, but nothing prevents to implement it with other solutions (plain text file, NoSQL db, ...).
+The current implementation are using either:
+- EiffelStore + MySQL: recommended for production, however Eiffel MySQL requires to configure your environment by setting, for instance MYSQL variable on Windows, and MYSQLINC on Linux.
+- EiffelStore + ODBC: via ODBC, there is a large range of available database (MySQL, SQLite, SQLserver, ...), but it requires to set up your environment (for instance install sqliteODBC driver to use SQLite database).
+- Eiffel sqlite3 wrapper: it is very convenient for development, but maybe not recommended for production websites. It does not require any environment setup, so this is a simple solution to build tests for instance.
+
+In practice, how to use a storage or another?
+The project needs to include the expected storage, the following instructions explains how to include sqlite3, EiffelStore+ODBC and EiffelStore+MYSQL storage.
+1. First the associated .ecf file need to be included in your project file (.ecf)
+For instance
+```xml
+<library name="persistence_sqlite3" location="$ISE_LIBRARY\unstable\library\web\cms\library\persistence\sqlite3\sqlite3-safe.ecf"/>
+<library name="persistence_store_odbc" location="$ISE_LIBRARY\unstable\library\web\cms\library\persistence\store_odbc\store_odbc-safe.ecf"/>
+<library name="persistence_store_mysql" location="$ISE_LIBRARY\unstable\library\web\cms\library\persistence\store_mysql\store_mysql-safe.ecf"/>
+```
+2. Then in the descendant of `CMS_EXECUTION`, in the demo `DEMO_CMS_EXECUTION`, see the code of `setup_storage`:
+```eiffel
+setup_storage (a_setup: CMS_SETUP)
+	do
+		a_setup.storage_drivers.force (create {CMS_STORAGE_SQLITE3_BUILDER}.make, "sqlite3")
+		a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_MYSQL_BUILDER}.make, "mysql")
+		a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_ODBC_BUILDER}.make, "odbc")
+	end
+```
+
+3. And finally, in the configuration file `site/config/demo.json` (in fact, the executable name + ".json"), define the driver and environment of the datasource. For instance the following code defines **sqlite3** as default CMS storage, and environment *sqlite3* that defines the path of SQLite database as "site/database.sqlite3". Note the way to declare sqlite with ODBC, mysql with ODBC, or mysql directly with EiffelStore.
+```json
+{
+	"database": {
+		"datasource": {
+			"driver": "sqlite3",
+			"environment": "sqlite3",
+		},
+		"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;"
+			}
+		}
+	}
+}
+```
+To use EiffelStore+MySQL, just change the "driver" to be "mysql" and "environment" to "mysql". The connection string for server database defines the credentials with "Uid" and "Pwd".
+
+### How to run the CMS site?
+As any Eiffel Web application (EWF), it can be executed as 
+- **standalone**: using Eiffel standalone httpd server included in the "standalone" connector, and then no setup is needed.
+- **CGI** or **libFCGI** server: using, for instance, Apache2. Please refer to the Eiffel Web Framework documentation.
+
+### Conclusion
+At this point, you know enough to build and administrate a ROC CMS site.
+However, for a real site, it is likely that you will need to build your own modules, you will learn how doing that in the Developer Documentation.
+
+***
+## Developper Documentation
+
+This diagram shows the main interfaces, they will be described in this documentation, but for now, it introduces those class names.
+
+
+![Diagram](img_diagram.png)
+
+
+### CMS APIs
+An instance of CMS_API is available either via argument, or via attribute / function of various CMS components.
+It provides routine specific to the ROC CMS engine (access to setup, modules, logs, custom values, ...).
+
+### CMS Hooks
+Hooks is a mechanism which provides a way for modules to interact with each other and extending blocks of the current CMS.
+
+- [CMS_HOOK](../library/src/hooks/cms_hook.e): deferred class CMS_HOOK is a marker interface for CMS Hook
+- [CMS_HOOK_AUTO_REGISTER](../library/src/hooks/cms_hook_auto_register.e): when inheriting from this deferred class, the declared hooks are automatically registered (note only the CMS core hooks are supported, as opposed to hook a module may propose). Otherwise, each descendant has to register itself to the associated hook manager.
+- [CMS_HOOK_BLOCK](../library/src/hooks/cms_hook_block.e): it provides a way to declare and build blocks.
+- [CMS_HOOK_FORM_ALTER](../library/src/hooks/cms_hook_form_alter.e): it provides a way to alter a web form `CMS_FORM`.
+- [CMS_HOOK_MENU_ALTER](../library/src/hooks/cms_hook_menu_alter.e): it provides a way to alter a menu, and thus add or remove a link. This is how a module can add a link into a specific `CMS_MENU`.
+- [CMS_HOOK_MENU_SYSTEM_ALTER](../library/src/hooks/cms_hook_menu_system_alter.e): similar to CMS_HOOK_MENU_ALTER, but on built-in menu, such as management, navigation menus, and other.
+- [CMS_HOOK_VALUE_TABLE_ALTER](../library/src/hooks/cms_hook_value_table_alter.e): it provides a way to alter the values table for a response (i.e: inserting custom values, or even override existing values).
+- [CMS_HOOK_EXPORT](../library/src/hooks/cms_hook_export.e): it provides a simple export solution for each module. Typically used to archive data associated with a module, for instance for backup purpose. In the future, a `CMS_HOOK_IMPORT` should also be available, and it would allow importing data exported by `CMS_HOOK_EXPORT`.
+- and for more hooks ... please check descendants of `CMS_HOOK`.
+
+### Custom Module
+How to build a new module?
+A module is usually developed as an Eiffel library, and provide one or many implementations of `CMS_MODULE`.
+It has to set or implement:
+- **name**: a unique name identifying the module
+- **description**: a human text to describe the purpose of the module, it will mainly be used by the administration front-end.
+- **package**: put the current module into a package, mainly for admin front-end.
+- **version**: version information
+- **dependencies**: defines dependencies on other modules.
+- **permissions**: defines permissions used by the modules (mainly for admin front-end)
+- **setup_router**: associate routes with request handlers (declare various url or url template and associated request handler).
+- **filters**: similar to routers setup, but for WSF Filters (See EWF documentation for more details).
+- **register_hooks**: register current module with various hooks if needed.
+
+A module can also redefine `install` and `uninstall`. This could be used during installation to create new database tables, or anything needed by the module, or clean similar resources when being uninstalled.
+
+In addition, a module can also implement `module_api: detachable CMS_MODULE_API` in order to be integrated easily with other modules (see for instance the CMS_NODE_API defined in **node** module).
+
+Please have a look at the [tutorial](tutorial.md) page.
+
+## References
+For the interface references, please have a look at the [ROC CMS source code](https://github.com/EiffelWebFramework/ROC).
+
+***
+*(last modified: Nov/17/2015 by Jocelyn.)*

examples/demo/demo-safe.ecf

@@ -1,58 +1,82 @@
 <?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-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-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>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</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 debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
+			<debug name="dbglog" enabled="true"/>
 		</option>
-		<setting name="concurrency" value="none"/>
+		<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_blog_module" location="..\..\modules\blog\cms_blog_module-safe.ecf" readonly="false"/>
 		<library name="cms_demo_module" location="modules\demo\cms_demo_module-safe.ecf" readonly="false"/>
+		<library name="cms_email_service" location="..\..\library\email\email-safe.ecf" readonly="false"/>
+		<library name="cms_feed_aggregator_module" location="..\..\modules\feed_aggregator\feed_aggregator-safe.ecf" readonly="false"/>
+		<library name="cms_file_uploader" location="..\..\modules\file_upload\file_uploader.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="persistence_mysql" location="..\..\library\persistence\mysql\persistence_mysql-safe.ecf" readonly="false"/>
-		-->
-		<library name="persistence_sqlite" location="..\..\library\persistence\sqlite\persistence_sqlite-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="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth-safe.ecf" readonly="false"/>
+		<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy-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="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"/>
-		<setting name="concurrency" value="none"/>
-		<library name="default_nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\nino-safe.ecf"/>
-		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+	<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,3 @@
 port=9090
+#port=12345
 #verbose=true

examples/demo/install_modules.bat

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

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

@@ -10,15 +10,15 @@ note
 	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_DEFAULT_SERVICE_LAUNCHER
+			launcher: WSF_DEFAULT_SERVICE_LAUNCHER [G]
 		do
-			create {WSF_DEFAULT_SERVICE_LAUNCHER} launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end
 
 end

examples/demo/modules/blog/cms_blog_module.e

@@ -1,120 +0,0 @@
-note
-	description: "Summary description for {CMS_BLOG_MODULE}."
-	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
-	revision: "$Revision: 96616 $"
-
-class
-	CMS_BLOG_MODULE
-
-inherit
-	CMS_MODULE
-		redefine
-			register_hooks,
-			initialize,
-			is_installed,
-			install
-		end
-
-	CMS_HOOK_MENU_SYSTEM_ALTER
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make
-		do
-			name := "Blog demo module"
-			version := "1.0"
-			description := "Service to demonstrate new node for blog"
-			package := "demo"
-		end
-
-feature {CMS_API} -- Module Initialization			
-
-	initialize (api: CMS_API)
-			-- <Precursor>
-		local
-			ct: CMS_BLOG_NODE_TYPE
-		do
-			Precursor (api)
-
-			if attached {CMS_NODE_API} api.module_api ({NODE_MODULE}) as l_node_api then
-				create ct
-				l_node_api.add_content_type (ct)
-				l_node_api.add_content_type_webform_manager (create {CMS_BLOG_NODE_TYPE_WEBFORM_MANAGER}.make (ct))
-					-- Add support for CMS_BLOG, which requires a storage extension to store the optional "tags" value
-					-- For now, we only have extension based on SQL statement.
-				if attached {CMS_NODE_STORAGE_SQL} l_node_api.node_storage as l_sql_node_storage then
-					l_sql_node_storage.register_node_storage_extension (create {CMS_NODE_STORAGE_SQL_BLOG_EXTENSION}.make (l_sql_node_storage))
-				end
-			end
-		end
-
-feature {CMS_API} -- Module management
-
-	is_installed (api: CMS_API): BOOLEAN
-			-- Is Current module installed?
-		do
-			Result := attached api.storage.custom_value ("is_initialized", "module-" + name) as v and then v.is_case_insensitive_equal_general ("yes")
-		end
-
-	install (api: CMS_API)
-		local
-			sql: STRING
-		do
-				-- Schema
-			if attached {CMS_STORAGE_SQL_I} api.storage as l_sql_storage then
-				if not l_sql_storage.sql_table_exists ("blog_post_nodes") then
-					sql := "[
-CREATE TABLE "blog_post_nodes"(
-  "nid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("nid">=0),
-  "revision" INTEGER,
-  "tags" VARCHAR(255)
-);
-					]"
-					l_sql_storage.sql_execute_script (sql)
-					if l_sql_storage.has_error then
-						api.logger.put_error ("Could not initialize database for blog module", generating_type)
-					end
-				end
-				api.storage.set_custom_value ("is_initialized", "module-" + name, "yes")
-			end
-		end
-
-feature -- Access: router
-
-	router (a_api: CMS_API): WSF_ROUTER
-			-- Node router.
-		do
-			create Result.make (1)
-			Result.handle_with_request_methods ("/blogs/", create {WSF_URI_AGENT_HANDLER}.make (agent handle_blogs (?,?, a_api)), Result.methods_get)
-		end
-
-feature -- Hooks
-
-	register_hooks (a_response: CMS_RESPONSE)
-		do
-			a_response.subscribe_to_menu_system_alter_hook (Current)
-		end
-
-	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
-		local
-			lnk: CMS_LOCAL_LINK
-		do
-			create lnk.make ("Blogs", "/blogs/")
-			a_menu_system.primary_menu.extend (lnk)
-		end
-
-feature -- Handler
-
-	handle_blogs (req: WSF_REQUEST; res: WSF_RESPONSE; a_api: CMS_API)
-		local
-			r: NOT_IMPLEMENTED_ERROR_CMS_RESPONSE
-		do
-			create r.make (req, res, a_api)
-			r.set_main_content ("Blog module is in development ...")
-			r.execute
-		end
-
-end

examples/demo/modules/blog/cms_node_storage_sql_blog_extension.e

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

examples/demo/modules/demo/cms_demo_module.e

@@ -10,9 +10,8 @@ class
 inherit
 	CMS_MODULE
 		redefine
-			register_hooks,
+			setup_hooks,
 			initialize,
-			is_installed,
 			install
 		end
 
@@ -27,12 +26,15 @@ 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)
@@ -49,12 +51,6 @@ feature {CMS_API} -- Module Initialization
 
 feature {CMS_API} -- Module management
 
-	is_installed (api: CMS_API): BOOLEAN
-			-- Is Current module installed?
-		do
-			Result := attached api.storage.custom_value ("is_initialized", "module-" + name) as v and then v.is_case_insensitive_equal_general ("yes")
-		end
-
 	install (api: CMS_API)
 		local
 			sql: STRING
@@ -63,42 +59,41 @@ feature {CMS_API} -- Module management
 			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 AUTOINCREMENT NOT NULL CHECK("demo_id">=0),
-  "name" VARCHAR(100) NOT NULL,
-  "value" TEXT
+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)
+					l_sql_storage.sql_execute_script (sql, Void)
 					if l_sql_storage.has_error then
 						api.logger.put_error ("Could not initialize database for demo module", generating_type)
 					end
 				end
-				api.storage.set_custom_value ("is_initialized", "module-" + name, "yes")
+				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)
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
 		do
-			a_response.subscribe_to_menu_system_alter_hook (Current)
-			a_response.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_hooks.subscribe_to_block_hook (Current)
 		end
 
 	block_list: ITERABLE [like {CMS_BLOCK}.name]
 		do
-			Result := <<"demo-info">>
+			Result := <<"?demo-info">>
 		end
 
 	get_block_view (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
@@ -108,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")
@@ -126,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
 
@@ -138,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/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,11 +1,30 @@
 [layout]
 root-dir=site/www
-themes-dir=site/themes
+#themes-dir=site/themes
+#modules-dir=site/modules
 
 [site]
 name=Eiffel CMS
 email=your@email.com
 theme=bootstrap
 
-[misc]
-smtp=localhost
+[mailer]
+#smtp=localhost:25
+#sendmail=/usr/bin/sendmail
+output=@stderr
+
+[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

@@ -1,15 +1,23 @@
 {
 	"database": {
 		"datasource": {
-			"driver": "sqlite",
-			"environment": "sqlite"
+			"driver": "sqlite3",
+			"environment": "sqlite3",
+			"-driver": "odbc",
+			"-environment": "odbc-sqlite"
 		},
 		"environments": {
-			"sqlite": {
+			"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;"
 			},
-			"test": {
-                "connection_string":"Server=localhost;Port=3306;Database=cms_dev;Uid=root;Pwd=;"
+			"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=;"
@@ -23,7 +31,8 @@
 		"server": "localhost"
 		},
 	"logger": { 
-			"level":"debug",
+			"level":"error",
+			"type":"stderr",
 			"backup_count":"4"
 		},
 	"server": { 

examples/demo/site/files/.cache/feed_aggregator/feed__forum__15_True

@@ -0,0 +1,79 @@
+<!-- Updated: 12/04/2015 12:30:04.000 AM --><div class="feed">
+<ul>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/-jtyp4iengE">Re: [eiffel-users] Precompile on Linux</a>
+<div class="description">Hi, I just check if the .ecf files are in /usr/share/eiffelstudio-MM.mm/precomp/spec/unix and they are. When I look in the "Locations of configuration files" dialog in EiffelStudio, I see this: # Search paths for precompiled libraries are specified in the configuration file: # /usr/share/ei</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/-jtyp4iengE">RE: [eiffel-users] Precompile on Linux</a>
+<div class="description">This is a bug in the Unix layout then. Do you mind submitting a problem report? Thanks, Manu *From:* eiffel...@googlegroups.com [mailto:eiffel...@googlegroups.com] *On Behalf Of *Louis *Sent:* Tuesday, December 08, 2015 23:02 *To:* eiffel...@googlegroups.com *Subject:* Re: [eiffel-users]</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/ddSxnBrvhUg">Re: [eiffel-users] Re: Version of EiffelBase2 shipped with different EiffelStudio versions</a>
+<div class="description">Not really. What I need to know is when I run tests on the performance and suitability for use of EiffelBase2, do I have to repeat them with all of ES versions 15.01, 15.08 and 15.11? On 8 December 2015 at 13:52, Jocelyn Fiat <jf...@eiffelsolution.com> wrote: > As the author of EiffelBase2 does</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/ddSxnBrvhUg">RE: [eiffel-users] Re: Version of EiffelBase2 shipped with different EiffelStudio versions</a>
+<div class="description">In this particular case, it is sufficient to take any version of EiffelStudio and the EiffelBase2 version that comes with it to evaluate EiffelBase2 as the library has not really changed much in the past few years. In the general case, you should stick to one version of EiffelStudio and</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/ddSxnBrvhUg">Re: [eiffel-users] Re: Version of EiffelBase2 shipped with different EiffelStudio versions</a>
+<div class="description">But this doesn't answer my question. Which version of EiffelBase2 ships with which version of EiffelStudio? On 8 December 2015 at 13:05, Jocelyn Fiat <jf...@eiffel.com> wrote: > Hi all, > > Usually the version uploaded to iron server comes from the associated > branch > for instance > > - 15.01</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/ddSxnBrvhUg">Re: [eiffel-users] Re: Version of EiffelBase2 shipped with different EiffelStudio versions</a>
+<div class="description">Hi all, Usually the version uploaded to iron server comes from the associated branch for instance - 15.01 has almost same content as https://svn.eiffel.com/eiffelstudio/branches/Eiffel_15.01/ - ... I said "almost" because, the ecf are modified to use iron references rather than $ISE_LIBRARY/...</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/ddSxnBrvhUg">Re: [eiffel-users] Re: Version of EiffelBase2 shipped with different EiffelStudio versions</a>
+<div class="description">As the author of EiffelBase2 does not define any specific versions, I would say - EiffelStudio 14.05 ships EiffelBase2 version 14.05, and associated source code can be found at https://svn.eiffel.com/eiffelstudio/branches/Eiffel_14.05/Src/unstable/library/base2/ (last changed revision: 94979)</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/-jtyp4iengE">RE: [eiffel-users] Precompile on Linux</a>
+<div class="description">We currently only ship precompiled libraries for EiffelBase, WEL on Windows and EiffelVision2. The configuration files for those precompiled library are in a read-only folder of the EiffelStudio installation. The first time EiffelStudio tries to access $ISE_PRECOMP (which if not set resolves to</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/ddSxnBrvhUg">Re: [eiffel-users] Re: Version of EiffelBase2 shipped with different EiffelStudio versions</a>
+<div class="description">Come on - someone must know - the person who loaded it to iron, e.g. On 7 December 2015 at 12:03, Colin Adams <colinpa...@gmail.com> wrote: > I know what EiffelBase2 is. I was asking about the version in the iron > repository for each version of EiffelStudio. > > On 7 December 2015 at 11:59,</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/Vwsw67vq6ss">Re: Explaining high-level programming</a>
+<div class="description">A very interesting article Ian. I learned more by reading it. However, the title leads me to ask: Who (precisely) is the target audience to whom the plea is being made? From my point of view, I cannot see this audience, so I am asking for your view to help me identify the audience. Thanks,</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/Vwsw67vq6ss">Explaining high-level programming</a>
+<div class="description">On 4 Dec 2015, at 00:24, Bertrand Meyer <Bertran...@inf.ethz.ch> wrote: 3. The community should help spread Eiffel. The last point is particularly important. The user community needs to grow; if it moves up to the next level then we at Eiffel Software will be able to perform many more</div>
+</li>
+<li>
+<div class="date"> Dec 08</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/-jtyp4iengE">Precompile on Linux</a>
+<div class="description">Recently I installed EiffelStudio 15.08 on my Xubuntu laptop, with an assist from Louis M who showed me how to install it using apt-get. In the past, after extracting everything in the .tar.bz archive, I would run the supplied precompile script to produce the precompiled libraries I needed. The</div>
+</li>
+<li>
+<div class="date"> Dec 07</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/4BS09rbY6UY">RE: [eiffel-users] Maximum capacity of a TUPLE</a>
+<div class="description">If you are looking at TUPLE with more than 20 entries, I think I would consider using LIST or ARRAY for storing data. The issue is not so much on the TUPLE capacity (which has the same limit as a SPECIAL object) but on the number of class types any type declaration. This is a limit for all</div>
+</li>
+<li>
+<div class="date"> Dec 07</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/YgyWglEEN3A">Re: [eiffel-users] Does {MEMORY}.collection_off reset the progress of the garbage collector?</a>
+<div class="description">Thanks, that was what I was looking for.</div>
+</li>
+<li>
+<div class="date"> Dec 07</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/4BS09rbY6UY">Maximum capacity of a TUPLE</a>
+<div class="description">The header comment to {TUPLE}.plus says the result can be Void if the result exceeds the capacity of a TUPLE. What is this maximum capacity? (without knowing it is is impossible to prove the result of such a concatenation will be attached).</div>
+</li>
+<liv class="nav"><a href="/feed_aggregation/forum">See more ...</a></li>
+</ul>

examples/demo/site/files/.cache/feed_aggregator/feed__forum__5_True

@@ -0,0 +1,29 @@
+<!-- Updated: 01/10/2016 12:50:45.000 PM --><div class="feed">
+<ul>
+<li>
+<div class="date"> Jan 11</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/mCVwJQ21QBA">SCOOP &amp; Contracts</a>
+<div class="description">Recently, I was reading a research paper from a Canadian university talking about applying something like SCOOP to Java. Because Java does not have Design-by-Contract, they wanted to build in a new keyword (like "require") called "await". From the writers point of view, the require contract was</div>
+</li>
+<li>
+<div class="date"> Jan 11</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/7HR-z0DVklU">General Question: Object Persistence Mechanism</a>
+<div class="description">NEED: An innate, compiler-known, object persistence mechanism, whereby objects are tracked for version (at design-time), version-updating (at run-time comparative between memory object and persisted object), and attribute change auto-persist. What would be nice is something akin to the Design-by</div>
+</li>
+<li>
+<div class="date"> Jan 11</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/BouQ6JU-fQ4">RE: [eiffel-users] Solving OOSC 2/E E7.3</a>
+<div class="description">In addition to Colin's reply, "is" is no longer used, as it is unnecessary. The functions sqrt and atan are in classes SINGLE_MATH or DOUBLE_MATH which are interfaces to the C library functions defined in math.h. Peter Horan -----Original Message----- From: eiffel...@googlegroups.com</div>
+</li>
+<li>
+<div class="date"> Jan 11</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/BouQ6JU-fQ4">Re: [eiffel-users] Solving OOSC 2/E E7.3</a>
+<div class="description">The indexing clause has been replaced by the note clause (just a change of keyword). You might try changing the configuration to use transitional syntax instead of standard syntax. On 11 January 2016 at 09:46, <sagyo1...@gmail.com> wrote: > Hi, everyone. > > I'm reading the japanese version of</div>
+</li>
+<li>
+<div class="date"> Jan 11</div>
+<a href="https://groups.google.com/d/topic/eiffel-users/BouQ6JU-fQ4">Solving OOSC 2/E E7.3</a>
+<div class="description">Hi, everyone. I'm reading the japanese version of Object-Oriented Software Construction 2/E. I tried to build the code of "7.5.4 class" in EiffelStudio 15.11 and it raises some build errors. My question is: 1) Is the "indexing description:" description disposed? 2) Is the "function: syntax</div>
+</li>
+<liv class="nav"><a href="/feed_aggregation/forum">See more ...</a></li>
+</ul>

examples/demo/site/files/.cache/feed_aggregator/feed__news__0_True

@@ -0,0 +1,138 @@
+<!-- Updated: 01/10/2016 12:50:45.000 PM --><div class="feed">
+<ul>
+<li>
+<div class="date">2015, Nov 17</div>
+<a href="https://room.eiffel.com/blog/colinadams/some_lazy_data_structures_implemented_in_eiffel_part_i_iterating_the_calkinwilf_tree">Some lazy data structures implemented in Eiffel - Part I - Iterating the Calkin-Wilf tree</a>
+<div class="description"><p>This is the first part of a series in which I intend to make some explorations of lazy, infinite data structures in Eiffel. If you want to compile the code in these articles, you will need EiffelStudio 15.11 or later.
+</p><p>In this first article, I am going to iterate an infinite data structure - the strictly-positive rational numbers, represented by an infinite tree - <a href="https://en.wikipedia.org/wiki/Calkin%E2%80%93Wilf_tree" class="external text" title="https://en.wikipedia.org/wiki/Calkin%E2%80%93Wilf_tree">The Calkin-Wilf tree</a>. The easiest way to follow the code is to view it directly on <a href="https://github.com/colin-adams/lazy_eiffel" class="external text" title="https://github.com/colin-adams/lazy_eiffel">GitHub</a>. An alternative is to checkout the repository and compile it in EiffelStudio. To do the latter (instructions are for Linux from a bash terminal, but should be similar for other O/S I think):
+</p>
+<ol><li> git clone git@github.com:colin-adams/lazy_eiffel.git
+</li><li> git checkout V1
+</li><li> cd lazy_eiffel/examples/calkin_wilf/src
+</li><li> estudio calkin_wilf.ecf &amp;
+</li><li> Press OK
+</li></ol>
+<p>The first class worth looking at briefly is <span class="geshifilter"><code class="eiffel geshifilter-eiffel">LAZY_BINARY_TREE</code></span>. This represents a single node in an infinite binary tree, together with a link to it's parent, and two <span class="geshifilter"><code class="eiffel geshifilter-eiffel"><a href="http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+function&amp;btnI=I%27m+Feeling+Lucky"><span style="color: #800000">FUNCTION</span></a></code></span>s to find the left and right children. Incidentally, you may be surprised at the syntax used for declaring these <span class="geshifilter"><code class="eiffel geshifilter-eiffel"><a href="http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+function&amp;btnI=I%27m+Feeling+Lucky"><span style="color: #800000">FUNCTION</span></a></code></span>s unless you have already read <a href="https://groups.google.com/forum/#!topic/eiffel-users/poTM7aUIa4I" class="external text" title="https://groups.google.com/forum/#!topic/eiffel-users/poTM7aUIa4I">this thread</a>. This is why 15.11 or later is needed to compile the code. I think it's worth showing one of those agents here:
+</p><p><div class="geshifilter"><div class="eiffel geshifilter-eiffel" style="font-family:monospace;">&nbsp; &nbsp; &nbsp; &nbsp; left_child_function<span style="color: #600000;">:</span> <a href="http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+function&amp;btnI=I%27m+Feeling+Lucky"><span style="color: #800000">FUNCTION</span></a> <span style="color: #FF0000;">&#91;</span>LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>G<span style="color: #FF0000;">&#93;</span>, LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>G<span style="color: #FF0000;">&#93;</span><span style="color: #FF0000;">&#93;</span></div></div>
+</p><p>This syntax is starting to look lightweight. Looking quite comparable to Haskell, for example (<span class="geshifilter"><code class="text geshifilter-text">leftChildFunction :: LazyBinaryTree a -&gt; LazyBinaryTree a</code></span>), and none of that horrible camelCase.
+</p><p>Then let's look at the <span class="geshifilter"><code class="eiffel geshifilter-eiffel">CALKIN_WILF</code></span> tree itself. The core of the class is a root node, two functions to navigate from any node in the tree to the left and right children (or to lazily build the tree structure, depending on how you want to look at it), and a creation procedure to initialize root to 1/1.
+</p><p><div class="geshifilter"><div class="eiffel geshifilter-eiffel" style="font-family:monospace;"><span style="color: #0600FF; font-weight: bold;">feature</span> <span style="color: #FF0000;">&#123;</span><a href="http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+none&amp;btnI=I%27m+Feeling+Lucky"><span style="color: #800000">NONE</span></a><span style="color: #FF0000;">&#125;</span> <span style="color: #008000; font-style: italic;">-- Initialization</span><br />
+<br />
+&nbsp; &nbsp; &nbsp; &nbsp; make<br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #008000; font-style: italic;">-- Create `root'.</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #0600FF; font-weight: bold;">do</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; left_child_agent<6E><span style="color: #600000;">:=</span> <span style="color: #0600FF; font-weight: bold;">agent</span> left_child<br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; right_child_agent<6E><span style="color: #600000;">:=</span> <span style="color: #0600FF; font-weight: bold;">agent</span> right_child<br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #0600FF; font-weight: bold;">create</span> <span style="color: #603000;">root</span>.<span style="color: #000060;">make</span> <span style="color: #FF0000;">&#40;</span><span style="color: #FF0000;">&#40;</span><span style="color: #0600FF; font-weight: bold;">create</span> <span style="color: #FF0000;">&#123;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#125;</span>.<span style="color: #000060;">make</span> <span style="color: #FF0000;">&#40;</span><span style="color: #FF0000;">1</span>, <span style="color: #FF0000;">1</span><span style="color: #FF0000;">&#41;</span><span style="color: #FF0000;">&#41;</span>, <span style="color: #800080;">Void</span>, left_child_agent, right_child_agent<span style="color: #FF0000;">&#41;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; start<br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #0600FF; font-weight: bold;">end</span><br />
+<br />
+<span style="color: #0600FF; font-weight: bold;">feature</span> <span style="color: #008000; font-style: italic;">-- Access</span><br />
+<br />
+&nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #603000;">root</span><span style="color: #600000;">:</span> LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #008000; font-style: italic;">-- 1/1</span><br />
+<br />
+&nbsp; &nbsp; &nbsp; &nbsp; left_child_agent<span style="color: #600000;">:</span> <a href="http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+function&amp;btnI=I%27m+Feeling+Lucky"><span style="color: #800000">FUNCTION</span></a> <span style="color: #FF0000;">&#91;</span>LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span>, LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span><span style="color: #FF0000;">&#93;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #008000; font-style: italic;">-- Function from a node to its left child</span><br />
+<br />
+&nbsp; &nbsp; &nbsp; &nbsp; right_child_agent<span style="color: #600000;">:</span> <a href="http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+function&amp;btnI=I%27m+Feeling+Lucky"><span style="color: #800000">FUNCTION</span></a> <span style="color: #FF0000;">&#91;</span>LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span>, LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span><span style="color: #FF0000;">&#93;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #008000; font-style: italic;">-- Function from a node to its left child</span><br />
+<br />
+&nbsp; &nbsp; &nbsp; &nbsp; left_child <span style="color: #FF0000;">&#40;</span>a_node<span style="color: #600000;">:</span> LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span><span style="color: #FF0000;">&#41;</span><span style="color: #600000;">:</span> LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #008000; font-style: italic;">-- Left child of `a_node'</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #0600FF; font-weight: bold;">do</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #0600FF; font-weight: bold;">create</span> <span style="color: #800080;">Result</span>.<span style="color: #000060;">make</span> <span style="color: #FF0000;">&#40;</span><span style="color: #0600FF; font-weight: bold;">create</span> <span style="color: #FF0000;">&#123;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#125;</span>.<span style="color: #000060;">make</span> <span style="color: #FF0000;">&#40;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; a_node.<span style="color: #000060;">item</span>.<span style="color: #000060;">numerator</span>, a_node.<span style="color: #000060;">item</span>.<span style="color: #000060;">numerator</span> <span style="color: #600000;">+</span> a_node.<span style="color: #000060;">item</span>.<span style="color: #000060;">denominator</span><span style="color: #FF0000;">&#41;</span>,<br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; a_node, left_child_agent, right_child_agent<span style="color: #FF0000;">&#41;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #0600FF; font-weight: bold;">end</span><br />
+<br />
+&nbsp; &nbsp; &nbsp; &nbsp; right_child <span style="color: #FF0000;">&#40;</span>a_node<span style="color: #600000;">:</span> LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span><span style="color: #FF0000;">&#41;</span><span style="color: #600000;">:</span> LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #008000; font-style: italic;">-- Right child of `a_node'</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #0600FF; font-weight: bold;">do</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #0600FF; font-weight: bold;">create</span> <span style="color: #800080;">Result</span>.<span style="color: #000060;">make</span> <span style="color: #FF0000;">&#40;</span><span style="color: #0600FF; font-weight: bold;">create</span> <span style="color: #FF0000;">&#123;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#125;</span>.<span style="color: #000060;">make</span> <span style="color: #FF0000;">&#40;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; a_node.<span style="color: #000060;">item</span>.<span style="color: #000060;">numerator</span> <span style="color: #600000;">+</span> a_node.<span style="color: #000060;">item</span>.<span style="color: #000060;">denominator</span>, a_node.<span style="color: #000060;">item</span>.<span style="color: #000060;">denominator</span><span style="color: #FF0000;">&#41;</span>,<br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; a_node, left_child_agent, right_child_agent<span style="color: #FF0000;">&#41;</span><br />
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style="color: #0600FF; font-weight: bold;">end</span></div></div>
+</p><p>However, I muddled this nice little picture by inheriting from <span class="geshifilter"><code class="eiffel geshifilter-eiffel"><a href="http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+linear&amp;btnI=I%27m+Feeling+Lucky"><span style="color: #800000">LINEAR</span></a> <span style="color: #FF0000;">&#91;</span>LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span><span style="color: #FF0000;">&#93;</span></code></span>. So the class <span class="geshifilter"><code class="eiffel geshifilter-eiffel">CALKIN_WILF</code></span> <em>has</em> a lazy tree of rationals, and <em>is</em> a linear iteration of them. In the root class <span class="geshifilter"><code class="eiffel geshifilter-eiffel">CALKIN_WILF_DEMO_ROOT</code></span> we simply print the first 100 rational numbers (I could have made the program take an argument) using a <span class="geshifilter"><code class="eiffel geshifilter-eiffel"><a href="http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+linear_iterator&amp;btnI=I%27m+Feeling+Lucky"><span style="color: #800000">LINEAR_ITERATOR</span></a> <span style="color: #FF0000;">&#91;</span>LAZY_BINARY_TREE <span style="color: #FF0000;">&#91;</span>RATIONAL_NUMBER<span style="color: #FF0000;">&#93;</span><span style="color: #FF0000;">&#93;</span></code></span>. However, the iteration is <em>not</em> in numerical order. In a future post we'll see other ways of iterating the rationals.
+</p><p>The really interesting thing (to me) about the Calkin-Wilf tree is the way I did a breadth-first traversal of this infinite tree. It turns out that the index in the linear structure, when translated into binary, can be considered as a set of instructions to move through the tree. You ignore all leading zeros. At the first one, move to the root. Then every time you see a zero, you take the left child, and every time you see a one, you take the right child. Lovely!
+</p></div>
+</li>
+<li>
+<div class="date">2015, Sep 15</div>
+<a href="http://feedproxy.google.com/~r/BertrandMeyer/~3/vAyEwWESHTY/">Design by Contract: ACM Webinar this Thursday</a>
+<div class="description"><p>A third ACM webinar this year (after two on agile methods): I will be providing a general introduction to Design by Contract. The date is this coming Thursday, September 17, and the time is noon New York (18 Paris/Zurich, 17 London, 9 Los Angeles, see here for hours elsewhere). Please tune in! The event is [&#8230;]</p>
+<p>The post <a rel="nofollow" href="https://bertrandmeyer.com/2015/09/15/design-by-contract-acm-webinar-this-thursday/">Design by Contract: ACM Webinar this Thursday</a> appeared first on <a rel="nofollow" href="https://bertrandmeyer.com">Bertrand Meyer&#039;s technology+ blog</a>.</p></div>
+</li>
+<li>
+<div class="date">2015, Jan 21</div>
+<a href="http://feedproxy.google.com/~r/BertrandMeyer/~3/zNoU82qSoBU/">Framing the frame problem (new paper)</a>
+<div class="description"><p>Among the open problems of verification, particularly the verification of object-oriented programs, one of the most vexing is framing: how to specify and verify what programs element do not change. Continuing previous work, this article presents a &#8220;double frame inference&#8221; method, automatic on both sides the specification and verification sides. There is no need to [&#8230;]</p>
+<p>The post <a rel="nofollow" href="https://bertrandmeyer.com/2015/01/21/framing-the-frame-problem-new-paper/">Framing the frame problem (new paper)</a> appeared first on <a rel="nofollow" href="https://bertrandmeyer.com">Bertrand Meyer&#039;s technology+ blog</a>.</p></div>
+</li>
+<li>
+<div class="date">2015, Jan 21</div>
+<a href="http://feedproxy.google.com/~r/BertrandMeyer/~3/gYfn3TjKVzA/">Detecting deadlock automatically? (New paper)</a>
+</li>
+<li>
+<div class="date">2015, Jan 11</div>
+<a href="https://room.eiffel.com/blog/conaclos/a_colored_year_on_the_web_for_eiffel">A colored year on the web for Eiffel</a>
+<div class="description"><p>Happy new year!
+</p><p>ACE, Prism, and Rouge now support the syntax highlighting of the Eiffel language.
+</p>
+<table id="toc" class="toc" summary="Contents"><tr><td><div id="toctitle"><strong>Contents</strong></div>
+<div id="tocbody">
+<ul>
+<li class="toclevel-1"><a href="#Prism"><span class="tocnumber">1</span> <span class="toctext">Prism</span></a></li>
+<li class="toclevel-1"><a href="#ACE_editor"><span class="tocnumber">2</span> <span class="toctext">ACE editor</span></a></li>
+<li class="toclevel-1"><a href="#Rouge"><span class="tocnumber">3</span> <span class="toctext">Rouge</span></a></li>
+<li class="toclevel-1"><a href="#Other_syntax_highlighters"><span class="tocnumber">4</span> <span class="toctext">Other syntax highlighters</span></a></li>
+</ul></div>
+</td></tr></table><a name="Prism"></a><h2> <span class="mw-headline"> Prism </span></h2>
+<p><a href="http://prismjs.com/" class="external text" title="http://prismjs.com/">Prism</a> is by-design a lightweight syntax highlighter for the web.
+It is very simple to use, and the <a href="http://prismjs.com/download.html" class="external text" title="http://prismjs.com/download.html">download page</a> enables to get only what you need. It proposes interesting add-ons (Line numbers, File Highlight, ...).
+</p><p>The library is usable with a bench of tools, including <a href="https://wordpress.org/" class="external text" title="https://wordpress.org/">Wordpress</a> and <a href="http://jekyllrb.com/" class="external text" title="http://jekyllrb.com/">Jekyll</a>.
+</p><p>You can test the highlighting <a href="http://prismjs.com/test.html" class="external text" title="http://prismjs.com/test.html">here</a>. The Eiffel support should be full, including the verbatim options.
+</p><p>If you note any issues, you can report it on my <a href="https://github.com/Conaclos/prism" class="external text" title="https://github.com/Conaclos/prism">github fork</a>.
+</p><p>I have commited a <a href="https://github.com/PrismJS/prism/pull/471" class="external text" title="https://github.com/PrismJS/prism/pull/471">Pull Request</a> to enable class name highlighting.
+Please feel free to express your support in the discussion thread of the <a href="https://github.com/PrismJS/prism/pull/471" class="external text" title="https://github.com/PrismJS/prism/pull/471">Pull Request</a>.
+The PR is waiitng for author agreement since January...
+</p>
+<a name="ACE_editor"></a><h2> <span class="mw-headline"> ACE editor </span></h2>
+<p><a href="http://ace.c9.io/" class="external text" title="http://ace.c9.io/">ACE Editor</a> is certainly the most use web-based code editor.
+A bench of web applications use ACE including:
+</p>
+<ul><li> the <a href="https://help.github.com/articles/editing-files-in-your-repository/" class="external text" title="https://help.github.com/articles/editing-files-in-your-repository/">Github web editor</a>
+</li><li> the <a href="https://c9.io/" class="external text" title="https://c9.io/">Cloud9 web IDE</a> 
+</li><li> <a href="http://codecombat.com/" class="external text" title="http://codecombat.com/">Code Combat</a>, a game to learn programming basis
+</li><li> and <a href="https://ace.c9.io/#nav=production" class="external text" title="https://ace.c9.io/#nav=production">more</a>
+</li></ul>
+<p>The support of Eiffel is not full. In particular, the verbatim options and multiple-line strings are not supported.
+</p><p>If you note any issues, you can report it on my <a href="https://github.com/Conaclos/ace" class="external text" title="https://github.com/Conaclos/ace">github fork</a>.
+</p>
+<a name="Rouge"></a><h2> <span class="mw-headline"> Rouge </span></h2>
+<p>Rouge is a recent syntax highlighter increasing in popularity.
+It is compatible with the stylesheets of Pygments.
+</p><p>It is used by:
+</p>
+<ul><li> <a href="https://about.gitlab.com/" class="external text" title="https://about.gitlab.com/">Gitlab</a>
+</li><li> <a href="http://kramdown.gettalong.org/" class="external text" title="http://kramdown.gettalong.org/">krandown</a>, a markdown parser (anoption must be enabled)
+</li><li> <a href="https://github.com/vmg/redcarpet" class="external text" title="https://github.com/vmg/redcarpet">RedCarpet</a>, another markdown parser
+</li><li> the static site builder <a href="https://middlemanapp.com/" class="external text" title="https://middlemanapp.com/">Middleman</a>
+</li></ul>
+<p>The support of Eiffel is not full. In particular, the verbatim options are not supported.
+</p><p>If you note any issues, you can report it on my <a href="https://github.com/Conaclos/rouge" class="external text" title="https://github.com/Conaclos/rouge">github fork</a>.
+</p>
+<a name="Other_syntax_highlighters"></a><h2> <span class="mw-headline"> Other syntax highlighters </span></h2>
+<p>Some tools need updates in order to fully support the highlighting of Eiffel.
+For instance:
+</p>
+<ul><li> <a href="https://codemirror.net/" class="external text" title="https://codemirror.net/">Code Mirror</a>, a web-based code editor
+</li><li> <a href="http://pygments.org/" class="external text" title="http://pygments.org/">Pygments</a>
+</li><li> <a href="https://github.com/textmate/eiffel.tmbundle" class="external text" title="https://github.com/textmate/eiffel.tmbundle">TexMate</a>, (used also by <a href="https://github.com/github/linguist" class="external text" title="https://github.com/github/linguist">Github Linguist</a>
+</li><li> <a href="http://qbnz.com/highlighter/" class="external text" title="http://qbnz.com/highlighter/">GeSHi</a>
+</li></ul>
+<p>Enjoy&nbsp;;)
+</p></div>
+</li>
+<liv class="nav"><a href="/feed_aggregation/news">See more ...</a></li>
+</ul>

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

@@ -1,16 +1,17 @@
 var ROC_AUTH = ROC_AUTH || { };
 
-var loginURL = "/login";
-var logoutURL = "/logoff";
+var loginURL = "/basic_auth_login";
+var logoutURL = "/basic_auth_logoff";
+
 var userAgent = navigator.userAgent.toLowerCase();
 var firstLogIn = true;
  
 ROC_AUTH.login = function() {
-    var form = document.forms[0];
+    var 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 origin = window.location.origin + window.location.pathname;
     var _login = function(){
 
  
@@ -24,7 +25,7 @@ ROC_AUTH.login = function() {
                     var newdiv = document.createElement('div');
 	                  newdiv.innerHTML = "<br>Invalid Credentials</br>";
                     newdiv.id = 'myModalFormId';
-                     $("body").append(newdiv);
+                     $(".primary-tabs").append(newdiv);
                } 
 	}else{  
          
@@ -38,7 +39,7 @@ ROC_AUTH.login = function() {
              if (request.readyState == 4) {
                  if (request.status==200) {
                         delete form;
-                        window.location=origin;
+                        window.location=window.location.origin;
                 }
                 else{
                   if (navigator.userAgent.toLowerCase().indexOf("firefox") != -1){                       
@@ -48,7 +49,7 @@ ROC_AUTH.login = function() {
                     var newdiv = document.createElement('div');
 	                   newdiv.innerHTML = "<br>Invalid Credentials</br>";
                     newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
+                    $(".primary-tabs").append(newdiv);
                    } 
 
                   }
@@ -92,7 +93,7 @@ ROC_AUTH.login_with_redirect = function() {
                     var newdiv = document.createElement('div');
                       newdiv.innerHTML = "<br>Invalid Credentials</br>";
                     newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
+                    $(".primary-tabs").append(newdiv);
                      $("#imgProgressRedirect").hide();
                } 
     }else{  
@@ -121,8 +122,8 @@ ROC_AUTH.login_with_redirect = function() {
                     var newdiv = document.createElement('div');
                        newdiv.innerHTML = "<br>Invalid Credentials</br>";
                     newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
-                     $("#imgProgressRedirect").hide();    
+                    $(".primary-tabs").append(newdiv);
+                    $("#imgProgressRedirect").hide();    
                    } 
 
                   }
@@ -305,3 +306,20 @@ ROC_AUTH.create_form = function() {
 };
 
 
+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

@@ -3,13 +3,15 @@ ul.cms-nodes {
   padding: 3px 3px 3px 3px;
   border: solid 1px #ccc;
 }
-
-li.cms_type_page {
+ul.cms-nodes li {
   border-top: dotted 1px #ccc;
 }
-li.cms_type_page a::before {
-  content: "[page] ";
-}
-li.cms_type_page:first-child {
+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/modules/session_auth/scripts/session_auth_table.sql

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

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

@@ -0,0 +1,37 @@
+ 	<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_session_auth" action="{$site_url/}account/login-with-session" method="POST">
+					<div>
+						<input type="text" name="username" id="username" required value="{$username/}">
+						<label>Username</label>
+					</div>
+										
+					<div>
+						<input  type="password" name="password"  id="password" required >
+						<label>Password</label>
+					</div>
+					<button type="submit">Login</button>
+				</form>
+			</div>
+    	</div>
+		<div>
+			<div>
+				<p>
+					<a href="{$site_url/}account/new-password">Forgot password?</a>
+				</p>
+			</div>
+		</div>	
+		{/unless}
+		{if isset=$error}
+			<div>
+			<div>
+				<p>
+					<strong>{$error/}
+				</p>
+			</div>
+		</div>	
+		{/if}
+	</div>

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

@@ -0,0 +1,26 @@
+ul.taxonomy {
+  font-size: 80%;
+  list-style-type: none;
+  font-style: italic;
+  margin: 0;
+}
+ul.taxonomy li {
+  padding: 2px;
+  margin-right: 3px;
+  display: inline-block;
+  border: none;
+}
+ul.taxonomy li a:hover {
+  text-decoration: none;
+}
+ul.taxonomy li:hover {
+  padding: 1px;
+  border-top: solid 1px #66f;
+  border-bottom: solid 1px #66f;
+  background-color: #ddf;
+}
+
+table.taxonomy td {
+  border: solid 1px #ccc;
+  padding: 2px;
+}

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

@@ -0,0 +1,27 @@
+ul.taxonomy {
+	font-size: 80%;
+	list-style-type: none;
+	font-style: italic;
+	margin: 0;
+	li {
+		a:hover {
+			text-decoration: none;
+		}
+		padding: 2px;
+		margin-right: 3px;
+		display: inline-block;
+		border: none;
+		&:hover {
+			padding: 1px;
+			border-top: solid 1px #66f;
+			border-bottom: solid 1px #66f;
+			background-color: #ddf;
+		}
+	}
+}
+table.taxonomy {
+	td {
+		border: solid 1px #ccc;
+		padding: 2px;
+	}
+}

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

@@ -0,0 +1,24 @@
+
+CREATE TABLE taxonomy_term (
+  `tid`	INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT UNIQUE,
+  `text` VARCHAR(255) NOT NULL,
+  `weight` INTEGER,
+  `description` TEXT,  
+  `langcode` VARCHAR(12)
+);
+
+CREATE TABLE taxonomy_hierarchy (
+  `tid`	INTEGER NOT NULL,
+  `parent` INTEGER,
+  CONSTRAINT PK_tid_parent PRIMARY KEY (tid,parent)
+);
+
+/* Associate tid with unique (type,entity)
+ * for instance: "page" + "$nid" -> "tid"
+ */
+CREATE TABLE taxonomy_index (
+  `tid`	INTEGER NOT NULL,
+  `entity`	VARCHAR(255),
+  `type` VARCHAR(255) NOT NULL,
+  CONSTRAINT PK_tid_entity_type PRIMARY KEY (tid,entity,type)
+);

examples/demo/site/modules/taxonomy/scripts/uninstall.sql

@@ -0,0 +1,3 @@
+DROP TABLE IF EXISTS taxonomy_term;
+DROP TABLE IF EXISTS taxonomy_hierarchy;
+DROP TABLE IF EXISTS taxonomy_index;

examples/demo/site/scripts/core.sql

@@ -1,51 +1,23 @@
-BEGIN;
-
-CREATE TABLE "users"(
-  "uid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("uid">=0),
-  "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 `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 "roles"(
-  "rid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("rid">=0),
-  "name" VARCHAR(100) NOT NULL,
-  CONSTRAINT "name"
-    UNIQUE("name")
+CREATE TABLE `custom_values`(
+  `type` VARCHAR(255) NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` TEXT
 );
 
-CREATE TABLE "users_roles"(
-  "uid" INTEGER NOT NULL CHECK("uid">=0),
-  "rid" INTEGER NOT NULL CHECK("rid">=0)
+CREATE TABLE `path_aliases`(
+  `pid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `source` VARCHAR(255) NOT NULL,
+  `alias` VARCHAR(255) NOT NULL,
+  `lang` VARCHAR(12)
 );
-
-CREATE TABLE "role_permissions"(
-  "rid" INTEGER NOT NULL CHECK("rid">=0),
-  "permission" VARCHAR(255) NOT NULL,
-  "module" VARCHAR(255)
-);
-
-CREATE TABLE "logs"(
-  "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("id">=0),
-  "category" VARCHAR(255) NOT NULL,
-  "level" INTEGER NOT NULL CHECK("level">=1),
-  "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" VARCHAR(255) NOT NULL
-);
-
-COMMIT;

examples/demo/site/scripts/node.sql

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

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

@@ -51,16 +51,24 @@ ul.horizontal li {
 .sidebar {
   padding: 5px;
   margin: 3px;
-  border: solid 1px #ccc;
+  /* border: solid 1px #ccc; */
 }
 .sidebar#sidebar_first {
   width: 250px;
-  float: left;
+  position: fixed;
+  top: 45px;
+  left: 0;
+  bottom: 0;
+  width: 200px;
+  border-right: solid 1px #ddd;
 }
 .sidebar#sidebar_second {
   width: 250px;
   float: right;
 }
+.sidebar + .main {
+  margin-left: 200px;
+}
 
 #primary-tabs ul.horizontal {
   list-style-type: none;
@@ -76,3 +84,17 @@ ul.horizontal li {
   border-width: 2px 1px 0;
   padding: 2px 7px 1px;
 }
+
+#message li.error {
+  background-color: #f99;
+  border: solid 1px red;
+  padding: 5px 2px 5px 2px;
+}
+
+table.with_border thead td {
+  font-weight: bold;
+}
+table.with_border td {
+  border: solid 1px #ccc;
+  padding: 2px 5px 2px 5px;
+}

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/node.scss

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

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

@@ -55,15 +55,24 @@ ul.horizontal {
 .sidebar {
 	padding: 5px;
 	margin: 3px;
-	border: solid 1px #ccc;
+	/* border: solid 1px #ccc; */
 	&#sidebar_first {
 		width: 250px;
-		float: left;
+		position: fixed;
+		top: 45px;
+		left: 0;
+		bottom: 0;
+		width: 200px;
+		border-right: solid 1px #ddd;
 	}
 	&#sidebar_second {
 		width: 250px;
 		float: right;
 	}
+
+	&+.main {
+		margin-left: 200px;
+	}
 }
 #primary-tabs {
 	ul.horizontal {
@@ -81,3 +90,18 @@ ul.horizontal {
 		}
 	}
 }
+#message li.error {
+	background-color: #f99;
+	border: solid 1px red;
+	padding: 5px 2px 5px 2px;
+}
+
+table.with_border {
+	thead td {
+		font-weight: bold;
+	}
+	td {
+		border: solid 1px #ccc;
+		padding: 2px 5px 2px 5px;
+	}
+}

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

@@ -4,10 +4,16 @@
   <meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<!-- EWF CMS -->
-	<link rel="stylesheet" href="{$site_url/}/theme/css/style.css">
-	<link rel="stylesheet" href="{$site_url/}/theme/css/node.css">
-  <script src="{$site_url/}/theme/js/jquery-1.10.2.min.js"></script>
-  <script src="{$site_url/}/theme/js/roc_auth.js"></script>
+	<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 -->
@@ -31,7 +37,17 @@
           {$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 -->
@@ -44,7 +60,7 @@
 		{/unless}
 
         <!-- Highlighted, Help, Content -->      
-        <div class='span8 main'>
+        <div id='main' class='span8 main'>
           <!-- Highlighted Section -->
           {unless isempty="$page.region_highlighted"}
 		  <div id="highlighted">{$page.region_highlighted/}</div>
@@ -57,9 +73,15 @@
           <!-- Main Content Section -->
 		  {unless isempty="$page_title"}<h1 class="page-title">{$page_title/}</h1>{/unless}
           {$page.region_content/}   
-        </div>
-
-
+		  {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>
 

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/themes/bootstrap/tpl/help_section.tpl

@@ -1 +0,0 @@
-	<h2>Help Section</h2>

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

@@ -1 +0,0 @@
-          <h1>Highlighted Section</h1>

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

@@ -1,8 +0,0 @@
-      <div class='span2 sidebar'>
-        <h3>Left Sidebar</h3>
-        <ul class="nav nav-tabs nav-stacked">
-          <li><a href='#'>Another Link 1</a></li>
-          <li><a href='#'>Another Link 2</a></li>
-          <li><a href='#'>Another Link 3</a></li>
-        </ul>
-      </div>

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

@@ -1,4 +0,0 @@
-          <h2>Main Content Section</h2>
-          <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum.<p> 
-
-          <p>Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum.</p>

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

@@ -1,9 +0,0 @@
-  <div id="footer">
-    <small>
-    <center>
-      <p class="text-muted"><a href="#" target="_blank" class="info">ROC Documentation </a>&nbsp;&nbsp;&nbsp;
-      <a href="http://www.eiffel.com/company/contact/" target="_blank" class="info">Questions? Comments? Let us know! </a></p>
-      <p>© Copyright 2014 Eiffel Software -- <a href="#" target="_blank" class="info">Privacy Policy</a>
-    </center>
-   </small>
-  </div>

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

@@ -1,34 +0,0 @@
-  <div class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="sr-only">Toggle navigation</span>
-      </button>
-      <a class="navbar-brand" href="{$site_url/}" itemprop="home" rel="home">{unless isset="$site_name"}Eiffel CMS{/unless}{if isset="$site_name"}{$site_name/}{/if}</a>
-
-    </div>
-    
-    <div class="navbar-collapse collapse">
-     
-      {if isset="$primary_nav"}
-        <ul class="nav navbar-nav navbar-left">
-             {foreach item="item" from="$primary_nav.items"}
-                <!-- TODO check if a menu item is active or not -->
-                <li class="active"><a href="{$item.location/}">{$item.title/}</a></li>
-             {/foreach}
-        </ul>
-      {/if}
-
-      {if isset="$secondary_nav"}
-        <ul class="nav navbar-nav navbar-right">
-              {foreach item="item" from="$secondary_nav.items"}
-                <!-- TODO check if a menu item is active or not -->
-                <li class="active"><a href="{$item.location/}">{$item.title/}</a></li>
-             {/foreach}
-        </ul>
-      {/if}  
-    </div>
-
-  </div>
-</div>
-

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

@@ -1,28 +0,0 @@
- {if isset="$default_nav"}
-  <div class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="sr-only">Toggle navigation</span>
-      </button>
-      <a class="navbar-brand" href="${site_url/}" itemprop="home" rel="home">{$page_title/}</a>
-    </div>
-    
-    <div class="navbar-collapse collapse">      
-  {/if}    
-
-      {if isset="$primary_nav"}
-            {$primary_nav/}
-      {/if}
-
-      {if isset="$secondary_nav"}
-          {$secondary_nav/}
-      {/if}  
- 
-{if isset="$default_nav"}
-  
-     </div>
-
-  </div>
-</div>
-{/if}  

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

@@ -1,6 +0,0 @@
-		<ul class="nav navbar-nav navbar-left">
-             {foreach item="item" from="$menu.items"}
-                <!-- TODO check if a menu item is active or not -->
-                <li class="active"><a href="{$item.location/}">{$item.title/}</a></li>
-             {/foreach}
-        </ul>

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

@@ -1,8 +0,0 @@
-	<div class='span2 sidebar'>
-         <h3>Right Sidebar</h3>
-         <ul class="nav nav-tabs nav-stacked">
-           <li><a href='#'>Another Link 1</a></li>
-           <li><a href='#'>Another Link 2</a></li>
-           <li><a href='#'>Another Link 3</a></li>
-         </ul>
-    </div>

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

@@ -1,7 +0,0 @@
-       <ul class="nav navbar-nav navbar-right">
-              {foreach item="item" from="$menu.items"}
-                <!-- TODO check if a menu item is active or not -->
-                <li class="active"><a href="{$item.location/}">{$item.title/}</a></li>
-             {/foreach}
-        </ul>
- 

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;
-});
-
-