Author: pvollenweider
Date: Mon Jul 2 10:57:39 2007
New Revision: 737
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D737&repname=
=3Dcorporate_portal_templates_v2
Log:
Truncate long file name in search box or saved search box to prevent displa=
y problems. The parameter maxLength is send into a request parameter.
Modified:
branches/JAHIA-ACG-BRANCH/src/jsp/box/declarations.inc
branches/JAHIA-ACG-BRANCH/src/jsp/box/savedsearch.inc
branches/JAHIA-ACG-BRANCH/src/jsp/box/searchbox.inc
branches/JAHIA-ACG-BRANCH/src/jsp/double.jsp
Modified: branches/JAHIA-ACG-BRANCH/src/jsp/box/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/src/jsp/box/declarations.inc&rev=3D737&repname=3Dcorporate_portal_temp=
lates_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-ACG-BRANCH/src/jsp/box/declarations.inc (original)
+++ branches/JAHIA-ACG-BRANCH/src/jsp/box/declarations.inc Mon Jul 2 10:57=
:39 2007
@@ -19,6 +19,11 @@
id =3D id =3D=3D null ? "" : "_" + id;
String rowColor =3D "#ffffff";
int rowColorCount =3D 0;
+int maxLength =3D -1;
+try {
+ maxLength =3D Integer.parseInt(request.getParameter("maxLength"));
+} catch (NumberFormatException nfe) {
+}
%>
<%!
//String boxTypes[] =3D {"files", "links", "lastNews", "texts", "webapps",=
"filterWizards"};
@@ -40,6 +45,10 @@
return css;
}
=
+public String truncate(String target, int maxSize) =
+throws JahiaException {
+ return (target.length() > maxSize ? target.substring(0, maxSize) + "=
..." : target);
+}
=
%>
=
Modified: branches/JAHIA-ACG-BRANCH/src/jsp/box/savedsearch.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/src/jsp/box/savedsearch.inc&rev=3D737&repname=3Dcorporate_portal_templ=
ates_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-ACG-BRANCH/src/jsp/box/savedsearch.inc (original)
+++ branches/JAHIA-ACG-BRANCH/src/jsp/box/savedsearch.inc Mon Jul 2 10:57:=
39 2007
@@ -198,7 +198,7 @@
extention =3D currentName.substring(curre=
ntName.lastIndexOf(".")+1,
currentName.length());
}
-
+ =
Iterator fieldsIt =3D viewSettings.getFields(=
).iterator();
JahiaSavedSearchDetail searchDetail =3D null;
while ( fieldsIt.hasNext() ){
@@ -248,8 +248,8 @@
</display:column>
<% }
} else if ( searchDetail.getName().equals(=
"File")) {%>
- <display:column title=3D'<%=3DgetResourceBund=
le("search.file","File",jData)%>' sortable=3D"true" sortProperty=3D"fileNam=
e" comparator=3D"<%=3D comparator %>">
- <!--<%=3DcurrentName%>--><a href=3D'<%=3D=
JahiaTools.replacePattern(jff.getDownloadUrl(),"'","'")%>' class=3D"<%=
=3Dextention%>" target=3D"_blank"><%=3DcurrentName%></a>
+ <display:column maxLength=3D"335" title=3D'<%=
=3DgetResourceBundle("search.file","File",jData)%>' sortable=3D"true" sortP=
roperty=3D"fileName" comparator=3D"<%=3D comparator %>">
+ <a title=3D"<%=3DcurrentName%>" href=3D'<=
%=3DJahiaTools.replacePattern(jff.getDownloadUrl(),"'","'")%>' class=3D=
"<%=3Dextention%>" target=3D"_blank"><%=3Dtruncate(currentName,maxLength)%>=
</a>
</display:column>
<% } else if ( searchDetail.getName().equals(=
"Author")) { %>
<logic:equal name=3D"displayDetails" value=3D=
"true">
Modified: branches/JAHIA-ACG-BRANCH/src/jsp/box/searchbox.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/src/jsp/box/searchbox.inc&rev=3D737&repname=3Dcorporate_portal_templat=
es_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-ACG-BRANCH/src/jsp/box/searchbox.inc (original)
+++ branches/JAHIA-ACG-BRANCH/src/jsp/box/searchbox.inc Mon Jul 2 10:57:39=
2007
@@ -240,7 +240,7 @@
target=3D"_blank"><img title=3D"Open in IE folder" alt=
=3D"IE Folder" border=3D"0" src=3D"<content:serverHttpPath/>/jsp/jahia/java=
script/zimbra/complexTree/IEFolder.gif" /></a>
</display:column>
<display:column title=3D'<%=3DgetResourceBundle("search=
.file","File",jData)%>' sortable=3D"true" sortProperty=3D"fileName" compara=
tor=3D"<%=3D comparator %>">
- <!--<%=3DcurrentName%>--><a href=3D'<%=3DJahiaTools=
.replacePattern(org.jahia.engines.filemanager.TableEntry.javascriptDecode(j=
ff.getDownloadUrl()),"'","'")%>' class=3D"<%=3Dextention%>" target=3D"_=
blank"><%=3DcurrentName%></a>
+ <a title=3D"<%=3DcurrentName%>" href=3D'<%=3DJahiaT=
ools.replacePattern(org.jahia.engines.filemanager.TableEntry.javascriptDeco=
de(jff.getDownloadUrl()),"'","'")%>' class=3D"<%=3Dextention%>" target=
=3D"_blank"><%=3Dtruncate(currentName,maxLength)%></a>
</display:column>
<logic:equal name=3D"displayDetails" value=3D"true">
<display:column property=3D"author"
title=3D'<%=3Dget=
ResourceBundle("search.author","Author",jData)%>' sortable=3D"true" compara=
tor=3D"<%=3D comparator %>" />
@@ -249,10 +249,6 @@
<display:column property=3D"lastContributor"
title=3D=
'<%=3DgetResourceBundle("search.lastAuthor","Last author",jData)%>' sortabl=
e=3D"true" comparator=3D"<%=3D comparator %>" />
</logic:equal>
<logic:equal name=3D"displayDetails" value=3D"true">
- <display:column property=3D"shortCreationDate"
- title=3D'<%=3DgetResourceBundle("search.creationDa=
te","Creation date",jData)%>' sortable=3D"true"/>
- </logic:equal>
- <logic:equal name=3D"displayDetails" value=3D"true">
<display:column property=3D"shortModificationDate"
title=3D'<%=3DgetResourceBundle("search.lastModifica=
tionDate","Last modification date",jData)%>'
sortable=3D"true"/>
Modified: branches/JAHIA-ACG-BRANCH/src/jsp/double.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/src/jsp/double.jsp&rev=3D737&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-ACG-BRANCH/src/jsp/double.jsp (original)
+++ branches/JAHIA-ACG-BRANCH/src/jsp/double.jsp Mon Jul 2 10:57:39 2007
@@ -31,6 +31,7 @@
<jsp:include page=3D"box/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"leftcol"/>
<jsp:param name=3D"displayDetails" value=3D"true"/>
+ <jsp:param name=3D"maxLength" value=3D"30"/>
</jsp:include>
</jesi:fragment>
</div>
@@ -67,9 +68,10 @@
<jsp:include page=3D"box/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"rightcol"/>
<jsp:param name=3D"displayDetails" value=3D"false"/>
+ <jsp:param name=3D"maxLength" value=3D"30"/>
</jsp:include>
</jesi:fragment>
</div>
<%@ include file=3D"common/bottom.inc"%>
=
-</jesi:template>
\ No newline at end of file
+</jesi:template>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
