Author: xlawrence
Date: Thu Jun 28 17:00:42 2007
New Revision: 735
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D735&repname=
=3Dcorporate_portal_templates_v2
Log:
implement support for visible marked for delete content
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/form_generator/display_form.inc
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=3D735&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 Jun 28 17:00:42 2007
@@ -15,25 +15,28 @@
See the License for the specific language governing permissions and
limitations under the License.
--%><jesi:fragment absolute=3D"true" aclGroup=3D'<%=3D"footer_TemplateId_"=
+jData.page().getPageTemplateID()%>' >
- </div>
- </div>
-
- <div id=3D"footer">
- <div class=3D"margin">
- <%@ include file=3D"footerlinks.inc" %>
- <div class=3D"footerlink">
- <bean:write name=3D"footerText" filter=3D"false"/>
- </div>
+</div>
+</div>
=
- <div class=3D"footerlinklogo">
- <a href=3D"http://www.jahia.org"; target=3D"_blank"><img
- src=3D"<%=3DcontextUrl%>/img/jahia_powered.gif" alt=3D=
"Powered by Jahia"
- border=3D"0" width=3D"114" height=3D"21"/></a>
- </div>
+<div id=3D"footer">
+<div class=3D"margin">
+ <%@ include file=3D"footerlinks.inc" %>
+ <div class=3D"footerlink">
+ <bean:write name=3D"footerText" filter=3D"false"/>
+ </div>
=
- </div>
+ <div class=3D"footerlinklogo">
+ <a href=3D"http://www.jahia.org"; target=3D"_blank"><img
+ src=3D"<%=3DcontextUrl%>/img/jahia_powered.gif" alt=3D"Powered=
by Jahia"
+ border=3D"0" width=3D"114" height=3D"21"/></a>
</div>
+
+</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=3D735&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 Jun 28 17:00:42 2007
@@ -96,9 +96,9 @@
if(isEditMode && introducingTheVeryFatZimbra) {
%>
<% if (request.getServletPath().endsWith("advsearchresult.jsp")) { %>
- <meta name=3D"robots" content=3D"noindex,nofollow"> =
+ <meta name=3D"robots" content=3D"noindex,nofollow">
<% } %>
- =
+
<ajax:zimbraInclude/>
=
<%
@@ -348,6 +348,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=3D735&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 Jun 28 17:00:42 2007
@@ -38,7 +38,7 @@
}
%>>
<a class=3D"link" href=3D"<%=3DnavigationLink.getURL(jPara=
ms)%>">
- <span>
+ <span <% if (isEditMode && navigationLink.getContentPage()=
.isMarkedForDelete()) { %> class=3D"markForDelete" <% } %>>
<%=3DnavigationLink.getHighLightDiffTitle(jData.params=
())%>
</span>
</a>
@@ -66,7 +66,7 @@
%> style=3D"border-width:0;"<%
}
%>>
- <a href=3D"" class=3D"link"><span>n.d</span></a><div class=
=3D"actions"><%
+ <a href=3D"" class=3D"link"><span <% if (isEditMode && nav=
igationLink.getContentPage().isMarkedForDelete()) { %> class=3D"markForDele=
te" <% } %>>n.d</span></a><div class=3D"actions"><%
jData.gui().html().drawBeginActionMenu(new Contain=
erBean(topNavigationContainer,jParams),
null, null, false, ".navigationLink",
"jahiatemplates.Corporate_portal_templates_v2"=
, null, out);
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=3D735&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 Jun 28 17:00:42 2007
@@ -2208,4 +2208,21 @@
border-bottom:none !important;
}
=
+/* #### 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;
+}
+
=
\ No newline at end of file
Modified: trunk/src/jsp/form_generator/display_form.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/form_ge=
nerator/display_form.inc&rev=3D735&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/form_generator/display_form.inc (original)
+++ trunk/src/jsp/form_generator/display_form.inc Thu Jun 28 17:00:42 2007
@@ -282,7 +282,7 @@
JahiaContainerList list =3D currentField.g=
etContainerList("values");
Enumeration values =3D list.getContainers(=
);
while (values.hasMoreElements()) {
- JahiaContainer c=3D (JahiaContainer)va=
lues.nextElement();
+ JahiaContainer c =3D (JahiaContainer)v=
alues.nextElement();
allValues.put(c.getFieldValue("id"),c.=
getFieldValue("value"));
if (!ids.contains(c.getFieldValue("id"=
))) ids.add(c.getFieldValue("id"));
}
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=3D735&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 Jun 28 17:00:42 2007
@@ -56,11 +56,19 @@
out.print("<div class=3D'isFirst'>");
}
out.print("<div class=3D'level" + level + "'>");
- out.print("<a href=3D'" +
navigationLink.getUrl(jData.params=
()) + "'");
+ out.print("<a href=3D'" +
navigationLink.getUrl(jData.para=
ms()) + "'");
if (navigationLink.getID() =3D=3D jData.page().getID()=
) out.print(" class=3D'current link" + level + "'");
- else out.print(" class=3D'link" + level + "'");
+ else out.print(" class=3D'link" + level
+ "'");
=
- out.print(">" + navigationLink.getHighLightDiffTitle(j=
Data.params())+"</a>");
+ out.print(">");
+ if (editMode && navigationLink.getContentPage().isMark=
edForDelete()) {
+ out.print("<span class=3D'markForDelete'> ");
+ }
+ out.print(navigationLink.getHighLightDiffTitle(jData.p=
arams()));
+ 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()),
null, null, false, ".navigationLink", "jahiate=
mplates.Corporate_portal_templates_v2", null, out);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
