Author: xlawrence
Date: Tue Jul 17 10:50:50 2007
New Revision: 1222
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1222&repname=
=3Dcorporate_portal_templates
Log:
clean up header.inc + add key for image title
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_en.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_fr.properties
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/header.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates.properties&rev=
=3D1222&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates.properties Tue Jul 17 10:50:50 2007
@@ -53,6 +53,7 @@
definitionLabel =3D Definition
delete =3D Delete
description =3D Description
+differentACLTitle
=3D This object and its parent have differen=
t ACLs
displayDropMenu =3D Display Drop Menu
displayItem =3D Display
displayingDocuments =3D Displaying documents
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_en.properties&re=
v=3D1222&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_en.properties Tue Jul 17 10:50:50 2007
@@ -53,6 +53,7 @@
definitionLabel =3D Definition
delete =3D Delete
description =3D Description
+differentACLTitle
=3D This object and its parent have differen=
t ACLs
displayDropMenu =3D Display Drop Menu
displayItem =3D Display
displayingDocuments =3D Displaying documents
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_fr.properties&re=
v=3D1222&repname=3Dcorporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_fr.properties Tue Jul 17 10:50:50 2007
@@ -112,6 +112,7 @@
definitionLabel =3D D=C3=A9finition
delete =3D Supprimer
description =3D Description
+differentACLTitle
=3D Cet objet et son parent ont des ACLs diff=
=C3=A9rentes
displayDropMenu =3D Affichage des menus d=C3=A9roul=
ants
displayItem =3D Afficher
displayingDocuments =3D Affichage des documents
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/header.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/header.inc&rev=3D1222&repname=3Dcorporate_port=
al_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/header.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/header.inc Tue Jul 17=
10:50:50 2007
@@ -69,7 +69,7 @@
}
}
String color1 =3D getColorCode(colorSet);
-boolean introducingTheVeryFatZimbra=3Dfalse;
+boolean needZimbra =3D false;
%>
<jesi:codeblock execute=3D"template" onerror=3D"ignore">
=
@@ -81,12 +81,12 @@
<%
=
=
- if(request.getSession().getAttribute(userSettings.TBP_VISU_ENABLED)!=
=3Dnull){
- introducingTheVeryFatZimbra=3D((String)request.getSession().getAttribu=
te(userSettings.TBP_VISU_ENABLED)).trim().equalsIgnoreCase("true");
+ if(request.getSession().getAttribute(userSettings.TBP_VISU_ENABLED)!=
=3D null){
+ needZimbra =3D ((Boolean)request.getSession().getAttribute(userSetting=
s.TBP_VISU_ENABLED)).booleanValue();
}
if (request.getServletPath().endsWith("sitemap.jsp")
|| request.getServletPath().endsWith("advsearchresult.jsp")
- || (jData.gui().isEditMode() && introducingTheVeryFatZimbra)) {
+ || (jData.gui().isEditMode() && needZimbra)) {
%>
<meta name=3D"robots" content=3D"noindex,nofollow"> =
<ajax:zimbraInclude/>
@@ -224,7 +224,7 @@
<%
final boolean debug =3D request.getQueryString() !=3D null && request.getQ=
ueryString().indexOf("debug=3D") > -1;
String onLoad=3D"";
-//if (jData.gui().isEditMode() && introducingTheVeryFatZimbra ){
+//if (jData.gui().isEditMode() && needZimbra ){
onLoad=3D"onload=3D\"initZimbraShell('MainShell',true,null,'userShell',tru=
e,";
=
if(debug) onLoad+=3D"true";
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
