Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv23271

Modified Files:
        assetsearch.jsp searchIconsBar.jspf 
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article 
using the more advanced custom search windows,move  thumbnail div to Iconbar


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-268


Index: assetsearch.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- assetsearch.jsp     4 Jan 2009 03:28:10 -0000       1.15
+++ assetsearch.jsp     4 Jan 2009 04:45:38 -0000       1.16
@@ -403,10 +403,6 @@
                   <c:if test="${creationRelNumber != trashnumber && (rights == 
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights == 
'webmaster') && fn:length(results) >1}">
                     <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>
-                  <c:if test="${not empty strict}">
-                     <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>
-                  </c:if>
                <%@ include file="searchIconsBar.jspf" %>
             </td>
             <td style="white-space: nowrap;" onMouseDown="objClick(this);">


Index: searchIconsBar.jspf
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/searchIconsBar.jspf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- searchIconsBar.jspf 22 Dec 2008 03:51:42 -0000      1.4
+++ searchIconsBar.jspf 4 Jan 2009 04:45:38 -0000       1.5
@@ -1,4 +1,8 @@
                   <mm:write referid="action" jspvar="action" write="false"/>
+               <c:if test="${not empty strict}">
+                  <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>
+               </c:if>
                <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>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to