Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv18900/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
attachmentupload.jsp attachmentsearch.jsp
Log Message:
CMSC-1280 - Assets: Relate attachment to content element - New search screen
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1280
Index: attachmentupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- attachmentupload.jsp 6 Feb 2009 06:08:19 -0000 1.14
+++ attachmentupload.jsp 18 Feb 2009 10:03:02 -0000 1.15
@@ -105,7 +105,13 @@
alt="<fmt:message key="asset.delete" />"/>
</a>
</td>
- <td onMouseDown="objClick(this);">
+ <c:if test="${strict == 'attachments'}">
+ <mm:import
id="url">javascript:top.opener.selectContent('<mm:field name="number" />', '',
''); top.close();</mm:import>
+ </c:if>
+ <c:if test="${strict == ''}">
+ <mm:import
id="url">javascript:objClick(this);</mm:import>
+ </c:if>
+ <td onMouseDown="${url}">
<c:set var="assettype" ><mm:nodeinfo type="type"/></c:set>
<mm:field id="title" write="false" name="title"/>
<c:if test="${fn:length(title) > 50}">
@@ -113,8 +119,8 @@
</c:if>
${title}
</td>
- <td onMouseDown="objClick(this);">${title}</td>
- <td onMouseDown="objClick(this);"></td>
+ <td onMouseDown="${url}">${title}</td>
+ <td onMouseDown="${url}"></td>
</tr>
<c:set var="useSwapStyle">${!useSwapStyle}</c:set>
</mm:listnodes>
Index: attachmentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- attachmentsearch.jsp 18 Feb 2009 02:56:54 -0000 1.33
+++ attachmentsearch.jsp 18 Feb 2009 10:03:02 -0000 1.34
@@ -68,9 +68,9 @@
var attachmentMode = document.getElementsByTagName("option");
for(i = 0; i < attachmentMode.length; i++){
if(attachmentMode[i].selected &
attachmentMode[i].id=="a_list"){
- document.location.href =
'../../repository/HighFrequencyAsset.do?action=often&offset=0&channelid='+channelid+'&assetShow=list&assettypes=attachments';
+ document.location.href =
'../../repository/HighFrequencyAsset.do?action=often&offset=0&channelid='+channelid+'&assetShow=list&assettypes=attachments&strict=${strict}';
}else if(attachmentMode[i].selected &
attachmentMode[i].id=="a_thumbnail"){
- document.location.href =
'../../repository/HighFrequencyAsset.do?action=often&offset=0&channelid='+channelid+'&assetShow=thumbnail&assettypes=attachments';
+ document.location.href =
'../../repository/HighFrequencyAsset.do?action=often&offset=0&channelid='+channelid+'&assetShow=thumbnail&assettypes=attachments&strict=${strict}';
}
}
}
@@ -148,7 +148,12 @@
<%
description = ((String)
description).replaceAll("[\\n\\r\\t]+", " ");
%>
+ <c:if test="${strict == 'attachments'}">
+ <mm:import
id="url">javascript:top.opener.selectContent('<mm:field name="number" />', '',
''); top.close();</mm:import>
+ </c:if>
+ <c:if test="${ empty strict}">
<mm:import
id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field
name="title" escape="js-single-quotes"/>','<mm:image />','120','100',
'<%=description%>');</mm:import>
+ </c:if>
</mm:field>
<div class="grid" href="<mm:write referid="url"/>"
onclick="initParentHref(this)" title="double click to show the info">
<div class="thumbnail" ondblclick="showInfo('<mm:field
name="number"/>')">
@@ -200,9 +205,12 @@
<%
description
= ((String) description).replaceAll("[\\n\\r\\t]+", " ");
%>
- <mm:import
id="url">javascript:selectElement('<mm:field
-
name="number" />', '<mm:field name="title"
-
escape="js-single-quotes" />','<mm:image />','120','100',
'<%=description%>');</mm:import>
+ <c:if test="${strict == 'attachments'}">
+
<mm:import id="url">javascript:top.opener.selectContent('<mm:field
name="number" />', '', ''); top.close();</mm:import>
+ </c:if>
+ <c:if test="${ empty strict}">
+ <mm:import
id="url">javascript:selectElement('<mm:field name="number"/>', '<mm:field
name="title" escape="js-single-quotes"/>','<mm:image />','120','100',
'<%=description%>');</mm:import>
+ </c:if>
</mm:field>
<tr <c:if
test="${useSwapStyle}">class="swap"</c:if>
href="<mm:write
referid="url"/>">
@@ -253,9 +261,9 @@
<c:if test="${action == 'often'}">
<div class="body">
<mm:url page="/editors/repository/select/SelectorChannel.do"
id="select_channel_url" write="false" />
- <mm:url page="/editors/resources/AttachmentInitAction.do?action=search"
id="search_attachment_url" write="false" />
- <mm:url
page="/editors/resources/attachmentupload.jsp?uploadedNodes=0&channelid=${channelid}"
id="new_attachment_url" write="false" />
- <mm:url
page="/editors/repository/HighFrequencyAsset.do?action=often&assetShow=${assetShow}&offset=0&channelid=all&assettypes=attachments"
id="often_show_attachments" write="false"/>
+ <mm:url
page="/editors/resources/AttachmentInitAction.do?action=search&strict=${strict}"
id="search_attachment_url" write="false" />
+ <mm:url
page="/editors/resources/attachmentupload.jsp?uploadedNodes=0&channelid=${channelid}&strict=${strict}"
id="new_attachment_url" write="false" />
+ <mm:url
page="/editors/repository/HighFrequencyAsset.do?action=often&assetShow=${assetShow}&offset=0&channelid=all&assettypes=attachments&strict=${strict}"
id="often_show_attachments" write="false"/>
<ul class="shortcuts">
<li><a href="${often_show_attachments}"><fmt:message
key="attachmentselect.link.allchannel" /></a></li>
<li><a onclick="openPopupWindow('selectchannel', 340,
400);" target="selectchannel" href="${select_channel_url}"><fmt:message
key="attachmentselect.link.channel" /></a></li>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
