Author: xlawrence
Date: Mon Nov 12 14:14:25 2007
New Revision: 23
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D23&repname=3D=
corporate_portal_templates_v3
Log:
fixed includes and put the navigation menu in a separate jsp file
Added:
trunk/src/jsp/common/navMenu.jsp
Modified:
trunk/src/jsp/common/declarations.jspf
trunk/src/jsp/content.jsp
trunk/src/jsp/home.jsp
trunk/src/jsp/mysettings.jsp
trunk/src/jsp/mysettingschanged.jsp
trunk/src/jsp/sitemap.jsp
Modified: trunk/src/jsp/common/declarations.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
declarations.jspf&rev=3D23&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 Mon Nov 12 14:14:25 2007
@@ -14,405 +14,401 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---%><%@ page import=3D"java.io.IOException,
- javax.servlet.jsp.PageContext,
- java.io.InputStream,
- java.lang.*,
- java.security.Principal,
- java.text.SimpleDateFormat,
- java.util.*,
- javax.servlet.*,
- org.compassframework.core.*,
- org.jahia.bin.Jahia,
- org.jahia.content.*,
- org.jahia.data.*,
- org.jahia.data.beans.*,
- org.jahia.data.containers.*,
- org.jahia.data.fields.*,
- org.jahia.data.files.*,
- org.jahia.data.search.*,
- org.jahia.data.viewhelper.sitemap.*,
- org.jahia.engines.mysettings.MySettingsEngine,
- org.jahia.engines.search.*,
- org.jahia.services.usermanager.*,
- org.jahia.exceptions.*,
- org.jahia.gui.*,
- org.jahia.params.*,
- org.jahia.registries.ServicesRegistry,
- org.jahia.resourcebundle.*,
- org.jahia.security.license.*,
- org.jahia.services.*,
- org.jahia.services.categories.*,
- org.jahia.services.containers.*,
- org.jahia.services.fields.*,
- org.jahia.services.pages.*,
- org.jahia.services.search.*,
- org.jahia.services.search.slide.*,
- org.jahia.services.search.savedsearch.*,
- org.jahia.services.sites.*,
- org.jahia.services.usermanager.*,
- org.jahia.services.version.*,
- org.jahia.services.webdav.*,
- org.jahia.services.workflow.*,
- org.jahia.utils.*,
- org.jahia.utils.fileparsers.CharsetDetection,
- org.apache.commons.lang.StringUtils,
- org.apache.slide.common.UriPath,
- org.apache.slide.common.PropertyName,
- org.apache.slide.webdav.util.URLUtil,
- org.apache.lucene.queryParser.QueryParser,
- org.jahia.taglibs.esi.JesiConst,
- org.jahia.taglibs.ajax.ComplexTreeInclude,
- org.jahia.ajax.usersession.userSettings,
- org.jahia.services.acl.JahiaACLManagerService,
- org.jahia.services.acl.JahiaBaseACL,
- org.jahia.settings.SettingsBean,
- org.jahia.services.esi.EsiSOAPInvalidatorService"
-%><%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %><%@
-taglib uri=3D"/WEB-INF/etc/struts/struts-html" prefix=3D"html" %><%@
-taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %><%@
-taglib uri=3D"/WEB-INF/etc/taglibs/jstl/c" prefix=3D"c" %><%@
-taglib uri=3D"/WEB-INF/etc/taglibs/pager-taglib" prefix=3D"pg" %><%@
-taglib uri=3D"ajaxLib" prefix=3D"ajax" %><%@
-taglib uri=3D"jahiaHtmlLib" prefix=3D"jahiaHtml" %><%@
-taglib uri=3D"jahiaComponentsLib" prefix=3D"jahiaComponents" %><%@
-taglib uri=3D"contentLib" prefix=3D"content" %><%@
-taglib uri=3D"http://displaytag.sf.net"; prefix=3D"display" %><%@
-taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
+--%>
+<%@ page import=3D"java.io.IOException,
+ javax.servlet.jsp.PageContext,
+ java.io.InputStream,
+ java.lang.*,
+ java.security.Principal,
+ java.text.SimpleDateFormat,
+ java.util.*,
+ javax.servlet.*,
+ org.compassframework.core.*,
+ org.jahia.bin.Jahia,
+ org.jahia.content.*,
+ org.jahia.data.*,
+ org.jahia.data.beans.*,
+ org.jahia.data.containers.*,
+ org.jahia.data.fields.*,
+ org.jahia.data.files.*,
+ org.jahia.data.search.*,
+ org.jahia.data.viewhelper.sitemap.*,
+ org.jahia.engines.mysettings.MySettingsEngine,
+ org.jahia.engines.search.*,
+ org.jahia.services.usermanager.*,
+ org.jahia.exceptions.*,
+ org.jahia.gui.*,
+ org.jahia.params.*,
+ org.jahia.registries.ServicesRegistry,
+ org.jahia.resourcebundle.*,
+ org.jahia.security.license.*,
+ org.jahia.services.*,
+ org.jahia.services.categories.*,
+ org.jahia.services.containers.*,
+ org.jahia.services.fields.*,
+ org.jahia.services.pages.*,
+ org.jahia.services.search.*,
+ org.jahia.services.search.slide.*,
+ org.jahia.services.search.savedsearch.*,
+ org.jahia.services.sites.*,
+ org.jahia.services.usermanager.*,
+ org.jahia.services.version.*,
+ org.jahia.services.webdav.*,
+ org.jahia.services.workflow.*,
+ org.jahia.utils.*,
+ org.jahia.utils.fileparsers.CharsetDetection,
+ org.apache.commons.lang.StringUtils,
+ org.apache.slide.common.UriPath,
+ org.apache.slide.common.PropertyName,
+ org.apache.slide.webdav.util.URLUtil,
+ org.apache.lucene.queryParser.QueryParser,
+ org.jahia.taglibs.esi.JesiConst,
+ org.jahia.taglibs.ajax.ComplexTreeInclude,
+ org.jahia.ajax.usersession.userSettings,
+ org.jahia.services.acl.JahiaACLManagerService,
+ org.jahia.services.acl.JahiaBaseACL,
+ org.jahia.settings.SettingsBean,
+ org.jahia.services.esi.EsiSOAPInvalidatorService" %>
+<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %>
+<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-html" prefix=3D"html" %>
+<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
+<%@ taglib uri=3D"/WEB-INF/etc/taglibs/jstl/c" prefix=3D"c" %>
+<%@ taglib uri=3D"/WEB-INF/etc/taglibs/pager-taglib" prefix=3D"pg" %>
+<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
+<%@ taglib uri=3D"jahiaHtmlLib" prefix=3D"jahiaHtml" %>
+<%@ taglib uri=3D"jahiaComponentsLib" prefix=3D"jahia-components" %>
+<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
+<%@ taglib uri=3D"http://displaytag.sf.net"; prefix=3D"display" %>
+<%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
+<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%@ taglib tagdir=3D"/WEB-INF/tags" prefix=3D"h" %>
-<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %><%!
-
-final static String topLinkIcons[] =3D {"icon.key", "icon.briefcase", "ico=
n.download", "icon.wallet", "icon.sheet"};
-final static String siteSkins[] =3D {"siteSettings.blue", "siteSettings.gr=
een"};
-
-final static String[] hex =3D {
- "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
- "%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f",
- "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17",
- "%18", "%19", "%1a", "%1b", "%1c", "%1d", "%1e", "%1f",
- "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27",
- "%28", "%29", "%2a", "%2b", "%2c", "%2d", "%2e", "%2f",
- "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37",
- "%38", "%39", "%3a", "%3b", "%3c", "%3d", "%3e", "%3f",
- "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47",
- "%48", "%49", "%4a", "%4b", "%4c", "%4d", "%4e", "%4f",
- "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57",
- "%58", "%59", "%5a", "%5b", "%5c", "%5d", "%5e", "%5f",
- "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67",
- "%68", "%69", "%6a", "%6b", "%6c", "%6d", "%6e", "%6f",
- "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77",
- "%78", "%79", "%7a", "%7b", "%7c", "%7d", "%7e", "%7f",
- "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87",
- "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f",
- "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97",
- "%98", "%99", "%9a", "%9b", "%9c", "%9d", "%9e", "%9f",
- "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%a6", "%a7",
- "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", "%ae", "%af",
- "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7",
- "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf",
- "%c0", "%c1", "%c2", "%c3", "%c4", "%c5", "%c6", "%c7",
- "%c8", "%c9", "%ca", "%cb", "%cc", "%cd", "%ce", "%cf",
- "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
- "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df",
- "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7",
- "%e8", "%e9", "%ea", "%eb", "%ec", "%ed", "%ee", "%ef",
- "%f0", "%f1", "%f2", "%f3", "%f4", "%f5", "%f6", "%f7",
- "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", "%fe", "%ff"
-};
-
-public String getSiteSkin (String skin, String resBundleID)
-throws JahiaException
-{
- String name =3D "blue";
- if (skin !=3D null) {
- for (int i =3D 0; i < siteSkins.length; i++){
- if ( skin.equals(ResourceBundleMarker.drawMarker(resBundleID,s=
iteSkins[i],"")) ){
- name =3D siteSkins[i].substring(siteSkins[i].indexOf(".") +1=
);
- break;
+<%!
+ 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"};
+
+ final static String[] hex =3D {
+ "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
+ "%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f",
+ "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17",
+ "%18", "%19", "%1a", "%1b", "%1c", "%1d", "%1e", "%1f",
+ "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27",
+ "%28", "%29", "%2a", "%2b", "%2c", "%2d", "%2e", "%2f",
+ "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37",
+ "%38", "%39", "%3a", "%3b", "%3c", "%3d", "%3e", "%3f",
+ "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47",
+ "%48", "%49", "%4a", "%4b", "%4c", "%4d", "%4e", "%4f",
+ "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57",
+ "%58", "%59", "%5a", "%5b", "%5c", "%5d", "%5e", "%5f",
+ "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67",
+ "%68", "%69", "%6a", "%6b", "%6c", "%6d", "%6e", "%6f",
+ "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77",
+ "%78", "%79", "%7a", "%7b", "%7c", "%7d", "%7e", "%7f",
+ "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87",
+ "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f",
+ "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97",
+ "%98", "%99", "%9a", "%9b", "%9c", "%9d", "%9e", "%9f",
+ "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%a6", "%a7",
+ "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", "%ae", "%af",
+ "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7",
+ "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf",
+ "%c0", "%c1", "%c2", "%c3", "%c4", "%c5", "%c6", "%c7",
+ "%c8", "%c9", "%ca", "%cb", "%cc", "%cd", "%ce", "%cf",
+ "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
+ "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df",
+ "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7",
+ "%e8", "%e9", "%ea", "%eb", "%ec", "%ed", "%ee", "%ef",
+ "%f0", "%f1", "%f2", "%f3", "%f4", "%f5", "%f6", "%f7",
+ "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", "%fe", "%ff"
+ };
+
+ public String getSiteSkin(String skin, String resBundleID)
+ throws JahiaException {
+ String name =3D "blue";
+ if (skin !=3D null) {
+ for (int i =3D 0; i < siteSkins.length; i++) {
+ if (skin.equals(ResourceBundleMarker.drawMarker(resBundleI=
D, siteSkins[i], ""))) {
+ name =3D siteSkins[i].substring(siteSkins[i].indexOf("=
.") + 1);
+ break;
+ }
}
}
+ return name;
}
- return name;
-}
=
-public String getTopIcon (String icon, String resBundleID)
-throws JahiaException
-{
- String name =3D "key";
- if (icon !=3D null) {
- for (int i =3D 0; i < topLinkIcons.length; i++){
- if ( icon.equals(ResourceBundleMarker.drawMarker(resBundleID,t=
opLinkIcons[i],"")) ){
- name =3D topLinkIcons[i].substring(topLinkIcons[i].indexOf("=
.") +1);
- break;
+ public String getTopIcon(String icon, String resBundleID)
+ throws JahiaException {
+ String name =3D "key";
+ if (icon !=3D null) {
+ for (int i =3D 0; i < topLinkIcons.length; i++) {
+ if (icon.equals(ResourceBundleMarker.drawMarker(resBundleI=
D, topLinkIcons[i], ""))) {
+ name =3D topLinkIcons[i].substring(topLinkIcons[i].ind=
exOf(".") + 1);
+ break;
+ }
}
}
+ return name;
}
- return name;
-}
=
-public static String encode(String s)
-{
- StringBuffer sbuf =3D new StringBuffer();
- int len =3D s.length();
- for (int i =3D 0; i < len; i++) {
- int ch =3D s.charAt(i);
- if ('A' <=3D ch && ch <=3D 'Z') { // 'A'..'Z'
- sbuf.append((char)ch);
- } else if ('a' <=3D ch && ch <=3D 'z') { // 'a'..'z'
- sbuf.append((char)ch);
- } else if ('0' <=3D ch && ch <=3D '9') { // '0'..'9'
- sbuf.append((char)ch);
- } else if (ch =3D=3D ' ') { // space
- sbuf.append('+');
- } else if (ch =3D=3D '-' || ch =3D=3D '_' // unreserved
- || ch =3D=3D '.' || ch =3D=3D '!'
- || ch =3D=3D '~' || ch =3D=3D '*'
- || ch =3D=3D '\'' || ch =3D=3D '('
- || ch =3D=3D ')') {
- sbuf.append((char)ch);
- } else if (ch <=3D 0x007f) { // other ASCII
- sbuf.append(hex[ch]);
- } else if (ch <=3D 0x07FF) { // non-ASCII <=3D 0x7FF
- sbuf.append(hex[0xc0 | (ch >> 6)]);
- sbuf.append(hex[0x80 | (ch & 0x3F)]);
- } else { // 0x7FF < ch <=3D 0xFFFF
- sbuf.append(hex[0xe0 | (ch >> 12)]);
- sbuf.append(hex[0x80 | ((ch >> 6) & 0x3F)]);
- sbuf.append(hex[0x80 | (ch & 0x3F)]);
- }
- }
- return sbuf.toString();
-}
-
-public String getResourceBundle (String resourceName, String defaultValue,=
ParamBean jParams){
- String resourceBundle =3D "jahiatemplates.default_v3_lang";
- ResourceBundle res =3D null;
- String resValue =3D null;
- try {
- res =3D ResourceBundle.getBundle(resourceBundle,jParams.getLocale(=
));
- resValue =3D res.getString(resourceName);
- } catch ( MissingResourceException mre ) {
- }
- if ( resValue =3D=3D null ){
- resValue =3D defaultValue;
- }
- return resValue;
-}
-
-public String getResourceBundle (String resourceName, String defaultValue,=
JahiaData jData){
- String resourceBundle =3D "jahiatemplates.default_v3_lang";
- ResourceBundle res =3D null;
- String resValue =3D null;
- try {
- res =3D ResourceBundle.getBundle(resourceBundle,jData.params().g=
etLocale());
- resValue =3D res.getString(resourceName);
- } catch ( MissingResourceException mre ) {
- }
- if ( resValue =3D=3D null ){
- resValue =3D defaultValue;
- }
- return resValue;
-} // getResourceBundle
-
-public String getMultivalues(ArrayList al){
- StringBuffer sb =3D new StringBuffer("<jahia_multivalue[");
- Collections.sort(al);
- for (int i =3D 0; i < al.size(); i++) {
- if (i > 0){
- sb.append(":");
- }
- sb.append(al.get(i));
- }
- sb.append("]>");
-
- return sb.toString();
-}
-
-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(":");
+ public static String encode(String s) {
+ StringBuffer sbuf =3D new StringBuffer();
+ int len =3D s.length();
+ for (int i =3D 0; i < len; i++) {
+ int ch =3D s.charAt(i);
+ if ('A' <=3D ch && ch <=3D 'Z') { // 'A'..'Z'
+ sbuf.append((char) ch);
+ } else if ('a' <=3D ch && ch <=3D 'z') { // 'a'..'z'
+ sbuf.append((char) ch);
+ } else if ('0' <=3D ch && ch <=3D '9') { // '0'..'9'
+ sbuf.append((char) ch);
+ } else if (ch =3D=3D ' ') { // space
+ sbuf.append('+');
+ } else if (ch =3D=3D '-' || ch =3D=3D '_' // unreserved
+ || ch =3D=3D '.' || ch =3D=3D '!'
+ || ch =3D=3D '~' || ch =3D=3D '*'
+ || ch =3D=3D '\'' || ch =3D=3D '('
+ || ch =3D=3D ')') {
+ sbuf.append((char) ch);
+ } else if (ch <=3D 0x007f) { // other ASCII
+ sbuf.append(hex[ch]);
+ } else if (ch <=3D 0x07FF) { // non-ASCII <=3D 0x7FF
+ sbuf.append(hex[0xc0 | (ch >> 6)]);
+ sbuf.append(hex[0x80 | (ch & 0x3F)]);
+ } else { // 0x7FF < ch <=3D 0xFFFF
+ sbuf.append(hex[0xe0 | (ch >> 12)]);
+ sbuf.append(hex[0x80 | ((ch >> 6) & 0x3F)]);
+ sbuf.append(hex[0x80 | (ch & 0x3F)]);
+ }
}
- sb.append(ResourceBundleMarker.drawMarker(resBundleID,(String)al.=
get(i),""));
+ return sbuf.toString();
}
- sb.append("]>");
- if (al.size() >=3D 0){
- sb.append(ResourceBundleMarker.drawMarker(resBundleID,(String)al.=
get(0),""));
- }
- return sb.toString();
-} // getMultivalues
=
-/**
- * Remove all html tags
- * @param str Input string (html code).
- * @return Output string
- */
-public String removeTags (String str)
-throws JahiaException {
- if (str =3D=3D null) {
- return "";
+ public String getResourceBundle(String resourceName, String defaultVal=
ue, ParamBean jParams) {
+ String resourceBundle =3D "jahiatemplates.default_v3_lang";
+ ResourceBundle res =3D null;
+ String resValue =3D null;
+ try {
+ res =3D ResourceBundle.getBundle(resourceBundle, jParams.getLo=
cale());
+ resValue =3D res.getString(resourceName);
+ } catch (MissingResourceException mre) {
+ }
+ if (resValue =3D=3D null) {
+ resValue =3D defaultValue;
+ }
+ return resValue;
}
- StringBuffer result =3D new StringBuffer(str.length());
- int startIndex =3D 0;
- int i =3D str.indexOf("<");
- while (i !=3D -1){
- result.append(str.substring(startIndex,i));
- i =3D str.indexOf(">",i);
- if (i !=3D -1){
- startIndex =3D i + 1;
+
+ public String getResourceBundle(String resourceName, String defaultVal=
ue, JahiaData jData) {
+ String resourceBundle =3D "jahiatemplates.default_v3_lang";
+ ResourceBundle res =3D null;
+ String resValue =3D null;
+ try {
+ res =3D ResourceBundle.getBundle(resourceBundle, jData.params(=
).getLocale());
+ resValue =3D res.getString(resourceName);
+ } catch (MissingResourceException mre) {
}
- i =3D str.indexOf("<" , startIndex);
+ if (resValue =3D=3D null) {
+ resValue =3D defaultValue;
+ }
+ return resValue;
+ } // getResourceBundle
+
+ public String getMultivalues(ArrayList al) {
+ StringBuffer sb =3D new StringBuffer("<jahia_multivalue[");
+ Collections.sort(al);
+ for (int i =3D 0; i < al.size(); i++) {
+ if (i > 0) {
+ sb.append(":");
+ }
+ sb.append(al.get(i));
+ }
+ sb.append("]>");
+
+ return sb.toString();
}
- str =3D result.append(str.substring(startIndex,str.length())).toString=
();
- return str;
-}
-public String hl(String str, String strToHighlight, boolean truncate) {
- org.apache.log4j.Logger logger =3D
- org.apache.log4j.Logger.getLogger(getClass());
=
- if (str=3D=3Dnull ){
+ 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
+
+ /**
+ * Remove all html tags
+ * @param str Input string (html code).
+ * @return Output string
+ */
+ public String removeTags(String str)
+ throws JahiaException {
+ if (str =3D=3D null) {
+ return "";
+ }
+ StringBuffer result =3D new StringBuffer(str.length());
+ int startIndex =3D 0;
+ int i =3D str.indexOf("<");
+ while (i !=3D -1) {
+ result.append(str.substring(startIndex, i));
+ i =3D str.indexOf(">", i);
+ if (i !=3D -1) {
+ startIndex =3D i + 1;
+ }
+ i =3D str.indexOf("<", startIndex);
+ }
+ str =3D result.append(str.substring(startIndex, str.length())).toS=
tring();
return str;
}
- logger.debug("strToHighlight is " + strToHighlight);
- int TRUNK_SIZE =3D 255;
- int CHARS_BEFORE =3D 50;
- String STRING_BEFORE_SEARCH =3D "<span class=3D'hl'>";
- String STRING_AFTER_SEARCH =3D "</span>";
-
- StringBuffer result =3D new StringBuffer(str.length() + 100);
-
- String[] searchStrings =3D JahiaTools.getTokens(strToHighlight," ");
- if (searchStrings.length > 0) {
- String searchString =3D JahiaTools.replacePattern(searchStrings[0]=
,"*","");
-
- String lcStr =3D str.toLowerCase();
- String lcsearchString =3D searchString.toLowerCase();
-
- int i =3D lcStr.indexOf(lcsearchString);
-
- // truncate to 255 chars
- int startOfIndex =3D Math.max(i,CHARS_BEFORE) - CHARS_BEFORE;
- int maxLength =3D Math.min(TRUNK_SIZE,str.length()-startOfIndex);
- if (truncate) {
- str =3D str.substring(startOfIndex, maxLength + startOfIndex);
- lcStr =3D str.toLowerCase();
- }
-
- for (int k =3D 0; k < searchStrings.length; k++){
- result =3D new StringBuffer(str.length() + 100);
- searchString =3D JahiaTools.replacePattern(searchStrings[k],"=
*","");
- lcStr =3D str.toLowerCase();
- lcsearchString =3D searchString.toLowerCase();
- startOfIndex =3D 0;
- i =3D lcStr.indexOf(lcsearchString,startOfIndex);
- int searchStringLength =3D searchString.length();
- while (i !=3D -1) {
- result.append(str.substring(startOfIndex, i));
- result.append(STRING_BEFORE_SEARCH);
- result.append(str.substring(i, i + searchStringLength) );
- result.append(STRING_AFTER_SEARCH);
- startOfIndex =3D i + searchStringLength;
- i =3D lcStr.indexOf(lcsearchString,startOfIndex);
- }
- result.append(str.substring(startOfIndex,str.length()));
- str =3D result.toString();
+
+ public String hl(String str, String strToHighlight, boolean truncate) {
+ org.apache.log4j.Logger logger =3D
+ org.apache.log4j.Logger.getLogger(getClass());
+
+ if (str =3D=3D null) {
+ return str;
}
- if (maxLength =3D=3D TRUNK_SIZE && truncate) {
- result.append("[...]");
+ logger.debug("strToHighlight is " + strToHighlight);
+ int TRUNK_SIZE =3D 255;
+ int CHARS_BEFORE =3D 50;
+ String STRING_BEFORE_SEARCH =3D "<span class=3D'hl'>";
+ String STRING_AFTER_SEARCH =3D "</span>";
+
+ StringBuffer result =3D new StringBuffer(str.length() + 100);
+
+ String[] searchStrings =3D JahiaTools.getTokens(strToHighlight, " =
");
+ if (searchStrings.length > 0) {
+ String searchString =3D JahiaTools.replacePattern(searchString=
s[0], "*", "");
+
+ String lcStr =3D str.toLowerCase();
+ String lcsearchString =3D searchString.toLowerCase();
+
+ int i =3D lcStr.indexOf(lcsearchString);
+
+ // truncate to 255 chars
+ int startOfIndex =3D Math.max(i, CHARS_BEFORE) - CHARS_BEFORE;
+ int maxLength =3D Math.min(TRUNK_SIZE, str.length() - startOfI=
ndex);
+ if (truncate) {
+ str =3D str.substring(startOfIndex, maxLength + startOfInd=
ex);
+ lcStr =3D str.toLowerCase();
+ }
+
+ for (int k =3D 0; k < searchStrings.length; k++) {
+ result =3D new StringBuffer(str.length() + 100);
+ searchString =3D JahiaTools.replacePattern(searchStrings[k=
], "*", "");
+ lcStr =3D str.toLowerCase();
+ lcsearchString =3D searchString.toLowerCase();
+ startOfIndex =3D 0;
+ i =3D lcStr.indexOf(lcsearchString, startOfIndex);
+ int searchStringLength =3D searchString.length();
+ while (i !=3D -1) {
+ result.append(str.substring(startOfIndex, i));
+ result.append(STRING_BEFORE_SEARCH);
+ result.append(str.substring(i, i + searchStringLength)=
);
+ result.append(STRING_AFTER_SEARCH);
+ startOfIndex =3D i + searchStringLength;
+ i =3D lcStr.indexOf(lcsearchString, startOfIndex);
+ }
+ result.append(str.substring(startOfIndex, str.length()));
+ str =3D result.toString();
+ }
+ if (maxLength =3D=3D TRUNK_SIZE && truncate) {
+ result.append("[...]");
+ }
}
+ return result.toString();
}
- return result.toString();
-}
-public String hl(String str, String strToHighlight) {
- return hl(str, strToHighlight,true);
-}
-
-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", "html",
- "htm", "waw", "mp3", "jpg", "jpeg", "gif", "tif",
- "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", "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;
+
+ public String hl(String str, String strToHighlight) {
+ return hl(str, strToHighlight, true);
+ }
+
+ public String firstCharToUpper(String s) {
+ if (s !=3D null && s.length() > 0) {
+ return s.substring(0, 1).toUpperCase() + s.substring(1);
}
+ return "";
}
- return p;
-} // getPicto
-static String emotionSymbol[] =3D {">:D<",":-"","<):)","[-o=
<",":)>-",
- "~:>",">-)","\\:D/",":\">","3:-O",
- ":(|)","@};-","**=3D=3D","(~~)","*-:)",
- "<):)","[-o<",":-\"",":)>-",">:D<",
- ":))",":-)",":((",":-(",";;)",
- ":-/","X-(","B-)",":-s",">:)",
- "/:)","O:)",":-B","I-)","8-|",
- ":-&",":-$","[-(",":o)","8-}",
- "(:|",":-?","#-o","=3DD>",":@)",
- "~:>","%%-","%%-","~o)","8-X",
- "=3D:)",">-)",":-L","@-)","$-)",
- ":^o","b-(","[-X",":)",":(",
- ";)",":D",":x",":p",":*",
- ":O",":>",":|","=3D;"};
-
-static String emotionLabel[] =3D {"hugs","whistling","cowboy","praying","p=
eace",
- "chicken","alien_2","dancing","blushing","c=
ow",
- "monkey","rose","flag","pumpkin","idea",
- "cowboy","praying","whistling","peace","hug=
s",
- "laughing","smile","crying","sad","batting_=
eyelashes",
- "confused","angry","cool","worried","devili=
sh",
- "raised_eyebrow","angel","nerd","sleep","ro=
lling_eyes",
- "sick","shhh","not_talking","clown","silly",
- "tired","thinking","d_oh","applause","pig",
- "chicken","sad","good_luck","coffee","skull=
",
- "alien_1","alien_2","frustrated","hypnotize=
d","money_eyes",
- "liar","beat_up","shame_on_you","smile","sa=
d",
- "wink","biggrin","love_struck","tongue","ki=
ss",
- "shock","smug","straight_face","talk_to_the=
_hand"};
-
-public static String toEmotion(String inputString,String folder) {
- for (int i =3D 0; i < emotionSymbol.length; i++) {
- int smileyIndex =3D inputString.indexOf(emotionSymbol[i]);
- while (smileyIndex !=3D -1) {
- String url =3D "<img src=3D\"" + folder + emotionLabel[i] + ".=
gif\" alt=3D\"" + emotionLabel[i] + "/\">";
- inputString =3D inputString.substring(0, smileyIndex) + url +
- inputString.substring(smileyIndex + emotionSymbo=
l[i].length());
- smileyIndex =3D inputString.indexOf(emotionSymbol[i]);
+
+ public String shopString(String s, int max) {
+ if (s !=3D null && s.length() > max) {
+ return s.substring(0, max);
}
+ return s;
}
- return inputString;
-} // toEmotion
+
+ String extention[] =3D {"doc", "xls", "ppt", "zip", "pdf", "txt", "htm=
l",
+ "htm", "waw", "mp3", "jpg", "jpeg", "gif", "tif",
+ "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", "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
+
+ static String emotionSymbol[] =3D {">:D<", ":-"", "<):)"=
, "[-o<", ":)>-",
+ "~:>", ">-)", "\\:D/", ":\">", "3:-O",
+ ":(|)", "@};-", "**=3D=3D", "(~~)", "*-:)",
+ "<):)", "[-o<", ":-\"", ":)>-", ">:D<",
+ ":))", ":-)", ":((", ":-(", ";;)",
+ ":-/", "X-(", "B-)", ":-s", ">:)",
+ "/:)", "O:)", ":-B", "I-)", "8-|",
+ ":-&", ":-$", "[-(", ":o)", "8-}",
+ "(:|", ":-?", "#-o", "=3DD>", ":@)",
+ "~:>", "%%-", "%%-", "~o)", "8-X",
+ "=3D:)", ">-)", ":-L", "@-)", "$-)",
+ ":^o", "b-(", "[-X", ":)", ":(",
+ ";)", ":D", ":x", ":p", ":*",
+ ":O", ":>", ":|", "=3D;"};
+
+ static String emotionLabel[] =3D {"hugs", "whistling", "cowboy", "pray=
ing", "peace",
+ "chicken", "alien_2", "dancing", "blushing", "cow",
+ "monkey", "rose", "flag", "pumpkin", "idea",
+ "cowboy", "praying", "whistling", "peace", "hugs",
+ "laughing", "smile", "crying", "sad", "batting_eyelashes",
+ "confused", "angry", "cool", "worried", "devilish",
+ "raised_eyebrow", "angel", "nerd", "sleep", "rolling_eyes",
+ "sick", "shhh", "not_talking", "clown", "silly",
+ "tired", "thinking", "d_oh", "applause", "pig",
+ "chicken", "sad", "good_luck", "coffee", "skull",
+ "alien_1", "alien_2", "frustrated", "hypnotized", "money_eyes",
+ "liar", "beat_up", "shame_on_you", "smile", "sad",
+ "wink", "biggrin", "love_struck", "tongue", "kiss",
+ "shock", "smug", "straight_face", "talk_to_the_hand"};
+
+ public static String toEmotion(String inputString, String folder) {
+ for (int i =3D 0; i < emotionSymbol.length; i++) {
+ int smileyIndex =3D inputString.indexOf(emotionSymbol[i]);
+ while (smileyIndex !=3D -1) {
+ String url =3D "<img src=3D\"" + folder + emotionLabel[i] =
+ ".gif\" alt=3D\"" + emotionLabel[i] + "/\">";
+ inputString =3D inputString.substring(0, smileyIndex) + ur=
l +
+ inputString.substring(smileyIndex + emotionSymbol[=
i].length());
+ smileyIndex =3D inputString.indexOf(emotionSymbol[i]);
+ }
+ }
+ return inputString;
+ } // toEmotion
%>
\ No newline at end of file
Added: trunk/src/jsp/common/navMenu.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
common/navMenu.jsp&rev=3D23&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/navMenu.jsp (added)
+++ trunk/src/jsp/common/navMenu.jsp Mon Nov 12 14:14:25 2007
@@ -0,0 +1,16 @@
+<%@ include file=3D"declarations.jspf" %>
+<content:declareContainerList name=3D"<%=3Drequest.getParameter("listName"=
)%>" title=3D"Navigation">
+ <content:declareContainer>
+ <content:declareField name=3D"<%=3Drequest.getParameter("fieldName=
")%>"
+ title=3D"Page"
+ type=3D"Page"
+ titleKey=3D"navigation.navLink"
+ bundleKey=3D"jahiatemplates.default_v3_lang"=
/>
+ </content:declareContainer>
+</content:declareContainerList>
+
+<jahia-components:navmenu containerListName=3D"<%=3Drequest.getParameter("=
listName")%>"
+ pageFieldName=3D"<%=3Drequest.getParameter("fiel=
dName")%>"
+ bundleKey=3D"jahiatemplates.default_v3_lang"
+ startLevel=3D"1"/>
+ =
\ No newline at end of file
Modified: trunk/src/jsp/content.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/content=
.jsp&rev=3D23&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/content.jsp (original)
+++ trunk/src/jsp/content.jsp Mon Nov 12 14:14:25 2007
@@ -1,27 +1,24 @@
-<%@ include file=3D"declarations.jspf" %>
-<%@ include file=3D"common_vars.jspf" %>
+<%@ include file=3D"common/declarations.jspf" %>
+<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
<%@ include file=3D"common/menu.jspf" %>
<div id=3D"main">
<div id=3D"column-left">
<%@ include file=3D"common/page_image.jspf" %>
=
- <content:declareContainerList name=3D"navListTest" title=3D"Naviga=
tion">
- <content:declareContainer>
- <content:declareField name=3D"navLink" title=3D"Page" type=
=3D"Page"
- titleKey=3D"navigation.navLink" bund=
leKey=3D"jahiatemplates.default_v3_lang"/>
- </content:declareContainer>
- </content:declareContainerList>
-
- <jahiaComponents:navmenu containerListName=3D"navListTest" pageFie=
ldName=3D"navLink"
- bundleKey=3D"jahiatemplates.Corporate_por=
tal_templates_v2" startLevel=3D"1"/>
+ <!-- left navigation menu (start) -->
+ <jsp:include page=3D"common/navMenu.jsp" flush=3D"true">
+ <jsp:param name=3D"listName" value=3D"leftNavList"/>
+ <jsp:param name=3D"fieldName" value=3D"leftNavLink"/>
+ </jsp:include>
+ <!-- left navigation menu (end) --> =
=
- <!-- left column (start) -->
+ <!-- left box (start) -->
<jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"2"/>
<jsp:param name=3D"column" value=3D"boxTypesContentLeft"/>
</jsp:include>
- <!-- left column (end) -->
+ <!-- left box (end) -->
</div>
<div id=3D"column-main">
<div id=3D"pagePath">
Modified: trunk/src/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/home.js=
p&rev=3D23&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/home.jsp (original)
+++ trunk/src/jsp/home.jsp Mon Nov 12 14:14:25 2007
@@ -1,28 +1,24 @@
-<%@ include file=3D"declarations.jspf" %>
-<%@ include file=3D"common_vars.jspf" %>
+<%@ include file=3D"common/declarations.jspf" %>
+<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf"%>
<%@ include file=3D"common/menu.jspf"%>
<%@ include file=3D"common/pub.jspf"%>
=
<div id=3D"main">
- <div id=3D"column-left">
- <!-- left column (start) -->
- =
- <content:declareContainerList name=3D"navListTest" title=3D"Navigati=
on">
- <content:declareContainer>
- <content:declareField name=3D"navLink" title=3D"Page"
type=3D"Page" =
- titleKey=3D"navigation.navLink"
bundleKey=3D"jahiatemplates.defa=
ult_v3_lang"/>
- </content:declareContainer>
- </content:declareContainerList>
+ <div id=3D"column-left"> =
+ <!-- left navigation menu (start) -->
+ <jsp:include page=3D"common/navMenu.jsp" flush=3D"true">
+ <jsp:param name=3D"listName" value=3D"leftNavList"/>
+ <jsp:param name=3D"fieldName" value=3D"leftNavLink"/>
+ </jsp:include>
+ <!-- left navigation menu (end) --> =
=
- <jahiaComponents:navmenu
containerListName=3D"navListTest" pageFieldNam=
e=3D"navLink"
-
bundleKey=3D"jahiatemplates.Corporate_portal_templates_v2" startLevel=
=3D"1"/>
-
- <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
- <jsp:param name=3D"id" value=3D"2"/>
- <jsp:param name=3D"column" value=3D"boxTypesHomeLeft"/>
- </jsp:include>
- <!-- left column (end) -->
+ <!-- left box (start) -->
+ <jsp:include page=3D"common/box/box_dispatcher.jsp" flush=3D"true">
+ <jsp:param name=3D"id" value=3D"2"/>
+ <jsp:param name=3D"column" value=3D"boxTypesHomeLeft"/>
+ </jsp:include>
+ <!-- left box (end) -->
</div>
<div id=3D"column-main" class=3D"home">
<!-- main column (start) -->
Modified: trunk/src/jsp/mysettings.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/mysetti=
ngs.jsp&rev=3D23&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/mysettings.jsp (original)
+++ trunk/src/jsp/mysettings.jsp Mon Nov 12 14:14:25 2007
@@ -17,8 +17,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ include file=3D"declarations.jspf" %>
-<%@ include file=3D"common_vars.jspf" %>
+<%@ include file=3D"common/declarations.jspf" %>
+<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
<%@ include file=3D"common/menu.jspf" %>
=
Modified: trunk/src/jsp/mysettingschanged.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/mysetti=
ngschanged.jsp&rev=3D23&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/mysettingschanged.jsp (original)
+++ trunk/src/jsp/mysettingschanged.jsp Mon Nov 12 14:14:25 2007
@@ -15,8 +15,8 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%>
-<%@ include file=3D"declarations.jspf" %>
-<%@ include file=3D"common_vars.jspf" %>
+<%@ include file=3D"common/declarations.jspf" %>
+<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf" %>
<%@ include file=3D"common/menu.jspf" %>
<jesi:template>
Modified: trunk/src/jsp/sitemap.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/sitemap=
.jsp&rev=3D23&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/sitemap.jsp (original)
+++ trunk/src/jsp/sitemap.jsp Mon Nov 12 14:14:25 2007
@@ -1,5 +1,5 @@
-<%@ include file=3D"declarations.jspf" %>
-<%@ include file=3D"common_vars.jspf" %>
+<%@ include file=3D"common/declarations.jspf" %>
+<%@ include file=3D"common/common_vars.jspf" %>
<%@ include file=3D"common/header.jspf"%>
<%@ include file=3D"common/menu.jspf"%>
<%@ include file=3D"common/pub.jspf"%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
