Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv29196/contentrepository/src/webapp/editors/resources
Modified Files:
attachmentsearch.jsp attachmentupload.jsp delete.jsp
imagesearch.jsp imageupload.jsp urlinfo.jsp urlsearch.jsp
Log Message:
CMSC-1275 Assets: URLs has both name and title
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1275
Index: attachmentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- attachmentsearch.jsp 21 Jan 2009 01:46:46 -0000 1.26
+++ attachmentsearch.jsp 6 Feb 2009 06:08:19 -0000 1.27
@@ -201,7 +201,7 @@
</c:if>
<c:if test="${assettype == 'urls'}">
<mm:import id="url">javascript:selectElement('<mm:field name="number"
/>', '<mm:field
- name="name" escape="js-single-quotes"/>','<mm:field
name="url" />');</mm:import>
+ name="title" escape="js-single-quotes"/>','<mm:field
name="url" />');</mm:import>
</c:if>
<tr <mm:even inverse="true">class="swap"</mm:even> href="<mm:write
referid="url"/>">
<td style="white-space: nowrap;">
@@ -213,9 +213,6 @@
<td style="white-space: nowrap;" onMouseDown="objClick(this);">
<c:set var="assettype" ><mm:nodeinfo type="type"/></c:set>
<mm:field id="title" write="false" name="title"/>
- <c:if test="${assettype == 'urls'}">
- <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>
@@ -291,7 +288,7 @@
</c:if>
<c:if test="${assettype == 'urls'}">
<mm:import id="url">javascript:selectElement('<mm:field name="number"
/>', '<mm:field
- name="name" escape="js-single-quotes"/>','<mm:field
name="url" />');</mm:import>
+ name="title" escape="js-single-quotes"/>','<mm:field
name="url" />');</mm:import>
</c:if>
<div class="thumbnail_show"
onMouseOut="javascript:hideEditItems(<mm:field name='number'/>)"
onMouseOver="showEditItems(<mm:field name='number'/>)">
<div class="thumbnail_operation">
@@ -324,9 +321,6 @@
<div class="thumnail_info">
<c:set var="assettype" ><mm:nodeinfo type="type"/></c:set>
<mm:field id="title" write="false" name="title"/>
- <c:if test="${assettype == 'urls'}">
- <c:set var="title" ><mm:field
name="name"/></c:set>
- </c:if>
<c:if test="${fn:length(title) > 15}">
<c:set
var="title">${fn:substring(title,0,14)}...</c:set>
</c:if>${title}
Index: attachmentupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- attachmentupload.jsp 9 Jan 2009 03:32:26 -0000 1.13
+++ attachmentupload.jsp 6 Feb 2009 06:08:19 -0000 1.14
@@ -108,9 +108,6 @@
<td onMouseDown="objClick(this);">
<c:set var="assettype" ><mm:nodeinfo type="type"/></c:set>
<mm:field id="title" write="false" name="title"/>
- <c:if test="${assettype == 'urls'}">
- <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>
Index: delete.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/delete.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- delete.jsp 24 Sep 2008 06:06:33 -0000 1.3
+++ delete.jsp 6 Feb 2009 06:08:19 -0000 1.4
@@ -33,7 +33,7 @@
</c:when>
<c:when test="${nodeType eq 'urls'}">
<c:set var="object_type" value="urls" scope="request"/>
- <fmt:message key="secondarydelete.field.name" />: <b><mm:field
name="name"/></b><br/>
+ <fmt:message key="secondarydelete.field.name" />: <b><mm:field
name="title"/></b><br/>
<fmt:message key="secondarydelete.field.url" />: <b><mm:field
name="url"/></b>
</c:when>
</c:choose>
Index: imagesearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- imagesearch.jsp 21 Jan 2009 01:46:46 -0000 1.46
+++ imagesearch.jsp 6 Feb 2009 06:08:19 -0000 1.47
@@ -154,9 +154,6 @@
<div class="imgInfo">
<c:set var="assettype" ><mm:nodeinfo
type="type"/></c:set>
<mm:field id="title" write="false" name="title"/>
- <c:if test="${assettype == 'urls'}">
- <c:set var="title" ><mm:field
name="name"/></c:set>
- </c:if>
<c:if test="${fn:length(title) > 15}">
<c:set
var="title">${fn:substring(title,0,14)}...</c:set>
</c:if>${title}
@@ -205,9 +202,6 @@
<td onMouseDown="initParentHref(this.parentNode)">
<c:set var="assettype" ><mm:nodeinfo
type="type"/></c:set>
<mm:field id="title" write="false" name="title"/>
- <c:if test="${assettype == 'urls'}">
- <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>
Index: imageupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- imageupload.jsp 15 Jan 2009 06:49:15 -0000 1.21
+++ imageupload.jsp 6 Feb 2009 06:08:19 -0000 1.22
@@ -121,9 +121,6 @@
<td onMouseDown="objClick(this);">
<c:set var="assettype" ><mm:nodeinfo type="type"/></c:set>
<mm:field id="title" write="false" name="title"/>
- <c:if test="${assettype == 'urls'}">
- <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>
Index: urlinfo.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlinfo.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- urlinfo.jsp 4 Dec 2008 03:25:08 -0000 1.8
+++ urlinfo.jsp 6 Feb 2009 06:08:19 -0000 1.9
@@ -32,7 +32,7 @@
<mm:cloud jspvar="cloud" rank="basic user" loginpage="../login.jsp">
<mm:node number="${param.objectnumber}">
<div style="float:left; padding:5px;">
- <fmt:message key="urlinfo.name" />: <b><mm:field
name="name"/></b><br/>
+ <fmt:message key="urlinfo.name" />: <b><mm:field
name="title"/></b><br/>
<fmt:message key="urlinfo.description" />: <mm:field
name="description"/><br/>
<fmt:message key="urlinfo.url" />: <mm:field
name="url"/><br/>
<fmt:message key="urlform.valid" />:
Index: urlsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- urlsearch.jsp 3 Jan 2009 18:01:21 -0000 1.18
+++ urlsearch.jsp 6 Feb 2009 06:08:19 -0000 1.19
@@ -74,16 +74,8 @@
<%...@include file="../repository/searchpages.jsp"%>
<form action="SecondaryContentMassDeleteAction.do?object_type=urls"
method="post" name="urlform">
<table border="0" width="100%" class="listcontent">
- <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>
- <c:if test="${fn:length(results) >1}">
- <input type="checkbox" name="selectall"
onclick="selectAll(this.checked, 'urlform', 'chk_');" value="on"/>
- </c:if>
</th>
<th nowrap="true"><a href="javascript:orderBy('name')"
class="headerlink"><fmt:message
key="urlsearch.namecolumn" /></a></th>
@@ -94,12 +86,9 @@
<c:set var="useSwapStyle">true</c:set>
<mm:listnodes referid="results">
<mm:import id="url">javascript:selectElement('<mm:field
name="number" />', '<mm:field
- name="name" escape="js-single-quotes"/>','<mm:field
name="url" />');</mm:import>
+ name="title" escape="js-single-quotes"/>','<mm:field
name="url" />');</mm:import>
<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['urlform'].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>
@@ -119,7 +108,7 @@
</c:if>
</td>
- <mm:field name="name" jspvar="name" write="false"/>
+ <mm:field name="title" jspvar="name" write="false"/>
<td onMouseDown="objClick(this);">${fn:substring(name, 0,
40)}<c:if test="${fn:length(name) > 40}">...</c:if></td>
<mm:field name="url" jspvar="url" write="false"/>
<td onMouseDown="objClick(this);">${fn:substring(url, 0,
40)}<c:if test="${fn:length(url) > 40}">...</c:if></td>
@@ -144,11 +133,6 @@
<c:set var="useSwapStyle">${!useSwapStyle}</c:set>
</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>
- </c:if>
- </tr>
</table>
</form>
</c:if>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
