Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv25831/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
imagesearch.jsp
Log Message:
CMSC-1126 using Assets in content
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: imagesearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- imagesearch.jsp 15 Oct 2008 07:35:08 -0000 1.19
+++ imagesearch.jsp 25 Nov 2008 10:47:58 -0000 1.20
@@ -3,166 +3,147 @@
%><[EMAIL PROTECTED] import="java.util.Iterator,
com.finalist.cmsc.mmbase.PropertiesUtil"
%><mm:content type="text/html" encoding="UTF-8" expires="0">
-<mm:import externid="mode" id="mode">search</mm:import>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
<cmscedit:head title="images.title">
<script src="../repository/search.js" type="text/javascript"></script>
- <script src="../repository/content.js" type="text/javascript"></script>
<script type="text/javascript">
- function selectElement(element, title, src, width, height, description) {
-
- if(window.top.opener != undefined) {
- window.top.opener.selectElement(element, title, src, width,
height, description);
- window.top.close();
- }
+ function showInfo(objectnumber) {
+ openPopupWindow('imageinfo', '900', '500',
+ 'imageinfo.jsp?objectnumber=' + objectnumber);
}
- function showInfo(objectnumber) {
- openPopupWindow('imageinfo', '900', '500',
'imageinfo.jsp?objectnumber='+objectnumber);
+ function initParentHref(elem) {
+ elem.style.cssText="background-color:yellow";
+ elem.parentNode.setAttribute('href', elem.getAttribute('href'));
}
- function confirmDelete(){
- var checkboxs = document.getElementsByTagName("input");
- var num = 0;
- for (i = 0; i < checkboxs.length; i++) {
- if (checkboxs[i].type == 'checkbox' &&
checkboxs[i].name.indexOf('chk_') == 0 && checkboxs[i].checked) {
- num++;
+ function doSelectIt() {
+ var href = document.getElementById('imgList').getAttribute('href')+"";
+ if (href.length<10) return;
+ if (href.indexOf('javascript:') == 0) {
+ eval(href.substring('javascript:'.length, href.length));
+ return false;
}
+ document.location=href;
}
- if(num > 0){
- del = confirm("<fmt:message key="secondaryedit.mass.sure"/> "+num+"
<fmt:message key="secondaryedit.mass.elements"/> ?");
- if(del){
- document.forms['imageform'].submit();
+
+ function doCancleIt(){
+ window.top.close();
}
- }else{
- alert("<fmt:message key="secondaryedit.mass.atleast.delete"/> ");
+
+ function selectElement(element, title, src, width, height, description)
{
+ if (window.top.opener != undefined) {
+ window.top.opener.selectElement(element, title, src,
width, height,
+ description);
+ window.top.close();
}
}
- </script>
-</cmscedit:head>
+</script>
+ <link rel="stylesheet" type="text/css"
href="../../editors/editwizards_new/style/extra/wizard.css">
+ <style type="text/css">
+div.editor div.body ul.shortcuts li {
+ padding-left: 5px;
+ font-size: 12px;
+ font-weight: normal;
+}
+
+div.editor div.body ul.shortcuts li a {
+ background-image: url(../gfx/button_side_block.gif);
+ background-position: right center;
+ background-repeat: no-repeat;
+ padding-right: 15px;
+}
+
+div.editor div.body #imgList div.grid {
+ width: 200px;
+ height: 200px;
+ float: left;
+ text-align: center
+}
+
+div.editor div.body #imgList div.grid div.thumbnail {
+ width: 100%;
+ height: 80%;
+ text-align: center;
+ padding: 0;
+}
+
+div.editor div.body #imgList div.grid div.imgInfo {
+ width: 100%;
+ height: 20%;
+ text-align: center;
+ padding: 0px;
+}
+</style>
+ </cmscedit:head>
<body>
<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
<mm:import externid="action">search</mm:import><%-- either: search of select
--%>
- <div class="tabs">
- <div class="tab_active">
- <div class="body">
- <div>
- <a href="#"><fmt:message key="images.title" /></a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="imageupload.jsp?uploadAction=${param.action}"><fmt:message
key="images.upload.title" /></a>
- </div>
- </div>
- </div>
- </div>
- <div class="editor" style="height:500px">
- <div class="body">
- <mm:import id="searchinit"><c:url
value='/editors/resources/ImageInitAction.do'/></mm:import>
+ <div class="editor" style="height:555px">
<html:form action="/editors/resources/ImageAction" method="post">
<html:hidden property="action" value="${action}"/>
<html:hidden property="offset"/>
<html:hidden property="order"/>
<html:hidden property="direction"/>
<mm:import id="contenttypes"
jspvar="contenttypes">images</mm:import>
- <[EMAIL PROTECTED] file="imageform.jsp" %>
</html:form>
- </div>
- <div class="ruler_green"><div><fmt:message key="images.results"
/></div></div>
- <div class="body">
+ <div class="ruler_green" style="margin-top:10px;"><div>??????????IMAGE
IN THIS CHANNEL?????????</div></div>
+ <div class="body" style="max-height:400px;overflow-y:auto;
overflow-x:hidden">
<mm:import externid="results" jspvar="nodeList" vartype="List"/>
<mm:import externid="resultCount" jspvar="resultCount"
vartype="Integer">0</mm:import>
<mm:import externid="offset" jspvar="offset"
vartype="Integer">0</mm:import>
<c:if test="${resultCount > 0}">
<[EMAIL PROTECTED] file="../repository/searchpages.jsp" %>
- <form action="SecondaryContentMassDeleteAction.do?object_type=images"
method="post" name="imageform">
- <table>
- <tr>
- <c:if test="${fn:length(results) >1}">
- <th><input type="submit" onclick="confirmDelete();return
false;" value="<fmt:message key="secondaryedit.mass.delete"/>"/></th>
- </c:if>
- </tr>
- <tr class="listheader">
- <th width="55">
- <c:if test="${fn:length(results) >1}">
- <input type="checkbox" name="selectall"
onclick="selectAll(this.checked, 'imageform', 'chk_');" value="on"/>
- </c:if>
- </th>
- <th nowrap="true"><a href="javascript:orderBy('title')"
class="headerlink"><fmt:message key="imagesearch.titlecolumn" /></a></th>
- <th nowrap="true"><a href="javascript:orderBy('filename')"
class="headerlink"><fmt:message key="imagesearch.filenamecolumn" /></a></th>
- <th nowrap="true"><a
href="javascript:orderBy('filesize')"><fmt:message key="imagesearch.sizecolumn"
/></a></th>
- <th nowrap="true"><a href="javascript:orderBy('itype')"
class="headerlink" ><fmt:message key="imagesearch.mimetypecolumn" /></a></th>
- <th></th>
- </tr>
- <tbody class="hover">
- <c:set var="useSwapStyle">true</c:set>
+ <div id="imgList" style="width:100%" href="">
<mm:listnodes referid="results">
<mm:field name="description" escape="js-single-quotes"
jspvar="description">
<%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 />','<mm:field
name="width"/>','<mm:field name="height"/>', '<%=description%>');</mm:import>
</mm:field>
- <tr <c:if test="${useSwapStyle}">class="swap"</c:if>
href="<mm:write referid="url"/>">
- <td style="white-space:nowrap;">
- <c:if test="${fn:length(results) >1}">
- <input type="checkbox" name="chk_<mm:field
name="number" />" value="<mm:field name="number" />"
onClick="document.forms['imageform'].elements.selectall.checked=false;"/>
- </c:if>
- <c:if test="${action != 'select'}">
- <a href="<mm:url page="../WizardInitAction.do">
- <mm:param name="objectnumber"><mm:field
name="number" /></mm:param>
- <mm:param name="returnurl"
value="<%="../editors/resources/ImageAction.do" +
request.getAttribute("geturl")%>" />
- </mm:url>"><img
src="../gfx/icons/page_edit.png" alt="<fmt:message key="imagesearch.icon.edit"
/>" title="<fmt:message key="imagesearch.icon.edit" />" /></a>
- <a href="javascript:showInfo(<mm:field
name="number" />)">
- <img src="../gfx/icons/info.png"
alt="<fmt:message key="imagesearch.icon.info" />" title="<fmt:message
key="imagesearch.icon.info" />" /></a>
- <mm:hasrank minvalue="administrator">
- <a href="<mm:url
page="DeleteSecondaryContentAction.do" >
- <mm:param name="object_type"
value="images"/>
- <mm:param name="objectnumber"><mm:field
name="number" /></mm:param>
- <mm:param name="returnurl"
value="<%="/editors/resources/ImageAction.do" +
request.getAttribute("geturl")%>" />
- </mm:url>"><img src="../gfx/icons/delete.png"
alt="<fmt:message key="imagesearch.icon.delete" />" title="<fmt:message
key="imagesearch.icon.delete" />"/></a>
- </mm:hasrank>
- </c:if>
- </td>
- <td onMouseDown="objClick(this);"><mm:field
name="title"/></td>
- <td onMouseDown="objClick(this);"><mm:field
name="filename"/></td>
- <td onMouseDown="objClick(this);"><mm:field
name="filesize" jspvar="filesize" write="false"/>
- <c:choose>
- <c:when test="${filesize lt 2048}">
- <fmt:formatNumber value="${filesize}"
pattern=""/> byte </td>
- </c:when>
- <c:when test="${filesize ge 2048 && filesize
le(2*1024*1024)}">
- <fmt:formatNumber value="${filesize div
1024}" pattern=".0"/> K </td>
- </c:when>
- <c:otherwise>
- <fmt:formatNumber value="${filesize div (1024
* 1024)}" pattern=".0"/> M </td>
- </c:otherwise>
- </c:choose>
- </td>
- <td onMouseDown="objClick(this);"><mm:field
name="itype"/></td>
- <td onMouseDown="objClick(this);"><a
href="javascript:showInfo(<mm:field name="number" />)"><img src="<mm:image
template="s(100x100)"/>" alt="" /></a></td>
- </tr>
- <c:set var="useSwapStyle">${!useSwapStyle}</c:set>
+ <div class="grid" href="<mm:write referid="url"/>"
onclick="initParentHref(this)">
+ <div class="thumbnail" ondblclick="showInfo('<mm:field
name="number"/>')"><mm:image mode="img" template="s(100x100)" alt="double
click to show the info"/></div>
+ <div class="imgInfo"><mm:field
name="title"/><br/><mm:field name="itype"/></div>
+ </div>
</mm:listnodes>
- </tbody>
- <tr>
- <c:if test="${fn:length(results) >1}">
- <th><input type="submit" onclick="confirmDelete();return
false;" value="<fmt:message key="secondaryedit.mass.delete"/>"/></th>
+ </div>
</c:if>
- </tr>
- </table>
- </form>
-</c:if>
-<c:if test="${resultCount == 0 && param.title != null}">
+ <c:if test="${resultCount == 0 && param.title != null}">
<fmt:message key="imagesearch.noresult" />
-</c:if>
-<c:if test="${resultCount > 0}">
+ </c:if>
+ <c:if test="${resultCount > 0}">
<[EMAIL PROTECTED] file="../repository/searchpages.jsp" %>
-</c:if>
-</div>
+ </c:if>
+ </div>
+ <div class="body">
+ <ul class="shortcuts">
+ <li><a href="${search_init_action_url}"> Often used
images in all channels </a></li>
+ <li><a href="${reorder_action_url}"> Select different
channel </a></li>
+ <li><a href="${search_init_action_url}"> Search image
</a></li>
+ <li><a href="${display_unsaved_files_url}"> New image
</a></li>
+ </ul>
+ </div>
</div>
+ <div id="commandbuttonbar" class="buttonscontent">
+ <div class="page_buttons_seperator">
+ <div></div>
+ </div>
+ <div class="page_buttons">
+ <div class="button">
+ <div class="button_body">
+ <a id="bottombutton-ok" class="bottombutton"
title="Select the image." href="javascript:doSelectIt();" unselectable="on"
titlesave="Select the image." titlenosave="Cannot be saved, since no image is
selected." inactive="false">OK</a>
+ </div>
+ </div>
+
+ <div class="button">
+ <div class="button_body">
+ <a id="bottombutton-cancel" class="bottombutton"
href="javascript:doCancleIt();" title="Cancel this task, image will NOT be
selected.">Cancel</a>
+ </div>
+ </div>
+ <div class="begin">
+ </div>
+ </div>
+ </div>
</mm:cloud>
</body>
</html:html>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
