From 33e7772a0845377f5bc3ffc38c2a4dcc20e6e977 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 5 Dec 2014 13:37:25 +0000 Subject: [PATCH] Foundry support for SiteProxy git-svn-id: https://svn.libreccm.org/ccm/trunk@3008 8810af33-2d31-482b-a856-94f89814c4df --- .../themes/foundry-base/conf/templates.xml | 3 ++ .../content-items/detail-default.xml | 4 +- .../content-items/siteproxy-detail.xml | 6 +++ .../lib/template-tags/content-items.xsl | 1 + .../template-tags/content-items/siteproxy.xsl | 45 +++++++++++++++++++ .../types/DecisionTree/DecisionTree.xsl | 4 +- 6 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 ccm-core/web/themes/foundry-base/templates/content-items/siteproxy-detail.xml create mode 100644 ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/siteproxy.xsl diff --git a/ccm-core/web/themes/foundry-base/conf/templates.xml b/ccm-core/web/themes/foundry-base/conf/templates.xml index 51742526e..a7035545f 100644 --- a/ccm-core/web/themes/foundry-base/conf/templates.xml +++ b/ccm-core/web/themes/foundry-base/conf/templates.xml @@ -33,6 +33,9 @@ content-items/news-detail.xml + + content-items/siteproxy-detail.xml + content-items/detail-default.xml diff --git a/ccm-core/web/themes/foundry-base/templates/content-items/detail-default.xml b/ccm-core/web/themes/foundry-base/templates/content-items/detail-default.xml index 3d4f29220..1b59004d2 100644 --- a/ccm-core/web/themes/foundry-base/templates/content-items/detail-default.xml +++ b/ccm-core/web/themes/foundry-base/templates/content-items/detail-default.xml @@ -1,8 +1,8 @@ -

+
diff --git a/ccm-core/web/themes/foundry-base/templates/content-items/siteproxy-detail.xml b/ccm-core/web/themes/foundry-base/templates/content-items/siteproxy-detail.xml new file mode 100644 index 000000000..98643d65f --- /dev/null +++ b/ccm-core/web/themes/foundry-base/templates/content-items/siteproxy-detail.xml @@ -0,0 +1,6 @@ + + +
+ +
+
\ No newline at end of file diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl index aba772b61..79d82c502 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl @@ -35,6 +35,7 @@ + diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/siteproxy.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/siteproxy.xsl new file mode 100644 index 000000000..b46176048 --- /dev/null +++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/siteproxy.xsl @@ -0,0 +1,45 @@ + + + + + + +

+ Processes the proxied XML of a SiteProxy using xsl:apply-templates. + Your theme must provide XSL to transform the proxied XML into HTML. +

+
+
+ + + + + + +
\ No newline at end of file diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl index 7efb439ee..127e3071d 100644 --- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl @@ -114,9 +114,9 @@