Update of /var/cvs/contributions/natmm/templates/nmintra/includes
In directory james.mmbase.org:/tmp/cvs-serv25174/templates/nmintra/includes
Modified Files:
relatedimage.jsp cacheparams.jsp attachment.jsp
poolanddate.jsp relatedimage_no_description.jsp
Log Message:
NMCMS-565 - Add multiple images to a news article - also optimized
image/attachment queries.
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/includes
See also: http://www.mmbase.org/jira/browse/NMCMS-565
Index: relatedimage.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/nmintra/includes/relatedimage.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- relatedimage.jsp 28 Sep 2006 13:28:19 -0000 1.4
+++ relatedimage.jsp 23 Sep 2008 12:08:42 -0000 1.5
@@ -11,7 +11,7 @@
// <option id="7">rechts groot</option>
// <option id="8">links groot</option>
-%><mm:related path="posrel,images" orderby="images.title"
constraints="posrel.pos!='9'"
+%><mm:related path="posrel,images" orderby="images.title"
constraints="posrel.pos!='9'" searchdir="destination"
><mm:first
><mm:field name="posrel.pos" jspvar="dummy" vartype="Integer"
write="false"><%
int posrel_pos = dummy.intValue();
Index: cacheparams.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/nmintra/includes/cacheparams.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Index: attachment.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/nmintra/includes/attachment.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- attachment.jsp 23 Aug 2006 17:43:08 -0000 1.2
+++ attachment.jsp 23 Sep 2008 12:08:42 -0000 1.3
@@ -1,4 +1,4 @@
-<mm:related path="posrel,attachments" orderby="posrel.pos,attachments.title"
directions="UP,UP">
+<mm:related path="posrel,attachments" orderby="posrel.pos,attachments.title"
directions="UP,UP" searchdir="destination">
<mm:node element="attachments">
<table>
<tr><td style="width:60px;">
Index: poolanddate.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/nmintra/includes/poolanddate.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- poolanddate.jsp 27 May 2008 13:49:26 -0000 1.5
+++ poolanddate.jsp 23 Sep 2008 12:08:42 -0000 1.6
@@ -1,5 +1,4 @@
-<% if(true) {
- String poolAndDate = "";
+<% String poolAndDate = "";
String artikelBegindatum = "";
%><mm:node referid="this_article">
<mm:field name="begindatum" jspvar="artikel_begindatum"
vartype="String" write="false"><%
@@ -22,5 +21,4 @@
if(!poolAndDate.equals("")) {
%><span class="normal"><%= poolAndDate %></span><br/><%
}
- %></mm:node><%
-} %>
\ No newline at end of file
+ %></mm:node>
\ No newline at end of file
Index: relatedimage_no_description.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/nmintra/includes/relatedimage_no_description.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- relatedimage_no_description.jsp 7 Aug 2007 14:10:45 -0000 1.4
+++ relatedimage_no_description.jsp 23 Sep 2008 12:08:42 -0000 1.5
@@ -14,7 +14,7 @@
%>
<mm:related path="posrel,images"
- constraints="posrel.pos='9'" orderby="images.title"
+ constraints="posrel.pos='9'" orderby="images.title" searchdir="destination"
><br/><div align="center"><img src="<mm:node element="images"><mm:image
template="s(535)" /></mm:node
>" alt="<mm:field name="images.title" />" border="0" ></div><br/>
</mm:related>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
