backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into es_17_01

Browse Source 
# Conflicts:
#	examples/demo/demo.ecf
#	modules/node/node-safe.ecf
This commit is contained in:
Jocelyn FIAT
2017-03-01 08:51:23 +01:00
parent 2cea3cf261 13d0927c58
commit 3d2770e759
38 changed files with 1188 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/demo/demo.ecf
View File

@@ -30,6 +30,7 @@
<library name="cms_feed_aggregator_module" location="..\..\modules\feed_aggregator\feed_aggregator.ecf" readonly="false"/>
<library name="cms_files_module" location="..\..\modules\files\files.ecf" readonly="false"/>
<library name="cms_google_search_module" location="..\..\modules\google_search\google_search.ecf" readonly="false" use_application_options="true"/>
<library name="cms_messaging_module" location="..\..\modules\messaging\messaging.ecf"/>
<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/>
<library name="cms_node_module" location="..\..\modules\node\node.ecf" readonly="false"/>
<library name="cms_oauth_20_module" location="..\..\modules\oauth20\oauth20.ecf" readonly="false"/>

1
examples/demo/roc.cfg
View File

@@ -23,6 +23,7 @@
"files": { "location": "../../modules/files" },
"custom_block": { "location": "../../modules/custom_block" },
"wikitext": { "location": "../../modules/wikitext" },
"messaging": { "location": "../../modules/messaging" },
"comments": { "location": "../../modules/comments" }
}
}

4
examples/demo/site/modules/admin/files/css/admin.css
View File

@@ -10,7 +10,7 @@ ul.cms-users li:first-child {
border-top: none;
}
ul.cms-users li.cms_user a::before {
content: "[users] ";
content: "[user] ";
}
ul.cms-roles {
@@ -25,7 +25,7 @@ ul.cms-roles li:first-child {
border-top: none;
}
ul.cms-roles li.cms_role a::before {
content: "[roles] ";
content: "[role] ";
}
ul.cms-permissions {

4
examples/demo/site/modules/admin/files/scss/admin.scss
View File

@@ -12,7 +12,7 @@ ul.cms-users {
}
li.cms_user a::before {
content: "[users] ";
content: "[user] ";
}
}
@@ -31,7 +31,7 @@ ul.cms-roles {
}
li.cms_role a::before {
content: "[roles] ";
content: "[role] ";
}
}

4
examples/demo/site/modules/messaging/files/css/messaging.css Normal file
View File

@@ -0,0 +1,4 @@
.messaging-box fieldset {
overflow: scroll;
height: 250px;
}

6
examples/demo/site/modules/messaging/files/scss/messaging.scss Normal file
View File

@@ -0,0 +1,6 @@
.messaging-box {
fieldset {
overflow:scroll;
height:250px;
}
}

1
examples/demo/src/demo_cms_execution.e
View File

@@ -84,6 +84,7 @@ feature -- CMS modules
a_setup.register_module (create {FEED_AGGREGATOR_MODULE}.make)
-- Miscellanious
a_setup.register_module (create {CMS_MESSAGING_MODULE}.make)
a_setup.register_module (create {GOOGLE_CUSTOM_SEARCH_MODULE}.make)
a_setup.register_module (create {CMS_CUSTOM_BLOCK_MODULE}.make)
a_setup.register_module (create {CMS_DEBUG_MODULE}.make)