Author: xlawrence
Date: Thu Oct 25 15:41:20 2007
New Revision: 830
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D830&repname=
=3Dcorporate_portal_templates_v2
Log:
Added support for marked for deleted content objects
Modified:
trunk/src/jsp/common/bottom.inc
trunk/src/jsp/common/top.inc
trunk/src/jsp/common/topmenu.inc
trunk/src/jsp/css/template_css.jsp
trunk/src/jsp/nav/menu.jsp
Modified: trunk/src/jsp/common/bottom.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
bottom.inc&rev=3D830&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
--- trunk/src/jsp/common/bottom.inc (original)
+++ trunk/src/jsp/common/bottom.inc Thu Oct 25 15:41:20 2007
@@ -34,6 +34,9 @@
</div>
</div>
</div>
+<% if (jData.gui().isEditMode() && jData.getProcessingContext().getContent=
Page().isMarkedForDelete()) { %>
+</div> <!-- End div for mark for deleted page -->
+<% } %>
<%@ include file=3D"../javascript/transmenu.inc"%>
</div>
</body>
Modified: trunk/src/jsp/common/top.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
top.inc&rev=3D830&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
--- trunk/src/jsp/common/top.inc (original)
+++ trunk/src/jsp/common/top.inc Thu Oct 25 15:41:20 2007
@@ -354,6 +354,9 @@
<%@ include file=3D"topmenu.inc" %>
</div>
</div>
+<% if (isEditMode && jData.getProcessingContext().getContentPage().isMarke=
dForDelete()) { %>
+<div class=3D"markForDeletedContent" > <!-- Start div for mark for deleted=
page -->
+<% } %>
<div id=3D"pagebody">
<%
if (! isFullScreen) {
Modified: trunk/src/jsp/common/topmenu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
topmenu.inc&rev=3D830&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
--- trunk/src/jsp/common/topmenu.inc (original)
+++ trunk/src/jsp/common/topmenu.inc Thu Oct 25 15:41:20 2007
@@ -38,11 +38,13 @@
}
%>>
<a class=3D"link" href=3D"<%=3DnavigationLink.getURL(jPara=
ms)%>">
+ <span class=3D"menuitem <% if (isEditMode && navigationLin=
k.getContentPage().isMarkedForDelete()) { %>markForDelete<% } %>">
<%if(navigationLink.getTitle()!=3Dnull && !navigationLink.=
getTitle().equals("")){%>
<span><%=3DnavigationLink.getHighLightDiffTitle(jData.=
params())%></span>
<% } else { %>
<span style=3D"color:red;"><content:resourceBundle res=
ourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=
=3D"noTitle" defaultValue=3D"No title"/></span>
<% }%>
+ </span>
</a>
<%
if (isEditMode) {
Modified: trunk/src/jsp/css/template_css.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/css/tem=
plate_css.jsp&rev=3D830&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
--- trunk/src/jsp/css/template_css.jsp (original)
+++ trunk/src/jsp/css/template_css.jsp Thu Oct 25 15:41:20 2007
@@ -508,3 +508,20 @@
.complexTreeWrapper .DwtListView .DwtListView-Rows .Row {
*height: 28px;
}
+
+/* #### MARK FOR DELETE #### */
+
+span.markForDelete {
+ text-decoration:line-through !important;
+}
+
+div.markForDeletedContent h1,
+div.markForDeletedContent h2,
+div.markForDeletedContent h3,
+div.markForDeletedContent td,
+div.markForDeletedContent table,
+div.markForDeletedContent div,
+div.markForDeletedContent {
+ background-color: #ddc !important;
+ background-image: none !important;
+}
Modified: trunk/src/jsp/nav/menu.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/nav/men=
u.jsp&rev=3D830&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
--- trunk/src/jsp/nav/menu.jsp (original)
+++ trunk/src/jsp/nav/menu.jsp Thu Oct 25 15:41:20 2007
@@ -77,11 +77,17 @@
else out.print(" class=3D'link" + level + "'");
=
out.print(">");
+ if (editMode && navigationLink.getContentPage().isMark=
edForDelete()) {
+ out.print("<span class=3D'markForDelete'> ");
+ }
if(navigationLink.getTitle()!=3Dnull && !navigationLin=
k.getTitle().equals("")){
out.print(navigationLink.getHighLightDiffTitle(jData.p=
arams()));
} else {
out.print("<font color=3D\"#FF0000\">"+getResource=
Bundle("noTitle","No title",jData)+"</font>");
}
+ if (editMode && navigationLink.getContentPage().isMark=
edForDelete()) {
+ out.print("</span>");
+ }
out.print("</a>");
if (editMode && isNotALink) {
jData.gui().html().drawBeginActionMenu(new Contain=
erBean(navigationContainer,jData.params()),
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
