From d337647696b270980ca74805b524c4fa605719b3 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 4 Oct 2014 20:01:46 +0000 Subject: [PATCH] Syncing Foundry files git-svn-id: https://svn.libreccm.org/ccm/trunk@2898 8810af33-2d31-482b-a856-94f89814c4df --- .../web/themes/foundry/conf/templates.xml | 15 +- .../foundry/doc/foundry-documentation.html | 1699 +++++++++++------ .../foundry/foundry/lib/template-parser.xsl | 61 +- .../foundry/foundry/lib/template-tags.xsl | 1 + .../lib/template-tags/content-items.xsl | 257 +++ .../foundry/lib/template-tags/data-tags.xsl | 3 + .../lib/template-tags/foundry-doc-tags.xsl | 152 +- .../foundry/lib/template-tags/html-tags.xsl | 46 +- .../web/themes/foundry/foundry/lib/utils.xsl | 262 +-- .../web/themes/foundry/foundry/main.xsl | 35 +- .../foundry/templates/doc/function-layout.xml | 71 + .../templates/doc/template-tag-layout.xml | 50 +- 12 files changed, 1948 insertions(+), 704 deletions(-) create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl create mode 100644 ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/function-layout.xml diff --git a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml index 60f8ef071..9f4c4c484 100644 --- a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml +++ b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml @@ -1,4 +1,13 @@ - - default-layout.xml - \ No newline at end of file + + + + default-layout.xml + + + + content-items/default.xml + + \ No newline at end of file diff --git a/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.html b/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.html index c6f7e8124..8bac3d631 100644 --- a/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.html +++ b/ccm-sci-bundle/web/themes/foundry/doc/foundry-documentation.html @@ -148,7 +148,7 @@ -
+

@@ -159,7 +159,7 @@ -
+

@@ -178,7 +178,7 @@ -
+

@@ -199,7 +199,7 @@

-
+

@@ -210,7 +210,7 @@ -
+

@@ -229,7 +229,7 @@ -
+

@@ -248,7 +248,7 @@ -
+

@@ -267,7 +267,7 @@ -
+

@@ -290,7 +290,11 @@
- Root element for generating a HTML fragment instead of a complete HTML document. + +

+ Root element for generating a HTML fragment instead of a complete HTML document. + +

@@ -300,14 +304,6 @@ -

See also

- -
    - - -
- -

@@ -323,8 +319,12 @@
- Root element of a template. Generates the - <html> root element. + +

+ Root element of a template. Generates the + <html> root element. + +

@@ -334,12 +334,104 @@ -

See also

-
    +
+ + +
+ +

+ content-item +

+ + +
- + + +

+ This tags inserts the HTML representation of the current content item, either + as greeting item or normal item. + +

+ +

+ The HTML representation of a content item is defined using special templates + with the contentitem-layout element as root. Usually these templates + are located in the templates/content-items folder. Which template is + used for a particular content item is defined by the conf/templates.xml + file. In this file there is a content-items below the + templates element. The association between templates and + content items is described by the content-item elements in the + content-items element. The content-item has four + optional attributes (at least on must be present) which are used to limit the + content items for which a template is used. The four attributes are: + +

+ +
+ +
+ oid + +
+ +
+ Limit the use of the template to a specific content item, identified by its + OID (the OID of the master version). Can't be used in combination with the other + attributes. + +
+ +
+ content-section + +
+ +
+ The name of the content section to which the item belongs. Can be used + in combination with the category and content-type + attributes. + +
+ +
+ category + +
+ +
+ The template is only used for the content item if the item is viewed as + item of the category. The category is set as a path contains the names + the categories. + +
+ +
+ content-type + +
+ +
+ The content-type of the item. + +
+ +
+ + + + The template system + + + +
+ +
+ + + @@ -369,12 +461,16 @@ -

See also

- -
    +
    +

    See also

    -
+
    + + +
+ + @@ -404,46 +500,42 @@ -

Attributes

- -
+
-
- id - -
-
- - -
-
- class - -
-
- - -
-
- with-colorset - -
-
- span - -
+

Attributes

-
- - - - -

See also

- -
    +
    + +
    + id + +
    +
    + + +
    +
    + class + +
    +
    + + +
    +
    + with-colorset + +
    +
    + span + +
    + +
    - -
+ + + @@ -509,125 +601,133 @@ -

Attributes

- -
+
-
- download - -
-
- -

- Value for the HTML5 download attribute. - -

- -
-
- href-property - -
-
- -

- The name of a property (aka the name of an XML element in the data-tree) - containing the URL of the link. - -

- -
-
- href - -
-
- -

- A static URL for the link. - -

- -
-
- href-lang - -
-
- -

- The language of the target of the link. - -

- -
-
- rel - -
-
- -

- The relationship of the linking document with the target document. - -

- -
-
- title-static - -
-
- -

- A key which identifies the translated title in lang/global.xml. - -

- -
-
- title - -
-
- -

- Static, not translated title of the link. - -

- -
-
- type - -
-
- -

- Value for the title attribute of the link. - -

- -
+

Attributes

-
- - - - -

See also

- -
    - -
  • - - http://www.w3.org/TR/html5/text-level-semantics.html#the-a-element - +
    -
  • +
    + download + +
    +
    + +

    + Value for the HTML5 download attribute. + +

    + +
    +
    + href-property + +
    +
    + +

    + The name of a property (aka the name of an XML element in the data-tree) + containing the URL of the link. + +

    + +
    +
    + href + +
    +
    + +

    + A static URL for the link. + +

    + +
    +
    + href-lang + +
    +
    + +

    + The language of the target of the link. + +

    + +
    +
    + rel + +
    +
    + +

    + The relationship of the linking document with the target document. + +

    + +
    +
    + title-static + +
    +
    + +

    + A key which identifies the translated title in lang/global.xml. + +

    + +
    +
    + title + +
    +
    + +

    + Static, not translated title of the link. + +

    + +
    +
    + type + +
    +
    + +

    + Value for the title attribute of the link. + +

    + +
    + + -
+ + + + + + @@ -655,18 +755,22 @@ -

See also

- - + @@ -694,18 +798,22 @@ -

See also

- - + @@ -737,18 +845,22 @@ -

See also

- - + @@ -776,18 +888,22 @@ -

See also

- - + @@ -815,18 +931,22 @@ -

See also

- - + @@ -858,18 +978,22 @@ -

See also

- - + @@ -901,18 +1025,22 @@ -

See also

- - + @@ -940,18 +1068,22 @@ -

See also

- - + @@ -981,18 +1113,22 @@ -

See also

- - + @@ -1020,18 +1156,22 @@ -

See also

- - + @@ -1059,18 +1199,22 @@ -

See also

- - + @@ -1098,24 +1242,28 @@ -

See also

- - + + + @@ -1143,18 +1291,22 @@ -

See also

- - + @@ -1188,78 +1340,86 @@ -

Attributes

- -
+
-
- absolute +

Attributes

+ +
-
-
- -

- If set to true the path in the src is used as it is. +

+ absolute -

- - -
- src - -
-
- -

- The path of the script to include. If the absolute> attribute is not - set (or not set to true the path is interpreted relative to the - theme directory. For example the path of a script included using + +

-

+                           

+ If set to true the path in the src is used as it is. + +

+ +
+
+ src + +
+
+ +

+ The path of the script to include. If the absolute> attribute is not + set (or not set to true the path is interpreted relative to the + theme directory. For example the path of a script included using + +

                 <script type="text/javascript" src="scripts/example.js"/>
                 

- in the a theme named my-theme at the server - http://www.example.org is altered to the absolute path - http://www.example.org/themes/published-themedir/itb/scripts/example.js. - If the absolute attribute is set to true the path is not - altered. One usecase for an absolute path is to load an script from a content delivery - network. + in the a theme named my-theme at the server + http://www.example.org is altered to the absolute path + http://www.example.org/themes/published-themedir/itb/scripts/example.js. + If the absolute attribute is set to true the path is not + altered. One usecase for an absolute path is to load an script from a content delivery + network. + +

-

- -
-
- type - -
-
- -

- The type of the script. Usally this is text/javascript. If the attribute - is not set in the layout template, it is automatically set to - text/javascript. +

+
+ type -

+
+
+ +

+ The type of the script. Usally this is text/javascript. If the attribute + is not set in the layout template, it is automatically set to + text/javascript. + +

+ +
- +
- + -

See also

- - + @@ -1287,18 +1447,22 @@ -

See also

- - + @@ -1326,18 +1490,22 @@ -

See also

- - + @@ -1384,30 +1552,34 @@ -

See also

- - + + + @@ -1438,14 +1610,6 @@ -

See also

- -
    - - -
- -
@@ -1471,6 +1635,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1510,7 +1695,7 @@

-
+

@@ -1521,7 +1706,7 @@ -
+

@@ -1540,7 +1725,7 @@ -
+

@@ -1625,7 +1810,7 @@ -
+

@@ -1644,7 +1829,7 @@ -
+

@@ -1771,92 +1956,538 @@ - The value to evaluate. +
+ +

+ Function foundry:boolean + +

+ + +
+ + + +

+ A helper function for evaluating certain string values to boolean. This function has + two purposes. First it simplifies some expressions. for example if you have a + template tag with a attribute containing a (pseudo) boolean value (attribute values + are always treated as strings) you would have to write something like: + +

+
+                ...
+                <xsl:if test="./@attr = 'true'">
+                ...
+                </xsl:if>
+                ...
+            
+

+ Using foundry:boolean this can be simplified to + +

+
+                ...
+                <xsl:if test="foundry:boolean(./@attr)">
+                ...
+                </xsl:if>
+                ...
+            
+

+ The more important purpose is to make the usage of boolean values more user + friendly, especially in the templates. Using foundry:boolean no only + true is evaluated to boolean true. A number of other + strings is also evaluated to true: + +

+ +
    + +
  • + true + +
  • + +
  • + TRUE + +
  • + +
  • + yes + +
  • + +
  • + YES + +
  • + +
  • + t + +
  • + +
  • + T + +
  • + +
  • + y + +
  • + +
  • + Y + +
  • + +
+ +

+ All other values are evaluated to false. + +

+ +
+ +
+ + + +

Parameters

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + NameMandatoryTypeDescription
+ + + value + + + yes + + + string + + + +

+ The value to evaluate. + +

+ +
+ + +
+ +

Result

+ +

Result type

+ +

+ boolean + +

+ +

Description

+ +
+ +

+ The evaluated boolean value. + +

+ +
+ +
+ + + + +
- - A helper function for evaluating certain string values to boolean. This function has two - two purposes. First it simplifies some expressions. for example if you have a - template tag with a attribute containing a (pseudo) boolean value (attribute values - are always treated as strings) you would have to write something like: +
+ +

+ Function foundry:message + +

+ + +
+ + + +

+ A helper function used by the other message functions like + foundry:message-warn. Concatenates the message level with the message. + +

+ +

+ This function should not be used directly. Use the other message functions instead. + +

+ +
+ +
+ + + +

Parameters

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + NameMandatoryTypeDescription
+ + + level + + + yes + + + string + + + + + + + + message + + + yes + + + string + + + + +
+ + +
+ +

Result

+ +

Result type

+ +

+ xs:string + +

+ +

Description

+ +
+ +

+ A message string of the for [Foundry $level] $message with + $level and $message replaced by the values of the + parameters. + +

+ +
+ +
+ + + + +
- ... - - ... - - ... +
+ +

+ Function foundry:message-info + +

+ + +
+ + + +

+ Helper function to generate an info message. This function be used together with + <xsl:message> to output a message in the CCM log. Example: + +

+
+                ...
+                <xsl:message>
+                    <xsl:message select="foundry:message-info('Hello from Foundry')" />
+                </xsl:message>
+            
+
+ +
+ + + +

Parameters

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + NameMandatoryTypeDescription
+ + + message + + + yes + + + string + + + + +
+ + +
+ +

Result

+ +

Result type

+ +

+ any + +

+ +

Description

+ +
+ + +
+ +
+ + + + +
- Using foundry:boolean this can be simplified to - - - ... - - ... - - ... - - - The more important purpose is to make the usage of boolean values more user - friendly, especially in the templates. Using foundry:boolean no only - true is evaluated to boolean true. A number of other - strings is also evaluated to true: - - - - true - - - TRUE - - - yes - - - YES - - - t - - - T - - - y - - - Y - - - - All other values are evaluated to false. - - - - - The level of the message, indicating its severity - - - The message text. - - - - A helper function used by the other message functions like - foundry:message-warn. Concats the message level with the message. - - - This function should not be used directly. Use the other message functions instead. - - - - #foundry-message-info - - - #foundry-message-warn - - - #foundry-message-error +
+ +

+ Function foundry:message-warn + +

+ + +
+ + + +

+ Helper function to generate an info message. This function be used together with + <xsl:message> to output a message in the CCM log warning + the administrator about some things in the theme, for example a missing + configuration file. Example: + +

+
+                ...
+                <xsl:message>
+                    <xsl:message select="foundry:message-info('Something is strange...')" />
+                </xsl:message>
+            
+
+ +
+ + + +

Parameters

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + NameMandatoryTypeDescription
+ + + message + + + yes + + + any + + + + +
+ + +
+ +

Result

+ +

Result type

+ +

+ any + +

+ +

Description

+ +
+ + +
+ +
+ + + + +
@@ -1864,51 +2495,6 @@ - Helper function to generate an info message. This function be used together with - <xsl:message> to output a message in the CCM log. Example: - - - ... - <xsl:message> - <xsl:message select="foundry:message-info('Hello from Foundry')" /> - </xsl:message> - - - - #foundry-message-warn - - - #foundry-message-error - - - - The message text. - - - - Helper function to generate an info message. This function be used together with - <xsl:message> to output a message in the CCM log warning - the administrator about some things in the theme, for example a missing - configuration file. Example: - - - ... - <xsl:message> - <xsl:message select="foundry:message-info('Something is strange...')" /> - </xsl:message> - - - - #foundry-message-info - - - #foundry-message-error - - - - The message text. - - Helper function to generate an info message. This function be used together with <xsl:message> to output a message in the CCM log when @@ -1920,6 +2506,7 @@ <xsl:message> <xsl:message select="foundry:message-info('Some error has occurred...')" /> </xsl:message> + ... @@ -1930,6 +2517,7 @@ + The node from which the value of the attribute is read. @@ -1939,15 +2527,17 @@ The default value if the attribute is not set. + The value of the attribute if it is set on the current element, the default-value otherwise. - A helper function for retrieving an attribute value from an element. If the attribute is - set on the current element the value of the attribute is used as result. If the - attribute is not set the default-value is used. This method is used - by several layout tags with optional attributes. A common use pattern looks like this: + A helper function for retrieving an attribute value from an element. If the + attribute is set on the current element the value of the attribute is used as + result. If the attribute is not set the default-value is used. This + method is used by several layout tags with optional attributes. A common use pattern + looks like this: <xsl:template match="example"> @@ -1969,6 +2559,7 @@ + The module of the settings. At the moment this corresponds to the name of the file in the conf directory. The empty string as value corresponds to the global.xml file. @@ -1990,6 +2581,7 @@ + The value of the requested setting or if no value has been set the provided default value. If no default value has been provided the result is an empty string. @@ -2001,6 +2593,7 @@ + he module of the settings. At the moment this corresponds to the name of the file in the texts directory. The empty string as value corresponds to the global.xml file. @@ -2016,6 +2609,7 @@ + The requested static text. If there is no value for the requested static text in the module provided by the module parameter the value depends if the debug mode is enabled or not. If the debug mode is not not enabled the result is an empty @@ -2043,6 +2637,33 @@ + A helper function for reading the current category from the datatree. The + function joins the titles of all categories in nav:categoryPath to a + string. The tokens a separated by a slash (/). + + + + + + + + + + + + + + + + + + + + + + + + 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 82b701dbf..f5dc6affe 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 @@ -33,8 +33,10 @@ - Root element of a template. Generates the - <html> root element. +

+ Root element of a template. Generates the + <html> root element. +

@@ -44,9 +46,17 @@ - + cms @@ -60,7 +70,9 @@ - Root element for generating a HTML fragment instead of a complete HTML document. +

+ Root element for generating a HTML fragment instead of a complete HTML document. +

@@ -116,7 +128,8 @@
- + @@ -136,7 +149,8 @@ - + @@ -180,9 +194,21 @@ - + + - + + + + + + + + @@ -198,7 +224,8 @@ - + @@ -231,9 +258,17 @@ - + - +
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl index 291adb98b..301bf2311 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl @@ -23,6 +23,7 @@ exclude-result-prefixes="xsl" version="2.0"> + 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 new file mode 100644 index 000000000..33346b9d4 --- /dev/null +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/content-items.xsl @@ -0,0 +1,257 @@ + + + + + + + +

+ This tags inserts the HTML representation of the current content item, either + as greeting item or normal item. +

+

+ The HTML representation of a content item is defined using special templates + with the contentitem-layout element as root. Usually these templates + are located in the templates/content-items folder. Which template is + used for a particular content item is defined by the conf/templates.xml + file. In this file there is a content-items below the + templates element. The association between templates and + content items is described by the content-item elements in the + content-items element. The content-item has four + optional attributes (at least on must be present) which are used to limit the + content items for which a template is used. The four attributes are: +

+
+
+ oid +
+
+ Limit the use of the template to a specific content item, identified by its + OID (the OID of the master version). Can't be used in combination with the other + attributes. +
+
+ content-section +
+
+ The name of the content section to which the item belongs. Can be used + in combination with the category and content-type + attributes. +
+
+ category +
+
+ The template is only used for the content item if the item is viewed as + item of the category. The category is set as a path contains the names + the categories. +
+
+ content-type +
+
+ The content-type of the item. +
+
+ + The template system + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file 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 7696c0bc8..2ccbf64c8 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 @@ -24,6 +24,9 @@ exclude-result-prefixes="xsl foundry" version="2.0"> + + + diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/foundry-doc-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/foundry-doc-tags.xsl index de9298a0d..546bcb9a6 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/foundry-doc-tags.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/foundry-doc-tags.xsl @@ -86,7 +86,11 @@ - + + + + + @@ -111,7 +115,11 @@ - + + + + + @@ -169,6 +177,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + + + + + + + + + + - + diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl index 26c73daf5..475bcfea0 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl @@ -73,7 +73,7 @@ A static URL for the link.

- +

The language of the target of the link.

@@ -173,7 +173,7 @@
- +
@@ -657,6 +657,20 @@
+ + + + +
+
+ + + + + + + +

@@ -699,6 +713,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl index 58c508612..39e8d88fd 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl @@ -35,22 +35,31 @@ XSLT 2.0 functions. version="2.0"> - - - The value to evaluate. - + + + +

    + The value to evaluate. +

    +
    +
    + +

    + The evaluated boolean value. +

    +

    - A helper function for evaluating certain string values to boolean. This function has two + A helper function for evaluating certain string values to boolean. This function has two purposes. First it simplifies some expressions. for example if you have a template tag with a attribute containing a (pseudo) boolean value (attribute values are always treated as strings) you would have to write something like:

                     ...
    -                
    -                    ...
    -                
    +                <xsl:if test="./@attr = 'true'">
    +                ...
    +                </xsl:if>
                     ...
                 

    @@ -58,9 +67,9 @@ XSLT 2.0 functions.

                     ...
    -                
    -                    ...
    -                
    +                <xsl:if test="foundry:boolean(./@attr)">
    +                ...
    +                </xsl:if>
                     ...
                 

    @@ -120,19 +129,30 @@ XSLT 2.0 functions. - - - The level of the message, indicating its severity - - - The message text. - + + + + The level of the message, indicating its severity + + + The message text. + + + +

    + A message string of the for [Foundry $level] $message with + $level and $message replaced by the values of the + parameters. +

    +

    A helper function used by the other message functions like - foundry:message-warn. Concats the message level with the message. + foundry:message-warn. Concatenates the message level with the message.

    This function should not be used directly. Use the other message functions instead. @@ -155,11 +175,14 @@ XSLT 2.0 functions. - - - The message text. - + + + + The message text. + +

    Helper function to generate an info message. This function be used together with @@ -185,11 +208,13 @@ XSLT 2.0 functions. - - - The message text. - + + + + The message text. + +

    Helper function to generate an info message. This function be used together with @@ -218,10 +243,12 @@ XSLT 2.0 functions. - - The message text. - + + + The message text. + +

    Helper function to generate an info message. This function be used together with @@ -234,6 +261,7 @@ XSLT 2.0 functions. <xsl:message> <xsl:message select="foundry:message-info('Some error has occurred...')" /> </xsl:message> + ... @@ -250,25 +278,28 @@ XSLT 2.0 functions. - - The node from which the value of the attribute is read. - - - The attribute to check for. - - - The default value if the attribute is not set. - + + + The node from which the value of the attribute is read. + + + The attribute to check for. + + + The default value if the attribute is not set. + + The value of the attribute if it is set on the current element, the default-value otherwise.

    - A helper function for retrieving an attribute value from an element. If the attribute is - set on the current element the value of the attribute is used as result. If the - attribute is not set the default-value is used. This method is used - by several layout tags with optional attributes. A common use pattern looks like this: + A helper function for retrieving an attribute value from an element. If the + attribute is set on the current element the value of the attribute is used as + result. If the attribute is not set the default-value is used. This + method is used by several layout tags with optional attributes. A common use pattern + looks like this:

                     <xsl:template match="example">
    @@ -301,7 +332,6 @@ XSLT 2.0 functions.
                     
                 
             
    -        
         
         
         
    @@ -320,32 +350,34 @@ XSLT 2.0 functions.
         
         
         
    -        
    -            

    - The module of the settings. At the moment this corresponds to the name of the file - in the conf directory. The empty string as value corresponds to the - global.xml file. -

    -
    - -

    - The name of the setting to retrieve. -

    -
    - -

    - The value to use if there is no entry for the setting in the settings file. -

    -
    - -

    - A node from the layout template which overrides the value from the configuration. -

    -
    + + +

    + The module of the settings. At the moment this corresponds to the name of the file + in the conf directory. The empty string as value corresponds to the + global.xml file. +

    +
    + +

    + The name of the setting to retrieve. +

    +
    + +

    + The value to use if there is no entry for the setting in the settings file. +

    +
    + +

    + A node from the layout template which overrides the value from the configuration. +

    +
    +
    The value of the requested setting or if no value has been set the provided default value. If no default value has been provided the result is an empty string. @@ -410,25 +442,27 @@ XSLT 2.0 functions. - -

    - he module of the settings. At the moment this corresponds to the name of the file - in the texts directory. The empty string as value corresponds to the - global.xml file. -

    -
    - - The name of the text to retrieve. - - -

    - The language to retrieve. Normally there is no need to set this parameter because - it is determined automatically. -

    -
    + + +

    + he module of the settings. At the moment this corresponds to the name of the file + in the texts directory. The empty string as value corresponds to the + global.xml file. +

    +
    + + The name of the text to retrieve. + + +

    + The language to retrieve. Normally there is no need to set this parameter because + it is determined automatically. +

    +
    +
    The requested static text. If there is no value for the requested static text in the module provided by the module parameter the value depends if the debug mode is @@ -477,21 +511,21 @@ XSLT 2.0 functions. - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -554,6 +588,17 @@ XSLT 2.0 functions. + + + A helper function for reading the current category from the datatree. The + function joins the titles of all categories in nav:categoryPath to a + string. The tokens a separated by a slash (/). + + + + + + @@ -567,7 +612,6 @@ XSLT 2.0 functions. - diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl index 2d2aea324..f95926096 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl +++ b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl @@ -50,23 +50,46 @@ - + + select="document(concat($theme-prefix, '/conf/templates.xml'))/templates/applications/application[@name=$application and @class=$class]"/> + + + + + + + + - - - + + + + + + + + + + + + + + + + diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/function-layout.xml b/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/function-layout.xml new file mode 100644 index 000000000..dd9a88b12 --- /dev/null +++ b/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/function-layout.xml @@ -0,0 +1,71 @@ + + +
    +

    + Function +

    + +
    + +
    + + +

    Parameters

    + + + + + + + + + + + + + + + + + + + +
    NameMandatoryTypeDescription
    + + + + + + + +
    +
    +
    +

    Result

    +

    Result type

    +

    + +

    +

    Description

    +
    + +
    +
    + + +
    +

    See also

    + +
    +
    + +
    +
    \ No newline at end of file diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/template-tag-layout.xml b/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/template-tag-layout.xml index c1821179e..c400b133b 100644 --- a/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/template-tag-layout.xml +++ b/ccm-sci-bundle/web/themes/foundry/foundry/templates/doc/template-tag-layout.xml @@ -10,31 +10,35 @@ -

    Attributes

    -
    - -
    - -
    -
    - -
    -
    -
    +
    +

    Attributes

    +
    + +
    + +
    +
    + +
    +
    +
    +
    - -

    See also

    - -
    + +
    +

    See also

    + +
    +

\ No newline at end of file