Author: xlawrence
Date: Thu Jan 10 17:01:39 2008
New Revision: 19490
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19490&repname=
=3Djahia
Log:
Moved GetPicto method from DAVFileAccess.java to JahiaTools.java
added a boolean field to the files default box in order to let the user cho=
ose to display file details or not =
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/webd=
av/DAVFileAccess.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/utils/JahiaTo=
ols.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/var/shared_te=
mplates/default_v3.jar
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/fil=
emanager/error.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/sha=
red/embedded_flat_filemanager.jsp
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/webdav/DAVFileAccess.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/webdav/DAVFileAccess.java&rev=
=3D19490&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/services/webd=
av/DAVFileAccess.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/webd=
av/DAVFileAccess.java Thu Jan 10 17:01:39 2008
@@ -113,24 +113,6 @@
=
private String webDavServerPath =3D "";
=
- protected final static String extention[] =3D {"doc", "xls", "ppt", "z=
ip", "pdf", "txt", "html", "htm", "waw", "mp3",
- "jpg", "jpeg", "gif", "tif", "avi", "mpeg", "mpa", "mpg", "mpe=
", "mov",
- "exe", "text", "rar", "tgz"};
- protected final static String picto[] =3D {"doc", "xls", "ppt", "zip",=
"pdf", "txt", "html", "html", "sound", "sound",
- "img", "img", "img", "img", "video", "video", "video", "video"=
, "video", "video",
- "exe", "txt", "rar", "zip"};
-
- public static String getPicto(final String fileName) {
- final String f =3D fileName.toLowerCase();
- for (int k =3D 0; k < extention.length; k++) {
- if (f.endsWith(extention[k])) {
- return picto[k];
- }
- }
- return "file";
- }
-
-
public DAVFileAccess(final JahiaSite site, final String path) {
this(site, null, path);
}
@@ -149,8 +131,7 @@
this.jParams =3D jParams;
this.site =3D site;
if (jParams !=3D null) {
- this.webDavServerPath =3D jParams.getContextPath()
- + "/webdav/site/" + jParams.getSiteKey();
+ this.webDavServerPath =3D jParams.getContextPath() + "/webdav/=
site/" + jParams.getSiteKey();
}
if (user !=3D null) {
String n =3D user.getUsername();
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=3D19490&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 Thu Jan 10 17:01:39 2008
@@ -74,7 +74,7 @@
*/
public void declare(final String fullListName) {
try {
- final Vector children =3D new Vector(2);
+ final Vector children =3D new Vector(3);
=
children.add("@f file");
jData.containers().declareField(fullListName, "file", "File", =
FieldTypes.FILE, null);
@@ -82,6 +82,9 @@
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);
+
checkDeclaration(fullListName, title, children);
=
} catch (final JahiaException 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=3D19490&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 Thu Jan 10 17:01:39 2008
@@ -1344,19 +1344,6 @@
throw new IOException("Too many redirects for request to [" + url =
+ "].");
}
=
- /**
- * Generate WHERE columnName=3Did1
- *
- * @param maxSqlWhereClauses
- * @param ids
- * @param columnName
- * @param valueOperator
- * @param logicOperator
- * @param prefixWithWhereKeyword
- * @param alwaysPrefixWithWhereKeyword
- * @param postFixWithAndKeyword
- * @return
- */
public static String getConditionalInClauseFromBitSet(BitSet ids,
String columnNam=
e, String valueOperator, String suffix) {
StringBuffer buff =3D new StringBuffer(1000);
@@ -1497,4 +1484,21 @@
return sb.toString();
} // getMultivalues
=
+ protected final static String extention[] =3D {"doc", "xls", "csv", "p=
pt", "zip", "pdf", "txt", "html", "htm", "waw", "mp3",
+ "jpg", "jpeg", "gif", "tif", "avi", "mpeg", "mpa", "mpg", "mpe=
", "mov",
+ "exe", "text", "rar", "tgz"};
+ protected final static String picto[] =3D {"doc", "xls", "xls", "ppt",=
"zip", "pdf", "txt", "html", "html", "sound", "sound",
+ "img", "img", "img", "img", "video", "video", "video", "video"=
, "video", "video",
+ "exe", "txt", "rar", "zip"};
+
+ public static String getPicto(final String fileName) {
+ final String f =3D fileName.toLowerCase();
+ for (int k =3D 0; k < extention.length; k++) {
+ if (f.endsWith(extention[k])) {
+ return picto[k];
+ }
+ }
+ return "file";
+ }
+
}
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=3D19490&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.
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engin=
es/filemanager/error.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/error.jsp&rev=3D=
19490&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/jsp/jahia/engines/fil=
emanager/error.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/fil=
emanager/error.jsp Thu Jan 10 17:01:39 2008
@@ -15,9 +15,10 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%@ page language=3D"java" %>
-<%@ page import=3D"java.util.HashMap" %>
-<%@ page import=3D"java.util.List"%>
-<%@ page import=3D"org.jahia.services.webdav.DAVFileAccess"%>
+<%@ page import=3D"org.jahia.services.webdav.DAVFileAccess" %>
+<%@ page import=3D"org.jahia.utils.JahiaTools"%>
+<%@ page import=3D"java.util.HashMap"%>
+<%@ page import=3D"java.util.List" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%
@@ -66,7 +67,7 @@
<% if (dav.isCollection()) { %>
<img src=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/images/t=
ypes/folder_open.gif" alt=3D""/>
<% } else { %>
- <% final String ext =3D DAVFileAccess.getPicto(dav.getPath());=
%>
+ <% final String ext =3D JahiaTools.getPicto(dav.getPath()); %>
<img src=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/images/t=
ypes/<%=3Dext%>.gif" alt=3D""/>
<% } %>
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engin=
es/shared/embedded_flat_filemanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_fileman=
ager.jsp&rev=3D19490&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/jsp/jahia/engines/sha=
red/embedded_flat_filemanager.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/sha=
red/embedded_flat_filemanager.jsp Thu Jan 10 17:01:39 2008
@@ -17,15 +17,15 @@
--%><%@ page import=3D"org.apache.slide.structure.ObjectNode,
org.apache.slide.webdav.util.URLUtil,
org.jahia.data.JahiaData,
+ org.jahia.engines.EngineLanguageHelper,
+ org.jahia.engines.JahiaEngine,
org.jahia.engines.filemanager.TableEntry,
org.jahia.params.ParamBean,
- org.jahia.resourcebundle.JahiaResourceBundle,
- org.jahia.services.webdav.listeners.IMGSlideContentListen=
er,
- org.jahia.utils.JahiaString" %>
-<%@ page import=3D"java.util.*" %>
-<%@ page import=3D"org.jahia.services.webdav.DAVFileAccess"%>
-<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
-<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
+ org.jahia.resourcebundle.JahiaResourceBundle" %>
+<%@ page import=3D"org.jahia.services.webdav.listeners.IMGSlideContentList=
ener" %>
+<%@ page import=3D"org.jahia.utils.JahiaString"%>
+<%@ page import=3D"org.jahia.utils.JahiaTools"%>
+<%@ page import=3D"java.util.*"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<jahia:i18n/>
<%!
@@ -567,7 +567,7 @@
if (selected) {
border =3D 3;
}
- final String thisPicto =3D DAVFileAccess.getPicto(tableEntry.getType()=
);
+ final String thisPicto =3D JahiaTools.getPicto(tableEntry.getType());
%>
<% if (ImageView.equals("0")) { %>
<a href=3D"javascript:sendForm('<%=3D tableEntry.getEncodedName() %>')">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
