Author: pvollenweider
Date: Mon Jul 2 17:21:18 2007
New Revision: 739
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D739&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 sent into a request parameter.
Modified:
trunk/src/jsp/box/declarations.inc
trunk/src/jsp/box/savedsearch.inc
trunk/src/jsp/box/searchbox.inc
trunk/src/jsp/double.jsp
Modified: trunk/src/jsp/box/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/box/dec=
larations.inc&rev=3D739&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
--- trunk/src/jsp/box/declarations.inc (original)
+++ trunk/src/jsp/box/declarations.inc Mon Jul 2 17:21:18 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: trunk/src/jsp/box/savedsearch.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/box/sav=
edsearch.inc&rev=3D739&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
--- trunk/src/jsp/box/savedsearch.inc (original)
+++ trunk/src/jsp/box/savedsearch.inc Mon Jul 2 17:21:18 2007
@@ -248,7 +248,7 @@
<% }
} 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=
jff.getDownloadUrl()%>' class=3D"<%=3Dextention%>" target=3D"_blank"><%=3Dc=
urrentName%></a>
+ <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: trunk/src/jsp/box/searchbox.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/box/sea=
rchbox.inc&rev=3D739&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
--- trunk/src/jsp/box/searchbox.inc (original)
+++ trunk/src/jsp/box/searchbox.inc Mon Jul 2 17:21:18 2007
@@ -228,7 +228,7 @@
} %>
<!--display:column property=3D"ranking" title=3D'<%=3Dg=
etResourceBundle("search.rank","Ranking",jData)%>' sortable=3D"true"/-->
<display:column title=3D'<%=3DgetResourceBundle("search=
.file","File",jData)%>' sortable=3D"true" sortProperty=3D"fileName" compara=
tor=3D"<%=3D comparator %>">
- <!--<%=3DcurrentName%>--><a href=3D'<%=3Djff.getDow=
nloadUrl()%>' 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 %>" />
Modified: trunk/src/jsp/double.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/double.=
jsp&rev=3D739&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
--- trunk/src/jsp/double.jsp (original)
+++ trunk/src/jsp/double.jsp Mon Jul 2 17:21:18 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,6 +68,7 @@
<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>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
