Author: dpillot
Date: Thu Jun 7 18:11:58 2007
New Revision: 702
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D702&repname=
=3Dcorporate_portal_templates_v2
Log:
TEMPLATES-274
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/dav.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2.properties&re=
v=3D702&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties Thu Jun 7 18:11:58 2007
@@ -161,6 +161,7 @@
delete.webdav =3D Delete
boxContainer.mountPoint =3D Path to mount
boxContainer.displaySubDir =3D Display sub directories
+davbox.mountpoint =3D Mount point
=
boxContainer.lastNews =3D Last news
boxContainer.lastNews.max =3D Display X news
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_en.properties=
&rev=3D702&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties Thu Jun 7 18:11:58 2007
@@ -712,4 +712,5 @@
box.users.query.validate=3Dvalidate your choices
ldap.group.sitelocalisation=3DGroup Localisation
homepage=3DHomepage
-ldap.searchall=3Dsearch all
\ No newline at end of file
+ldap.searchall=3Dsearch all
+davbox.mountpoint=3DMount point
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_fr.properties=
&rev=3D702&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties Thu Jun 7 18:11:58 2007
@@ -623,4 +623,5 @@
box.users.query.validate=3Dvalidez vos choix
ldap.group.sitelocalisation=3DGroupe localisation
homepage=3DPage d'accueuil
-ldap.searchall=3Dtout rechercher
\ No newline at end of file
+ldap.searchall=3Dtout rechercher
+davbox.mountpoint=3DPoint de montage
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/dav.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/dav.inc&rev=3D702&repname=3Dcorporate_portal_templates_=
v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-5-0-SP-BRANCH/src/jsp/box/dav.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/dav.inc Thu Jun 7 18:11:58 20=
07
@@ -46,7 +46,9 @@
if ("<empty>".equals(mountPoint)) {
mountPoint =3D defaultMountPoint;
}
- %>Mount point is [<%=3DmountPoint%>]
+ %><content:resourceBundle
+ resourceBundle=3D"jahiatemplates.Corporate_portal_temp=
lates_v2"
+ resourceName=3D"davbox.mountpoint"/>: [<%=3DmountPoint=
%>]
<jahiaHtml:actionMenu name=3D"davContainer" namePostFix=3D"" u=
seFieldSet=3D"false"
resourceBundle=3D"jahiatemplates.Corporate_portal_template=
s_v2"/><br/><br/>
<%
@@ -56,15 +58,25 @@
</content:containerList>
<%
String mountPointR =3D request.getParameter(boxContainer.getID() + "_mount=
Point");
+boolean isUserRequested=3Dfalse;
if (mountPointR !=3D null) {
- mountPoint =3D mountPointR;
+ isUserRequested=3Dtrue;
+} else {
+ mountPointR=3D"";
}
+/*
if (mountPoint =3D=3D null) {
mountPoint =3D defaultMountPoint;
}
-logger.info("mountPoint is [" + mountPoint + "]");
+*/
+if(isUserRequested) logger.info("user requested mountPoint is [" + mountPo=
intR + "]");
try {
- DAVFileAccess fileObject =3D JahiaWebdavBaseService.getInstance().getD=
AVFileAccess(jParams, mountPoint);
+ DAVFileAccess fileObject;
+ if(isUserRequested){
+ fileObject =3D JahiaWebdavBaseService.getInstance().getDAVFileAccess(=
jParams, mountPointR);
+ } else {
+ fileObject =3D
JahiaWebdavBaseService.getInstance().getDAVFileAccess(jPa=
rams, mountPoint);
+ }
if(fileObject !=3D null && fileObject.isValid()) {
TreeSet sortedResources =3D new TreeSet(new Comparator() {
public int compare(Object o1, Object o2) {
@@ -81,10 +93,19 @@
});
sortedResources.addAll(fileObject.getChildren());
=
- String popupAjaxFileManagerURL =3D bypassUrl;
+ //String popupAjaxFileManagerURL =3D bypassUrl;
+ String parentpath=3D"";
%>
<div class=3D"davbox">
- <ul>
+ <%if(isUserRequested){
+ parentpath=3DmountPointR.substring(0,mountPointR.lastIndexOf("/"));
+ if(!mountPointR.equals(mountPoint)){
+ %><a href=3D"?<%=3DboxContainer.getID() + "_mountPoint=3D"+parentp=
ath%>">[.]</a>
+ <%
+ }
+ }
+
+ %>
<%
for (Iterator iter =3D sortedResources.iterator(); iter.hasNext();=
) {
DAVFileAccess curDf =3D (DAVFileAccess)iter.next();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
