diff --git a/library/src/service/response/cms_response.e b/library/src/service/response/cms_response.e index d0ff284..91ee6d0 100644 --- a/library/src/service/response/cms_response.e +++ b/library/src/service/response/cms_response.e @@ -740,7 +740,8 @@ feature -- Theme if l_info.engine.is_case_insensitive_equal_general ("smarty") then create {SMARTY_CMS_THEME} theme.make (setup, l_info) else - create {DEFAULT_CMS_THEME} theme.make (setup, l_info) + to_implement ("Add a default SMARTY_CMS_THEME") + create {SMARTY_CMS_THEME} theme.make (setup, l_info) end end diff --git a/library/src/theme/cms_theme.e b/library/src/theme/cms_theme.e index 0612b96..51081c0 100644 --- a/library/src/theme/cms_theme.e +++ b/library/src/theme/cms_theme.e @@ -1,5 +1,5 @@ note - description: "Summary description for {WSF_CMS_THEME}." + description: "Abstract class describing a generic theme" date: "$Date$" revision: "$Revision$" diff --git a/library/src/theme/default_theme/default_cms_html_template.e b/library/src/theme/default_theme/default_cms_html_template.e deleted file mode 100644 index 3667e2b..0000000 --- a/library/src/theme/default_theme/default_cms_html_template.e +++ /dev/null @@ -1,100 +0,0 @@ -note - description: "Summary description for {CMS_HTML_TEMPLATE}." - author: "" - date: "$Date$" - revision: "$Revision$" - -class - DEFAULT_CMS_HTML_TEMPLATE - -inherit - CMS_HTML_TEMPLATE - - DEFAULT_CMS_TEMPLATE - -create - make - -feature {NONE} -- Initialization - - make (t: DEFAULT_CMS_THEME) - do - theme := t - create variables.make (0) - end - - variables: STRING_TABLE [detachable ANY] - -feature -- Access - - register (v: STRING_8; k: STRING_8) - do - variables.force (v, k) - end - - theme: DEFAULT_CMS_THEME - - prepare (page: CMS_HTML_PAGE) - do - variables.make (10) - - across - page.variables as ic - loop - variables.force (ic.item, ic.key) - end - - if attached page.title as l_title then - variables.force (l_title, "title") - variables.force (l_title, "head_title") - else - variables.force ("", "title") - variables.force ("", "head_title") - end - - variables.force (page.language, "language") - variables.force (page.head_lines_to_string, "head_lines") - end - - to_html (page: CMS_HTML_PAGE): STRING - do - -- Process html generation - create Result.make_from_string (template) - apply_template_engine (Result) - end - -feature {NONE} -- Implementation - - template: STRING - once - Result := "[ - - - - $head - $head_title - $styles - $scripts - $head_lines - - - $page_top - $page - $page_bottom - - - ]" - end - - -note - copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others" - license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" - source: "[ - Eiffel Software - 5949 Hollister Ave., Goleta, CA 93117 USA - Telephone 805-685-1006, Fax 805-685-6869 - Website http://www.eiffel.com - Customer support http://support.eiffel.com - ]" -end diff --git a/library/src/theme/default_theme/default_cms_page_template.e b/library/src/theme/default_theme/default_cms_page_template.e deleted file mode 100644 index 0e4ceab..0000000 --- a/library/src/theme/default_theme/default_cms_page_template.e +++ /dev/null @@ -1,102 +0,0 @@ -note - description: "Summary description for {CMS_PAGE_TEMPLATE}." - author: "" - date: "$Date$" - revision: "$Revision$" - -class - DEFAULT_CMS_PAGE_TEMPLATE - -inherit - CMS_PAGE_TEMPLATE - - DEFAULT_CMS_TEMPLATE - -create - make - -feature {NONE} -- Initialization - - make (t: DEFAULT_CMS_THEME) - do - theme := t - create variables.make (0) - end - - variables: STRING_TABLE [detachable ANY] - -feature -- Access - - theme: DEFAULT_CMS_THEME - - prepare (page: CMS_HTML_PAGE) - do - variables.make (10) - - across - page.variables as ic - loop - variables.force (ic.item, ic.key) - end - - if attached page.title as l_title then - variables.force (l_title, "title") - else - variables.force ("", "title") - end - across - theme.regions as r - loop - variables.force (page.region (r.item), r.item) - end - end - - to_html (page: CMS_HTML_PAGE): STRING - do - -- Process html generation - create Result.make_from_string (template) - apply_template_engine (Result) - end - -feature -- Registration - - register (v: STRING_8; k: STRING_8) - do - variables.force (v, k) - end - -feature {NONE} -- Implementation - - template: STRING - once - Result := "[ -
-
- -
-
- -
$content
- -
-
- -
-
- ]" - end - - -note - copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others" - license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" - source: "[ - Eiffel Software - 5949 Hollister Ave., Goleta, CA 93117 USA - Telephone 805-685-1006, Fax 805-685-6869 - Website http://www.eiffel.com - Customer support http://support.eiffel.com - ]" -end diff --git a/library/src/theme/default_theme/default_cms_theme.e b/library/src/theme/default_theme/default_cms_theme.e deleted file mode 100644 index 5cc4189..0000000 --- a/library/src/theme/default_theme/default_cms_theme.e +++ /dev/null @@ -1,100 +0,0 @@ -note - description: "Summary description for {CMS_THEME}." - author: "" - date: "$Date$" - revision: "$Revision$" - -class - DEFAULT_CMS_THEME - -inherit - CMS_THEME - -create - make - -feature {NONE} -- Initialization - - make (a_setup: like setup; a_info: like information) - do - setup := a_setup - information := a_info - end - - information: CMS_THEME_INFORMATION - -feature -- Access - - name: STRING = "CMS" - - regions: ARRAY [STRING] - once - Result := <<"header", "content", "footer", "first_sidebar", "second_sidebar">> - end - - html_template: DEFAULT_CMS_HTML_TEMPLATE - local - tpl: like internal_html_template - do - tpl := internal_html_template - if tpl = Void then - create tpl.make (Current) - internal_html_template := tpl - end - Result := tpl - end - - page_template: DEFAULT_CMS_PAGE_TEMPLATE - local - tpl: like internal_page_template - do - tpl := internal_page_template - if tpl = Void then - create tpl.make (Current) - internal_page_template := tpl - end - Result := tpl - end - -feature -- Conversion - - prepare (page: CMS_HTML_PAGE) - do - end - - page_html (page: CMS_HTML_PAGE): STRING_8 - local - l_content: STRING_8 - do - prepare (page) - page_template.prepare (page) - l_content := page_template.to_html (page) - html_template.prepare (page) - html_template.register (l_content, "page") - Result := html_template.to_html (page) - end - - navigation_template: detachable READABLE_STRING_GENERAL - -- navigation template name, if any. - do - end - -feature {NONE} -- Internal - - internal_page_template: detachable like page_template - - internal_html_template: detachable like html_template - -invariant - attached internal_page_template as inv_p implies inv_p.theme = Current -note - copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others" - license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" - source: "[ - Eiffel Software - 5949 Hollister Ave., Goleta, CA 93117 USA - Telephone 805-685-1006, Fax 805-685-6869 - Website http://www.eiffel.com - Customer support http://support.eiffel.com - ]" -end diff --git a/library/src/theme/smarty_theme/smarty_cms_theme.e b/library/src/theme/smarty_theme/smarty_cms_theme.e index c69aeb0..638f1cd 100644 --- a/library/src/theme/smarty_theme/smarty_cms_theme.e +++ b/library/src/theme/smarty_theme/smarty_cms_theme.e @@ -1,6 +1,5 @@ note - description: "Summary description for {SMARTY_CMS_THEME}." - author: "" + description: "Smarty template CMS theme." date: "$Date$" revision: "$Revision$" @@ -55,7 +54,7 @@ feature -- Access i := i + 1 end else - l_regions := <<"top","header", "content", "footer", "first_sidebar", "second_sidebar","bottom">> + l_regions := <<"top","header", "highlighted","help", "content", "footer", "first_sidebar", "second_sidebar", "bottom">> end internaL_regions := l_regions end