Update of
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
In directory
james.mmbase.org:/tmp/cvs-serv28336/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
Modified Files:
xslt.jsp Iframe.jsp Jsp.jsp Content.jsp Menu.jsp
RelatedContent.jsp ServerSideInclude.jsp ContentChannel.jsp
Log Message:
CMSC-1253 - Reduce code duplication in edit_default templates
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
See also: http://www.mmbase.org/jira/browse/CMSC-1253
Index: xslt.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/xslt.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- xslt.jsp 23 Jan 2009 21:24:34 -0000 1.6
+++ xslt.jsp 25 Jan 2009 15:30:34 -0000 1.7
@@ -2,7 +2,6 @@
<%...@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">
<table class="editcontent">
Index: Iframe.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Iframe.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Iframe.jsp 23 Jan 2009 21:24:34 -0000 1.9
+++ Iframe.jsp 25 Jan 2009 15:30:34 -0000 1.10
@@ -2,7 +2,6 @@
<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
<div class="portlet-config-canvas">
- <h3><fmt:message key="edit_defaults.title" /></h3>
<form name="<portlet:namespace />form" method="post"
action="<cmsc:actionURL />" target="_parent">
<table class="editcontent">
@@ -10,20 +9,21 @@
<c:import url="sections/definitiondisplay.jsp" />
<tr>
- <td><fmt:message key="edit_defaults.source"
/>:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.source" />:</td>
<td><cmsc:text var="source" /></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.height"
/>:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.height" />:</td>
<td><cmsc:text var="height" /></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.width"
/>:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.width" />:</td>
<td><cmsc:text var="width" /></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.scrolling"
/>:</td>
- <td><cmsc:select var="scrolling">
+ <td colspan="2"><fmt:message
key="edit_defaults.scrolling" />:</td>
+ <td>
+ <cmsc:select var="scrolling">
<cmsc:option value="no"
message="edit_defaults.scrolling.no" />
<cmsc:option value="yes"
message="edit_defaults.scrolling.yes"/>
<cmsc:option value="auto"
message="edit_defaults.scrolling.auto" />
@@ -31,24 +31,26 @@
</td>
</tr>
<tr>
- <td><fmt:message
key="edit_defaults.frameBorder" />:</td>
- <td><cmsc:select var="frameBorder">
+ <td colspan="2"><fmt:message
key="edit_defaults.frameBorder" />:</td>
+ <td>
+ <cmsc:select var="frameBorder">
<cmsc:option value="0"
message="edit_defaults.frameBorder.no" />
<cmsc:option value="1"
message="edit_defaults.frameBorder.yes" />
</cmsc:select>
</td>
</tr>
<tr>
- <td><fmt:message
key="edit_defaults.marginHeight" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.marginHeight" />:</td>
<td><cmsc:text var="marginHeight" /></td>
</tr>
<tr>
- <td><fmt:message
key="edit_defaults.marginWidth" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.marginWidth" />:</td>
<td><cmsc:text var="marginWidth" /></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.align"
/>:</td>
- <td><cmsc:select var="align">
+ <td colspan="2"><fmt:message
key="edit_defaults.align" />:</td>
+ <td>
+ <cmsc:select var="align">
<cmsc:option value="top"
message="edit_defaults.align.top" />
<cmsc:option value="middle"
message="edit_defaults.align.middle" />
<cmsc:option value="bottom"
message="edit_defaults.align.bottom" />
@@ -58,24 +60,25 @@
</td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.style"
/>:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.style" />:</td>
<td><cmsc:text var="style" /></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.class"
/>:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.class" />:</td>
<td><cmsc:text var="class" /></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.id" />:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.id" />:</td>
<td><cmsc:text var="id" /></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.name"
/>:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.name" />:</td>
<td><cmsc:text var="name" /></td>
</tr>
<tr>
- <td><fmt:message key="edit_defaults.usetable"
/>:</td>
- <td><cmsc:select var="useTable">
+ <td colspan="2"><fmt:message
key="edit_defaults.usetable" />:</td>
+ <td>
+ <cmsc:select var="useTable">
<cmsc:option value="true"
message="edit_defaults.usetable.yes" />
<cmsc:option value="false"
message="edit_defaults.usetable.no" />
</cmsc:select>
Index: Jsp.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Jsp.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Jsp.jsp 23 Jan 2009 09:51:37 -0000 1.7
+++ Jsp.jsp 25 Jan 2009 15:30:34 -0000 1.8
@@ -2,8 +2,6 @@
<%...@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">
<table class="editcontent">
Index: Content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Content.jsp 23 Jan 2009 21:24:34 -0000 1.8
+++ Content.jsp 25 Jan 2009 15:30:34 -0000 1.9
@@ -2,7 +2,6 @@
<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
<div class="portlet-config-canvas">
- <h3><fmt:message key="edit_defaults.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">
Index: Menu.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Menu.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Menu.jsp 23 Jan 2009 09:51:37 -0000 1.7
+++ Menu.jsp 25 Jan 2009 15:30:34 -0000 1.8
@@ -2,8 +2,6 @@
<%...@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">
<table class="editcontent">
Index: RelatedContent.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- RelatedContent.jsp 23 Jan 2009 21:24:34 -0000 1.3
+++ RelatedContent.jsp 25 Jan 2009 15:30:34 -0000 1.4
@@ -2,7 +2,6 @@
<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
<div class="portlet-config-canvas">
- <h3><fmt:message key="edit_defaults.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">
Index: ServerSideInclude.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ServerSideInclude.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ServerSideInclude.jsp 23 Jan 2009 21:24:34 -0000 1.6
+++ ServerSideInclude.jsp 25 Jan 2009 15:30:34 -0000 1.7
@@ -2,7 +2,6 @@
<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
<div class="portlet-config-canvas">
- <h3><fmt:message key="edit_defaults.title" /></h3>
<form name="<portlet:namespace />form" method="post"
action="<cmsc:actionURL />" target="_parent">
<table class="editcontent">
@@ -10,7 +9,7 @@
<c:import url="sections/definitiondisplay.jsp" />
<tr>
- <td><fmt:message key="edit_defaults.source"
/>:</td>
+ <td colspan="2"><fmt:message
key="edit_defaults.source" />:</td>
<td><cmsc:text var="source" /></td>
</tr>
Index: ContentChannel.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ContentChannel.jsp 23 Jan 2009 21:24:34 -0000 1.12
+++ ContentChannel.jsp 25 Jan 2009 15:30:34 -0000 1.13
@@ -2,7 +2,6 @@
<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
<div class="portlet-config-canvas">
- <h3><fmt:message key="edit_defaults.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">
@@ -16,6 +15,9 @@
<c:import url="sections/viewselector.jsp" />
<tr>
+ <td colspan="3"><h4><fmt:message
key="edit_defaults.contentset"/></h4></td>
+ </tr>
+ <tr>
<td><fmt:message key="edit_defaults.channel"
/>:</td>
<td align="right">
<a
href="javascript:openRepositoryWithChannel()">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
