Update of /var/cvs/contributions/natmm/templates/editors/beheerbibliotheek
In directory
james.mmbase.org:/tmp/cvs-serv1065/templates/editors/beheerbibliotheek
Modified Files:
searchresults.jsp
Log Message:
NMCMS-504
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/beheerbibliotheek
See also: http://www.mmbase.org/jira/browse/NMCMS-504
Index: searchresults.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/editors/beheerbibliotheek/searchresults.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- searchresults.jsp 12 Oct 2006 16:10:19 -0000 1.16
+++ searchresults.jsp 7 May 2008 09:57:48 -0000 1.17
@@ -208,7 +208,15 @@
%>
<mm:import id="pagesString">Pagina's <b> <%= pagesLinkString %>
</b></mm:import>
<mm:list referid="contentresults">
- <% counter++; %>
+ <%
+ String thisType = "";
+ counter++;
+ %>
+
+ <mm:field name="contentelement.otype" jspvar="otype" vartype="String" >
+ <% thisType = (String) contentHelper.getNameWithOtype(otype); %>
+ </mm:field>
+
<mm:first>
<p><b>Er zijn <mm:size/> content elementen gevonden</b></p>
<table border="0" cellpadding="0" cellspacing="0" width="876"
height="73">
@@ -221,11 +229,19 @@
</td>
</tr>
</table>
- <table border="0" cellpadding="0" cellspacing="0" width="876"
height="73">
+ <table border="0" cellpadding="0" cellspacing="0" width="976"
height="73">
<tr>
<th style="width:60;height:13;"></th>
<th
style="width:60;height:13;vertical-align:bottom;text-align:left;"><a class="th"
href="#" onclick='javascript:changeOrder("contentelement.otype")'>Type</a><%
if("contentelement.otype".equals(orderColumn)) { %><img border="0"
src="../img/down.gif"> <% } %> </th>
<th
style="width:250;height:13;vertical-align:bottom;text-align:left;"><a
class="th" href="#"
onclick='javascript:changeOrder("contentelement.titel")'>Titel</a><%
if("contentelement.titel".equals(orderColumn)) { %><img border="0"
src="../img/down.gif"> <% } %> </th>
+
+ <%
+ if (thisType.equals("medewerkers")) {%>
+ <th
style="width:100;height:13;vertical-align:bottom;text-align:left;">
+ Afbeelding?
+ </th>
+ <% } %>
+
<th
style="width:200;height:13;vertical-align:bottom;text-align:left;"><a
class="th" href="#"
onclick='javascript:changeOrder("rubriek.naam")'>Rubriek</a><%
if("rubriek.naam".equals(orderColumn)) { %><img border="0"
src="../img/down.gif"> <% } %> </th>
<th
style="width:90;height:13;vertical-align:bottom;text-align:left;"><a class="th"
href="#"
onclick='javascript:changeOrder("contentelement.creatiedatum")'>Creatie</a><%
if("contentelement.creatiedatum".equals(orderColumn)) { %><img border="0"
src="../img/down.gif"> <% } %> </th>
<th
style="width:90;height:13;vertical-align:bottom;text-align:left;"><a class="th"
href="#"
onclick='javascript:changeOrder("contentelement.datumlaatstewijziging")'>Geupdate</a><%
if("contentelement.datumlaatstewijziging".equals(orderColumn)) { %><img
border="0" src="../img/down.gif"> <% } %> </th>
@@ -233,9 +249,10 @@
<th
style="width:50;height:13;vertical-align:bottom;text-align:left;">Versie</th>
</tr>
</mm:first>
+
<%
if( (counter > (curPage-1)*AMOUNT_OF_RESULTS ) && (counter <
curPage*AMOUNT_OF_RESULTS+1) ) {
- String thisType = "";
+
String usedIn = "";
%><mm:field name="contentelement.number"
jspvar="contentelement_number" vartype="String" write="false">
<% NodeList nl =
contentHelper.usedInItems(contentelement_number);
@@ -247,9 +264,7 @@
// todo: not used content
elements can not be opened in the editwizard
usedIn = (usedIn.equals("") ?
"style=\"color:red;\" title=\"Dit object is niet in gebruik.\"" :
"title=\"Gebruikt in: " + usedIn + "\"" );%>
</mm:field>
- <mm:field name="contentelement.otype"
jspvar="otype" vartype="String" >
- <% thisType = (String) contentHelper.getNameWithOtype(otype); %>
- </mm:field>
+
<tr height="11">
<td valign="top">
<%
@@ -298,6 +313,29 @@
}
} %>
</td>
+
+ <%
+ if (thisType.equals("medewerkers")) {%>
+ <td>
+ <% boolean hasPicture = false; %>
+
+ <mm:field name="contentelement.number" jspvar="contentNumber"
write="false" vartype="String">
+ <mm:listcontainer nodes="<%= contentNumber %>"
path="medewerkers,posrel,images">
+ <mm:list max="1">
+ <% hasPicture = true; %>
+ </mm:list>
+ </mm:listcontainer>
+ </mm:field>
+
+ <% if (hasPicture) { %>
+ ja
+ <% } else { %>
+ nee
+ <% } %>
+
+ </td>
+ <% } %>
+
<td valign="top">
<mm:field name="rubriek.naam" />
</td>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
