Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory
james.mmbase.org:/tmp/cvs-serv19279/cmsc/contentrepository/src/webapp/editors/repository
Modified Files:
channeldeletewarning.jsp
Log Message:
CMSC-429 - Updated translations of deleting a channel
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-429
Index: channeldeletewarning.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/channeldeletewarning.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- channeldeletewarning.jsp 28 Nov 2007 13:39:52 -0000 1.4
+++ channeldeletewarning.jsp 8 May 2008 17:09:06 -0000 1.5
@@ -22,7 +22,6 @@
<div class="editor">
<div class="body">
-
<c:set var="relcount1" value="0"/>
<c:set var="relcount2" value="0"/>
@@ -46,43 +45,68 @@
</mm:list>
<p>
- <fmt:message key="channeldelete.warning" />
- <b><mm:node number="$parentchannel"><mm:field
name="name" /></mm:node></b>.
- </p>
- <p>
- <fmt:message key="channeldelete.intro" />
+ <fmt:message key="channeldelete.warning">
+ <fmt:param><b><mm:node number="$parentchannel"><mm:field
name="name" /></mm:node></b></fmt:param>
+ </fmt:message>
<ul>
<li>
<fmt:message key="channeldelete.message.1">
<fmt:param >${relcount1}</fmt:param>
</fmt:message>
</li>
+ <c:if test="${relcount2 ne 0}">
<li>
<fmt:message key="channeldelete.message.2">
<fmt:param >${relcount2}</fmt:param>
</fmt:message>
</li>
+ </c:if>
</ul>
</p>
<p>
<fmt:message key="channeldelete.choice" />
- <ul>
- <li>
+ <table>
+ <tbody class="hover">
+ <tr>
+ <td style="width: 16px;">
<a class="channeldelete"
href="javascript:document.forms['deleteAllForm'].remove.value='delete';document.forms['deleteAllForm'].submit();">
- <img src="../gfx/icons/delete.png" width="16" height="16"
alt="<fmt:message key="channeldelete.remove" />" />
- <fmt:message key="channeldelete.remove.message" />
- </li>
- <li>
+ <img src="../gfx/icons/delete.png" width="16" height="16"
alt="<fmt:message key="channeldelete.remove" />" /></a>
+ </td>
+ <td style="width: 130px;">
+ <b><fmt:message key="channeldelete.remove.message" /></b>
+ </td>
+ <td>
+ <fmt:message key="channeldelete.remove.message.text" />
+ </td>
+ </tr>
+
+ <c:if test="${relcount2 ne 0}">
+ <tr>
+ <td>
<a class="channeldelete"
href="javascript:document.forms['deleteAllForm'].remove.value='move';document.forms['deleteAllForm'].submit();">
- <img src="../gfx/icons/arrow_right.png" width="16" height="16"
alt="<fmt:message key="channeldelete.move" />" />
- <fmt:message key="channeldelete.move.message" />
- </li>
- <li>
+ <img src="../gfx/icons/arrow_right.png" width="16" height="16"
alt="<fmt:message key="channeldelete.move" />" /></a>
+ </td>
+ <td>
+ <b><fmt:message key="channeldelete.move.message" /></b>
+ </td>
+ <td>
+ <fmt:message key="channeldelete.move.message.text" />
+ </td>
+ </tr>
+ </c:if>
+ <tr>
+ <td>
<a class="channeldelete"
href="javascript:document.forms['deleteAllForm'].remove.value='cancel';document.forms['deleteAllForm'].submit();">
- <img src="../gfx/icons/arrow_undo.png" width="16" height="16"
alt="<fmt:message key="channeldelete.cancel" />" />
- <fmt:message key="channeldelete.cancel.message" />
- </li>
- </ul>
+ <img src="../gfx/icons/arrow_undo.png" width="16" height="16"
alt="<fmt:message key="channeldelete.cancel" />" /></a>
+ </td>
+ <td>
+ <b><fmt:message key="channeldelete.cancel.message" /></b>
+ </td>
+ <td>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</p>
<form action="ChannelDelete.do" method="post" onsubmit="return
unlinkAll();" name="deleteAllForm">
@@ -91,6 +115,9 @@
</form>
<div style="clear:both; height:10px;"></div>
+ </div>
+ <div class="editor">
+ <br />
<div class="ruler_green"><div><fmt:message key="channeldelete.content"
/></div></div>
<mm:import id="lastotype" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
