Author: xlawrence
Date: Wed Jan 16 12:43:58 2008
New Revision: 19524
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19524&repname=
=3Djahia
Log:
Boxes now support the multi-lingual feature
Added support for alias names
Added attribute 'displayTitle' to the Box tag
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/box/B=
oxTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/DeclareBoxListTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/DeclareContainerListTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/DeclareDefaultBoxesTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/AbstractDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/FilesDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/GroupsDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LastNewsDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LinksDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/MainContentDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/NewsDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/PagesDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/UsersDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/WebAppsDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/utils/JahiaTo=
ols.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/j=
ahia-components.tld
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/var/shared_te=
mplates/default_v3.jar
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/box/BoxTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/box/BoxTag.java&rev=3D19524&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/box/B=
oxTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/box/B=
oxTag.java Wed Jan 16 12:43:58 2008
@@ -35,7 +35,6 @@
import java.io.IOException;
=
/**
- *
* Tag used to dispatch the request to the JSP file responsible of display=
ing the actual box
*
* @author Xavier Lawrence
@@ -52,6 +51,7 @@
private static final transient JahiaContainersService containerService=
=3D ServicesRegistry.getInstance().getJahiaContainersService();
=
private String id;
+ private String displayTitle;
=
public String getId() {
return id;
@@ -61,19 +61,29 @@
this.id =3D id;
}
=
+ public String getDisplayTitle() {
+ return displayTitle;
+ }
+
+ public void setDisplayTitle(String displayTitle) {
+ this.displayTitle =3D displayTitle;
+ }
+
public int doEndTag() {
final ContainerTag parentContainerTag =3D (ContainerTag) findAnces=
torWithClass(this, ContainerTag.class);
String view =3D null;
=
try {
final JahiaContainer parentContainer =3D parentContainerTag.ge=
tContainer();
- final String boxType =3D parentContainer.getFieldValue(BOX_TYP=
E_FIELD_NAME, "");
+ final String boxType =3D extractKey(parentContainer.getFieldVa=
lue(BOX_TYPE_FIELD_NAME, ""));
final String boxTitle =3D parentContainer.getFieldValue(BOX_TI=
TLE_FIELD_NAME, "");
=
final JspWriter out =3D pageContext.getOut();
- out.print("<span class=3D\"boxTitle\">");
- out.print(boxTitle);
- out.print("</span>");
+ if (displayTitle =3D=3D null || displayTitle.length() =3D=3D 0=
|| !displayTitle.toLowerCase().equals("false")) {
+ out.print("<span class=3D\"boxTitle\">");
+ out.print(boxTitle);
+ out.print("</span>");
+ }
=
final ServletRequest request =3D pageContext.getRequest();
final ProcessingContext jParams =3D (ProcessingContext) reques=
t.getAttribute("org.jahia.params.ParamBean");
@@ -105,8 +115,10 @@
logger.error("IOException trying to include the view file: " +=
view, ioe);
} catch (final ServletException ioe) {
logger.error("ServletException trying to include the view file=
: " + view, ioe);
+ } finally {
+ id =3D null;
+ displayTitle =3D null;
}
- id =3D null;
return EVAL_PAGE;
}
=
@@ -145,4 +157,26 @@
}
return filePath;
}
+
+ /**
+ * Simply utility method in order to extract the key value from a Stri=
ng made of a resource bundle marker.<br/>
+ * <p/>
+ * i.e: <br/>
+ * Extracts the value 'files' from the String below: <br/>
+ * <jahia-resource id=3D"DEFAULT_V3_LANG" key=3D"files" default-value=
=3D"files"/>
+ */
+ private String extractKey(final String value) {
+ if (value.startsWith("<jahia-resource")) {
+ final int keyIndex =3D value.indexOf("key=3D");
+ final String tmp =3D value.substring(keyIndex + 5);
+ int whiteSpaceIndex =3D tmp.indexOf("\"");
+ if (whiteSpaceIndex < 0) {
+ whiteSpaceIndex =3D tmp.indexOf("'");
+ }
+ return tmp.substring(0, whiteSpaceIndex);
+
+ } else {
+ return value;
+ }
+ }
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/DeclareBoxListTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/DeclareBoxListTag=
.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/DeclareBoxListTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/DeclareBoxListTag.java Wed Jan 16 12:43:58 2008
@@ -21,6 +21,7 @@
import org.jahia.data.beans.BoxListBean;
import org.jahia.data.fields.FieldTypes;
import org.jahia.exceptions.JahiaException;
+import org.jahia.resourcebundle.ResourceBundleMarker;
import org.jahia.utils.JahiaTools;
=
import javax.servlet.ServletRequest;
@@ -149,9 +150,11 @@
// first, check if the list has been declared
checkAttributes(jData);
try {
- jData.containers().declareField(listName, "boxTitle", "Tit=
le", FieldTypes.SMALLTEXT, null);
- jData.containers().declareField(listName, "boxType", "Box =
Type", FieldTypes.SMALLTEXT_SHARED_LANG,
- JahiaTools.getMultiValuesSingle(null, boxTypes));
+ jData.containers().declareField(listName, "boxTitle", reso=
lveTitle("Title", bundleKey, "boxContainer.title"),
+ FieldTypes.SMALLTEXT, null, new String[]{"boxTitle=
"}, 0, true, false);
+ jData.containers().declareField(listName, "boxType", resol=
veTitle("Box Type", bundleKey, "boxContainer.type"),
+ FieldTypes.SMALLTEXT_SHARED_LANG, JahiaTools.getMu=
ltiValuesSingle(bundleKey, boxTypes),
+ new String[]{"boxType"}, 0, true, false);
=
checkDeclaration(jData);
} catch (final JahiaException je) {
@@ -174,4 +177,14 @@
excludedTypes =3D null;
return super.doEndTag();
}
+
+ protected String resolveTitle(final String title,
+ final String bundleKey,
+ final String titleKey) {
+ if ((titleKey !=3D null) && (bundleKey !=3D null)) {
+ return ResourceBundleMarker.drawMarker(bundleKey, titleKey, ti=
tle);
+ } else {
+ return title;
+ }
+ }
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/DeclareContainerListTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/DeclareContainerL=
istTag.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/DeclareContainerListTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/DeclareContainerListTag.java Wed Jan 16 12:43:58 2008
@@ -426,7 +426,7 @@
return children;
}
=
- private String resolveTitle() {
+ protected String resolveTitle() {
if ((titleKey !=3D null) && (bundleKey !=3D null)) {
return ResourceBundleMarker.drawMarker(bundleKey, titleKey, ti=
tle);
} else {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/DeclareDefaultBoxesTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/DeclareDefaultBox=
esTag.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/DeclareDefaultBoxesTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/DeclareDefaultBoxesTag.java Wed Jan 16 12:43:58 2008
@@ -114,7 +114,7 @@
} else {
fullListName =3D defaultBox.getListName();
}
- defaultBox.declare(fullListName);
+ defaultBox.declare(fullListName, bundleKey);
final BoxListBean boxBean =3D new BoxListBean(defaultBox.getTy=
pe(), fullListName);
boxTypes.add(boxBean);
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/AbstractDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/AbstractDefau=
ltBox.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/AbstractDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/AbstractDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -21,6 +21,7 @@
import org.jahia.data.containers.JahiaContainerDefinition;
import org.jahia.exceptions.JahiaException;
import org.jahia.taglibs.declarations.DeclareBoxTag;
+import org.jahia.resourcebundle.ResourceBundleMarker;
=
import java.util.Properties;
import java.util.Vector;
@@ -37,7 +38,8 @@
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(AbstractDefaultBox.class);
=
- public abstract void declare(final String fullListName);
+ public abstract void declare(final String fullListName,
+ final String bundleKey );
=
public abstract String getType();
=
@@ -70,7 +72,23 @@
logger.debug("End declareContainer call with name " + listName);
}
=
- public int hashCode() {
- return listName.hashCode();
+ protected String resolveTitle(final String title,
+ final String bundleKey,
+ final String titleKey) {
+ if ((titleKey !=3D null) && (bundleKey !=3D null)) {
+ return ResourceBundleMarker.drawMarker(bundleKey, titleKey, ti=
tle);
+ } else {
+ return title;
+ }
+ }
+
+ protected String resolveValue(final String value,
+ final String bundleKey,
+ final String valueKey) {
+ if ((valueKey !=3D null) && (bundleKey !=3D null)) {
+ return ResourceBundleMarker.drawMarker(bundleKey, valueKey, va=
lue);
+ } else {
+ return value;
+ }
}
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/FilesDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/FilesDefaultB=
ox.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/FilesDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/FilesDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -29,6 +29,7 @@
public class FilesDefaultBox extends AbstractDefaultBox {
=
public static final String VIEW_FILE =3D "common/box/filesBoxDisplay.j=
sp";
+ public static final String TITLE_KEY =3D "boxContainer.filesContainer";
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(FilesDefaultBox.class);
@@ -56,36 +57,48 @@
>
<content:declareContainer>
<content:declareField
- name=3D"file"
+ name=3D"boxFile"
title=3D"File"
type=3D"File"
titleKey=3D"boxContainer.filesContainer.file"
aliasNames=3D"boxFile"
/>
<content:declareField
- name=3D"fileDesc"
+ name=3D"boxFileDesc"
title=3D"Description"
type=3D"BigText"
titleKey=3D"boxContainer.filesContainer.description"
aliasNames=3D"boxFileDesc"
/>
+ <content:declareField
+ name=3D"boxFileDisplayDetails"
+ title=3D"Display Details"
+ type=3D"Boolean"
+ titleKey=3D"boxContainer.filesContainer.displayDetails"
+ aliasNames=3D"boxFileDesc"
+ />
</content:declareContainer>
</content:declareContainerList>
*/
- public void declare(final String fullListName) {
+ public void declare(final String fullListName, final String bundleKey)=
{
try {
final Vector children =3D new Vector(3);
=
- children.add("@f file");
- jData.containers().declareField(fullListName, "file", "File", =
FieldTypes.FILE, null);
-
- children.add("@f fileDesc");
- jData.containers().declareField(fullListName, "fileDesc", "Des=
cription", FieldTypes.BIGTEXT, null);
-
- children.add("@f fileDisplayDetails");
- jData.containers().declareField(fullListName, "fileDisplayDeta=
ils", "Display Details", FieldTypes.BOOLEAN, null);
+ children.add("@f boxFile");
+ jData.containers().declareField(fullListName, "boxFile", resol=
veTitle("File", bundleKey,
+ "boxContainer.filesContainer.file"), FieldTypes.FILE, =
null, new String[]{"boxFile"}, 0, true, false);
+
+ children.add("@f boxFileDesc");
+ jData.containers().declareField(fullListName, "boxFileDesc", r=
esolveTitle("Description", bundleKey,
+ "boxContainer.filesContainer.description"), FieldTypes=
.BIGTEXT, null, new String[]{"boxFileDesc"},
+ 0, true, false);
+
+ children.add("@f boxFileDisplayDetails");
+ jData.containers().declareField(fullListName, "boxFileDisplayD=
etails", resolveTitle("Display Details", bundleKey,
+ "boxContainer.filesContainer.displayDetails"), FieldTy=
pes.BOOLEAN, null, new String[]{"boxFileDisplayDetails"},
+ 0, true, false);
=
- checkDeclaration(fullListName, title, children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/GroupsDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/GroupsDefault=
Box.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/GroupsDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/GroupsDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -29,6 +29,7 @@
public class GroupsDefaultBox extends AbstractDefaultBox {
=
public static final String VIEW_FILE =3D "common/box/groupsBoxDisplay.=
jsp";
+ public static final String TITLE_KEY =3D "boxContainer.groupsContainer=
";
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(GroupsDefaultBox.class);
@@ -75,20 +76,26 @@
</content:declareContainer>
</content:declareContainerList>
*/
- public void declare(final String fullListName) {
+ public void declare(final String fullListName, final String bundleKey)=
{
try {
final Vector children =3D new Vector(3);
=
- children.add("@f groupname");
- jData.containers().declareField(fullListName, "groupname", "Gr=
oup Name", FieldTypes.SMALLTEXT_SHARED_LANG, null);
+ children.add("@f boxGroupName");
+ jData.containers().declareField(fullListName, "boxGroupName", =
resolveTitle("Group Name", bundleKey,
+ "boxContainer.groupsContainer.groupName"), FieldTypes.=
SMALLTEXT_SHARED_LANG, null, new String[]{"boxGroupName"},
+ 0, true, false);
+
+ children.add("@f boxGroupDisplayLimit");
+ jData.containers().declareField(fullListName, "boxGroupDisplay=
Limit", resolveTitle("Group Display Limit", bundleKey,
+ "boxContainer.groupsContainer.displayLimit"), FieldTyp=
es.SMALLTEXT_SHARED_LANG, "5", new String[]{"boxGroupDisplayLimit"},
+ 0, true, false);
+
+ children.add("@f boxGroupQuery");
+ jData.containers().declareField(fullListName, "boxGroupQuery",=
resolveTitle("Group Query", bundleKey,
+ "boxContainer.groupsContainer.groupQuery"), FieldTypes=
.SMALLTEXT_SHARED_LANG, "*", new String[]{"boxGroupQuery"},
+ 0, true, false);
=
- children.add("@f groupdisplaylimit");
- jData.containers().declareField(fullListName, "groupdisplaylim=
it", "Group Display Limit", FieldTypes.SMALLTEXT_SHARED_LANG, "5");
-
- children.add("@f groupquery");
- jData.containers().declareField(fullListName, "groupquery", "G=
roup Query", FieldTypes.SMALLTEXT_SHARED_LANG, "*");
-
- checkDeclaration(fullListName, title, children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/LastNewsDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/LastNewsDefau=
ltBox.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LastNewsDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LastNewsDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -29,6 +29,7 @@
public class LastNewsDefaultBox extends AbstractDefaultBox {
=
public static final String VIEW_FILE =3D "common/box/lastNewsBoxDispla=
y.jsp";
+ public static final String TITLE_KEY =3D "boxContainer.lastNewsContain=
er";
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(LastNewsDefaultBox.class);
@@ -62,14 +63,16 @@
</content:declareContainer>
</content:declareContainerList>
*/
- public void declare(final String fullListName) {
+ public void declare(final String fullListName, final String bundleKey)=
{
try {
final Vector children =3D new Vector(1);
=
- children.add("@f maxNews");
- jData.containers().declareField(fullListName, "maxNews", "Max =
News", FieldTypes.INTEGER, "10");
+ children.add("@f boxMaxNews");
+ jData.containers().declareField(fullListName, "boxMaxNews", re=
solveTitle("Max News", bundleKey,
+ "boxContainer.lastNewsContainer.maxNews"), FieldTypes.=
INTEGER, "10", new String[]{"boxMaxNews"}, =
+ 0, true, false);
=
- checkDeclaration(fullListName, title, children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/LinksDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/LinksDefaultB=
ox.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LinksDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/LinksDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -29,6 +29,7 @@
public class LinksDefaultBox extends AbstractDefaultBox {
=
public static final String VIEW_FILE =3D "common/box/linksBoxDisplay.j=
sp";
+ public static final String TITLE_KEY =3D "boxContainer.linksContainer";
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(LinksDefaultBox.class);
@@ -58,6 +59,7 @@
<content:declareField
name=3D'boxlink'
title=3D"Link"
+ titleKey=3D"boxContainer.linksContainer.link"
type=3D"Page"
value=3D"<jahia_linkonly>"
aliasNames=3D"boxLink"
@@ -65,23 +67,28 @@
<content:declareField
name=3D'linkDesc'
title=3D"Description"
+ titleKey=3D"boxContainer.linksContainer.description"
type=3D"BigText"
aliasNames=3D"boxLinkDesc"
/>
</content:declareContainer>
</content:declareContainerList>
*/
- public void declare(final String fullListName) {
+ public void declare(final String fullListName, final String bundleKey)=
{
try {
final Vector children =3D new Vector(2);
=
- children.add("@f link");
- jData.containers().declareField(fullListName, "link", "Link", =
FieldTypes.PAGE, "<jahia_linkonly>");
+ children.add("@f boxLink");
+ jData.containers().declareField(fullListName, "boxLink", resol=
veTitle("Link", bundleKey,
+ "boxContainer.linksContainer.link"), FieldTypes.PAGE, =
"<jahia_linkonly>", new String[]{"boxLink"},
+ 0, true, false);
+
+ children.add("@f boxLinkDesc");
+ jData.containers().declareField(fullListName, "boxLinkDesc", r=
esolveTitle("Description", bundleKey,
+ "boxContainer.linksContainer.description"), FieldTypes=
.BIGTEXT, null, new String[]{"boxLinkDesc"},
+ 0, true, false);
=
- children.add("@f linkDesc");
- jData.containers().declareField(fullListName, "linkDesc", "Des=
cription", FieldTypes.BIGTEXT, null);
-
- checkDeclaration(fullListName, title, children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/MainContentDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/MainContentDe=
faultBox.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/MainContentDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/MainContentDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -29,6 +29,7 @@
public class MainContentDefaultBox extends AbstractDefaultBox {
=
public static final String VIEW_FILE =3D "common/box/maincontentsBoxDi=
splay.jsp";
+ public static final String TITLE_KEY =3D "boxContainer.mainContentsCon=
tainer";
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(MainContentDefaultBox.class);
@@ -76,24 +77,32 @@
</content:declareContainer>
</content:declareContainerList>
*/
- public void declare(final String fullListName) {
+ public void declare(final String fullListName, final String bundleKey)=
{
try {
final Vector children =3D new Vector(4);
=
- children.add("@f mainContentTitle");
- jData.containers().declareField(fullListName, "mainContentTitl=
e", "Title", FieldTypes.SMALLTEXT, null);
+ children.add("@f boxMainContentTitle");
+ jData.containers().declareField(fullListName, "boxMainContentT=
itle", resolveTitle("Title", bundleKey,
+ "boxContainer.mainContentsContainer.title"), FieldType=
s.SMALLTEXT, null, new String[]{"boxMainContentTitle"},
+ 0, true, false);
+
+ children.add("@f boxMainContentContent");
+ jData.containers().declareField(fullListName, "boxMainContentC=
ontent", resolveTitle("Content", bundleKey,
+ "boxContainer.mainContentsContainer.content"), FieldTy=
pes.BIGTEXT, null, new String[]{"boxMainContentContent"},
+ 0, true, false);
+
+ children.add("@f boxMainContentImage");
+ jData.containers().declareField(fullListName, "boxMainContentI=
mage", resolveTitle("Image", bundleKey,
+ "boxContainer.mainContentsContainer.image"), FieldType=
s.FILE, null, new String[]{"boxMainContentImage"},
+ 0, true, false);
+
+ children.add("@f boxMainContentAlign");
+ jData.containers().declareField(fullListName, "boxMainContentA=
lign", resolveTitle("Align", bundleKey,
+ "boxContainer.mainContentsContainer.align"), FieldType=
s.SMALLTEXT_SHARED_LANG,
+ "<jahia_multivalue[left:right:default]>left", new Stri=
ng[]{"boxMainContentAlign"}, 0, true, false);
=
- children.add("@f content");
- jData.containers().declareField(fullListName, "content", "Cont=
ent", FieldTypes.BIGTEXT, null);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
=
- children.add("@f image");
- jData.containers().declareField(fullListName, "image", "Image"=
, FieldTypes.FILE, null);
-
- children.add("@f align");
- jData.containers().declareField(fullListName, "align", "Align"=
, FieldTypes.SMALLTEXT_SHARED_LANG, "<jahia_multivalue[left:right:default]>=
left");
-
- checkDeclaration(fullListName, title, children);
- =
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/NewsDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/NewsDefaultBo=
x.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/NewsDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/NewsDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -29,6 +29,7 @@
public class NewsDefaultBox extends AbstractDefaultBox {
=
public static final String VIEW_FILE =3D "common/box/newsBoxDisplay.js=
p";
+ public static final String TITLE_KEY =3D "boxContainer.newsContainer";
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(NewsDefaultBox.class);
@@ -70,24 +71,31 @@
</content:declareContainer>
</content:declareContainerList>
*/
- public void declare(final String fullListName) {
+ public void declare(final String fullListName, final String bundleKey)=
{
try {
final Vector children =3D new Vector(4);
=
- children.add("@f newsTitle");
- jData.containers().declareField(fullListName, "newsTitle", "Ti=
tle", FieldTypes.SMALLTEXT, null);
+ children.add("@f boxNewsTitle");
+ jData.containers().declareField(fullListName, "boxNewsTitle", =
resolveTitle("Title", bundleKey,
+ "boxContainer.newsContainer.title"), FieldTypes.SMALLT=
EXT, null, new String[]{"boxNewsTitle"},
+ 0, true, false);
+
+ children.add("@f boxNewsDesc");
+ jData.containers().declareField(fullListName, "boxNewsDesc", r=
esolveTitle("Description", bundleKey,
+ "boxContainer.newsContainer.description"), FieldTypes.=
BIGTEXT, null, new String[]{"boxNewsDesc"},
+ 0, true, false);
+
+ children.add("@f boxNewsLink");
+ jData.containers().declareField(fullListName, "boxNewsLink", r=
esolveTitle("Link", bundleKey,
+ "boxContainer.newsContainer.link"), FieldTypes.PAGE, "=
<jahia_linkonly>",
+ new String[]{"boxNewsLink"}, 0, true, false);
+
+ children.add("@f boxNewsDate");
+ jData.containers().declareField(fullListName, "boxNewsDate", r=
esolveTitle("Date", bundleKey,
+ "boxContainer.newsContainer.date"), FieldTypes.DATE, "=
<jahia_calendar[dd.MM.yyyy / hh:mm]>now",
+ new String[]{"boxNewsDate"}, 0, true, false);
=
- children.add("@f newsDesc");
- jData.containers().declareField(fullListName, "newsDesc", "Des=
cription", FieldTypes.BIGTEXT, null);
-
- children.add("@f newsLink");
- jData.containers().declareField(fullListName, "newsLink", "Lin=
k", FieldTypes.PAGE, "<jahia_linkonly>");
-
- children.add("@f newsDate");
- jData.containers().declareField(fullListName, "newsDate", "Dat=
e", FieldTypes.DATE,
- "<jahia_calendar[dd.MM.yyyy / hh:mm]>now");
-
- checkDeclaration(fullListName, title, children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/PagesDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/PagesDefaultB=
ox.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/PagesDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/PagesDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -29,6 +29,7 @@
public class PagesDefaultBox extends AbstractDefaultBox {
=
public static final String VIEW_FILE =3D "common/box/pagesBoxDisplay.j=
sp";
+ public static final String TITLE_KEY =3D "boxContainer.pagesContainer";
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(PagesDefaultBox.class);
@@ -61,14 +62,16 @@
</content:declareContainer>
</content:declareContainerList>
*/
- public void declare(final String fullListName) {
- try {
+ public void declare(final String fullListName, final String bundleKey)=
{
+ try {
final Vector children =3D new Vector(1);
=
- children.add("@f page");
- jData.containers().declareField(fullListName, "page", "Page", =
FieldTypes.PAGE, null);
+ children.add("@f boxPage");
+ jData.containers().declareField(fullListName, "boxPage", resol=
veTitle("Page", bundleKey,
+ "boxContainer.pagesContainer.page"), FieldTypes.PAGE, =
null, new String[]{"boxPage"},
+ 0, true, false);
=
- checkDeclaration(fullListName, title, children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/UsersDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/UsersDefaultB=
ox.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/UsersDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/UsersDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -29,6 +29,7 @@
public class UsersDefaultBox extends AbstractDefaultBox {
=
public static final String VIEW_FILE =3D "common/box/usersBoxDisplay.j=
sp";
+ public static final String TITLE_KEY =3D "boxContainer.usersContainer";
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(UsersDefaultBox.class);
@@ -74,20 +75,26 @@
</content:declareContainer>
</content:declareContainerList>
*/
- public void declare(final String fullListName) {
+ public void declare(final String fullListName, final String bundleKey)=
{
try {
final Vector children =3D new Vector(3);
=
- children.add("@f username");
- jData.containers().declareField(fullListName, "username", "Use=
r Name", FieldTypes.SMALLTEXT_SHARED_LANG, null);
+ children.add("@f boxUserName");
+ jData.containers().declareField(fullListName, "boxUserName", r=
esolveTitle("User Name", bundleKey,
+ "boxContainer.usersContainer.userName"), FieldTypes.SM=
ALLTEXT_SHARED_LANG, null, new String[]{"boxUserName"},
+ 0, true, false);
+
+ children.add("@f boxUserDisplayLimit");
+ jData.containers().declareField(fullListName, "boxUserDisplayL=
imit", resolveTitle("User Display Limit", bundleKey,
+ "boxContainer.usersContainer.displayLimit"), FieldType=
s.SMALLTEXT_SHARED_LANG, "5", new String[]{"boxUserDisplayLimit"},
+ 0, true, false);
+
+ children.add("@f boxUserQuery");
+ jData.containers().declareField(fullListName, "boxUserQuery", =
resolveTitle("User Query", bundleKey,
+ "boxContainer.usersContainer.userQuery"), FieldTypes.S=
MALLTEXT_SHARED_LANG, "*", new String[]{"boxUserQuery"},
+ 0, true, false);
=
- children.add("@f userdisplaylimit");
- jData.containers().declareField(fullListName, "userdisplaylimi=
t", "User Display Limit", FieldTypes.SMALLTEXT_SHARED_LANG, "5");
-
- children.add("@f userquery");
- jData.containers().declareField(fullListName, "userquery", "Us=
er Query", FieldTypes.SMALLTEXT_SHARED_LANG, "*");
-
- checkDeclaration(fullListName, title, children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/declarations/box/WebAppsDefaultBox.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/declarations/box/WebAppsDefaul=
tBox.java&rev=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/WebAppsDefaultBox.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/WebAppsDefaultBox.java Wed Jan 16 12:43:58 2008
@@ -29,6 +29,7 @@
public class WebAppsDefaultBox extends AbstractDefaultBox {
=
public static final String VIEW_FILE =3D "common/box/webappsBoxDisplay=
.jsp";
+ public static final String TITLE_KEY =3D "boxContainer.webappsContaine=
r";
=
private static final transient org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(WebAppsDefaultBox.class);
@@ -61,14 +62,16 @@
</content:declareContainer>
</content:declareContainerList>
*/
- public void declare(final String fullListName) {
+ public void declare(final String fullListName, final String bundleKey)=
{
try {
final Vector children =3D new Vector(1);
=
- children.add("@f webapp");
- jData.containers().declareField(fullListName, "webapp", "WebAp=
p", FieldTypes.APPLICATION, null);
+ children.add("@f boxWebapp");
+ jData.containers().declareField(fullListName, "boxWebapp", res=
olveTitle("WebApp", bundleKey,
+ "boxContainer.webappsContainer.webapp"), FieldTypes.AP=
PLICATION, null, new String[]{"boxWebapp"},
+ 0, true, false);
=
- checkDeclaration(fullListName, title, children);
+ checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
=
} catch (final JahiaException je) {
logger.info("Already declared: " + je);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/utils/J=
ahiaTools.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/utils/JahiaTools.java&rev=3D19524&repn=
ame=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/utils/JahiaTo=
ols.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/utils/JahiaTo=
ols.java Wed Jan 16 12:43:58 2008
@@ -1469,7 +1469,7 @@
if (resBundleID =3D=3D null || resBundleID.length() =3D=3D 0) {
sb.append((String) al.get(i));
} else {
- sb.append(ResourceBundleMarker.drawMarker(resBundleID, (St=
ring) al.get(i), ""));
+ sb.append(ResourceBundleMarker.drawMarker(resBundleID, (St=
ring) al.get(i), (String) al.get(i)));
}
=
}
@@ -1478,7 +1478,7 @@
if (resBundleID =3D=3D null || resBundleID.length() =3D=3D 0) {
sb.append((String) al.get(0));
} else {
- sb.append(ResourceBundleMarker.drawMarker(resBundleID, (St=
ring) al.get(0), ""));
+ sb.append(ResourceBundleMarker.drawMarker(resBundleID, (St=
ring) al.get(0), (String) al.get(0)));
}
}
return sb.toString();
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/tag=
libs/jahia-components.tld
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/jahia-components.tld&rev=
=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/j=
ahia-components.tld (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/j=
ahia-components.tld Wed Jan 16 12:43:58 2008
@@ -316,6 +316,11 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>bundleKey</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
=
<tag>
@@ -342,6 +347,16 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>bundleKey</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>titleKey</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
=
<tag>
@@ -368,6 +383,16 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>bundleKey</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>titleKey</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
=
<tag>
@@ -395,6 +420,11 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>displayTitle</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
=
<tag>
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/var/sha=
red_templates/default_v3.jar
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/WEB-INF/var/shared_templates/default_v3.jar&re=
v=3D19524&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary files - no diff available.
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
