Author: xlawrence
Date: Tue Jul 17 10:51:11 2007
New Revision: 747
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D747&repname=
=3Dcorporate_portal_templates_v2
Log:
clean up top.inc + add key for image title
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties
branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2.properties&re=
v=3D747&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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_v2.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties Tue Jul 17 10:51:11 2007
@@ -23,6 +23,7 @@
paste =3D Paste
search =3D Search
add =3D Add
+differentACLTitle =3D This object and its parent have different ACLs
message.noLink =3D No link
message.noPage =3D No page
message.noNews =3D No news
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_en.properties=
&rev=3D747&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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_v2_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties Tue Jul 17 10:51:11 2007
@@ -23,6 +23,7 @@
paste =3D Paste
search =3D Search
add =3D Add
+differentACLTitle =3D This object and its parent have different ACLs
message.noLink =3D No link
message.noPage =3D No page
message.noNews =3D No news
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_fr.properties=
&rev=3D747&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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_v2_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties Tue Jul 17 10:51:11 2007
@@ -175,6 +175,7 @@
delete.webapp =3D Supprimer
delete.webdav =3D Supprimer
description=3Ddescription
+differentACLTitle =3D Cet objet et son parent ont des ACLs diff=C3=A9rentes
displayingDocuments=3DAffichage des documents
doc.creationDate =3D Date de cr=C3=A9ation
doc.creator =3D Cr=C3=A9ateur
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/common/top.inc&rev=3D747&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/jsp/common/top.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc Tue Jul 17 10:51:11=
2007
@@ -95,11 +95,11 @@
<!--END TEMPLATE CSS-->
<script language=3D"javascript" src=3D"<content:serverHttpPath/>/jsp/jahia=
/javascript/SearchTools.js" type=3D"text/javascript"></script>
<%
- boolean introducingTheVeryFatZimbra=3Dfalse;
- if(request.getSession().getAttribute(userSettings.TBP_VISU_ENABLED)!=
=3Dnull){
- introducingTheVeryFatZimbra=3D((String)request.getSession().getAttribu=
te(userSettings.TBP_VISU_ENABLED)).trim().equalsIgnoreCase("true");
+ boolean needZimbra =3D false;
+ if (request.getSession().getAttribute(userSettings.TBP_VISU_ENABLED)!=
=3D null){
+ needZimbra =3D ((Boolean)request.getSession().getAttribute(userSetting=
s.TBP_VISU_ENABLED)).booleanValue();
}
- if(isEditMode && introducingTheVeryFatZimbra) {
+ if (isEditMode && needZimbra) {
%>
<% if (request.getServletPath().endsWith("advsearchresult.jsp")) { %>
<meta name=3D"robots" content=3D"noindex,nofollow">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
