From e3327f82a87a2747317eeab94432bb9ae1abd98d Mon Sep 17 00:00:00 2001 From: jensp Date: Mon, 29 Apr 2019 17:14:33 +0000 Subject: [PATCH] Renaming git-svn-id: https://svn.libreccm.org/ccm/trunk@5980 8810af33-2d31-482b-a856-94f89814c4df --- .../themes/freemarker/ccm-sci-publications/article.ftl | 4 ++-- .../freemarker/ccm-sci-publications/collected-volume.ftl | 4 ++-- .../themes/freemarker/ccm-sci-publications/journal.ftl | 4 ++-- .../freemarker/ccm-sci-publications/proceedings.ftl | 6 +++--- .../web/themes/freemarker/ccm-sci-publications/series.ftl | 6 +++--- .../web/themes/freemarker/ccm-sci-types-department.ftl | 8 ++++---- .../web/themes/freemarker/ccm-sci-types-institute.ftl | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl index 501b08cc1..152b501ce 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/article.ftl @@ -5,8 +5,8 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms.ftl as CMS> +<#import ../ccm-cms/ContentItem.ftl as ContentItem> <#function getHref article> - <#return CMS.generateContentItemLink(article["./@oid"])> + <#return ContentItem.generateContentItemLink(article["./@oid"])> diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl index 70bdfeb3f..1f7a66d76 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/collected-volume.ftl @@ -5,8 +5,8 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms.ftl as CMS> +<#import ../ccm-cms/ContentItem.ftl as ContentItem> <#function getHref collectedVolume> - <#return CMS.generateContentItemLink(collectedVolume["./@oid"])> + <#return ContentItem.generateContentItemLink(collectedVolume["./@oid"])> \ No newline at end of file diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl index f98ade8c9..d23294280 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/journal.ftl @@ -5,13 +5,13 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms.ftl as CMS> +<#import ../ccm-cms/ContentItem.ftl as ContentItem> <#function getTitle journal> <#return journal["./title"]> <#function getHref journal> - <#return CMS.generateContentItemLink(journal["./@oid"])> + <#return ContentItem.generateContentItemLink(journal["./@oid"])> diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl index 48e2662f1..7f6e87331 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/proceedings.ftl @@ -5,12 +5,12 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms.ftl as CMS> +<#import ../ccm-cms/ContentItem.ftl as ContentItem> <#function getHref proceedings> - <#return CMS.generateContentItemLink(proceedings["./@oid"])> + <#return ContentItem.generateContentItemLink(proceedings["./@oid"])> <#function getPaperHref paper> - <#return CMS.generateContentItemLink(paper["./@oid"])> + <#return ContentItem.generateContentItemLink(paper["./@oid"])> \ No newline at end of file diff --git a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl index 6f0c35943..6b0b9cec9 100644 --- a/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl +++ b/ccm-sci-publications/web/themes/freemarker/ccm-sci-publications/series.ftl @@ -5,10 +5,10 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms.ftl as CMS> +<#import ../ccm-cms/ContentItem.ftl as ContentItem> <#function getLink series> - <#return CMS.generateContentItemLink(series)> + <#return ContentItem.generateContentItemLink(series)> <#function getName series> @@ -20,6 +20,6 @@ <#function getVolumeHref volume> - <#return CMS.generateContentItemLink(volume)> + <#return ContentItem.generateContentItemLink(volume)> diff --git a/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl b/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl index c10815cfb..0e42269fc 100644 --- a/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl +++ b/ccm-sci-types-department/web/themes/freemarker/ccm-sci-types-department.ftl @@ -5,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms.ftl as CMS> +<#import ../ccm-cms/ContentItem.ftl as ContentItem> <#function getDescription data> <#if (data["./instituteDesc"]?size > 0)> @@ -34,7 +34,7 @@ <#function getDepartmentHeadLink head> - <#return CMS.generateContentItemLink(head)> + <#return ContentItem.generateContentItemLink(head)> <#function getDepartmentViceHeads data> @@ -58,7 +58,7 @@ <#function getSecretariatsLink sec> - <#return CMS.generateContentItemLink(sec)> + <#return ContentItem.generateContentItemLink(sec)> <#function getProjects data> @@ -70,7 +70,7 @@ <#function getProject project> - <#return CMS.generateContentItemLink(project)> + <#return ContentItem.generateContentItemLink(project)> diff --git a/ccm-sci-types-institute/web/themes/freemarker/ccm-sci-types-institute.ftl b/ccm-sci-types-institute/web/themes/freemarker/ccm-sci-types-institute.ftl index d97bbf18f..aa3997327 100644 --- a/ccm-sci-types-institute/web/themes/freemarker/ccm-sci-types-institute.ftl +++ b/ccm-sci-types-institute/web/themes/freemarker/ccm-sci-types-institute.ftl @@ -5,7 +5,7 @@ "ui": "http://www.arsdigita.com/ui/1.0"} > -<#import ../ccm-cms.ftl as CMS> +<#import ../ccm-cms/ContentItem.ftl as ContentItem> <#function getDescription data> <#if (data["./instituteDesc"]?size > 0)> @@ -36,7 +36,7 @@ <#function getDepartmentLink department> - <#return CMS.generateContentItemLink(department)> + <#return ContentItem.generateContentItemLink(department)>