Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv2017/webapp/editors/repository
Modified Files:
asset.js asset.jsp assetsearch.jsp contentsearch.jsp
Added Files:
imageupload.jsp searchIconsBar.jspf
Log Message:
CMSC-1126 using Assets in contentElements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1126
imageupload.jsp is new
searchIconsBar.jspf is new
Index: asset.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- asset.js 11 Nov 2008 05:56:54 -0000 1.4
+++ asset.js 2 Dec 2008 02:40:21 -0000 1.5
@@ -4,7 +4,7 @@
infoURL += assetType.toLowerCase();
infoURL += 'info.jsp?objectnumber=';
infoURL += objectnumber;
- openPopupWindow('imageinfo', '900', '500', infoURL);
+ openPopupWindow(assetType.toLowerCase()+'info', '900', '500', infoURL);
}
function unpublish(parentchannel, objectnumber) {
@@ -26,3 +26,54 @@
+ moveContentNumber + "&orderby=" + type + "&direction="
+ newDirection + '&offset=' + offset;
}
\ No newline at end of file
+
+function permanentDelete(objectnumber, message, offset) {
+ if (confirm(message)) {
+ var url = "DeleteAction.do";
+ url += "?objectnumber=" + objectnumber;
+ url += "&returnurl=" + escape(document.location);
+ url += "&offset=" + offset;
+
+ document.location.href = url;
+ }
+ }
+
+
+function selectAll(value, formName, elementPrefix) {
+ var elements = document.forms[formName].elements;
+ for (var i = 0; i < elements.length; i++) {
+ if (elements[i].name.indexOf(elementPrefix) == 0) {
+ elements[i].checked = value;
+ }
+ }
+}
+
+function deleteAsset(objectnumber, confirmmessage) {
+ if (confirmmessage) {
+ if (confirm(confirmmessage)) {
+ if(objectnumber == 'massdelete'){
+ var checkboxs = document.getElementsByTagName("input");
+ var objectnumbers = '';
+ for(i = 0; i < checkboxs.length; i++) {
+ if(checkboxs[i].type == 'checkbox' &&
checkboxs[i].name.indexOf('chk_') == 0 && checkboxs[i].checked) {
+ objectnumbers += checkboxs[i].value+",";
+ }
+ }
+ if(objectnumbers == ''){
+ return ;
+ }
+ objectnumbers = objectnumbers.substr(0,objectnumbers.length -
1);
+ document.forms[0].deleteAssetRequest.value =
"massDelete:"+objectnumbers;
+ document.forms[0].submit();
+ }
+ else {
+ document.forms[0].deleteAssetRequest.value = "permanentDelete:"
+ objectnumber;
+ document.forms[0].submit();
+ }
+ }
+ }
+ else {
+ document.forms[0].deleteAssetRequest.value = "moveToRecyclebin:" +
objectnumber;
+ document.forms[0].submit();
+ }
+}
\ No newline at end of file
Index: asset.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Index: assetsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- assetsearch.jsp 7 Nov 2008 02:54:48 -0000 1.1
+++ assetsearch.jsp 2 Dec 2008 02:40:21 -0000 1.2
@@ -8,9 +8,40 @@
%><mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
+
+<mm:import externid="action">search</mm:import><%-- either: search, link, of
select --%>
+<mm:import externid="mode" id="mode">basic</mm:import>
+<mm:import externid="returnurl"/>
+<mm:import externid="parentchannel" jspvar="parentchannel"/>
+<mm:import externid="assettypes" jspvar="assettypes"><%=
AssetElementUtil.ASSETELEMENT %></mm:import>
+<mm:import externid="results" jspvar="nodeList" vartype="List" />
+<mm:import externid="offset" jspvar="offset" vartype="Integer">0</mm:import>
+<mm:import externid="resultCount" jspvar="resultCount"
vartype="Integer">0</mm:import>
+
<cmscedit:head title="search.title">
- <script src="content.js" type="text/javascript"></script>
+ <script src="../repository/asset.js" language="JavaScript"
type="text/javascript"></script>
<script src="search.js" type="text/javascript"></script>
+ <script type="text/javascript">
+ function showEditItems(id){
+ document.getElementById('asset-info-'+id).style.display =
'block';
+ document.getElementById('asset-info-'+id).style.display =
2001;
+ }
+ function hideEditItems(id){
+ document.getElementById('asset-info-'+id).style.display =
'none';
+ document.getElementById('asset-info-'+id).style.display =
2000;
+ }
+ function changeMode(offset){
+ if(offset==null){offset=0;}
+ var assetsMode = document.getElementsByTagName("option");3
+ for(i = 0; i < assetsMode.length; i++){
+ if(assetsMode[i].selected & assetsMode[i].id=="a_list"){
+ document.location.href =
'AssetSearchAction.do?type=asset&direction=down&offset='+offset;
+ }else if(assetsMode[i].selected &
assetsMode[i].id=="a_thumbnail"){
+ document.location.href =
'AssetSearchAction.do?type=asset&direction=down&show=0&offset='+offset;
+ }
+ }
+ }
+ </script>
<c:if test="${not empty requestScope.refreshChannels}">
<script>
refreshFrame('channels');
@@ -18,99 +49,63 @@
</c:if>
</cmscedit:head>
<body>
-<mm:import id="searchinit"><c:url
value='/editors/repository/SearchInitAction.do'/></mm:import>
-<mm:import externid="action">search</mm:import><%-- either: search, link, of
select --%>
-<mm:import externid="mode" id="mode">basic</mm:import>
-<mm:import externid="returnurl"/>
-<mm:import externid="parentchannel" jspvar="parentchannel"/>
-<mm:import externid="assettypes" jspvar="assettypes"><%=
AssetElementUtil.ASSETELEMENT %></mm:import>
-<mm:import externid="results" jspvar="nodeList" vartype="List" />
-<mm:import externid="offset" jspvar="offset" vartype="Integer">0</mm:import>
-<mm:import externid="resultCount" jspvar="resultCount"
vartype="Integer">0</mm:import>
+<mm:import id="assetsearchinit"><c:url
value='/editors/repository/AssetSearchInitAction.do'/></mm:import>
+
<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
- <div class="content">
<div class="tabs">
- <mm:compare referid="mode" value="basic">
- <div class="tab_active">
- </mm:compare>
- <mm:compare referid="mode" value="basic" inverse="true">
- <div class="tab">
- </mm:compare>
+ <!-- active TAB -->
+ <div class="${assettypes == 'content'?'tab_active':'tab'}">
<div class="body">
<div>
- <a href="#" onclick="selectTab('basic');"><fmt:message
key="search.simple.search" /></a>
+ <a href="SearchInitAction.do"><fmt:message key="content.title"
/></a>
</div>
</div>
</div>
- <mm:compare referid="mode" value="advanced">
- <div class="tab_active">
- </mm:compare>
- <mm:compare referid="mode" value="advanced" inverse="true">
- <div class="tab">
- </mm:compare>
+ <div class="${(assettypes == 'assetelement' || assettypes ==
null)?'tab_active':'tab'}">
<div class="body">
<div>
- <a href="#" onclick="selectTab('advanced');"><fmt:message
key="search.advanced.search" /></a>
- </div>
- </div>
+ <a href="AssetSearchInitAction.do"><fmt:message
key="asset.title"/></a>
</div>
</div>
</div>
+
+</div>
<div class="editor">
<br />
- <%-- If we want to link content: --%>
- <mm:compare referid="action" value="link">
- <div class="ruler_green"><div><fmt:message
key="searchform.link.title"/></div></div>
- <mm:notpresent referid="results">
- <fmt:message key="searchform.link.text.step1" ><fmt:param
><mm:node number="${linktochannel}"> <mm:field
name="name"/></mm:node></fmt:param></fmt:message>
- </mm:notpresent>
- <mm:present referid="results">
- <fmt:message key="searchform.link.text.step2" ><fmt:param
><mm:node number="${linktochannel}"> <mm:field
name="name"/></mm:node></fmt:param></fmt:message>
- </mm:present>
- <br />
- <br />
- <mm:present referid="returnurl">
- <a href="<mm:url page="${returnurl}"/>" title="<fmt:message
key="locate.back" />" class="button"><fmt:message key="locate.back" /></a>
- </mm:present>
- <br />
- <br />
- <hr />
- </mm:compare>
+ <div class="body">
- <html:form action="/editors/repository/SearchAction" method="post">
+ <html:form action="/editors/repository/AssetSearchAction"
method="post">
<html:hidden property="action" value="${action}"/>
<html:hidden property="mode"/>
<html:hidden property="search" value="true"/>
- <html:hidden property="linktochannel"/>
<html:hidden property="offset"/>
<html:hidden property="order"/>
<html:hidden property="direction"/>
- <input type="hidden" name="deleteContentRequest"/>
+ <input type="hidden" name="deleteAssetRequest"/>
<mm:present referid="returnurl"><input type="hidden" name="returnurl"
value="<mm:write referid="returnurl"/>"/></mm:present>
-
+ <mm:compare referid="mode" value="advanced" >
+ <a href="#" onclick="selectTab('basic');"><input
type="button" class="button" value="<fmt:message key="search.simple.search"
/>"/></a>
+ </mm:compare>
+ <mm:compare referid="mode" value="basic" >
+ <a href="#" onclick="selectTab('advanced');"><input
type="button" class="button" value="<fmt:message key="search.advanced.search"
/>"/></a>
+ </mm:compare>
<table>
<tr>
<td style="width:105px"><fmt:message key="searchform.title"
/></td>
- <td colspan="3"><html:text property="title"
style="width:200px"/></td>
+ <td colspan="5"><html:text property="title"
style="width:200px"/></td>
</tr>
+ <mm:compare referid="mode" value= "advanced">
<tr>
- <td><fmt:message key="searchform.keywords" /></td>
- <td style="width:210px"><html:text property="keywords"
style="width:200px"/></td>
- <td style="width:105px"><fmt:message
key="searchform.contenttype" /></td>
+ <td style="width:105px"><fmt:message
key="searchform.assettype" /></td>
<td>
- <html:select property="assettypes"
onchange="selectContenttype('${searchinit}');" >
- <html:option value="contentelement"><<fmt:message
key="searchform.assettypes.all" />></html:option>
+ <html:select property="assettypes"
onchange="selectAssettype('${searchinit}');" >
+ <html:option value="assetelement"><<fmt:message
key="searchform.assettypes.all" />></html:option>
<html:optionsCollection name="typesList" value="value"
label="label"/>
</html:select>
- <mm:compare referid="mode" value="advanced" inverse="true">
- <input type="submit" class="button" name="submitButton"
onclick="setOffset(0);" value="<fmt:message key="searchform.submit" />"/>
- </mm:compare>
</td>
</tr>
-
- <mm:compare referid="mode" value= "advanced">
<tr>
<td></td>
<td><b><fmt:message key="searchform.dates" /></b></td>
@@ -287,28 +282,46 @@
</mm:present>
</td>
</tr>
+
+ </mm:compare>
<tr>
<td></td>
<td>
<input type="submit" class="button" name="submitButton"
onclick="setOffset(0);" value="<fmt:message key="searchform.submit" />"/>
</td>
</tr>
- </mm:compare>
</table>
</html:form>
</div>
-
+ </div>
<div class="editor" style="height:500px">
<div class="ruler_green"><div><fmt:message key="searchform.results"
/></div></div>
- <div class="body">
+
+ <div>
+ <select name="assesMode"
onchange="javascript:changeMode(${param.offset})">
+ <c:if test="${empty show}">
+ <option id="a_list" selected="selected">list</option>
+ <option id = "a_thumbnail" >thumbnail</option>
+ </c:if>
+ <c:if test="${!empty show}">
+ <option id="a_list">list</option>
+ <option id = "a_thumbnail" selected="selected" >thumbnail</option>
+ </c:if>
+ </select>
+ </div>
+
+<c:if test="${empty show}">
+ <div class="body">
<!-- we check to see if we have workflow, this is done by looking if the
editors for the workflow are on the HD -->
<c:set var="hasWorkflow" value="false"/>
<mm:haspage page="/editors/workflow">
<c:set var="hasWorkflow" value="true"/>
</mm:haspage>
+
+
<%-- Now print if no results --%>
<mm:isempty referid="results">
<fmt:message key="searchform.searchpages.nonefound" />
@@ -318,53 +331,44 @@
<mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>">
<mm:field id="trashnumber" name="number" write="false"/>
</mm:node>
+
<mm:list referid="results">
<mm:first>
+ <c:set var="extraparams" value="&direction=${param.direction}" />
<[EMAIL PROTECTED] file="searchpages.jsp" %>
-
- <form action="LinkToChannelAction.do" name="linkForm">
- <mm:compare referid="action" value="link" inverse="true">
- <mm:hasrank minvalue="siteadmin">
+<mm:hasrank minvalue="siteadmin">
<c:if test="${fn:length(results) >1}">
- <div align="left"> <input type="button" class="button"
name="massdelete" onclick="javascript:deleteContent('massdelete','<fmt:message
key="recyclebin.massremoveconfirm"/>')" value="<fmt:message
key="asset.delete.massdelete" />"/></div>
+ <div align="left">
+ <input type="submit" class="button" name="massdelete"
+
onclick="javascript:deleteAsset('massdelete','<fmt:message
key="recyclebin.massremoveconfirm"/>')"
+ value="<fmt:message key="asset.delete.massdelete" />"/>
+ </div>
</c:if>
</mm:hasrank>
- </mm:compare>
- <mm:compare referid="action" value="link" >
- <input type="submit" class="button" value="<fmt:message
key="searchform.link.submit" />"/>
- </mm:compare>
+ <form action="" name="linkForm" method="post">
+
<table>
<thead>
<tr>
<th>
- <mm:compare referid="action" value="link" >
- <input type="hidden" name="channelnumber"
value="<mm:write referid="linktochannel"/>" />
- <input type="hidden" name="channel" value="<mm:write
referid="linktochannel"/>" />
<mm:present referid="returnurl"><input type="hidden"
name="returnurl" value="<mm:write referid="returnurl"/>"/></mm:present>
<input type="checkbox"
onclick="selectAll(this.checked, 'linkForm', 'chk_');" value="on"
name="selectall" />
- </mm:compare>
- <mm:compare referid="action" value="link" inverse="true">
- <c:if test="${fn:length(results) >1}">
- <input type="checkbox" onclick="selectAll(this.checked,
'linkForm', 'chk_');" value="on" name="selectall" />
- </c:if>
- </mm:compare>
</th>
+ <th></th>
<th><a href="javascript:orderBy('otype')" class="headerlink"
><fmt:message key="locate.typecolumn" /></a></th>
<th><a href="javascript:orderBy('title')" class="headerlink"
><fmt:message key="locate.titlecolumn" /></a></th>
<th><fmt:message key="locate.creationchannelcolumn" /></th>
<th><a href="javascript:orderBy('creator')"
class="headerlink" ><fmt:message key="locate.authorcolumn" /></th>
<th><a href="javascript:orderBy('lastmodifieddate')"
class="headerlink" ><fmt:message key="locate.lastmodifiedcolumn" /></th>
<th><a href="javascript:orderBy('number')"
class="headerlink" ><fmt:message key="locate.numbercolumn" /></th>
- <th></th>
</tr>
</thead>
+
<tbody class="hover">
</mm:first>
-
- <mm:field name="${assettypes}.number" id="number">
+ <mm:field name="${assettypes}.number" id="number" write="false">
<mm:node number="${number}">
-
<mm:relatednodes role="creationrel" type="contentchannel">
<c:set var="creationRelNumber"><mm:field name="number"
id="creationnumber"/></c:set>
<mm:compare referid="trashnumber" referid2="creationnumber">
@@ -373,22 +377,18 @@
<c:set var="channelIconMessage"><fmt:message
key="search.trash" /></c:set>
<c:set var="channelUrl" value="../recyclebin/index.jsp"/>
</mm:compare>
- <mm:compare referid="trashnumber" referid2="creationnumber"
inverse="true">
<mm:field name="number" jspvar="channelNumber"
write="false"/>
<cmsc:rights nodeNumber="${channelNumber}" var="rights"/>
+ <mm:compare referid="trashnumber" referid2="creationnumber"
inverse="true">
<mm:field name="name" jspvar="channelName" write="false"/>
-
<c:set var="channelIcon"
value="/editors/gfx/icons/type/contentchannel_${rights}.png"/>
<c:set var="channelIconMessage"><fmt:bundle
basename="cmsc-security"><fmt:message key="role.${rights}"
/></fmt:bundle></c:set>
- <c:set var="channelUrl"
value="asset.do?parentchannel=${channelNumber}"/>
+ <c:set var="channelUrl"
value="Asset.do?parentchannel=${channelNumber}"/>
</mm:compare>
</mm:relatednodes>
-
-
-
<tr <mm:even inverse="true">class="swap"</mm:even>>
- <td style="white-space: nowrap;">
- <cmsc:rights nodeNumber="${creationRelNumber}" var="rights"/>
+ <td style="white-space: nowrap;" onMouseDown="objClick(this);">
+
<mm:compare referid="action" value="link">
<input type="checkbox" value="<mm:field name="number" />"
name="chk_<mm:field name="number" />"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
</mm:compare>
@@ -400,81 +400,25 @@
<input type="checkbox" value="moveToRecyclebin:<mm:field
name="number" />" name="chk_<mm:field name="number" />"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
</c:if>
</mm:compare>
-
-
- <%-- also show the edit icon when we return from an edit
wizard! --%>
- <mm:write referid="action" jspvar="action" write="false"/>
- <c:if test="${action == 'search' || action == 'save' ||
action == 'cancel'}">
- <a href="<mm:url page="../WizardInitAction.do">
- <mm:param name="objectnumber"><mm:field
name="number" /></mm:param>
- <mm:param name="returnurl"
value="/editors/repository/SearchAction.do${geturl}" />
- </mm:url>">
- <img src="../gfx/icons/page_edit.png"
alt="<fmt:message key="searchform.icon.edit.title" />" title="<fmt:message
key="searchform.icon.edit.title" />" /></a>
- </c:if>
-
- <mm:compare referid="action" value="select">
- <script>
- function link<mm:field name="number"/>() {
- selectElement('<mm:field name="number" />',
- '<mm:field name="title"
escape="js-single-quotes"/>',
- '<cmsc:staticurl page="/content/"
/><mm:field name="number"/>')
- }
- </script>
-
- <a href="#" onClick="link<mm:field name="number" />();">
- <img src="../gfx/icons/link.png" title="<fmt:message
key="searchform.icon.select.title" />" /></a>
- </mm:compare>
- <mm:compare referid="action" value="selectforwizard">
- <a href="#" onClick="top.opener.selectContent('<mm:field
name="number" />', '', ''); top.close();">
- <img src="../gfx/icons/link.png" title="<fmt:message
key="searchform.icon.select.title" />" /></a>
- </mm:compare>
- <mm:field name="number" write="false" id="nodenumber">
- <a href="<cmsc:contenturl number="${nodenumber}"/>"
target="_blank"><img src="../gfx/icons/preview.png" alt="<fmt:message
key="searchform.icon.preview.title" />" title="<fmt:message
key="searchform.icon.preview.title" />" /></a>
- </mm:field>
- <a href="#" onclick="showItem(<mm:field name="number"/>);"><img
src="../gfx/icons/info.png" alt="<fmt:message key="searchform.icon.info.title"
/>" title="<fmt:message key="searchform.icon.info.title" />" /></a>
-
- <c:if test="${creationRelNumber == trashnumber && rights ==
'webmaster'}">
- <a href="javascript:deleteContent('<mm:field
name='number'/>','<fmt:message key="recyclebin.removeconfirm"/>')">
- <img src="../gfx/icons/delete.png" title="<fmt:message
key="searchform.icon.delete.recyclebin" />" alt="<fmt:message
key="searchform.icon.delete.recyclebin" />"/>
- </a>
- </c:if>
- <c:if test="${creationRelNumber != trashnumber && (rights ==
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights ==
'webmaster')}">
- <a href="javascript:deleteContent('<mm:field
name='number'/>')"><img src="../gfx/icons/delete.png" title="<fmt:message
key="searchform.icon.delete.channel" />" alt="<fmt:message
key="searchform.icon.delete.channel" />"/></a>
- </c:if>
-
-
- <mm:compare referid="action" value="search">
- <mm:haspage page="/editors/versioning">
- <c:url value="/editors/versioning/ShowVersions.do"
var="showVersions">
- <c:param name="nodenumber"><mm:field name="number"
/></c:param>
- </c:url>
- <a href="#" onclick="openPopupWindow('versioning',
750, 550, '${showVersions}')"><img src="../gfx/icons/versioning.png"
alt="<fmt:message key="searchform.icon.versioning.title" />"
title="<fmt:message key="searchform.icon.versioning.title" />" /></a>
- </mm:haspage>
- <cmsc:hasfeature name="savedformmodule">
- <c:set var="typeval">
- <mm:nodeinfo type="type" />
- </c:set>
- <c:if test="${typeval == 'responseform'}">
- <mm:url
page="/editors/savedform/ShowSavedForm.do" id="showSavedForms" write="false">
- <mm:param name="nodenumber"><mm:field
name="number" /></mm:param>
- <mm:param name="initreturnurl"
value="/editors/repository/SearchAction.do${geturl}" />
- </mm:url>
- <a href="<mm:write
referid="showSavedForms"/>"><img
src="../gfx/icons/application_form_magnify.png" title="<fmt:message
key="asset.icon.savedform.title" />" alt="<fmt:message
key="asset.icon.savedform.title" />"/></a>
- </c:if>
- </cmsc:hasfeature>
- </mm:compare>
</td>
- <td style="white-space: nowrap;">
+ <td style="white-space: nowrap;" onMouseDown="objClick(this);">
+ <%@ include file="searchIconsBar.jspf" %>
+ </td>
+ <td style="white-space: nowrap;" onMouseDown="objClick(this);">
<mm:nodeinfo type="guitype"/>
</td>
- <td>
- <mm:field jspvar="title" write="false" name="title" />
+ <td style="white-space: nowrap;" onMouseDown="objClick(this);">
+ <c:set var="assettype" ><mm:nodeinfo type="guitype"/></c:set>
+ <mm:field id="title" write="false" name="title"/>
+ <c:if test="${assettype == 'URL'}">
+ <c:set var="title" ><mm:field name="name"/></c:set>
+ </c:if>
<c:if test="${fn:length(title) > 50}">
<c:set var="title">${fn:substring(title,0,49)}...</c:set>
</c:if>
${title}
</td>
- <td style="white-space: nowrap;">
+ <td style="white-space: nowrap;" onMouseDown="objClick(this);">
<img src="<cmsc:staticurl page="${channelIcon}"/>" align="top"
alt="${channelIconMessage}" />
<mm:compare referid="action" value="search">
<a href="${channelUrl}">${channelName}</a>
@@ -483,20 +427,13 @@
${channelName}
</mm:compare>
</td>
- <td style="white-space: nowrap;">
- <mm:field name="lastmodifier" jspvar="lastmodifier"
write="false"/>
- <mm:listnodes type="user" constraints="username =
'${lastmodifier}'">
- <c:set var="lastmodifierFull"><mm:field name="firstname"
/> <mm:field name="prefix" /> <mm:field name="surname" /></c:set>
- <c:if test="${lastmodifierFull != ''}"><c:set
var="lastmodifier" value="${lastmodifierFull}"/></c:if>
- </mm:listnodes>
- ${lastmodifier}
- </td>
- <td style="white-space: nowrap;"><mm:field
name="lastmodifieddate"><cmsc:dateformat displaytime="true" /></mm:field></td>
- <td width="60"><mm:field name="number"/></td>
+ <td style="white-space: nowrap;"
onMouseDown="objClick(this);"><mm:field name="creator" /></td>
+ <td style="white-space: nowrap;"
onMouseDown="objClick(this);"><mm:field
name="lastmodifieddate"><cmsc:dateformat displaytime="true" /></mm:field></td>
+ <td style="white-space: nowrap;"
onMouseDown="objClick(this);"><mm:field name="number"/></td>
<c:if test="${hasWorkflow}">
- <td width="10" style="white-space: nowrap;">
+ <td width="10" onMouseDown="objClick(this);">
<c:set var="status" value="waiting"/>
- <mm:relatednodes type="workflowitem">
+ <mm:relatednodes type="workflowitem"
constraints="type='asset'">
<c:set var="status"><mm:field name="status"/></c:set>
</mm:relatednodes>
<c:if test="${status == 'waiting'}">
@@ -504,32 +441,122 @@
<c:set var="status" value="onlive"/>
</mm:listnodes>
</c:if>
- <img src="../gfx/icons/status_${status}.png"
alt="<fmt:message key="asset.status" />: <fmt:message
key="asset.status.${status}" />" title="<fmt:message key="asset.status" />:
<fmt:message key="asset.status.${status}" />" />
+ <img src="../gfx/icons/status_${status}.png"
+ alt="<fmt:message key="asset.status" />: <fmt:message
key="asset.status.${status}" />"
+ title="<fmt:message key="asset.status" />:
<fmt:message key="asset.status.${status}" />"/>
</td>
</c:if>
</tr>
-
</mm:node>
</mm:field>
-
<mm:last>
</tbody>
</table>
- <mm:compare referid="action" value="link" inverse="true">
+ </form>
+ <mm:hasrank minvalue="siteadmin">
<c:if test="${fn:length(results) >1}">
- <input type="submit" class="button" name="massdelete"
onclick="javascript:deleteContent('massdelete','<fmt:message
key="recyclebin.removeconfirm"/>')" value="<fmt:message
key="content.delete.massdelete" />"/>
+ <div align="left">
+ <input type="submit" class="button" name="massdelete"
+
onclick="javascript:deleteAsset('massdelete','<fmt:message
key="recyclebin.massremoveconfirm"/>')"
+ value="<fmt:message key="asset.delete.massdelete" />"/>
+ </div>
</c:if>
- </mm:compare>
- <mm:compare referid="linktochannel" value="" inverse="true">
- <input type="submit" class="button" value="<fmt:message
key="searchform.link.submit" />"/>
+ </mm:hasrank>
+ <[EMAIL PROTECTED] file="searchpages.jsp" %>
+ </mm:last>
+ </mm:list>
+ </div>
+</c:if>
+
+<c:if test="${!empty show}">
+<div class="body">
+
+<!-- we check to see if we have workflow, this is done by looking if the
editors for the workflow are on the HD -->
+<c:set var="hasWorkflow" value="false"/>
+<mm:haspage page="/editors/workflow">
+ <c:set var="hasWorkflow" value="true"/>
+</mm:haspage>
+
+ <%-- Now print if no results --%>
+ <mm:isempty referid="results">
+ <fmt:message key="searchform.searchpages.nonefound" />
+ </mm:isempty>
+
+ <%-- Now print the results --%>
+ <mm:node number="<%= RepositoryUtil.ALIAS_TRASH %>">
+ <mm:field id="trashnumber" name="number" write="false"/>
+ </mm:node>
+ <mm:list referid="results">
+ <mm:first>
+ <c:set var="extraparams" value="&direction=${param.direction}&show=0"/>
+ <[EMAIL PROTECTED] file="searchpages.jsp" %>
+ <form name="linkForm">
+ </mm:first>
+
+ <mm:field name="${assettypes}.number" id="number" write="false">
+ <mm:node number="${number}">
+
+ <mm:relatednodes role="creationrel" type="contentchannel">
+ <c:set var="creationRelNumber"><mm:field name="number"
id="creationnumber"/></c:set>
+ <mm:compare referid="trashnumber" referid2="creationnumber">
+ <c:set var="channelName"><fmt:message key="search.trash"
/></c:set>
+ <c:set var="channelIcon"
value="/editors/gfx/icons/trashbin.png"/>
+ <c:set var="channelIconMessage"><fmt:message
key="search.trash" /></c:set>
+ <c:set var="channelUrl" value="../recyclebin/index.jsp"/>
</mm:compare>
+ <mm:field name="number" jspvar="channelNumber" write="false"/>
+ <cmsc:rights nodeNumber="${channelNumber}" var="rights"/>
+ <mm:compare referid="trashnumber" referid2="creationnumber"
inverse="true">
+ <mm:field name="name" jspvar="channelName" write="false"/>
+ <c:set var="channelIcon"
value="/editors/gfx/icons/type/contentchannel_${rights}.png"/>
+ <c:set var="channelIconMessage"><fmt:bundle
basename="cmsc-security"><fmt:message key="role.${rights}"
/></fmt:bundle></c:set>
+ <c:set var="channelUrl"
value="Asset.do?parentchannel=${channelNumber}"/>
+ </mm:compare>
+ </mm:relatednodes>
+ <div style="width:160px; height:180px;float:left;text-align:center;"
onMouseOut="javascript:hideEditItems(<mm:field name='number'/>)"
onMouseOver="showEditItems(<mm:field name='number'/>)">
+ <div style="clear:both;float:left;width:77%;height:33px;">
+ <div class="asset-info" id="asset-info-<mm:field
name='number'/>" style="display: none; position: relative; border: 1px solid
#eaedff" >
+ <%@ include file="searchIconsBar.jspf" %>
+ </div>
+ </div>
+ <div style="width:100%;height:100px;text-align:left;padding:0px
10px 5px 5px;vertical-align:middle;display:block;float:left;" >
+ <a href="javascript:showInfo(<mm:field name="number" />)">
+ <c:set var="typedef" ><mm:nodeinfo type="guitype"/></c:set>
+ <c:if test="${typedef eq 'Image'}">
+ <img src="<mm:image template="s(120x100)"/>" alt=""/>
+ </c:if>
+ <c:if test="${typedef eq 'Attachment'}">
+ <img src="../gfx/alert_green_left.gif" alt=""/>change
+ </c:if>
+ <c:if test="${typedef eq 'URL'}">
+ need to add
+ </c:if>
+ </a>
+ <div style="width:80%;text-align:center;margin:0px 0px 0px
0px;padding-top:0px;padding-right:0px;overflow-x:hidden;">
+ <c:set var="typedef" ><mm:nodeinfo type="guitype"/></c:set>
+ <c:if test="${typedef eq 'Image'}">
+ <mm:field name="title"/><br/><mm:field name="itype"/>
+ </c:if>
+ <c:if test="${typedef eq 'Attachment'}">
+ <mm:field name="title"/>
+ </c:if>
+ <c:if test="${typedef eq 'URL'}">
+ <mm:field name="name"/>
+ </c:if>
+ </div>
+ </div>
+ </div>
+ </mm:node>
+ </mm:field>
+ <mm:last>
</form>
<[EMAIL PROTECTED] file="searchpages.jsp" %>
</mm:last>
</mm:list>
- </div>
+</div>
+</c:if>
</div>
</mm:cloud>
Index: contentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- contentsearch.jsp 13 Nov 2008 10:17:04 -0000 1.1
+++ contentsearch.jsp 2 Dec 2008 02:40:21 -0000 1.2
@@ -43,7 +43,7 @@
<div class="${contenttypes == 'asset'?'tab_active':'tab'}">
<div class="body">
<div>
- <a
href="Asset.do?type=asset&parentchannel=${parentchannel}&direction=${direction}"><fmt:message
key="asset.title" /></a>
+ <a href="AssetSearchInitAction.do"><fmt:message key="asset.title"
/></a>
</div>
</div>
</div>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
