From 82bf9a4294fa388166233aa0e7df6e3a6ccc7090 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 5 Sep 2017 16:08:10 +0200 Subject: [PATCH] Converted ecf files to 1-16-0, to use a single ecf file for all variants (void-safe, non-void-safe, ...). Keep *-safe.ecf as redirection to avoid breaking existing -safe.ecf projects. --- cms-safe.ecf | 44 +------ cms.ecf | 9 +- .../masquerade_auth/masquerade_auth-safe.ecf | 30 +---- .../masquerade_auth/masquerade_auth.ecf | 31 +++++ examples/demo/demo.ecf | 110 ++++++++++-------- .../modules/demo/cms_demo_module-safe.ecf | 24 +--- .../demo/modules/demo/cms_demo_module.ecf | 26 +++++ .../modules/core/scripts/user_profile.sql | 6 + .../site/modules/files/files/js/basic.css | 1 + .../site/themes/admin/assets/css/style.css | 107 +++++++++++++++++ .../demo/site/themes/admin/assets/favicon.ico | Bin 0 -> 994 bytes examples/demo/site/themes/admin/page.tpl | 101 ++++++++++++++++ examples/demo/site/themes/admin/theme.info | 14 +++ launcher/any-safe.ecf | 19 +-- launcher/any.ecf | 9 +- launcher/cgi-safe.ecf | 17 +-- launcher/cgi.ecf | 18 +++ launcher/libfcgi-safe.ecf | 17 +-- launcher/libfcgi.ecf | 9 +- launcher/standalone-safe.ecf | 18 +-- launcher/standalone.ecf | 9 +- library/app_env/app_env-safe.ecf | 21 +--- library/app_env/app_env.ecf | 15 +-- library/configuration/config-safe.ecf | 18 +-- library/configuration/config.ecf | 9 +- .../configuration/tests/config_tests-safe.ecf | 19 +-- library/configuration/tests/config_tests.ecf | 11 +- library/email/email-safe.ecf | 19 +-- library/email/email.ecf | 20 ++++ library/gcse/gcse-safe.ecf | 20 +--- library/gcse/gcse.ecf | 13 ++- library/gcse/test/test.ecf | 18 +-- .../http_client_extension-safe.ecf | 26 +---- .../http_client_extension.ecf | 25 ++-- library/model/cms_model-safe.ecf | 20 +--- library/model/cms_model.ecf | 13 ++- library/persistence/sqlite3/sqlite3-safe.ecf | 29 +---- library/persistence/sqlite3/sqlite3.ecf | 30 +++++ .../store_mysql/store_mysql-safe.ecf | 35 +----- .../persistence/store_mysql/store_mysql.ecf | 37 ++++++ .../persistence/store_mysql/tests/tests.ecf | 29 ++--- .../store_odbc/store_odbc-safe.ecf | 31 +---- library/persistence/store_odbc/store_odbc.ecf | 33 ++++++ .../store_odbc/tests/tests-safe.ecf | 27 +---- .../persistence/store_odbc/tests/tests.ecf | 29 +++++ library/recaptcha/recaptcha-safe.ecf | 21 +--- library/recaptcha/recaptcha.ecf | 24 ++-- library/recaptcha/test/test.ecf | 18 +-- modules/admin/admin-safe.ecf | 31 +---- modules/admin/admin.ecf | 33 ++++++ modules/auth/auth-safe.ecf | 33 +----- modules/auth/auth.ecf | 35 ++++++ modules/basic_auth/basic_auth-safe.ecf | 26 +---- modules/basic_auth/basic_auth.ecf | 28 +++++ modules/blog/cms_blog_module-safe.ecf | 34 +----- modules/blog/cms_blog_module.ecf | 34 ++++++ modules/comments/comments-safe.ecf | 29 +---- modules/comments/comments.ecf | 14 +-- modules/contact/contact-safe.ecf | 23 +--- modules/contact/contact.ecf | 22 ++++ modules/custom_block/custom_block-safe.ecf | 23 +--- modules/custom_block/custom_block.ecf | 7 +- .../embedded_video/embedded_video-safe.ecf | 15 +-- modules/embedded_video/embedded_video.ecf | 17 +++ modules/embedded_video/test/testing.ecf | 15 +-- .../feed_aggregator/feed_aggregator-safe.ecf | 21 +--- modules/feed_aggregator/feed_aggregator.ecf | 22 ++++ modules/files/files-safe.ecf | 23 +--- modules/files/files.ecf | 7 +- modules/files/site/files/js/basic.css | 1 + modules/google_search/google_search-safe.ecf | 20 +--- modules/google_search/google_search.ecf | 7 +- .../google_search_20-safe.ecf | 15 +-- modules/google_search_20/google_search_20.ecf | 9 +- modules/messaging/messaging-safe.ecf | 21 +--- modules/messaging/messaging.ecf | 9 +- modules/node/node-safe.ecf | 34 +----- modules/node/node.ecf | 13 ++- modules/oauth20/oauth20-safe.ecf | 32 +---- modules/oauth20/oauth20.ecf | 33 ++++++ modules/openid/openid-safe.ecf | 30 +---- modules/openid/openid.ecf | 31 +++++ .../recent_changes/recent_changes-safe.ecf | 27 +---- modules/recent_changes/recent_changes.ecf | 14 ++- modules/seo/seo-safe.ecf | 14 +-- modules/seo/seo.ecf | 15 +++ .../session_auth/cms_session_auth-safe.ecf | 29 +---- modules/session_auth/cms_session_auth.ecf | 30 +++++ modules/sitemap/sitemap-safe.ecf | 27 +---- modules/sitemap/sitemap.ecf | 9 +- modules/taxonomy/taxonomy-safe.ecf | 31 +---- modules/taxonomy/taxonomy.ecf | 15 +-- modules/wikitext/wikitext-safe.ecf | 27 +---- modules/wikitext/wikitext.ecf | 29 +++++ tests/all-safe.ecf | 42 +------ tests/all.ecf | 44 +++++++ tools/roc/roc.ecf | 14 ++- 97 files changed, 1173 insertions(+), 1170 deletions(-) create mode 100644 dev_modules/masquerade_auth/masquerade_auth.ecf create mode 100644 examples/demo/modules/demo/cms_demo_module.ecf create mode 100644 examples/demo/site/modules/core/scripts/user_profile.sql create mode 100644 examples/demo/site/modules/files/files/js/basic.css create mode 100644 examples/demo/site/themes/admin/assets/css/style.css create mode 100644 examples/demo/site/themes/admin/assets/favicon.ico create mode 100644 examples/demo/site/themes/admin/page.tpl create mode 100644 examples/demo/site/themes/admin/theme.info create mode 100644 launcher/cgi.ecf create mode 100644 library/email/email.ecf create mode 100644 library/persistence/sqlite3/sqlite3.ecf create mode 100644 library/persistence/store_mysql/store_mysql.ecf create mode 100644 library/persistence/store_odbc/store_odbc.ecf create mode 100644 library/persistence/store_odbc/tests/tests.ecf create mode 100644 modules/admin/admin.ecf create mode 100644 modules/auth/auth.ecf create mode 100644 modules/basic_auth/basic_auth.ecf create mode 100644 modules/blog/cms_blog_module.ecf create mode 100644 modules/contact/contact.ecf create mode 100644 modules/embedded_video/embedded_video.ecf create mode 100644 modules/feed_aggregator/feed_aggregator.ecf create mode 100644 modules/files/site/files/js/basic.css create mode 100644 modules/oauth20/oauth20.ecf create mode 100644 modules/openid/openid.ecf create mode 100644 modules/seo/seo.ecf create mode 100644 modules/session_auth/cms_session_auth.ecf create mode 100644 modules/wikitext/wikitext.ecf create mode 100644 tests/all.ecf diff --git a/cms-safe.ecf b/cms-safe.ecf index 9d82c88..6544ac0 100644 --- a/cms-safe.ecf +++ b/cms-safe.ecf @@ -1,43 +1,3 @@ - - - - - /.svn$ - /CVS$ - /EIFGENs$ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/cms.ecf b/cms.ecf index 80e88e4..90f8a65 100644 --- a/cms.ecf +++ b/cms.ecf @@ -1,6 +1,5 @@ - - ROC CMS library + @@ -8,8 +7,12 @@ /CVS$ /EIFGENs$ - + + + + diff --git a/dev_modules/masquerade_auth/masquerade_auth-safe.ecf b/dev_modules/masquerade_auth/masquerade_auth-safe.ecf index 7aac9ee..1da46a6 100644 --- a/dev_modules/masquerade_auth/masquerade_auth-safe.ecf +++ b/dev_modules/masquerade_auth/masquerade_auth-safe.ecf @@ -1,29 +1,3 @@ - - - - - /EIFGENs$ - /CVS$ - /.svn$ - - - - - - - - - - - - - - - - - - - - + + diff --git a/dev_modules/masquerade_auth/masquerade_auth.ecf b/dev_modules/masquerade_auth/masquerade_auth.ecf new file mode 100644 index 0000000..f2f8bc9 --- /dev/null +++ b/dev_modules/masquerade_auth/masquerade_auth.ecf @@ -0,0 +1,31 @@ + + + + + + /.svn$ + /CVS$ + /EIFGENs$ + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/demo/demo.ecf b/examples/demo/demo.ecf index ebd52ed..c5953dd 100644 --- a/examples/demo/demo.ecf +++ b/examples/demo/demo.ecf @@ -1,5 +1,5 @@ - + Example/demo for Eiffel ROC CMS library @@ -8,87 +8,101 @@ /CVS$ /EIFGENs$ - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + + + - + - + + + - + + + - + + + - + + + - - + + + + - - + + + + diff --git a/examples/demo/modules/demo/cms_demo_module-safe.ecf b/examples/demo/modules/demo/cms_demo_module-safe.ecf index cc692d8..bbb0890 100644 --- a/examples/demo/modules/demo/cms_demo_module-safe.ecf +++ b/examples/demo/modules/demo/cms_demo_module-safe.ecf @@ -1,23 +1,3 @@ - - - - - /.git$ - /.svn$ - /EIFGENs$ - - - + + diff --git a/examples/demo/modules/demo/cms_demo_module.ecf b/examples/demo/modules/demo/cms_demo_module.ecf new file mode 100644 index 0000000..c47d577 --- /dev/null +++ b/examples/demo/modules/demo/cms_demo_module.ecf @@ -0,0 +1,26 @@ + + + + + + /.git$ + /.svn$ + /EIFGENs$ + + + + + + + + + + + + + + + + + diff --git a/examples/demo/site/modules/core/scripts/user_profile.sql b/examples/demo/site/modules/core/scripts/user_profile.sql new file mode 100644 index 0000000..c9adf65 --- /dev/null +++ b/examples/demo/site/modules/core/scripts/user_profile.sql @@ -0,0 +1,6 @@ +CREATE TABLE user_profiles( + `uid` INTEGER NOT NULL CHECK("uid">=0), + `key` VARCHAR(255) NOT NULL, + `value` TEXT, + CONSTRAINT PK_uid_key PRIMARY KEY (uid,key) +); diff --git a/examples/demo/site/modules/files/files/js/basic.css b/examples/demo/site/modules/files/files/js/basic.css new file mode 100644 index 0000000..5238d5c --- /dev/null +++ b/examples/demo/site/modules/files/files/js/basic.css @@ -0,0 +1 @@ +.dropzone,.dropzone *{box-sizing:border-box}.dropzone{position:relative}.dropzone .dz-preview{position:relative;display:inline-block;width:120px;margin:0.5em}.dropzone .dz-preview .dz-progress{display:block;height:15px;border:1px solid #aaa}.dropzone .dz-preview .dz-progress .dz-upload{display:block;height:100%;width:0;background:green}.dropzone .dz-preview .dz-error-message{color:red;display:none}.dropzone .dz-preview.dz-error .dz-error-message,.dropzone .dz-preview.dz-error .dz-error-mark{display:block}.dropzone .dz-preview.dz-success .dz-success-mark{display:block}.dropzone .dz-preview .dz-error-mark,.dropzone .dz-preview .dz-success-mark{position:absolute;display:none;left:30px;top:30px;width:54px;height:58px;left:50%;margin-left:-27px} diff --git a/examples/demo/site/themes/admin/assets/css/style.css b/examples/demo/site/themes/admin/assets/css/style.css new file mode 100644 index 0000000..7b0a705 --- /dev/null +++ b/examples/demo/site/themes/admin/assets/css/style.css @@ -0,0 +1,107 @@ +div { + background-color: #ffdddd; +} + +ul.horizontal li { + display: inline-block; +} + +#header #primary.menu ul li { + color: #555; + background-color: #fff; + padding: 10px; + margin: 0; +} +#header #primary.menu ul li a { + color: #555; + text-decoration: none; +} +#header #primary.menu ul li a:hover { + color: black; +} +#header #primary.menu ul.horizontal { + border-bottom: solid 1px #ddd; +} +#header #primary.menu ul.horizontal li { + border-top: solid 3px #fff; +} +#header #primary.menu ul.horizontal li:hover { + background-color: #ffe; + border-top: solid 3px #999; +} +#header #primary.menu ul.horizontal li.active { + font-weight: bold; + border-top: solid 3px #ddd; + background-color: #ddd; +} +#header #primary.menu ul.horizontal li.active:hover { + border-top: solid 3px blue; +} + +#content { + margin-left: 20px; +} +#content #highlighted { + position: relative; + border: solid 1px #ddd; + background-color: #ffc; + width: 70%; + left: 15%; + right: 15%; + padding: 5px; + font-style: italic; +} +#content .preview { + border: solid 1px red; +} + +.sidebar { + padding: 5px; + margin: 3px; + /* border: solid 1px #ccc; */ +} +.sidebar#sidebar_first { + width: 250px; + position: fixed; + top: 45px; + left: 0; + bottom: 0; + width: 200px; + border-right: solid 1px #ddd; +} +.sidebar#sidebar_second { + width: 250px; + float: right; +} +.sidebar + .main { + margin-left: 200px; +} + +#primary-tabs ul.horizontal { + list-style-type: none; +} +#primary-tabs ul.horizontal li { + display: inline; + padding: 2px 5px; + border: solid 1px #ccf; +} +#primary-tabs ul.horizontal li.active { + border-color: #99f #99f #ddd; + border-style: solid solid none; + border-width: 2px 1px 0; + padding: 2px 7px 1px; +} + +#message li.error { + background-color: #f99; + border: solid 1px red; + padding: 5px 2px 5px 2px; +} + +table.with_border thead td { + font-weight: bold; +} +table.with_border td { + border: solid 1px #ccc; + padding: 2px 5px 2px 5px; +} diff --git a/examples/demo/site/themes/admin/assets/favicon.ico b/examples/demo/site/themes/admin/assets/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a41a15974bacf503bd3fb2873f0c436cf07efeff GIT binary patch literal 994 zcmV<810DPT0096203aX$0096X0L%jb02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|AOHXW zAP5Ek0047(dh`GQ1CvQaK~z}7?blhTR#g-S@Smuenr1x|(Fo>TH;2$NOCK`H1`RR_ zi3-vz6eAj-!GsDbx)n(e(WFrrjgk#QWncvvl;l7qN!GQLk|fNs^m=;vAK2V9zWa5d z9@?@6a2cjyQ+V{nbbO27yZRA5un6nXjtY-r5Z=nT z81wNBCUzzB6LB{#!9IM4DVT{JcoB2(6Gle3cHD=9xU%%X~C` zEcTwR)z@sBf(x)4{jdzJ5d=15JSpQuti&OB5C^9>ZTHXdNmTm~wqY37SkNresZ%IsN&b#gMnS~fL>v|BEk&7tvJ89dlpuqCE(PplgxW1pxlTf(`$EH zhpY1P%{T>z;TJrNBN7)@;8@($jOteg)n6B?-xmg>f`Q3-<8-_QE^?6vD`E7W%*sJp0 zt(n)~Ul7?HpYDNAi}jrt8~|2$8&_xkF)m6l8q`_lgOb6j0BuZc{z|-{DiYAb;(J%r zJvrw-jG6j&R)E(-@R0&&HIo^I%3BIEEe{3;;GN?9^8JO>zia0P!BcTUUeUYQUliZ& z9z3i{rW=kYlB|9x&M)iC%X=ni49Uf6KYdrg)-$i2og$>(|ER!0dt$*~eEUGHchuM# z+ifa(8}h^-VuSz`x`^Eq1Gn_MMb>cW z{F+V6rS-Trhr3u QJOBUy07*qoM6N<$f+ + + + + + + + + + + + +{if isset="$head"}{$head/}{/if} +{if isset="$styles"}{$styles/}{/if} +{if isset="$scripts"}{$scripts/}{/if} +{if isset="$head_lines"}{$head_lines/}{/if} + + + + + + + + {$head_title/} + + + + {if isset="$region_top"} + {$region_top/} + {/if} + +
+ + + + +
+
+
+
+ + +
+
+
+
+ +
+ + {unless isempty="$page.region_sidebar_first"} + + {/unless} + + {unless isempty="$page.region_sidebar_second"} + + {/unless} + + +
+ + {unless isempty="$page.region_highlighted"} +
{$page.region_highlighted/}
+ {/unless} + + {unless isempty="$page.region_help"} +
{$page.region_help/}
+ {/unless} + + + {unless isempty="$page_title"}

{$page_title/}

{/unless} + {$page.region_content/} + {if condition="$page.is_front"} + {if isset="$page.region_feed_news"} +
{$page.region_feed_news/}
+ {/if} + {if isset="$page.region_feed_forum"} +
{$page.region_feed_forum/}
+ {/if} + {/if} +
+
+
+ + + {$page.region_footer/} + + + {$page.region_bottom/} + + + + + + +{include file="debug.tpl"/} + + diff --git a/examples/demo/site/themes/admin/theme.info b/examples/demo/site/themes/admin/theme.info new file mode 100644 index 0000000..c78a44e --- /dev/null +++ b/examples/demo/site/themes/admin/theme.info @@ -0,0 +1,14 @@ +name=admin +engine=smarty +author=jocelyn fiat +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 +navigation=default_nav diff --git a/launcher/any-safe.ecf b/launcher/any-safe.ecf index 9ad5a1b..8a779af 100644 --- a/launcher/any-safe.ecf +++ b/launcher/any-safe.ecf @@ -1,18 +1,3 @@ - - - - - - - - - - - - - - - - - + + diff --git a/launcher/any.ecf b/launcher/any.ecf index 58aec7e..9440bc5 100644 --- a/launcher/any.ecf +++ b/launcher/any.ecf @@ -1,9 +1,10 @@ - + - diff --git a/launcher/cgi-safe.ecf b/launcher/cgi-safe.ecf index 068d7de..88206a0 100644 --- a/launcher/cgi-safe.ecf +++ b/launcher/cgi-safe.ecf @@ -1,16 +1,3 @@ - - - - - - - - - - - - - - - + + diff --git a/launcher/cgi.ecf b/launcher/cgi.ecf new file mode 100644 index 0000000..dc3bffe --- /dev/null +++ b/launcher/cgi.ecf @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/launcher/libfcgi-safe.ecf b/launcher/libfcgi-safe.ecf index b3289d0..e520d4d 100644 --- a/launcher/libfcgi-safe.ecf +++ b/launcher/libfcgi-safe.ecf @@ -1,16 +1,3 @@ - - - - - - - - - - - - - - - + + diff --git a/launcher/libfcgi.ecf b/launcher/libfcgi.ecf index e85e154..802f917 100644 --- a/launcher/libfcgi.ecf +++ b/launcher/libfcgi.ecf @@ -1,9 +1,10 @@ - + - - + diff --git a/launcher/standalone-safe.ecf b/launcher/standalone-safe.ecf index 3148e44..08cc870 100644 --- a/launcher/standalone-safe.ecf +++ b/launcher/standalone-safe.ecf @@ -1,17 +1,3 @@ - - - - - - - - - - - - - - - - + + diff --git a/launcher/standalone.ecf b/launcher/standalone.ecf index dbf73ff..2590032 100644 --- a/launcher/standalone.ecf +++ b/launcher/standalone.ecf @@ -1,9 +1,10 @@ - + - diff --git a/library/app_env/app_env-safe.ecf b/library/app_env/app_env-safe.ecf index c0d314c..a596365 100644 --- a/library/app_env/app_env-safe.ecf +++ b/library/app_env/app_env-safe.ecf @@ -1,20 +1,3 @@ - - Application Environment (layout, configuration, logger, database, ...) - - - - - - - - - - /EIFGENs$ - /CVS$ - /.svn$ - - - - + + diff --git a/library/app_env/app_env.ecf b/library/app_env/app_env.ecf index f7c8062..8833c6d 100644 --- a/library/app_env/app_env.ecf +++ b/library/app_env/app_env.ecf @@ -1,21 +1,22 @@ - + Application Environment (layout, configuration, logger, database, ...) - diff --git a/library/configuration/config-safe.ecf b/library/configuration/config-safe.ecf index 642acea..1680134 100644 --- a/library/configuration/config-safe.ecf +++ b/library/configuration/config-safe.ecf @@ -1,17 +1,3 @@ - - - - - /.git$ - /EIFGENs$ - /.svn$ - - - - - - - - + + diff --git a/library/configuration/config.ecf b/library/configuration/config.ecf index 9be28f0..72e8bcb 100644 --- a/library/configuration/config.ecf +++ b/library/configuration/config.ecf @@ -1,14 +1,17 @@ - + /.git$ - /EIFGENs$ /.svn$ + /EIFGENs$ - + + + diff --git a/library/configuration/tests/config_tests-safe.ecf b/library/configuration/tests/config_tests-safe.ecf index 351fb38..f3883f0 100644 --- a/library/configuration/tests/config_tests-safe.ecf +++ b/library/configuration/tests/config_tests-safe.ecf @@ -1,18 +1,3 @@ - - - - - /.git$ - /EIFGENs$ - /.svn$ - - - - - - - - - + + diff --git a/library/configuration/tests/config_tests.ecf b/library/configuration/tests/config_tests.ecf index 3f93907..2bb6bf3 100644 --- a/library/configuration/tests/config_tests.ecf +++ b/library/configuration/tests/config_tests.ecf @@ -1,15 +1,18 @@ - + /.git$ - /EIFGENs$ /.svn$ + /EIFGENs$ - - + + + + diff --git a/library/email/email-safe.ecf b/library/email/email-safe.ecf index 70fb3fd..b93d811 100644 --- a/library/email/email-safe.ecf +++ b/library/email/email-safe.ecf @@ -1,18 +1,3 @@ - - - - - /.git$ - /EIFGENs$ - /.svn$ - - - - - - - - - + + diff --git a/library/email/email.ecf b/library/email/email.ecf new file mode 100644 index 0000000..7317a73 --- /dev/null +++ b/library/email/email.ecf @@ -0,0 +1,20 @@ + + + + + + /.git$ + /.svn$ + /EIFGENs$ + + + + + + + + + + + diff --git a/library/gcse/gcse-safe.ecf b/library/gcse/gcse-safe.ecf index cba2c57..5594fd0 100644 --- a/library/gcse/gcse-safe.ecf +++ b/library/gcse/gcse-safe.ecf @@ -1,19 +1,3 @@ - - - - - /.git$ - /EIFGENs$ - /CVS$ - /.svn$ - - - + + diff --git a/library/gcse/gcse.ecf b/library/gcse/gcse.ecf index 463cf6d..9fb986b 100644 --- a/library/gcse/gcse.ecf +++ b/library/gcse/gcse.ecf @@ -1,17 +1,18 @@ - + /.git$ - /EIFGENs$ - /CVS$ /.svn$ + /CVS$ + /EIFGENs$ -