Update of /var/cvs/contributions/natmm/templates/natmm
In directory james.mmbase.org:/tmp/cvs-serv19081/templates/natmm
Modified Files:
calendar.jsp events.jsp
Log Message:
NMCMS-434 - Veranderde spacing rondom de rechterkolom waar de agendafuncties
staan.
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm
See also: http://www.mmbase.org/jira/browse/NMCMS-434
Index: calendar.jsp
===================================================================
RCS file: /var/cvs/contributions/natmm/templates/natmm/calendar.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- calendar.jsp 6 Apr 2006 18:25:59 -0000 1.1
+++ calendar.jsp 15 Apr 2008 09:06:11 -0000 1.2
@@ -46,7 +46,7 @@
<jsp:param name="sr" value="1" />
</jsp:include>
</td>
- <td style="vertical-align:top;padding-left:10px;width:175px;<jsp:include
page="includes/rightcolumn_bgimage.jsp"><jsp:param name="rnimageid" value="<%=
rnImageID %>" /></jsp:include>">
+ <td style="vertical-align:top;padding-left:5px;width:175px;<jsp:include
page="includes/rightcolumn_bgimage.jsp"><jsp:param name="rnimageid" value="<%=
rnImageID %>" /></jsp:include>">
<jsp:include page="includes/viewmonths.jsp">
<jsp:param name="r" value="<%= rubriekID %>" />
<jsp:param name="rs" value="<%= styleSheet %>" />
Index: events.jsp
===================================================================
RCS file: /var/cvs/contributions/natmm/templates/natmm/events.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- events.jsp 6 Jul 2007 12:45:00 -0000 1.12
+++ events.jsp 15 Apr 2008 09:06:11 -0000 1.13
@@ -5,9 +5,9 @@
nl.leocms.util.DoubleDateNode,
nl.leocms.evenementen.forms.SubscribeForm,
nl.leocms.evenementen.Evenement,
- nl.leocms.evenementen.EventNotifier" %>
-<[EMAIL PROTECTED] file="includes/top0.jsp" %>
-<%
+ nl.leocms.evenementen.EventNotifier"
+%><[EMAIL PROTECTED] file="includes/top0.jsp"
+%><%
// *** use paginaID from session to return to the last visited agenda page (in
case of redirect from subscribe form) ***
if(paginaID.equals("-1") && session.getAttribute("pagina")!=null) {
paginaID = (String) session.getAttribute("pagina");
@@ -17,9 +17,10 @@
<[EMAIL PROTECTED] file="includes/top2_cacheparams.jsp" %>
<mm:import jspvar="searchID" externid="search">show</mm:import>
<!-- cache:cache key="<%= cacheKey %>" time="<%= expireTime %>"
scope="application" -->
-<[EMAIL PROTECTED] file="includes/top3_nav.jsp" %>
-<[EMAIL PROTECTED] file="includes/top4_head.jsp" %>
-<[EMAIL PROTECTED] file="includes/top5_breadcrumbs_and_pano.jsp" %>
+<[EMAIL PROTECTED] file="includes/top3_nav.jsp"
+%><[EMAIL PROTECTED] file="includes/top4_head.jsp"
+%><[EMAIL PROTECTED] file="includes/top5_breadcrumbs_and_pano.jsp"
+%>
<%-- Any template calling others need to pass isNaardermeer as
PaginaHelper/mm:import fails--%>
<%request.setAttribute("isNaardermeer", isNaardermeer);%>
@@ -115,9 +116,12 @@
<%
} %>
</td>
- <td
style="vertical-align:top;padding-left:10px;padding-right:10px;width:185px;<jsp:include
page="includes/rightcolumn_bgimage.jsp"><jsp:param name="rnimageid" value="<%=
rnImageID %>" /></jsp:include>">
<% if (isNaardermeer.equals("true")) { %>
+ <td
style="vertical-align:top;padding-left:5px;padding-right:5px;width:185px;<jsp:include
page="includes/rightcolumn_bgimage.jsp"><jsp:param name="rnimageid" value="<%=
rnImageID %>" /></jsp:include>">
<img src="media/trans.gif" height="226"
width="1">
+ <% }
+ else { %>
+ <td
style="vertical-align:top;padding-left:10px;padding-right:10px;width:185px;<jsp:include
page="includes/rightcolumn_bgimage.jsp"><jsp:param name="rnimageid" value="<%=
rnImageID %>" /></jsp:include>">
<% } %>
<br/>
<jsp:include page="includes/events/searchform.jsp">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
