Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login
In directory
james.mmbase.org:/tmp/cvs-serv11048/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login
Modified Files:
register.jsp login.jsp
Log Message:
CMSC-1253 - Reduce code duplication in edit_default templates
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login
See also: http://www.mmbase.org/jira/browse/CMSC-1253
Index: register.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/register.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- register.jsp 13 Feb 2009 03:29:51 -0000 1.4
+++ register.jsp 21 Feb 2009 10:28:18 -0000 1.5
@@ -1,20 +1,18 @@
-<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
+<%...@include file="/WEB-INF/templates/portletglobals.jsp"%>
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
+
<div class="portlet-config-canvas">
-<h3><fmt:message key="edit_defaults.register.title" /></h3>
+ <form name="<portlet:namespace />form" method="post" target="_parent"
action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>">
+ <table class="editcontent">
-<form
- method="post"
- name="<portlet:namespace />form"
- action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>"
- target="_parent"
->
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
-<table class="editcontent">
<tr>
- <td colspan="2"><h4><fmt:message key="edit_defaults.register.group"
/></h4></td>
+ <td colspan="3"><h4><fmt:message
key="edit_defaults.register.group" /></h4></td>
</tr>
<tr>
- <td ><fmt:message key="edit_defaults.register.defaultgroup" />:</td>
+ <td colspan="2" ><fmt:message
key="edit_defaults.register.defaultgroup" />:</td>
<td>
<cmsc:select var="groupName">
<cmsc:option value="nogroup"
message="edit_defaults.register.nogroup" />
@@ -25,40 +23,36 @@
</td>
</tr>
<tr>
- <td colspan="2"><h4><fmt:message key="edit_defaults.register.subject"
/></h4></td>
+ <td colspan="3"><h4><fmt:message
key="edit_defaults.register.subject" /></h4></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.register.emailfromname" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.register.emailfromname" />:</td>
<td>
<input type="text" name="emailFromName"
value="${fn:escapeXml(emailFromName)}" />
</td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.register.emailfromemail" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.register.emailfromemail" />:</td>
<td>
<input type="text" name="emailFromEmail"
value="${fn:escapeXml(emailFromEmail)}" />
</td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.register.emailsubject" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.register.emailsubject" />:</td>
<td>
<input type="text" name="emailSubject"
value="${fn:escapeXml(emailSubject)}" />
</td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.register.emailtext" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.register.emailtext" />:</td>
<td>
<textarea name="emailText" rows="5" cols="20"><c:out
value="${emailText}" /></textarea>
</td>
</tr>
- <tr>
- <td colspan="2">
- <a href="javascript:document.forms['<portlet:namespace
/>form'].submit()" class="button">
- <img src="<cmsc:staticurl page='/editors/gfx/icons/save.png'/>"
alt=""/>
- <fmt:message key="edit_defaults.save" />
- </a>
- </td>
- </tr>
-</table>
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
\ No newline at end of file
Index: login.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/login.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- login.jsp 12 Dec 2008 13:36:41 -0000 1.4
+++ login.jsp 21 Feb 2009 10:28:18 -0000 1.5
@@ -1,49 +1,44 @@
-<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
+<%...@include file="/WEB-INF/templates/portletglobals.jsp"%>
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
+
<div class="portlet-config-canvas">
-<h3><fmt:message key="edit_defaults.title" /></h3>
-<form
- method="post"
- name="<portlet:namespace />form"
- action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>"
- target="_parent"
->
+ <form name="<portlet:namespace />form" method="post" target="_parent"
action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>">
+ <table class="editcontent">
+
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
-<table class="editcontent">
<tr>
- <td colspan="2"><h4><fmt:message key="view.account.sendpassword"
/></h4></td>
+ <td colspan="3"><h4><fmt:message
key="view.account.sendpassword" /></h4></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.register.emailfromname" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.register.emailfromname" />:</td>
<td>
<input type="text" name="emailFromName"
value="${fn:escapeXml(emailFromName)}" />
</td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.register.emailfromemail" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.register.emailfromemail" />:</td>
<td>
<input type="text" name="emailFromEmail"
value="${fn:escapeXml(emailFromEmail)}" />
</td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.register.emailsubject" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.register.emailsubject" />:</td>
<td>
<input type="text" name="emailSubject"
value="${fn:escapeXml(emailSubject)}" />
</td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.register.emailtext" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.register.emailtext" />:</td>
<td>
<textarea name="emailText" rows="8" cols="25"><c:out
value="${emailText}" /></textarea>
</td>
</tr>
- <tr>
- <td colspan="2">
- <a href="javascript:document.forms['<portlet:namespace
/>form'].submit()" class="button">
- <img src="<cmsc:staticurl page='/editors/gfx/icons/save.png'/>"
alt=""/>
- <fmt:message key="edit_defaults.save" />
- </a>
- </td>
- </tr>
-</table>
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
