Author: xlawrence
Date: Thu Jan 10 16:17:37 2008
New Revision: 52
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D52&repname=3D=
corporate_portal_templates_v3
Log:
remove unnecessary scriptlet methods
Modified:
trunk/src/jsp/common/declarations.jspf
trunk/src/jsp/common/site_settings.jspf
Modified: trunk/src/jsp/common/declarations.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
declarations.jspf&rev=3D52&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/declarations.jspf (original)
+++ trunk/src/jsp/common/declarations.jspf Thu Jan 10 16:17:37 2008
@@ -91,7 +91,6 @@
final static String topLinkIcons[] =3D {"icon.key", "icon.briefcase", =
"icon.download", "icon.wallet", "icon.sheet"};
final static String siteSkins[] =3D {"siteSettings.blue", "siteSetting=
s.green"};
=
-
public String getSiteSkin(String skin, String resBundleID)
throws JahiaException {
String name =3D "blue";
@@ -121,64 +120,6 @@
return name;
}
=
-
- public String getMultivalues(String resBundleID, String values[]) {
- StringBuffer sb =3D new StringBuffer("<jahia_multivalue[");
- ArrayList al =3D new ArrayList();
- for (int i =3D 0; i < values.length; i++) {
- al.add(values[i]);
- }
- Collections.sort(al);
- for (int i =3D 0; i < al.size(); i++) {
- if (i > 0) {
- sb.append(":");
- }
- sb.append(ResourceBundleMarker.drawMarker(resBundleID, (String=
) al.get(i), ""));
- }
- sb.append("]>");
- if (al.size() >=3D 0) {
- sb.append(ResourceBundleMarker.drawMarker(resBundleID, (String=
) al.get(0), ""));
- }
- return sb.toString();
- } // getMultivalues
-
-
- public String firstCharToUpper(String s) {
- if (s !=3D null && s.length() > 0) {
- return s.substring(0, 1).toUpperCase() + s.substring(1);
- }
- return "";
- }
-
- public String shopString(String s, int max) {
- if (s !=3D null && s.length() > max) {
- return s.substring(0, max);
- }
- return s;
- }
-
- String extention[] =3D {"doc", "xls", "ppt", "zip", "pdf", "txt", "htm=
l",
- "htm", "waw", "mp3", "jpg", "jpeg", "gif", "tif", "png",
- "avi", "mpeg", "mpa", "mpg", "mpe", "mov",
- "exe", "text", "rar", "tgz", "dir"};
- String picto[] =3D {"doc", "xls", "ppt", "zip", "pdf", "txt", "html",
- "html", "sound", "sound", "img", "img", "img", "img", "img",
- "video", "video", "video", "video", "video", "video",
- "exe", "txt", "zip", "tgz", "dir"};
-
- public String getPicto(String fileName)
- throws JahiaException {
- String p =3D "file";
- String f =3D fileName.toLowerCase();
- for (int k =3D 0; k < extention.length; k++) {
- if (f.endsWith(extention[k])) {
- p =3D picto[k];
- break;
- }
- }
- return p;
- } // getPicto
-
/**
* Remove all html tags
* @param str Input string (html code).
Modified: trunk/src/jsp/common/site_settings.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
site_settings.jspf&rev=3D52&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/site_settings.jspf (original)
+++ trunk/src/jsp/common/site_settings.jspf Thu Jan 10 16:17:37 2008
@@ -53,7 +53,7 @@
title=3D"Skin"
type=3D"SharedSmallText"
titleKey=3D"siteSettings.siteSkin"
- value=3D"<%=3DgetMultivalues(resBundleID,sit=
eSkins)%>"
+ value=3D"<%=3DJahiaTools.getMultiValuesSingl=
e(resBundleID, siteSkins)%>"
bundleKey=3D"<%=3DresBundleID%>"
/>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
