Merge branch 'master' of https://github.com/EiffelWebFramework/ROC into roc_gcse

Conflicts:
	examples/demo/demo-safe.ecf

examples/demo/site/config/blocks.ini

@@ -0,0 +1,38 @@
+### 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=<none>
+feed.forum.weight=2
+feed.forum.region=feed_forum
+feed.forum.region=<none>
+feed.forum.condition=<none>
+feed.forum.options[size]=15
+
+#Updates
+recent_changes.region=content
+recent_changes.condition=is_front
+recent_changes.title=Updates
+recent_changes.options[size]=3
+
+#Aliases
+&aliases[foo]=management
+&aliases[bar]=feed.forum
+
+foo.region=content
+foo.condition=is_front
+foo.weight=-10
+
+bar.region=content
+bar.condition=is_front
+bar.title=Bar
+
+
+

examples/demo/site/config/cms.ini

@@ -9,9 +9,9 @@ email=your@email.com
 theme=bootstrap
 
 [mailer]
-smtp=localhost:25
+#smtp=localhost:25
 #sendmail=/usr/bin/sendmail
-#output=@stderr
+output=@stderr
 
 [modules]
 # Module status
@@ -21,27 +21,10 @@ smtp=localhost:25
 # for each module, this can be overwritten with
 #  module_name= on or off
 *=all
-admin=on
-auth=on
-basic_auth=on
-blog=on
-debug=on
-demo=on
-node=on
-oauth20=on
-openid=on
 
 [blocks]
-#navigation.region=sidebar_first
-feed.news.region=feed_news
-feed.news.condition=is_front
-
-feed.forum.region=feed_forum
-feed.forum.condition=is_front
-
-#management.condition=is_front
-#navigation.condition=is_front
+@include=blocks.ini
 
 [admin]
 # CMS Installation, are accessible by "all", "none" or uppon "permission". (default is none)
-installation_access=permission
+installation_access=all

examples/demo/site/config/demo.json

@@ -1,10 +1,15 @@
 {
 	"database": {
 		"datasource": {
-			"driver": "odbc",
-			"environment": "odbc-sqlite"
+			"driver": "sqlite3",
+			"environment": "sqlite3",
+			"-driver": "odbc",
+			"-environment": "odbc-sqlite"
 		},
 		"environments": {
+			"sqlite3": {
+				"connection_string":"Database=./site/database.sqlite3;"
+			},
 			"odbc-sqlite": {
 				"connection_string":"Driver=SQLite3 ODBC Driver;Database=./site/database.sqlite;LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;"
 			},