Author: xlawrence
Date: Thu Jan 17 12:16:49 2008
New Revision: 62
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D62&repname=3D=
corporate_portal_templates_v3
Log:
Finished implementation of 'users' and 'groups' boxes
Modified:
trunk/src/java/jahiatemplates/default_v3_lang.properties
trunk/src/java/jahiatemplates/default_v3_lang_en.properties
trunk/src/java/jahiatemplates/default_v3_lang_fr.properties
trunk/src/jsp/common/box/groupsBoxDisplay.jsp
trunk/src/jsp/common/box/usersBoxDisplay.jsp
Modified: trunk/src/java/jahiatemplates/default_v3_lang.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/default_v3_lang.properties&rev=3D62&repname=3Dcorporate_portal_tem=
plates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/java/jahiatemplates/default_v3_lang.properties (original)
+++ trunk/src/java/jahiatemplates/default_v3_lang.properties Thu Jan 17 12:=
16:49 2008
@@ -178,6 +178,25 @@
update.rsss =3D Settings
update.rss =3D Update RSS feed
delete.rss =3D Delete RSS feed
+
+boxContainer.usersContainer =3D Users
+boxContainer.usersContainer.query =3D Query
+boxContainer.usersContainer.displayLimit =3D Display limit
+boxContainer.usersContainer.queryResult =3D Query result
+add.userQueries =3D Add user query
+update.userQueries =3D Settings
+update.userQuery =3D Update user query
+delete.userQuery =3D Delete user query
+
+boxContainer.groupsContainer =3D Groups
+boxContainer.groupsContainer.query =3D Query
+boxContainer.groupsContainer.displayLimit =3D Display limit
+boxContainer.groupsContainer.queryResult =3D Query result
+add.groupQueries =3D Add group query
+update.groupQueries =3D Settings
+update.groupQuery =3D Update group query
+delete.groupQuery =3D Delete group query
+
#************* Box container (end) *************
=
#**************** General ressources (start) **************
Modified: trunk/src/java/jahiatemplates/default_v3_lang_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/default_v3_lang_en.properties&rev=3D62&repname=3Dcorporate_portal_=
templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/java/jahiatemplates/default_v3_lang_en.properties (original)
+++ trunk/src/java/jahiatemplates/default_v3_lang_en.properties Thu Jan 17 =
12:16:49 2008
@@ -176,6 +176,24 @@
update.rsss =3D Settings
update.rss =3D Update RSS feed
delete.rss =3D Delete RSS feed
+
+boxContainer.usersContainer =3D Users
+boxContainer.usersContainer.query =3D Query
+boxContainer.usersContainer.displayLimit =3D Display limit
+boxContainer.usersContainer.queryResult =3D Query result
+add.userQueries =3D Add user query
+update.userQueries =3D Settings
+update.userQuery =3D Update user query
+delete.userQuery =3D Delete user query
+
+boxContainer.groupsContainer =3D Groups
+boxContainer.groupsContainer.query =3D Query
+boxContainer.groupsContainer.displayLimit =3D Display limit
+boxContainer.groupsContainer.queryResult =3D Query result
+add.groupQueries =3D Add group query
+update.groupQueries =3D Settings
+update.groupQuery =3D Update group query
+delete.groupQuery =3D Delete group query
#************* Box container (end) *************
=
#**************** General ressources (start) **************
Modified: trunk/src/java/jahiatemplates/default_v3_lang_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/default_v3_lang_fr.properties&rev=3D62&repname=3Dcorporate_portal_=
templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/java/jahiatemplates/default_v3_lang_fr.properties (original)
+++ trunk/src/java/jahiatemplates/default_v3_lang_fr.properties Thu Jan 17 =
12:16:49 2008
@@ -600,4 +600,22 @@
update.rsss =3D Options
update.rss =3D Modifier un feed RSS
delete.rss =3D Supprimer un feed RSS
+
+boxContainer.usersContainer =3D Utilisateurs
+boxContainer.usersContainer.query =3D Requ=C3=AAte
+boxContainer.usersContainer.displayLimit =3D Limite d'affichage
+boxContainer.usersContainer.queryResult =3D R=C3=A9sultat de la requ=C3=AA=
te
+add.userQueries =3D Ajouter une requ=C3=AAte utilisateur
+update.userQueries =3D Options
+update.userQuery =3D Modifier la requ=C3=AAte utilisateur
+delete.userQuery =3D Supprimer la requ=C3=AAte utilisateur
+
+boxContainer.groupsContainer =3D Groupes
+boxContainer.groupsContainer.query =3D Requ=C3=AAte
+boxContainer.groupsContainer.displayLimit =3D Limite d'affichage
+boxContainer.groupsContainer.queryResult =3D R=C3=A9sultat de la requ=C3=
=AAte
+add.groupQueries =3D Ajouter une requ=C3=AAte de groupe
+update.groupQueries =3D Options
+update.groupQuery =3D Modifier la requ=C3=AAte de groupe
+delete.groupQuery =3D Supprimer la requ=C3=AAte de groupe
#************* Box container (end) *************
\ No newline at end of file
Modified: trunk/src/jsp/common/box/groupsBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/groupsBoxDisplay.jsp&rev=3D62&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/groupsBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/groupsBoxDisplay.jsp Thu Jan 17 12:16:49 2008
@@ -16,123 +16,35 @@
limitations under the License.
--%>
<%@ include file=3D"../declarations.jspf" %>
-<%
- final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.=
data.JahiaData");
- // get the parambean
- ParamBean jParams =3D jData.params();
=
- String theURL =3D jData.gui().drawHttpJspContext(request);
-
- // get the context url
- String contextURL =3D jData.gui().drawHttpJspContext(request);
- final String id =3D request.getParameter("id");
- JahiaContainerList gcontlist =3D jData.containers().getContainerList("=
groupsContainer" + id);
- JahiaContainer thegboxcontainer =3D null;
- if (gcontlist.getFullSize() =3D=3D 0) {
- thegboxcontainer =3D new JahiaContainer(0, jData.getProcessingCont=
ext().getJahiaID(), jData.getProcessingContext().getPageID(), gcontlist.get=
ID(), 0, /* rank */gcontlist.getAclID(), gcontlist.getctndefid(), 0, 2);
- ServicesRegistry.getInstance().getJahiaContainersService().saveCon=
tainer(thegboxcontainer, gcontlist.getID(), jData.getProcessingContext());
- thegboxcontainer.setLanguageCode(jData.getProcessingContext().getL=
ocale().toString());
- thegboxcontainer.fieldsStructureCheck(jData.getProcessingContext()=
);
- } else {
- thegboxcontainer =3D gcontlist.getContainer(0);
- }
-
- // the query from the user's request in an edit context
- String groupQueryString =3D request.getParameter("groupquery_" + id);
- String gdisplay =3D request.getParameter("grouplistsize_" + id);
-
-
- JahiaField theglimit =3D thegboxcontainer.getField("groupdisplaylimit"=
);
- JahiaField thegquery =3D thegboxcontainer.getField("groupquery");
-
- // to store the values from this page context
- if (groupQueryString =3D=3D null) {
- groupQueryString =3D thegquery.getValue();
- } else {
- thegquery.setValue(groupQueryString);
- thegquery.setObject(groupQueryString);
- thegquery.save(jParams);
- }
- if (gdisplay =3D=3D null || gdisplay.equals("")) {
- gdisplay =3D theglimit.getValue();
- } else {
- theglimit.setValue(gdisplay);
- theglimit.setObject(gdisplay);
- theglimit.save(jParams);
- }
-
- // in case of null values
- if (groupQueryString =3D=3D null || groupQueryString.equals("null")) g=
roupQueryString =3D "";
- if (gdisplay =3D=3D null || gdisplay.equals("")) gdisplay =3D "5";
-%>
-
-<script type=3D"text/javascript">
-
- var ldap_pop;
-
- function openWindowDetail(id, type, width, height) {
- //alert(id+" "+type);
- params =3D "width=3D" + width + ",height=3D" + height + ",resizabl=
e=3Dyes,scrollbars=3Dyes,status=3Dno";
- if (ldap_pop) {
- ldap_pop.close();
- ldap_pop =3D window.open("<%=3DcontextURL%>/ldap_pop.jsp?" + t=
ype + "=3D" + id, "mywindow", params);
- } else {
-
- ldap_pop =3D window.open("<%=3DcontextURL%>/ldap_pop.jsp?" + t=
ype + "=3D" + id, "mywindow", params);
- }
- }
-</script>
-
-<% if (!jData.gui().isEditMode()) { %>
-
-<!-- the scope used here is everywhere, i.e. jahiaDB+LDAP if available
-// we have chosen here to not displaying query box nor display limit selec=
tor in visit. so guest and users without writing rights
-would not change the search criteria just view the dynamic list of groups
-please see the taglib info for special usage and options of this tag
-//-->
-<jahiaHtml:groupList
- displayLimit=3D"<%=3DInteger.parseInt(gdisplay)%>"
- query=3D"<%=3DgroupQueryString%>"
- scope=3D"all"
- membersLimit=3D"12"
- membersVisibility=3D"true"
- separator=3D"<br/>"
- backCall=3D"javascript:openWindowDetail(groupid,'g',480,480);" sty=
leClass=3D""
- />
-<% } else { %>
-<form name=3D"jahiagrouplist_<%=3Did%>" action=3D"" method=3D"post">
- <content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3_la=
ng"
- resourceName=3D"box.groups.query"/>:
- <input class=3D"text" type=3D"text" name=3D"groupquery_<%=3Did%>" valu=
e=3D"<%=3DgroupQueryString%>"><br/>
- <i><content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3=
_lang"
- resourceName=3D"box.groups.query.info"/></i=
><br/>
- <content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3_la=
ng"
- resourceName=3D"box.groups.displaylimit"/>:
- <select class=3D"text" name=3D'grouplistsize_<%=3Did%>' onChange=3D"ja=
vascript:document.jahiagrouplist_<%=3Did%>.submit()">
- <%
- String sform =3D "";
- for (int n =3D 5; n < 40; n =3D n * 2) {
- if (Integer.parseInt(gdisplay) =3D=3D n) sform =3D "select=
ed";
- else sform =3D "";
- %>
- <option value=3D"<%=3Dn%>" <%=3Dsform%>><%=3Dn%>
- </option>
- <% } %>
- </select> <br/>
- <a href=3D"javascript:document.jahiagrouplist_<%=3Did%>.submit()"
- title=3D"<content:resourceBundle resourceBundle=3D"jahiatemplates.d=
efault_v3_lang" resourceName=3D"box.groups.query.validate"/>"
- alt=3D"<content:resourceBundle resourceBundle=3D"jahiatemplates.def=
ault_v3_lang" resourceName=3D"box.groups.query.validate"/>"><img
- src=3D"<%=3DcontextURL%>/img/refresh.gif" width=3D"16" height=
=3D"16" border=3D"0" alt=3D"validate"></a>
-</form>
-
-<!--please see the taglib info for special usage and options of this tag-->
-<jahiaHtml:groupList
- displayLimit=3D"<%=3DInteger.parseInt(gdisplay)%>"
- query=3D"<%=3DgroupQueryString%>"
- scope=3D"all"
- membersLimit=3D"12"
- membersVisibility=3D"true"
- separator=3D"<br/>"
- backCall=3D"javascript:openWindowDetail(groupid,'g',480,480);" sty=
leClass=3D""
- />
-<% } %>
\ No newline at end of file
+<content:containerList name=3D"groups${boxID}" id=3D"groups" parentContain=
erName=3D"boxContainer">
+ <content:container id=3D"groupsContainer">
+ <content:textField name=3D'boxGroupDisplayLimit' defaultValue=3D"5=
" valueId=3D"boxGroupDisplayLimit" display=3D"false"/>
+ <content:textField name=3D'boxGroupQuery' defaultValue=3D"*" value=
Id=3D"boxGroupQuery" display=3D"false"/>
+
+ <h2>
+ <content:resourceBundle resourceBundle=3D"jahiatemplates.defau=
lt_v3_lang"
+ resourceName=3D"boxContainer.groupsCon=
tainer.queryResult"/>
+
+ <jahiaHtml:actionMenu name=3D"groupsContainer" resourceBundle=
=3D"jahiatemplates.default_v3_lang"
+ useFieldSet=3D"false"
+ namePostFix=3D".groupQuery">
+ </jahiaHtml:actionMenu>
+ </h2>
+
+ <jahiaHtml:groupList
+ displayLimit=3D"${boxGroupDisplayLimit}"
+ query=3D"${boxGroupQuery}"
+ scope=3D"all"
+ membersLimit=3D"12"
+ membersVisibility=3D"true"
+ separator=3D"<br/>"
+ styleClass=3D""
+ />
+ </content:container>
+ <br/>
+ <jahiaHtml:actionMenu name=3D"groups" namePostFix=3D".groupQueries"
+ resourceBundle=3D"jahiatemplates.default_v3_lang=
" useFieldSet=3D"false"
+ labelKey=3D"add.groupQueries">
+ </jahiaHtml:actionMenu>
+</content:containerList>
Modified: trunk/src/jsp/common/box/usersBoxDisplay.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/usersBoxDisplay.jsp&rev=3D62&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/box/usersBoxDisplay.jsp (original)
+++ trunk/src/jsp/common/box/usersBoxDisplay.jsp Thu Jan 17 12:16:49 2008
@@ -19,109 +19,25 @@
=
<content:containerList name=3D"users${boxID}" id=3D"users" parentContainer=
Name=3D"boxContainer">
<content:container id=3D"usersContainer">
+ <content:textField name=3D'boxUserDisplayLimit' defaultValue=3D"5"=
valueId=3D"boxUserDisplayLimit" display=3D"false"/>
+ <content:textField name=3D'boxUserQuery' defaultValue=3D"*" valueI=
d=3D"boxUserQuery" display=3D"false"/>
=
- <content:textField name=3D'boxUserName' defaultValue=3D"N/A" diffA=
ctive=3D"true"/>
- <content:textField name=3D'boxUserDisplayLimit' defaultValue=3D"N/=
A" diffActive=3D"true"/>
- <content:textField name=3D'boxUserQuery' defaultValue=3D"N/A" diff=
Active=3D"true"/>
+ <h2>
+ <content:resourceBundle resourceBundle=3D"jahiatemplates.defau=
lt_v3_lang"
+ resourceName=3D"boxContainer.usersCont=
ainer.queryResult"/>
+
+ <jahiaHtml:actionMenu name=3D"usersContainer" resourceBundle=
=3D"jahiatemplates.default_v3_lang"
+ useFieldSet=3D"false"
+ namePostFix=3D".userQuery">
+ </jahiaHtml:actionMenu>
+ </h2>
=
- <jahiaHtml:actionMenu name=3D"usersContainer" resourceBundle=3D"ja=
hiatemplates.default_v3_lang" useFieldSet=3D"true"
- namePostFix=3D".users">
+ <jahiaHtml:userList displayLimit=3D"${boxUserDisplayLimit}" query=
=3D"${boxUserQuery}" scope=3D"all" styleClass=3D""/>
=
- </jahiaHtml:actionMenu>
</content:container>
- <jahiaHtml:actionMenu name=3D"users" namePostFix=3D".user"
+ <br/>
+ <jahiaHtml:actionMenu name=3D"users" namePostFix=3D".userQueries"
resourceBundle=3D"jahiatemplates.default_v3_lang=
" useFieldSet=3D"false"
- labelKey=3D"add.user">
+ labelKey=3D"add.userQueries">
</jahiaHtml:actionMenu>
-</content:containerList>
-
-
-<%
- JahiaContainer theuboxcontainer =3D null;
- =
- // the query from the user assumed edit context
- String userQueryString =3D request.getParameter("userquery_" + id);
- String udisplay =3D request.getParameter("userlistsize_" + id);
-
- JahiaField thelimit =3D theuboxcontainer.getField("userdisplaylimit");
- JahiaField thequery =3D theuboxcontainer.getField("userquery");
-
- // to store and retrieve the query from this page context
- if (userQueryString =3D=3D null) {
- userQueryString =3D thequery.getValue();
- } else {
- thequery.setValue(userQueryString);
- thequery.setObject(userQueryString);
- thequery.save(jParams);
- }
-
- // idem for the userlimit from this page context
- if (udisplay =3D=3D null || udisplay.equals("")) {
- udisplay =3D thelimit.getValue();
- } else {
- thelimit.setValue(udisplay);
- thequery.setObject(udisplay);
- thelimit.save(jParams);
- }
-
- // in case of null values
- if (userQueryString =3D=3D null || userQueryString.equals("null")) use=
rQueryString =3D "";
- if (udisplay =3D=3D null || udisplay.equals("")) udisplay =3D "5";
-%>
-<script type=3D"text/javascript">
-
- var ldap_pop;
-
- function openWindowDetail(id, type, width, height) {
- //alert(id+" "+type);
- params =3D "width=3D" + width + ",height=3D" + height + ",resizabl=
e=3Dyes,scrollbars=3Dyes,status=3Dno";
- if (ldap_pop) {
- ldap_pop.close();
- ldap_pop =3D window.open("<%=3DcontextURL%>/ldap_pop.jsp?" + t=
ype + "=3D" + id, "mywindow", params);
- } else {
-
- ldap_pop =3D window.open("<%=3DcontextURL%>/ldap_pop.jsp?" + t=
ype + "=3D" + id, "mywindow", params);
- }
- }
-</script>
-
-<% if (!jData.gui().isEditMode()) { %>
-
-<!-- the scope is everywhere jahiaDB+LDAP if available -->
-<jahiaHtml:userList displayLimit=3D"<%=3DInteger.parseInt(udisplay)%>" que=
ry=3D"<%=3DuserQueryString%>" scope=3D"all"
- backCall=3D"javascript:openWindowDetail(userid,'u',480=
,480);" styleClass=3D""/>
-<% } else {
-//edit mode
-%>
-<form name=3D"jahiauserlist_<%=3Did%>" action=3D"" method=3D"post">
- <content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3_la=
ng"
- resourceName=3D"box.users.query"/>:
- <input class=3D"text" type=3D"text" name=3D"userquery_<%=3Did%>" value=
=3D"<%=3DuserQueryString%>"><br/>
- <i><content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3=
_lang"
- resourceName=3D"box.users.query.info"/></i>=
<br/>
- <content:resourceBundle resourceBundle=3D"jahiatemplates.default_v3_la=
ng"
- resourceName=3D"box.users.displaylimit"/>:
- <select class=3D"text" name=3D'userlistsize_<%=3Did%>' onChange=3D"doc=
ument.jahiauserlist_<%=3Did%>.submit()">
- <%
- String sform =3D "";
- for (int n =3D 5; n < 40; n =3D n * 2) {
- if (Integer.parseInt(udisplay) =3D=3D n) sform =3D "select=
ed";
- else sform =3D "";
- %>
- <option value=3D"<%=3Dn%>" <%=3Dsform%>><%=3Dn%>
- </option>
- <%
- }
- %>
- </select><br/>
- <a href=3D"javascript:document.jahiauserlist_<%=3Did%>.submit()"
- title=3D"<content:resourceBundle resourceBundle=3D"jahiatemplates.d=
efault_v3_lang" resourceName=3D"box.users.query.validate"/>"
- alt=3D"<content:resourceBundle resourceBundle=3D"jahiatemplates.def=
ault_v3_lang" resourceName=3D"box.users.query.validate"/>"><img
- src=3D"<%=3DcontextURL%>/img/refresh.gif" width=3D"16" height=
=3D"16" border=3D"0" alt=3D"validate"></a>
-</form>
-<!-- the scope is everywhere jahiaDB+LDAP if available -->
-<h3>results</h3>
-
-<jahiaHtml:userList displayLimit=3D"<%=3DInteger.parseInt(udisplay)%>" que=
ry=3D"<%=3DuserQueryString%>" scope=3D"all"
- backCall=3D"javascript:openWindowDetail(userid,'u',480=
,480);" styleClass=3D""/>
-<% } %>
+</content:containerList>
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
