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

Merge branch 'master' into es17.01

Browse Source 
# Conflicts:
#	modules/blog/cms_blog_module-safe.ecf
This commit is contained in:
Jocelyn FIAT
2017-03-02 16:05:20 +01:00
parent 099dc968fd f5671bc190
commit 12e02bdfbf
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/blog/cms_blog_module.ecf
View File

@@ -15,6 +15,7 @@
<library name="cms" location="..\..\cms.ecf" readonly="false"/> <library name="cms" location="..\..\cms.ecf" readonly="false"/>
<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/> <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_node_module" location="..\..\modules\node\node.ecf" readonly="false"/>
<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy.ecf"/>
<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/> <library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/> <library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/> <library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>

13
modules/blog/handler/blog_handler.e
View File

@@ -179,6 +179,9 @@ feature -- HTML Output
-- Output the title of the post as a link (to the detail page) -- Output the title of the post as a link (to the detail page)
append_title_html_to (n, page, a_output) append_title_html_to (n, page, a_output)
-- Output associated tags.
append_taxonomy_html_to (n, page, a_output)
-- Output the summary of the post and a more link to the detail page -- Output the summary of the post and a more link to the detail page
append_summary_html_to (n, page, a_output) append_summary_html_to (n, page, a_output)
@@ -240,7 +243,7 @@ feature -- HTML Output
local local
lnk: CMS_LOCAL_LINK lnk: CMS_LOCAL_LINK
do do
if attached n.summary as l_summary then if attached n.summary as l_summary and then not l_summary.is_whitespace then
lnk := blog_api.node_api.node_link (n) lnk := blog_api.node_api.node_link (n)
a_output.append ("<p class=%"blog_list_summary%">") a_output.append ("<p class=%"blog_list_summary%">")
if attached api.format (n.format) as f then if attached api.format (n.format) as f then
@@ -254,6 +257,14 @@ feature -- HTML Output
end end
end end
append_taxonomy_html_to (n: CMS_NODE; page: CMS_RESPONSE; a_output: STRING_8)
-- returns a html string with the summary of the node and a link to the detail page
do
if attached {CMS_TAXONOMY_API} api.module_api ({CMS_TAXONOMY_MODULE}) as l_taxo_api then
l_taxo_api.append_taxonomy_to_xhtml (n, page, a_output)
end
end
append_pagination_html_to (a_output: STRING) append_pagination_html_to (a_output: STRING)
-- Append to `a_output' with the pagination links (if necessary). -- Append to `a_output' with the pagination links (if necessary).
local local