Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv24749/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
secondaryedit.jsp urlsearch.jsp urlform.jsp
Added Files:
urlcreate.jsp
Log Message:
CMSC-1281 Assets: Relate URLs to content element - New search screen
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1281
urlcreate.jsp is new
Index: secondaryedit.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/secondaryedit.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- secondaryedit.jsp 21 May 2007 18:06:16 -0000 1.2
+++ secondaryedit.jsp 19 Feb 2009 12:09:01 -0000 1.3
@@ -40,10 +40,19 @@
<html:hidden property="number"/>
<html:hidden property="returnUrl"/>
<table border="0">
+ <mm:cloud>
+ <mm:node number="${SecondaryEditForm.number}">
+ <mm:nodeinfo type="type" jspvar="nodetype" write="false"/>
<tr>
<td style="width: 150px"><fmt:message
key="secondaryedit.titlefield" /></td>
<td><html:text property="title" style="width:
350px"/></td>
</tr>
+ <c:if test="${nodetype == 'urls'}">
+ <tr>
+ <td style="width: 150px"><fmt:message
key="secondaryedit.urlfield" /></td>
+ <td><html:text property="url" style="width: 350px"/></td>
+ </tr>
+ </c:if>
<tr>
<td style="width: 150px"><fmt:message
key="secondaryedit.description" /></td>
<td><html:textarea property="description"
style="width: 350px; height:75px"/></td>
@@ -54,9 +63,6 @@
<html:submit
onclick="cancel();"><fmt:message key="secondaryedit.cancel" /></html:submit>
</td>
</tr>
- <mm:cloud>
- <mm:node
number="${SecondaryEditForm.number}">
- <mm:nodeinfo type="type"
jspvar="nodetype" write="false"/>
<c:if test="${nodetype ==
'images'}">
<tr>
<td colspan="2">
Index: urlsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- urlsearch.jsp 19 Feb 2009 07:38:41 -0000 1.23
+++ urlsearch.jsp 19 Feb 2009 12:09:01 -0000 1.24
@@ -168,8 +168,8 @@
<img src="../gfx/url.gif" title="${thumbnail_alt}"
alt="${thumbnail_alt}" width="120" height="100"/>
</div>
<div class="assetInfo">
- <mm:field name="title" jspvar="name"
write="false"/>
- ${fn:substring(name, 0, 40)}<c:if
test="${fn:length(name) > 40}">...</c:if>
+ <mm:field name="title" jspvar="title"
write="false"/>
+ ${fn:substring(title, 0, 40)}<c:if
test="${fn:length(title) > 40}">...</c:if>
<br/>
<mm:field name="valid" write="false"
jspvar="isValidUrl"/>
<c:choose>
@@ -197,8 +197,8 @@
<c:if test="${action == 'search'}">
<tr class="listheader">
<th width="55"></th>
- <th nowrap="true"><a href="javascript:orderBy('name')"
class="headerlink"><fmt:message
- key="urlsearch.namecolumn" /></a></th>
+ <th nowrap="true"><a href="javascript:orderBy('title')"
class="headerlink"><fmt:message
+ key="urlsearch.titlecolumn" /></a></th>
<th nowrap="true"><a href="javascript:orderBy('url')"
class="headerlink"><fmt:message
key="urlsearch.urlcolumn" /></a></th>
<th nowrap="true"><a href="javascript:orderBy('valid')"
@@ -220,8 +220,8 @@
<a href="javascript:showInfo(<mm:field name="number"
/>)">
<img src="../gfx/icons/info.png"
title="<fmt:message key="urlsearch.icon.info" />" /></a>
</td>
- <mm:field name="title" jspvar="name" write="false"/>
- <td
onMouseDown="initParentHref(this.parentNode)">${fn:substring(name, 0, 40)}<c:if
test="${fn:length(name) > 40}">...</c:if></td>
+ <mm:field name="title" jspvar="title" write="false"/>
+ <td
onMouseDown="initParentHref(this.parentNode)">${fn:substring(title, 0,
40)}<c:if test="${fn:length(title) > 40}">...</c:if></td>
<mm:field name="url" jspvar="url" write="false"/>
<td
onMouseDown="initParentHref(this.parentNode);">${fn:substring(url, 0, 40)}<c:if
test="${fn:length(url) > 40}">...</c:if></td>
<mm:field name="valid" write="false" jspvar="isValidUrl"/>
@@ -260,8 +260,7 @@
<div class="body">
<mm:url page="/editors/repository/select/SelectorChannel.do"
id="select_channel_url" write="false" />
<mm:url
page="/editors/resources/UrlInitAction.do?action=search&strict=${strict}"
id="search_url_url" write="false" />
-<mm:import jspvar="returnurl"
id="returnurl">/editors/repository/UrlAction.do?action=select</mm:import>
-<mm:url
page="/editors/WizardInitAction.do?assettype=urls&action=create&creation=${channelid}&returnurl=${returnurl}"
id="new_url_url" write="false" />
+<mm:url
page="/editors/resources/urlcreate.jsp?createdNode=0&channelid=${channelid}&strict=${strict}"
id="new_url_url" write="false" />
<mm:url
page="/editors/repository/HighFrequencyAsset.do?action=often&assetShow=${assetShow}&offset=0&channelid=all&assettypes=urls&strict=${strict}"
id="often_show_urls" write="false"/>
<ul class="shortcuts">
<li><a href="${often_show_urls}"><fmt:message
key="urlselect.link.allchannel" /></a></li>
Index: urlform.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlform.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- urlform.jsp 17 Feb 2009 13:55:22 -0000 1.6
+++ urlform.jsp 19 Feb 2009 12:09:01 -0000 1.7
@@ -1,8 +1,8 @@
<html:hidden property="contenttypes" value="urls" />
<table border="0">
<tr>
- <td style="width: 105px"><fmt:message key="urlform.name" /></td>
- <td><html:text style="width: 200px" property="name"/></td>
+ <td style="width: 105px"><fmt:message key="urlform.title" /></td>
+ <td><html:text style="width: 200px" property="title"/></td>
</tr>
<tr>
<td><fmt:message key="imageform.description" /></td>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
