Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-mailfriend/src/webapp/WEB-INF/templates/view/mailfriend
In directory
james.mmbase.org:/tmp/cvs-serv15572/portlets-mailfriend/src/webapp/WEB-INF/templates/view/mailfriend
Modified Files:
basic.jsp
Log Message:
CMSC-1121 Backfix mailfriend from L1
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-mailfriend/src/webapp/WEB-INF/templates/view/mailfriend
See also: http://www.mmbase.org/jira/browse/CMSC-1121
Index: basic.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-mailfriend/src/webapp/WEB-INF/templates/view/mailfriend/basic.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- basic.jsp 7 Mar 2007 19:36:50 -0000 1.1
+++ basic.jsp 28 Oct 2008 13:37:35 -0000 1.2
@@ -1,4 +1,5 @@
<[EMAIL PROTECTED] file="/WEB-INF/templates/portletglobals.jsp"%>
+<cmsc:location var="cur" sitevar="site" />
<div class="kolombestel">
<mm:cloud method="asis">
<mm:import externid="elementId" required="true" from="request" />
@@ -27,10 +28,28 @@
</c:set>
</mm:node>
- <mm:node number="${elementId}" notfound="skip">
- <mm:field name="intro">
- <mm:isnotempty><p class="body"><mm:write
escape="none"/></p></mm:isnotempty></mm:field>
- </mm:node>
+ <p><fmt:message key="view.titleinfo"/></p>
+
+ <table cellpadding="0" cellspacing="0" border="0"
class="nopad">
+ <tr>
+ <td></td>
+ <td>
+ <label
class="upcase"><fmt:message key="view.link"/></label>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label for="url"><fmt:message
key="view.url"/></label>
+ </td>
+ <td>
+ <c:set var="articleUrlPath"
value="http://${site.urlfragment}/content/${articleIdValue}" />
+ <input type="text"
name="articleUrlPath" value="${articleUrlPath}" maxlength="255"
readonly="readonly"/>
+ <div></div>
+ </td>
+ </tr>
+ </table>
+
+ <p><fmt:message key="view.info"/></p>
<c:if test="${!empty errormessages['sendemail']}">
<font size="1" color="red"><fmt:message
key="${errormessages['sendemail']}" /></font>
@@ -43,9 +62,15 @@
<form name="<portlet:namespace />form" method="post"
action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>" >
<input type="hidden" name="articleNumber"
value="${articleIdValue}"/>
+ <input type="hidden" name="articleUrlPath"
value="${articleUrlPath}"/>
<mm:node number="${elementId}" notfound="skip">
<table cellpadding="0" cellspacing="0" border="0">
- <tr><td colspan="2"> </td></tr>
+ <tr>
+ <td></td>
+ <td>
+ <label
class="upcase"><fmt:message key="view.addressee"/></label>
+ </td>
+ </tr>
<tr>
<td>
<label
for="toname"><fmt:message key="view.toname"/></label>
@@ -75,6 +100,12 @@
</td>
</tr>
<tr>
+ <td></td>
+ <td>
+ <label
class="upcase"><fmt:message key="view.sender"/></label>
+ </td>
+ </tr>
+ <tr>
<td>
<label
for="fromname"><fmt:message key="view.fromname"/></label>
</td>
@@ -103,6 +134,14 @@
</td>
</tr>
<tr>
+ <td>
+ <label
for="message"><fmt:message key="view.message"/></label>
+ </td>
+ <td>
+ <textarea
name="message" rows="3" cols="20">${message}</textarea>
+ </td>
+ </tr>
+ <tr>
<td></td>
<td>
<font size="1" color="red"><b>*
<fmt:message key="view.mandatory"/> </b></font>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs