LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Changed log level in RelationAtttributeImportTool to debug for all none error messages 

- Fixed some typos in the Foundry documentation


git-svn-id: https://svn.libreccm.org/ccm/trunk@4047 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2016-05-04 06:10:09 +00:00
parent 3f1a1c9930
commit 5818a27d7b
3 changed files with 273 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ccm-cms/src/com/arsdigita/cms/RelationAttributeImportTool.java
View File

@ -169,11 +169,11 @@ public class RelationAttributeImportTool {
return; return;
} }
LOGGER.warn("Creating RelationAttribute entry with this values:"); LOGGER.debug("Creating RelationAttribute entry with this values:");
LOGGER.warn(String.format("\tcurrentEnum = '%s'", currentEnum)); LOGGER.debug(String.format("\tcurrentEnum = '%s'", currentEnum));
LOGGER.warn(String.format("\tcurrentKey = '%s'", currentKey)); LOGGER.debug(String.format("\tcurrentKey = '%s'", currentKey));
LOGGER.warn(String.format("\tcurrentLang = '%s'", currentLang)); LOGGER.debug(String.format("\tcurrentLang = '%s'", currentLang));
LOGGER.warn(String.format("\tcurrentValue = '%s'", currentValue)); LOGGER.debug(String.format("\tcurrentValue = '%s'", currentValue));
final RelationAttribute entry = new RelationAttribute(); final RelationAttribute entry = new RelationAttribute();
if ((currentId != null) && !currentId.isEmpty()) { if ((currentId != null) && !currentId.isEmpty()) {

6
ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
View File

@ -74,7 +74,7 @@
<code>mode</code> set to <code>detail</code> or without the <code>mode</code> set to <code>detail</code> or without the
attribute inserts the HTML representation of the detail view of attribute inserts the HTML representation of the detail view of
the current content item. The content item can either be the the current content item. The content item can either be the
greeting item or normal item. greeting item or a normal item.
</p> </p>
<p> <p>
The HTML representation of a content item is defined using The HTML representation of a content item is defined using
@ -852,7 +852,7 @@
<p> <p>
Generic tag for showing date properties. The format of the Generic tag for showing date properties. The format of the
date is configured using one or more <code>date-element</code> date is configured using one or more <code>date-element</code>
inside this tag. tags inside this tag.
</p> </p>
</foundry:doc-desc> </foundry:doc-desc>
<foundry:doc-see-also> <foundry:doc-see-also>
@ -905,7 +905,7 @@
item. item.
</p> </p>
<p> <p>
To use this feature put the following snippet like the following into the To use this feature put something following snippet into the
templates for the content items in your theme: templates for the content items in your theme:
</p> </p>
<pre> <pre>

14
ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
View File

@ -28,8 +28,8 @@
<foundry:doc-file-title>Data tags</foundry:doc-file-title> <foundry:doc-file-title>Data tags</foundry:doc-file-title>
<foundry:doc-file-desc> <foundry:doc-file-desc>
<p> <p>
These tags can be used to display several informations from the These tags can be used to display several informations provided
XML provided by CCM. by CCM.
</p> </p>
</foundry:doc-file-desc> </foundry:doc-file-desc>
</foundry:doc-file> </foundry:doc-file>
@ -37,9 +37,11 @@
<foundry:doc section="user" <foundry:doc section="user"
type="template-tag"> type="template-tag">
<foundry:doc-desc> <foundry:doc-desc>
Outputs the title of the current page. For a content item, this is <p>
the title of the content item. For more details please refer to Outputs the title of the current page. For a content item, this
the documentation of the <code>foundry:title</code> function. is the title of the content item. For more details please refer
to the documentation of the <code>foundry:title</code> function.
</p>
</foundry:doc-desc> </foundry:doc-desc>
<foundry:doc-see-also> <foundry:doc-see-also>
<foundry:doc-link href="#foundry:title"> <foundry:doc-link href="#foundry:title">
@ -64,6 +66,7 @@
<foundry:doc section="user" <foundry:doc section="user"
type="template-tag"> type="template-tag">
<foundry:doc-desc> <foundry:doc-desc>
<p>
Outputs a static text which is retrieved from a file in the Outputs a static text which is retrieved from a file in the
<code>texts</code> directory. If the <code>module</code> attribute <code>texts</code> directory. If the <code>module</code> attribute
is not present, the <code>texts/global.xml</code> file is used. is not present, the <code>texts/global.xml</code> file is used.
@ -72,6 +75,7 @@
<code>id</code>, <code>class</code> or <code>with-colorset</code> is <code>id</code>, <code>class</code> or <code>with-colorset</code> is
present at the attribute, the text is wrapped in a present at the attribute, the text is wrapped in a
<code>span</code> element. <code>span</code> element.
</p>
</foundry:doc-desc> </foundry:doc-desc>
<foundry:doc-attributes> <foundry:doc-attributes>
<foundry:doc-attribute name="id"> <foundry:doc-attribute name="id">