Author: xlawrence
Date: Thu Jan 17 12:17:57 2008
New Revision: 19532
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19532&repname=
=3Djahia
Log:
Finished implementation of 'users' and 'groups' boxes
Modified:
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/GroupsDefaultBox.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/decla=
rations/box/UsersDefaultBox.java
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=3D19532&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 Thu Jan 17 12:17:57 2008
@@ -72,8 +72,10 @@
DEFAULT_TYPES.add(new NewsDefaultBox(NEWS, "News"));
DEFAULT_TYPE_NAMES.add(NEWS);
// DEFAULT_TYPES.add(new LastNewsDefaultBox(LASTNEWS, "Last News")=
);
- // DEFAULT_TYPES.add(new UsersDefaultBox(USERS, "Users"));
- // DEFAULT_TYPES.add(new GroupsDefaultBox(GROUPS, "Groups"));
+ DEFAULT_TYPES.add(new UsersDefaultBox(USERS, "Users"));
+ DEFAULT_TYPE_NAMES.add(USERS);
+ DEFAULT_TYPES.add(new GroupsDefaultBox(GROUPS, "Groups"));
+ DEFAULT_TYPE_NAMES.add(GROUPS);
}
=
private String id;
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=3D19532&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 Thu Jan 17 12:17:57 2008
@@ -56,13 +56,6 @@
>
<content:declareContainer>
=
- <content:declareField name=3D'GroupName'
- title=3D"Group Name"
- titleKey=3D"groupName"
- bundleKey=3D"<%=3DresBundleID%>"
- type=3D"SmallText"
- aliasNames=3D"boxGroupName"
- />
<content:declareField name=3D'groupdisplaylimit'
title=3D"userdisplaylimit"
type=3D"SharedSmallText"
@@ -78,12 +71,7 @@
*/
public void declare(final String fullListName, final String bundleKey)=
{
try {
- final Vector children =3D new Vector(3);
-
- 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);
+ final Vector children =3D new Vector(2);
=
children.add("@f boxGroupDisplayLimit");
jData.containers().declareField(fullListName, "boxGroupDisplay=
Limit", resolveTitle("Group Display Limit", bundleKey,
@@ -92,7 +80,7 @@
=
children.add("@f boxGroupQuery");
jData.containers().declareField(fullListName, "boxGroupQuery",=
resolveTitle("Group Query", bundleKey,
- "boxContainer.groupsContainer.groupQuery"), FieldTypes=
.SMALLTEXT_SHARED_LANG, "*", new String[]{"boxGroupQuery"},
+ "boxContainer.groupsContainer.query"), FieldTypes.SMAL=
LTEXT_SHARED_LANG, "*", new String[]{"boxGroupQuery"},
0, true, false);
=
checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
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=3D19532&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 Thu Jan 17 12:17:57 2008
@@ -55,13 +55,6 @@
aliasNames=3D"boxUsers"
>
<content:declareContainer>
- <content:declareField name=3D'UserName'
- title=3D"User Name"
- titleKey=3D"userName"
- bundleKey=3D"<%=3DresBundleID%>"
- type=3D"SmallText"
- aliasNames=3D"boxUserName"
- />
<content:declareField name=3D'userdisplaylimit'
title=3D"userdisplaylimit"
type=3D"SharedSmallText"
@@ -77,12 +70,7 @@
*/
public void declare(final String fullListName, final String bundleKey)=
{
try {
- final Vector children =3D new Vector(3);
-
- 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);
+ final Vector children =3D new Vector(2);
=
children.add("@f boxUserDisplayLimit");
jData.containers().declareField(fullListName, "boxUserDisplayL=
imit", resolveTitle("User Display Limit", bundleKey,
@@ -91,7 +79,7 @@
=
children.add("@f boxUserQuery");
jData.containers().declareField(fullListName, "boxUserQuery", =
resolveTitle("User Query", bundleKey,
- "boxContainer.usersContainer.userQuery"), FieldTypes.S=
MALLTEXT_SHARED_LANG, "*", new String[]{"boxUserQuery"},
+ "boxContainer.usersContainer.query"), FieldTypes.SMALL=
TEXT_SHARED_LANG, "*", new String[]{"boxUserQuery"},
0, true, false);
=
checkDeclaration(fullListName, resolveTitle(title, bundleKey, =
TITLE_KEY), children);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
