Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv16143/webapp/editors/repository
Modified Files:
asset.jsp assetsearch.jsp
Log Message:
CMSC-681 Asset Maintenance code refacted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: asset.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- asset.jsp 23 Dec 2008 10:48:23 -0000 1.23
+++ asset.jsp 25 Dec 2008 01:56:33 -0000 1.24
@@ -8,7 +8,7 @@
<html:html xhtml="true">
<mm:import externid="parentchannel" jspvar="parentchannel"
vartype="Integer" from="parameters" required="true"/>
<mm:import jspvar="returnurl"
id="returnurl">/editors/repository/Asset.do?type=asset&parentchannel=<mm:write
- referid="parentchannel"/>&direction=down</mm:import>
+ referid="parentchannel"/>&direction=up</mm:import>
<cmscedit:head title="images.title">
<script type="text/javascript">
@@ -27,9 +27,9 @@
var assetsMode = document.getElementsByTagName("option");
for(i = 0; i < assetsMode.length; i++){
if(assetsMode[i].selected & assetsMode[i].id=="a_list"){
- document.location.href =
'Asset.do?type=asset&parentchannel=<mm:write
referid="parentchannel"/>&direction=down&show=list&offset='+offset;
+ document.location.href =
'Asset.do?type=asset&parentchannel=<mm:write
referid="parentchannel"/>&direction=up&show=list&offset='+offset;
}else if(assetsMode[i].selected & assetsMode[i].id=="a_thumbnail"){
- document.location.href =
'Asset.do?type=asset&parentchannel=<mm:write
referid="parentchannel"/>&direction=down&show=thumbnail&offset='+offset;
+ document.location.href =
'Asset.do?type=asset&parentchannel=<mm:write
referid="parentchannel"/>&direction=up&show=thumbnail&offset='+offset;
}
}
}
@@ -38,16 +38,16 @@
var assetsMode = document.getElementById("assetMode");
assetsMode.selectedIndex=1;
if(document.getElementById("chk_showImageOnly").checked == true){
- document.location.href =
'Asset.do?type=asset&parentchannel=<mm:write
referid="parentchannel"/>&direction=down&show=thumbnail&offset='+offset+'&imageOnly=yes'
+ document.location.href =
'Asset.do?type=asset&parentchannel=<mm:write
referid="parentchannel"/>&direction=up&show=thumbnail&offset='+offset+'&imageOnly=yes'
}else{
- document.location.href =
'Asset.do?type=asset&parentchannel=<mm:write
referid="parentchannel"/>&direction=down&show=thumbnail&offset='+offset+'&imageOnly=no';
+ document.location.href =
'Asset.do?type=asset&parentchannel=<mm:write
referid="parentchannel"/>&direction=up&show=thumbnail&offset='+offset+'&imageOnly=no';
}
}
</script>
<script src="../repository/asset.js" language="JavaScript"
type="text/javascript"></script>
</cmscedit:head>
- <div class="editor">
+<div class="editor">
<div class="body">
<!-- 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"/>
@@ -76,14 +76,15 @@
<% } %>
</div>
- <div class="ruler_green">
+<div class="ruler_green">
<div>
<fmt:message key="asset.asset">
<fmt:param><mm:field name="path"/></fmt:param>
</fmt:message>
</div>
- </div>
+</div>
+<div class="body" >
<div style="padding-left:11px">
<select name="assesMode" id="assetMode"
onchange="javascript:changeMode(${param.offset})">
<c:if test="${show eq 'list'}">
@@ -102,8 +103,6 @@
</div>
</div>
- <c:if test="${show eq 'list'}">
- <div class="body" >
<mm:import externid="elements" from="request"
required="true"/>
<mm:import externid="elementCount" from="request"
vartype="Integer">0</mm:import>
<mm:import externid="resultsPerPage" from="request"
vartype="Integer">25</mm:import>
@@ -112,8 +111,10 @@
<c:set var="extraparams"
value="&direction=${param.direction}&parentchannel=${param.parentchannel}&show=list"/>
<c:set var="orderby" value="${param.orderby}" scope="page" />
<c:set var="type" value="asset" scope="page" />
+
<%@ include file="../pages.jsp" %>
+ <c:if test="${show eq 'list'}">
<form action="AssetMassDeleteAction.do" name="assetForm">
<input type="hidden" name="offset"
value="${param.offset}"/>
<input type="hidden" name="orderby" value="${orderby}" />
@@ -148,7 +149,7 @@
<tbody class="hover">
<mm:listnodes referid="elements" jspvar="node">
- <mm:field name="number" write="false"
id="number" vartype="String"/>
+ <mm:field name="number" write="false"
id="number"vartype="String"/>
<mm:field name="number" write="false"
id="relnumber"/>
<mm:url page="../WizardInitAction.do" id="url"
write="false">
@@ -215,31 +216,15 @@
</c:if>
<% } %>
</form>
- <%@ include file="../pages.jsp" %>
- </div>
</c:if>
<c:if test="${show eq 'thumbnail'}">
- <div class="body">
- <mm:import externid="elements" from="request"
required="true"/>
- <mm:import externid="elementCount" from="request"
vartype="Integer">0</mm:import>
- <mm:import externid="resultsPerPage" from="request"
vartype="Integer">25</mm:import>
- <c:set var="listSize" value="${elementCount}"/>
- <c:set var="offset" value="${param.offset}"/>
- <c:set var="orderby" value="${param.orderby}" scope="page" />
- <c:set var="type" value="asset" scope="page" />
<c:if test="${imageOnly eq 'no'}">
<c:set var="extraparams"
value="&direction=${param.direction}&parentchannel=${param.parentchannel}&show=thumbnail&imageOnly=no"/>
</c:if>
<c:if test="${imageOnly eq 'yes'}">
<c:set var="extraparams"
value="&direction=${param.direction}&parentchannel=${param.parentchannel}&show=thumbnail&imageOnly=yes"/>
</c:if>
- <%@ include file="../pages.jsp" %>
- <form>
- <input type="hidden" name="offset"
value="${param.offset}"/>
- <input type="hidden" name="orderby" value="${orderby}" />
- <input type="hidden" name="direction"
value="${direction}"/>
-
<div width="100%;float:left;">
<mm:listnodes referid="elements">
<div style="width:160px;
height:180px;float:left;text-align:center;"
onMouseOut="javascript:hideEditItems(<mm:field name='number'/>)"
onMouseOver="showEditItems(<mm:field name='number'/>)">
@@ -261,7 +246,6 @@
<c:if test="${typedef eq 'urls'}">
need to add
</c:if>
-
</a>
</div>
<div
style="width:80%;text-align:center;margin:0px 0px 0px
0px;padding-top:0px;padding-right:0px;overflow-x:hidden;">
@@ -281,12 +265,11 @@
</mm:listnodes>
<div style="clear:both;"></div>
</div>
- </form>
- <%@ include file="../pages.jsp" %>
- </div>
</c:if>
- </mm:node>
- </div>
+ <%@ include file="../pages.jsp" %>
+</div>
+</mm:node>
+</div>
</html:html>
</mm:cloud>
Index: assetsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- assetsearch.jsp 23 Dec 2008 10:48:23 -0000 1.8
+++ assetsearch.jsp 25 Dec 2008 01:56:33 -0000 1.9
@@ -35,9 +35,9 @@
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;
+ document.location.href =
'AssetSearchAction.do?type=asset&direction=down&show=list&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;
+ document.location.href =
'AssetSearchAction.do?type=asset&direction=down&show=thumbnail&offset='+offset;
}
}
}
@@ -297,22 +297,20 @@
<div class="editor" style="height:500px">
<div class="ruler_green"><div><fmt:message key="searchform.results"
/></div></div>
-
+ <div class="body">
<div style="padding-left:11px">
<select name="assesMode"
onchange="javascript:changeMode(${param.offset})">
- <c:if test="${empty show}">
+ <c:if test="${empty show || show eq 'list'}">
<option id="a_list" selected="selected">list</option>
<option id = "a_thumbnail" >thumbnail</option>
</c:if>
- <c:if test="${!empty show}">
+ <c:if test="${show eq 'thumbnail'}">
<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">
@@ -329,10 +327,11 @@
<mm:field id="trashnumber" name="number" write="false"/>
</mm:node>
+<c:if test="${show eq 'list'}">
<mm:list referid="results">
<mm:first>
<%...@include file="searchpages.jsp" %>
-<mm:hasrank minvalue="siteadmin">
+ <mm:hasrank minvalue="siteadmin">
<c:if test="${fn:length(results) >1}">
<div align="left">
<input type="submit" class="button" name="massdelete"
@@ -342,7 +341,6 @@
</c:if>
</mm:hasrank>
<form action="" name="linkForm" method="post">
-
<table>
<thead>
<tr>
@@ -454,32 +452,12 @@
<%...@include 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>
-
+<c:if test="${show eq 'thumbnail'}">
<mm:list referid="results">
<mm:first>
<%...@include file="searchpages.jsp" %>
- <form name="linkForm">
</mm:first>
<mm:field name="${assettypes}.number" id="number" write="false">
@@ -528,14 +506,11 @@
</div>
</mm:node>
</mm:field>
- <mm:last>
- </form>
- </mm:last>
</mm:list>
<div style="clear:both;"></div>
<%...@include file="searchpages.jsp" %>
-</div>
</c:if>
+</div>
</div>
</mm:cloud>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
