diff --git a/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml b/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml index 62b3251d7..54f1ac1c7 100644 --- a/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml +++ b/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml @@ -1,10 +1,10 @@ - admin.css + admin.css - admin.css + admin.css public.css diff --git a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml index bd5dfbfd4..681b7e43f 100644 --- a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml +++ b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml @@ -20,6 +20,9 @@ content-items/bookmark-detail.xml + + content-items/event-detail.xml + content-items/news-detail.xml diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-parser.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-parser.xsl index 36f507065..92104868d 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-parser.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-parser.xsl @@ -649,7 +649,15 @@ - + + + + @@ -678,7 +686,11 @@ - + + + - + + + @@ -714,7 +731,12 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl index 6d41f349d..378795118 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl @@ -31,6 +31,7 @@ + diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/event.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/event.xsl new file mode 100644 index 000000000..5e06010b0 --- /dev/null +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/event.xsl @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/news.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/news.xsl index ecfa37e29..c9beec245 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/news.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items/news.xsl @@ -62,8 +62,7 @@ - + diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl index cc836baa8..452128446 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl @@ -53,35 +53,57 @@ - Outputs a static text which is retrieved from the - static-texts/global.xml file in the layout file. The key is the content + Outputs a static text which is retrieved from a file in the texts + directory. If the module attribute is not present, the + texts/global.xml file is used. Otherwise the file provided by the + module element ist used. The key is the content of the element. If at least one of the attributes id, class or with-colorset is present at the attribute, the text is wrapped in a span element. - An unique id for the text. +

An unique id for the text.

- One or more classes to format the text per CSS. +

One or more classes to format the text per CSS.

+
+ +

+ The module (file) from the text is retrieved. The name of the file should be + provided without file extension. +

- Add the classes for using the Colorset feature to the span element - the text is wrapped in. +

+ Add the classes for using the Colorset feature to the span element + the text is wrapped in. +

+ + + - + - + diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/loaders.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/loaders.xsl index 48bd3ed6d..fc7992a67 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/loaders.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/loaders.xsl @@ -69,7 +69,7 @@ - + diff --git a/ccm-sci-bundle/web/themes/foundry/templates/content-items/event-detail.xml b/ccm-sci-bundle/web/themes/foundry/templates/content-items/event-detail.xml new file mode 100644 index 000000000..7aa67d210 --- /dev/null +++ b/ccm-sci-bundle/web/themes/foundry/templates/content-items/event-detail.xml @@ -0,0 +1,72 @@ + + + +

+ +

+ +
+ +
+ +
+
+ start-date +
+
+ + + + + + T + +