Merge branch 'master' into es_17_01
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
<library name="cms_openid_module" location="..\..\modules\openid\openid.ecf" readonly="false"/>
|
||||
<library name="cms_recent_changes_module" location="..\..\modules\recent_changes\recent_changes.ecf" readonly="false"/>
|
||||
<library name="cms_seo_module" location="..\..\modules\seo\seo.ecf" readonly="false"/>
|
||||
<library name="cms_sitemap_module" location="..\..\modules\sitemap\sitemap.ecf" readonly="false"/>
|
||||
<library name="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth.ecf" readonly="false"/>
|
||||
<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy.ecf" readonly="false"/>
|
||||
<library name="cms_wikitext_module" location="..\..\modules\wikitext\wikitext.ecf" readonly="false"/>
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
"openid": { "location": "../../modules/openid" },
|
||||
"recent_changes": { "location": "../../modules/recent_changes" },
|
||||
"seo": { "location": "../../modules/seo" },
|
||||
"sitemap": { "location": "../../modules/sitemap" },
|
||||
"session_auth": { "location": "../../modules/session_auth" },
|
||||
"taxonomy": { "location": "../../modules/taxonomy" },
|
||||
"files": { "location": "../../modules/files" },
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
<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" value="{$cms_search_query/}" >
|
||||
<input type="search" class="form-control" name="q" id="gcse_search" placeholder="search" value="{htmlentities}{$cms_search_query/}{/htmlentities}" >
|
||||
<span class="glyphicon glyphicon-search form-control-feedback"></span>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -52,7 +52,7 @@ feature -- CMS modules
|
||||
a_setup.register_module (create {CMS_OAUTH_20_MODULE}.make)
|
||||
a_setup.register_module (create {CMS_OPENID_MODULE}.make)
|
||||
a_setup.register_module (create {CMS_SESSION_AUTH_MODULE}.make)
|
||||
|
||||
|
||||
-- User
|
||||
|
||||
-- Nodes
|
||||
@@ -68,6 +68,7 @@ feature -- CMS modules
|
||||
|
||||
-- Misc
|
||||
a_setup.register_module (create {CMS_SEO_MODULE}.make)
|
||||
a_setup.register_module (create {CMS_SITEMAP_MODULE}.make)
|
||||
a_setup.register_module (create {CMS_COMMENTS_MODULE}.make)
|
||||
|
||||
-- Taxonomy
|
||||
|
||||
Reference in New Issue
Block a user