Update of /var/cvs/contributions/natmm/templates/natmm/includes
In directory james.mmbase.org:/tmp/cvs-serv23344/templates/natmm/includes
Modified Files:
Tag: BRANCH_NATMM_1_3
image_logic.jsp fotopopup.jsp
Added Files:
Tag: BRANCH_NATMM_1_3
image_metadata.jsp
Log Message:
NMCMS-639: Klikbare images (tijdelijke wijziging zodat redacteurs gemakkelijk
foto's en metadata daarover kunnen achterhalen)
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes
See also: http://www.mmbase.org/jira/browse/NMCMS-639
image_metadata.jsp is new
Index: image_logic.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/image_logic.jsp,v
retrieving revision 1.10
retrieving revision 1.10.6.1
diff -u -b -r1.10 -r1.10.6.1
--- image_logic.jsp 7 Jul 2008 14:02:13 -0000 1.10
+++ image_logic.jsp 31 Mar 2009 08:53:41 -0000 1.10.6.1
@@ -25,8 +25,7 @@
boolean isShortyOrTeaserImage = imgFormat.indexOf("shorty")>-1;
boolean fitToThirdColumn = imgFormat.indexOf("fittothirdcolumn")>-1;
-if(isShortyOrTeaserImage || fitToThirdColumn || imagePartOfColumn) {
-
+// NMCMS-639
String imgFloat ="float:none;";
String imgParams = "";
if(posrel_pos.equals("6")) { posrel_pos = "0"; }
@@ -83,12 +82,13 @@
boolean resetLink = false;
%><mm:node number="<%= images_number %>"><%
- if(readmoreURL.equals("")) {
+ // NMCMS-639
+ if(readmoreURL.equals("") || true) {
%><mm:field name="reageer" jspvar="showpopup"
vartype="String" write="false"><%
- if(showpopup.equals("1")) {
+ if(showpopup.equals("1") || true) {
String requestURL =
javax.servlet.http.HttpUtils.getRequestURL(request).toString();
requestURL =
requestURL.substring(0,requestURL.lastIndexOf("/"));
- readmoreURL =
"javascript:launchCenter('" + requestURL + "/" + (isSubDir? "../" : "" ) +
"includes/fotopopup.jsp?i="+ images_number + "&rs=" + styleSheet +
"','foto',600,600,'location=no,directories=no,status=no,toolbars=no,scrollbars=no,resizable=yes');setTimeout('newwin.focus();',250);";
+ readmoreURL =
"javascript:launchCenter('" + requestURL + "/" + (isSubDir? "../" : "" ) +
"includes/fotopopup.jsp?i="+ images_number + "&rs=" + styleSheet +
"','foto',600,600,'location=no,directories=no,status=no,toolbars=no,scrollbars=yes,resizable=yes');setTimeout('newwin.focus();',250);";
validLink = true;
resetLink = true;
} else {
@@ -130,7 +130,7 @@
</table>
</mm:node><%
if(resetLink) { readmoreURL = ""; validLink = false; }
-}
+
%></mm:field
></mm:field
><mm:remove referid="relatedimagefound"
Index: fotopopup.jsp
===================================================================
RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/fotopopup.jsp,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -b -r1.4 -r1.4.12.1
--- fotopopup.jsp 21 Nov 2007 13:07:53 -0000 1.4
+++ fotopopup.jsp 31 Mar 2009 08:53:41 -0000 1.4.12.1
@@ -13,32 +13,8 @@
</mm:field>
</mm:node>
<mm:node number="<%= imgID %>" notfound="skipbody">
- <mm:field name="title" jspvar="images_title" vartype="String" write="false">
- <%
- if(!images_title.equals("")){
- pageTitle += " - " + images_title;
- pageText += "<strong>" + images_title + "</strong>";
- bFirst = false;
- }
- %>
- </mm:field>
- <mm:field name="omschrijving" jspvar="images_omschrijving" vartype="String"
write="false">
- <%
- if(!images_omschrijving.equals("")){
- pageText += (!bFirst ? "<strong> | </strong>" : "") +
images_omschrijving;
- bFirst = false;
- }
- %>
- </mm:field>
- <% pageText += (!bFirst ? "<br/>" : ""); %>
- <mm:field name="bron" jspvar="images_bron" vartype="String" write="false">
- <%
- if(!images_bron.equals("")){
- pageText += "<strong>Foto | </strong>" + images_bron;
- bFirst = false;
- }
- %>
- </mm:field>
+ <%-- NMCMS-639 --%>
+ <% bFirst = false; %>
<title><%= pageTitle %></title>
<script type="text/javascript" language="Javascript">
<!-- //
@@ -68,15 +44,18 @@
<% if(styleSheet!=null) { %><link rel="stylesheet" type="text/css"
href="../<%= styleSheet %>" /><% } %>
</head>
<body style="padding:0px;margin:0px;overflow:no;text-align:center;"
class="footer" onLoad="javascript:resizeDiv()">
-<a href="javascript:void(0);" onClick="window.close();" title="Klik op de foto
om het venster te sluiten"><img src="<mm:image template="s(600x450)" />"
style="margin:0px;" border="0"></a><br/>
+<%-- NMCMS-639 --%>
+<a href="javascript:void(0);" onClick="window.close();" title="Klik op de foto
om het venster te sluiten"><img src="<mm:image />" style="margin:0px;"
border="0"></a><br/>
<% if(!bFirst) {
%><div style="display:block;overflow:auto;width:600px;height:150px;"
id="contentblock">
<table width="580px;" border="0" cellspacing="0" cellpadding="0">
<tr>
<td
style="padding-left:7px;padding-right:7px;padding-top:9px;padding-bottom:9px;">
- <%= pageText %>
+ <%-- NMCMS-639 --%>
+ <%...@include file="image_metadata.jsp" %>
</td>
</tr>
+
</table>
</div><%
} %>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
