Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv10672/src/webapp/editors/repository
Modified Files:
content.js content.jsp
Added Files:
asset.jsp assetupload.jsp elementlist.jsp
Log Message:
CMSC-681,Asset Maintenance model change Normal listing
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
asset.jsp is new
assetupload.jsp is new
elementlist.jsp is new
Index: content.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- content.js 24 Sep 2008 06:06:33 -0000 1.12
+++ content.js 23 Oct 2008 11:44:00 -0000 1.13
@@ -41,7 +41,7 @@
-function sortBy(orderColumn, channel) {
+function sortBy(action, orderColumn, channel) {
var offset = document.forms[0].offset.value;
var oldOrderColumn = document.forms[0].order.value;
@@ -62,7 +62,7 @@
}
newDirection=document.forms[0].direction.value;
type=document.forms[0].order.value;
- var url = 'Content.do?orderby='+type+'&parentchannel=' +
channel+'&direction='+newDirection+'&offset='+offset;
+ var url = action + '.do?orderby='+type+'&parentchannel=' +
channel+'&direction='+newDirection+'&offset='+offset;
document.location = url;
Index: content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- content.jsp 26 Sep 2008 08:30:54 -0000 1.38
+++ content.jsp 23 Oct 2008 11:44:00 -0000 1.39
@@ -3,44 +3,14 @@
%><%@ page import="com.finalist.cmsc.repository.RepositoryUtil"
%><%@ page import="com.finalist.cmsc.security.*"
%><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">
-<cmscedit:head title="content.title">
- <script src="content.js" type="text/javascript"></script>
-</cmscedit:head>
-<body>
-<script type="text/javascript">
- <c:if test="${not empty param.message}">
- addLoadEvent(alert('${param.message}'));
- </c:if>
- <c:if test="${not empty param.refreshchannel}">
- addLoadEvent(refreshChannels);
- </c:if>
- <c:if test="${requestScope.refresh}">
- addLoadEvent(refreshChannels);
- </c:if>
- addLoadEvent(alphaImages);
-</script>
+
<mm:cloud jspvar="cloud" rank="basic user" loginpage="../login.jsp">
<mm:import externid="parentchannel" jspvar="parentchannel" vartype="Integer"
from="parameters" required="true"/>
-<mm:import jspvar="returnurl"
id="returnurl">/editors/repository/Content.do?parentchannel=<mm:write
+<mm:import jspvar="returnurl"
id="returnurl">/editors/repository/Content.do?type=content&parentchannel=<mm:write
referid="parentchannel"/>&direction=down</mm:import>
-<div class="tabs">
- <!-- active TAB -->
- <div class="tab_active">
- <div class="body">
- <div>
- <a name="activetab"><fmt:message key="content.title"/></a>
- </div>
- </div>
- </div>
-</div>
-
-
<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"/>
<mm:haspage page="/editors/workflow">
@@ -143,15 +113,15 @@
</c:if>
<% } %>
</th>
- <th><a href="javascript:sortBy('otype','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Content','otype','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="content.typecolumn"/></a></th>
- <th><a href="javascript:sortBy('title','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Content','title','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="content.titlecolumn"/></a></th>
- <th><a href="javascript:sortBy('creator','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Content','creator','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="content.authorcolumn"/></a></th>
- <th><a href="javascript:sortBy('lastmodifieddate','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Content','lastmodifieddate','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="content.lastmodifiedcolumn"/></a></th>
- <th><a href="javascript:sortBy('number','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Content','number','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="content.numbercolumn"/></a></th>
<th><fmt:message key="content.creationchannelcolumn"/></th>
<th></th>
@@ -307,6 +277,4 @@
</div>
</mm:node>
</mm:cloud>
-</body>
-</html:html>
</mm:content>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
