Author: rfelden
Date: Tue Nov 20 15:40:34 2007
New Revision: 37
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D37&repname=3D=
corporate_portal_templates_v3
Log:
huge scriptlet cleanup
many useless definitions/declarations removed
Removed:
trunk/src/jsp/common/definitions.jspf
trunk/src/jsp/common/globals.jspf
trunk/src/jsp/common/utils.jspf
Modified:
trunk/src/jsp/common/common_vars.jspf
trunk/src/jsp/common/declarations.jspf
trunk/src/jsp/common/header.jspf
Modified: trunk/src/jsp/common/common_vars.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
common_vars.jspf&rev=3D37&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/common_vars.jspf (original)
+++ trunk/src/jsp/common/common_vars.jspf Tue Nov 20 15:40:34 2007
@@ -20,79 +20,27 @@
/* list of common variables used in this set of template =
*/
/*************************************************************************=
*****/
=
-org.apache.log4j.Logger logger =3D
- org.apache.log4j.Logger.getLogger(getClass());
-//long tt1=3DSystem.currentTimeMillis();
-//logger.debug("----------------------------------------------------------=
-");
+
=
JahiaData jData =3D (JahiaData) request.getAttribute( "org.jahia.data.Jahi=
aData" );
HashMap engineMap =3D (HashMap) request.getAttribute( "org.jahia.engines.E=
ngineHashMap" );
-String contextPath =3D request.getContextPath();
+
=
// get the parambean
ParamBean jParams =3D jData.params();
-// get the entry load request
-EntryLoadRequest entryLoadRequest =3D jParams.getEntryLoadRequest();
=
-// get the operation mode
-String operationMode =3D jParams.getOperationMode();
-
-request.setAttribute("editMode", jData.gui().isEditMode());
-request.setAttribute("homePage", jData.gui().getHomePage().getID() =3D=3D =
jData.page().getID());
-request.setAttribute("homePageId", jData.gui().getHomePage().getID());
-
-// get the site and siteId
-JahiaSite jahiaSite =3D jParams.getSite();
-int siteId =3D jParams.getSiteID();
=
String theURL =3D jData.gui().drawHttpJspContext(request);
=
-// get the current user
-JahiaUser user =3D jParams.getUser();
-JahiaACLManagerService aclService =3D ServicesRegistry.getInstance().getJa=
hiaACLManagerService();
-
-//get the locale
-String languageCode =3D jParams.getLocale().toString();
-
-// generate a bypassUrl URL
-String savedCacheStatus =3D jParams.getCacheStatus();
-jParams.setCacheStatus(ParamBean.CACHE_BYPASS);
-String bypassUrl =3D jParams.composePageUrl(jData.page().getID());
-// generate a cacheoffonce URL
-jParams.setCacheStatus(ParamBean.CACHE_OFFONCE);
-String actionURL =3D jParams.composePageUrl(jData.page().getID());
-//restore cachestatus
-jParams.setCacheStatus(savedCacheStatus);
=
// get the context url
String contextURL =3D jData.gui().drawHttpJspContext(request);
-String contextUrl =3D contextURL;
+
=
// get the home page ID
int homePageId =3D jData.gui().getContentHomePage().getID();
=
-// get the current page ID and content page
-int currentPageId =3D jData.page().getID();
-ContentPage contentPage =3D ContentPage.getPage(currentPageId);
-
-//logger.debug("Current user: " + user.getUsername());
-// isAdmin return true if current user is an administrator
-boolean isAdmin =3D user.isAdminMember( siteId );
-
-// isEditMode return true if current mode is edit
-boolean isEditMode =3D jData.gui().isEditMode();
-
-// isLogged() return true if user is logged
-boolean isLogged =3D jData.gui().isLogged();
=
-// hasWriteAccess return true if current user has write access on current =
page
-boolean hasWriteAccess =3D jData.page().checkWriteAccess(user);
-
-// hasAdminAccess return true if current user has admin access on current =
page
-boolean hasAdminAccess =3D jData.page().checkAdminAccess(user);
-
-// hasReadAccess return true if current user has read access on current pa=
ge
-boolean hasReadAccess =3D jData.page().checkReadAccess(user);
=
// Resource Bundle Definition
//String resBundleID =3D jParams.getSite().getSiteKey() + "_default_v3_lan=
g";
@@ -106,101 +54,9 @@
ServicesRegistry.getInstance().getResourceBundleService()
.declareResourceBundleDefinition(resBundleID,resourceBundleName);
=
-// store the navigationContainerList def containers for level 1
-Vector topNavigationContainerVector =3D new Vector();
-JahiaContainerList topNavigationContainerList =3D null;
-if (request.getAttribute("topNavigationContainerVector") =3D=3D null) {
- logger.debug("topNavigationContainerVector not in request -> compute A=
bsoluteContainerList");
- topNavigationContainerList =3D
- jData.containers().getAbsoluteContainerList( "navigationContainerL=
ist",homePageId );
- request.setAttribute("topNavigationContainerList",topNavigationContain=
erList);
- if (topNavigationContainerList !=3D null) {
- Enumeration topNavigationContainers =3D topNavigationContainerList=
.getContainers();
- while (topNavigationContainers.hasMoreElements()) {
- JahiaContainer topNavigationContainer =3D
- (JahiaContainer) topNavigationContainers.nextElement();
- topNavigationContainerVector.add(topNavigationContainer);
- }
- } else {
- logger.debug("navigationContainerList on page " + homePageId + " i=
s NULL" );
- }
- request.setAttribute("topNavigationContainerVector",topNavigationConta=
inerVector);
-} else {
- topNavigationContainerVector =3D
- (Vector) request.getAttribute("topNavigationContainerVector");
- topNavigationContainerList =3D
- (JahiaContainerList) request.getAttribute("topNavigationContainerL=
ist");
- //logger.debug("get topNavigationContainerVector from request");
-}
-
-Enumeration topNavigationContainers =3D null;
-Map languagesStates =3D null;
-try
-{
- // store the languagesStates on request
-
- if (request.getAttribute("languagesStates") =3D=3D null) {
- logger.debug("languagesStates not in request -> comppute LanguagesSt=
ates");
- boolean withContent =3D true;
- if (jData.gui().isNormalMode()) {
- withContent =3D false;
- }
-
- if(contentPage !=3D null)
- {
- languagesStates =3D
- contentPage.getLanguagesStates(withContent);
- }
-
- if(languagesStates !=3D null)
- {
- Iterator languageIterator =3D languagesStates.keySet().iterator();
- boolean checkUnlinkedObject =3D true;
- while (languageIterator.hasNext()) {
- String language =3D (java.lang.String) languageIterator.next();
- if(("shared".equals(language) || jParams.getLocale().toString(=
).equals(language))&& (((Integer)languagesStates.get(language)).intValue() =
> EntryLoadRequest.ACTIVE_WORKFLOW_STATE)) {
- checkUnlinkedObject =3D false;
- }
- }
- if(checkUnlinkedObject) {
- try {
- WorkflowService workflowService =3D ServicesRegistry.getIn=
stance().getWorkflowService();
- List unlinkedObjects =3D workflowService.getUnlinkedConten=
tObjects(contentPage);
- for (int i =3D 0; i < unlinkedObjects.size(); i++) {
- ContentObject contentObject =3D (org.jahia.content.Con=
tentObject) unlinkedObjects.get(i);
- Map map =3D workflowService.getLanguagesStates(workflo=
wService.getHardLinkedMainObject(contentObject));
- languageIterator =3D map.keySet().iterator();
- while (languageIterator.hasNext()) {
- String language =3D (java.lang.String) languageIte=
rator.next();
- if(languagesStates.get(language) =3D=3D null || ((=
Integer)map.get(language)).intValue()>((Integer)languagesStates.get(languag=
e)).intValue()) {
- languagesStates.put(language, map.get(language=
));
- }
- }
- }
- } catch (JahiaException e) {
- e.printStackTrace(); //To change body of catch statement =
use File | Settings | File Templates.
- }
- }
-
- request.setAttribute("languagesStates",languagesStates);
- }
- } else {
- //logger.debug("get languagesStates from request");
- languagesStates =3D (Map) request.getAttribute("languagesStates");
- }
-}
-catch(Exception ex)
-{
-
-}
-
-String addButton =3D "<img src=3D'" + contextURL + "/img/actions/add.gif' =
border=3D'0' alt=3D'Add'/>";
-
-boolean advSearchLicenseEnabled =3D LicenseActionChecker.isAuthorizedByLic=
ense("org.jahia.engines.search.advancedSearch", 0);
-
-//variables necessary for chat.jspf
-String chatstatus=3D(String) session.getAttribute("chatstatus");
-if(chatstatus=3D=3Dnull) chatstatus=3D"false";
=
-boolean isFullScreen =3D request.getServletPath().endsWith("fullbox.jsp");
+
+
+
+
%>
\ No newline at end of file
Modified: trunk/src/jsp/common/declarations.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
declarations.jspf&rev=3D37&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 Tue Nov 20 15:40:34 2007
@@ -86,40 +86,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"};
=
- 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 {
@@ -135,6 +101,7 @@
return name;
}
=
+
public String getTopIcon(String icon, String resBundleID)
throws JahiaException {
String name =3D "key";
@@ -149,82 +116,6 @@
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 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;
- }
-
- 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) {
- }
- 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[");
@@ -246,92 +137,6 @@
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;
- }
-
- 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;
- }
- 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();
- }
-
- public String hl(String str, String strToHighlight) {
- return hl(str, strToHighlight, true);
- }
=
public String firstCharToUpper(String s) {
if (s !=3D null && s.length() > 0) {
@@ -348,13 +153,13 @@
}
=
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"};
+ "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", "video", "video", "video", "video",
- "video", "video", "exe", "txt", "zip", "tgz", "dir"};
+ "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 {
@@ -369,46 +174,5 @@
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
Modified: trunk/src/jsp/common/header.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
header.jspf&rev=3D37&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/header.jspf (original)
+++ trunk/src/jsp/common/header.jspf Tue Nov 20 15:40:34 2007
@@ -3,8 +3,6 @@
<head>
<content:JSTools/> =
<%@ include file=3D"site_settings.jspf" %>
- <%@ include file=3D"globals.jspf" %>
- <%@ include file=3D"utils.jspf" %>
<title><jahia:currentPageTitle/><c:if test=3D"${!empty titlePrefix}"> =
- <c:out value=3D"${titlePrefix}"
=
escapeXml=3D"false"/></c:if></title>
<jahiaHtml:meta name=3D"keywords" value=3D"keywords"/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
