Author: xlawrence
Date: Tue Nov 6 10:12:22 2007
New Revision: 10
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D10&repname=3D=
corporate_portal_templates_v3
Log:
took out javascript code and stored it into js files in Jahia.
Removed dependency to actions.js file, since it will now be loaded by the J=
STools tag
Modified:
trunk/src/jsp/common/header.jspf
Modified: trunk/src/jsp/common/header.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
header.jspf&rev=3D10&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 6 10:12:22 2007
@@ -27,7 +27,7 @@
<meta name=3D"author" lang=3D"<%=3DjParams.getLocale().getLanguage()%>" =
content=3D"<%=3Dmetadataauthor%>"/>
<%}%>
<meta name=3D"robots" content=3D"index,follow" />
- <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DISO-88=
59-1" />
+ <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF-8"=
/>
=
<link href=3D"<content:contextURL/>/shared/css/base.css" rel=3D"styleshe=
et" type=3D"text/css" />
<link href=3D"<content:contextURL/>/shared/css/<%=3DgetSiteSkin(skin, re=
sBundleID)%>.css" rel=3D"stylesheet" type=3D"text/css" />
@@ -39,78 +39,6 @@
<%if (jData.gui().isEditMode()){%>
<link href=3D"<content:contextURL/>/shared/css/editMode.css" rel=3D"styl=
esheet" type=3D"text/css" />
<%}%>
- <script language=3D"javascript" src=3D"<content:contextURL/>/shared/js/a=
ctions.js" type=3D"text/javascript"></script>
- <script language=3D"javascript" type=3D"text/javascript">
- <!--
- function hideUserShell(){
- try {
- Dwt.setVisibility(document.getElementById("userShell"),false);
- } catch (ex){
- return;
- }
- }
- function showUserShell(){
- try {
- Dwt.setVisibility(document.getElementById("userShell"),true);
- } catch (ex){
- return;
- }
- }
-
- function esiGeneratePageInvalidationUrl(){
- var theUrl =3D window.location.href;
-
- var invEsiMarker =3D "esi=3DinvalidateNow";
-
- var posInv =3D theUrl.indexOf(invEsiMarker);
- //add invalidation marker
- if (posInv =3D=3D -1) {
- var posParam =3D theUrl.indexOf("?");
- if (posParam =3D=3D -1) {
- theUrl +=3D "?"+invEsiMarker;
- } else {
- theUrl +=3D "&"+invEsiMarker;
- }
- document.write("Invalidating cache for this page...");
- document.close();
- }
- else {
- document.write("The current URL["+theUrl+"] already contains ["=
+invEsiMarker+"] when it shouldn't");
- document.close();
- }
- window.location.href =3D theUrl;
- }
-
- function esiForwardToOrginalUrl(){
- var theUrl =3D window.location.href;
- var invEsiMarker =3D new String("esi=3DinvalidateNow");
- var posInv =3D theUrl.indexOf(invEsiMarker);
-
- //remove invalidation marker
- if (posInv !=3D -1) {
- document.write(theUrl);
- theUrl =3D theUrl.replace(/\?esi=3DinvalidateNow/gi,"");
- theUrl =3D theUrl.replace(/&esi=3DinvalidateNow/gi,"");
- theUrl =3D theUrl.replace(/esi=3DinvalidateNow/gi,"");
- window.location.href =3D theUrl;
- }
- }
-
- function readCookie(name)
- {
- var nameEQ =3D name + "=3D";
- var ca =3D document.cookie.split(';');
- for(var i=3D0;i < ca.length;i++)
- {
- var c =3D ca[i];
- while (c.charAt(0)=3D=3D' ') c =3D c.substring(1,c.length);
- if (c.indexOf(nameEQ) =3D=3D 0) return c.substring(nameEQ.leng=
th,c.length);
- }
- //alert('A cookie was not set. '+name+'. Please ensure that your b=
rowser accepts cookies.');
- return "Username";
- }
- //-->
- </script>
<%}%>
</head>
<body>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
