Author: xlawrence
Date: Thu Oct 25 15:40:49 2007
New Revision: 1271
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1271&repname=
=3Dcorporate_portal_templates
Log:
Added support for displaying marked for delete content object
Added:
trunk/src/view/jsp/semi-transparent.gif (with props)
Modified:
trunk/src/java/jahiatemplates/Corporate_portal_templates.properties
trunk/src/java/jahiatemplates/Corporate_portal_templates_en.properties
trunk/src/java/jahiatemplates/Corporate_portal_templates_fr.properties
trunk/src/view/jsp/include/footer.inc
trunk/src/view/jsp/include/left_menu.inc
trunk/src/view/jsp/include/main_menu.inc
trunk/src/view/jsp/include/top_banner.inc
trunk/src/view/jsp/template_css.jsp
Modified: trunk/src/java/jahiatemplates/Corporate_portal_templates.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/Corporate_portal_templates.properties&rev=3D1271&repname=3Dcorpora=
te_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
--- trunk/src/java/jahiatemplates/Corporate_portal_templates.properties (or=
iginal)
+++ trunk/src/java/jahiatemplates/Corporate_portal_templates.properties Thu=
Oct 25 15:40:49 2007
@@ -176,6 +176,7 @@
register =3D Register
repeat =3D Repeat
resetLayout =3D Reset layout in
+restore
=3D Restore content
result =3D Result
right =3D right
search =3D Search
Modified: trunk/src/java/jahiatemplates/Corporate_portal_templates_en.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/Corporate_portal_templates_en.properties&rev=3D1271&repname=3Dcorp=
orate_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
--- trunk/src/java/jahiatemplates/Corporate_portal_templates_en.properties =
(original)
+++ trunk/src/java/jahiatemplates/Corporate_portal_templates_en.properties =
Thu Oct 25 15:40:49 2007
@@ -176,6 +176,7 @@
register =3D Register
repeat =3D Repeat
resetLayout =3D Reset layout in
+restore
=3D Restore content
result =3D Result
right =3D right
search =3D Search
Modified: trunk/src/java/jahiatemplates/Corporate_portal_templates_fr.prope=
rties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/Corporate_portal_templates_fr.properties&rev=3D1271&repname=3Dcorp=
orate_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
--- trunk/src/java/jahiatemplates/Corporate_portal_templates_fr.properties =
(original)
+++ trunk/src/java/jahiatemplates/Corporate_portal_templates_fr.properties =
Thu Oct 25 15:40:49 2007
@@ -293,6 +293,7 @@
reload =3D Veuillez recharger la page
repeat =3D R=C3=A9p=C3=A9tition
resetLayout =3D R=C3=A9initialiser en
+restore
=3D Restaurer contenu
result =3D R=C3=A9sultat
right =3D droite
rss.title =3D S'abonner =C3=A0 ce blog via =
RSS
Modified: trunk/src/view/jsp/include/footer.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/view/jsp/in=
clude/footer.inc&rev=3D1271&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
--- trunk/src/view/jsp/include/footer.inc (original)
+++ trunk/src/view/jsp/include/footer.inc Thu Oct 25 15:40:49 2007
@@ -32,6 +32,9 @@
</td>
</tr>
</table>
+<% if (jData.gui().isEditMode() && jData.getProcessingContext().getContent=
Page().isMarkedForDelete()) { %>
+</div> <!-- End div for mark for deleted page -->
+<% } %>
</div>
</body>
</html>
Modified: trunk/src/view/jsp/include/left_menu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/view/jsp/in=
clude/left_menu.inc&rev=3D1271&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
--- trunk/src/view/jsp/include/left_menu.inc (original)
+++ trunk/src/view/jsp/include/left_menu.inc Thu Oct 25 15:40:49 2007
@@ -263,7 +263,11 @@
%><span class=3D'<%=3Dlink.getPageType=
() =3D=3D PageInfoInterface.TYPE_URL ? "remote" : "local"%>'><%
}
%>
- <% if ( jData.gui().isCompareMode() ){%><%=
=3DlinkPage.getHighLightDiffTitle(jData.params())%><% } else { %><bean:writ=
e name=3D"link" property=3D"title" filter=3D"false"/><% } %>
+ <% if ( jData.gui().isCompareMode() ){%><%=
=3DlinkPage.getHighLightDiffTitle(jData.params())%><% } else { %>
+ <span <% if (jData.gui().isEditMod=
e() && linkPage.getContentPage().isMarkedForDelete()) { %> class=3D"markFor=
Delete" <% } %>>
+ <bean:write name=3D"link" property=
=3D"title" filter=3D"false"/>
+ </span>
+ <% } %>
<%
if (isRemoteLink) {
%></span><%
Modified: trunk/src/view/jsp/include/main_menu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/view/jsp/in=
clude/main_menu.inc&rev=3D1271&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
--- trunk/src/view/jsp/include/main_menu.inc (original)
+++ trunk/src/view/jsp/include/main_menu.inc Thu Oct 25 15:40:49 2007
@@ -142,10 +142,16 @@
%><img src=3D"<%=3DtheURL%>/images/<%=3Dto=
pLinkBean.getPageType() =3D=3D PageInfoInterface.TYPE_URL ? "remote" : "loc=
al"%>.gif" border=3D"0" width=3D"9" height=3D"9"/><%
}
%>
- <% if ( jData.gui().isCompareMode() ){%><%=3Dt=
opLink.getHighLightDiffTitle(jData.params())%><% } else { %><bean:write nam=
e=3D"topLink" property=3D"title" filter=3D"false"/><% } %>
- <logic:empty name=3D"topLink"
property=3D"title">=
<span style=3D"color:#ff0000;"><content:resourceBundle
+ <% if ( jData.gui().isCompareMode() ){%><%=3Dt=
opLink.getHighLightDiffTitle(jData.params())%><% } else { %>
+ <span <% if (jData.gui().isEditMode() && topLi=
nk.getContentPage().isMarkedForDelete()) { %> class=3D"markForDelete" <% } =
%>>
+ <bean:write name=3D"topLink" property=3D"title=
" filter=3D"false"/>
+ </span>
+ <% } %>
+ <logic:empty name=3D"topLink" property=3D"title"><=
span style=3D"color:#ff0000;">
+ <span <% if (jData.gui().isEditMode() && topLi=
nk.getContentPage().isMarkedForDelete()) { %> class=3D"markForDelete" <% } =
%>>
+ <content:resourceBundle
resourceBundle=3D"jahiatemplates.Corporate_po=
rtal_templates" resourceName=3D"noTitle"
- defaultValue=3D"No
title"/></span></logic:emp=
ty>
+ defaultValue=3D"No title"/></span></span></log=
ic:empty>
</a>
<jahiaHtml:actionMenu name=3D"topMenuContainer" na=
mePostFix=3D"" resourceBundle=3D"jahiatemplates.Corporate_portal_templates"=
useFieldSet=3D"false">
</jahiaHtml:actionMenu>
Modified: trunk/src/view/jsp/include/top_banner.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/view/jsp/in=
clude/top_banner.inc&rev=3D1271&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
--- trunk/src/view/jsp/include/top_banner.inc (original)
+++ trunk/src/view/jsp/include/top_banner.inc Thu Oct 25 15:40:49 2007
@@ -99,6 +99,9 @@
<%
}
%>
+<% if (jData.gui().isEditMode() && jData.getProcessingContext().getContent=
Page().isMarkedForDelete()) { %>
+<div class=3D"markForDeletedPage" > <!-- Start div for mark for deleted pa=
ge -->
+<% } %>
<table width=3D"<bean:write name=3D"pageWidth" filter=3D"false"/>" border=
=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=3D"maintable">
<%
if (!thePrint) {
Added: trunk/src/view/jsp/semi-transparent.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/view=
/jsp/semi-transparent.gif&rev=3D1271&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
Binary file - no diff available.
Modified: trunk/src/view/jsp/template_css.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/view/jsp/te=
mplate_css.jsp&rev=3D1271&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
--- trunk/src/view/jsp/template_css.jsp (original)
+++ trunk/src/view/jsp/template_css.jsp Thu Oct 25 15:40:49 2007
@@ -1966,6 +1966,27 @@
background-color: #C8C8C8; /* a light-medium gray */
color: white;
}
+ =
+span.markForDelete {
+ text-decoration:line-through !important;
+ display: inline !important;
+}
+
+div.markForDeletedPage td,
+div.markForDeletedPage table,
+div.markForDeletedPage,
+div.markForDeletedContent td,
+div.markForDeletedContent table,
+div.markForDeletedContent {
+ background-color: #ccb !important;
+ background-image: url(semi-transparent.gif) !important;
+ z-index: 1000;
+}
+
+div.markForDeletedPage {
+ width: 771px !important;
+ display: block !important;
+}
=
.differentACL {
background: url("images/differentACL.png") no-repeat 0px 0px;
@@ -1973,4 +1994,4 @@
width: 16px;
padding-left: 12px;
display: inline;
-}
\ No newline at end of file
+}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
