Update of
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
In directory
james.mmbase.org:/tmp/cvs-serv16791/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
Modified Files:
xslt.jsp RelatedContent.jsp ContentChannel.jsp
ServerSideInclude.jsp Iframe.jsp Content.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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- xslt.jsp 23 Jan 2009 09:51:37 -0000 1.5
+++ xslt.jsp 23 Jan 2009 21:24:34 -0000 1.6
@@ -5,6 +5,10 @@
<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">
+
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
+
<tr>
<td colspan="2"><fmt:message
key="edit_defaults.source" />:</td>
<td><cmsc:text var="source" /></td>
Index: RelatedContent.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RelatedContent.jsp 23 Jan 2009 09:51:37 -0000 1.2
+++ RelatedContent.jsp 23 Jan 2009 21:24:34 -0000 1.3
@@ -6,6 +6,9 @@
<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" />
+
<%-- View selector --%>
<c:import url="sections/viewselector.jsp" />
Index: ContentChannel.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ContentChannel.jsp 23 Jan 2009 09:51:37 -0000 1.11
+++ ContentChannel.jsp 23 Jan 2009 21:24:34 -0000 1.12
@@ -9,10 +9,6 @@
<%-- Save button --%>
<c:import url="sections/savebutton.jsp" />
- <tr>
- <td colspan="3"><h3><fmt:message
key="edit_defaults.portletset"/></h3></td>
- </tr>
-
<%-- Portletdefinition display --%>
<c:import url="sections/definitiondisplay.jsp" />
Index: ServerSideInclude.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ServerSideInclude.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ServerSideInclude.jsp 23 Jan 2009 09:51:37 -0000 1.5
+++ ServerSideInclude.jsp 23 Jan 2009 21:24:34 -0000 1.6
@@ -5,6 +5,10 @@
<h3><fmt:message key="edit_defaults.title" /></h3>
<form name="<portlet:namespace />form" method="post"
action="<cmsc:actionURL />" target="_parent">
<table class="editcontent">
+
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
+
<tr>
<td><fmt:message key="edit_defaults.source"
/>:</td>
<td><cmsc:text var="source" /></td>
Index: Iframe.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Iframe.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Iframe.jsp 23 Jan 2009 09:51:37 -0000 1.8
+++ Iframe.jsp 23 Jan 2009 21:24:34 -0000 1.9
@@ -5,16 +5,10 @@
<h3><fmt:message key="edit_defaults.title" /></h3>
<form name="<portlet:namespace />form" method="post"
action="<cmsc:actionURL />" target="_parent">
<table class="editcontent">
- <tr>
- <td><fmt:message
key="edit_defaults.define"/></td>
- <mm:cloud>
- <mm:node
number="${requestScope['com.finalist.cmsc.beans.om.definitionId']}"
notfound="skip">
- <td>
- <input type="text"
name="portletname" value="<mm:field name='title'/>" disabled="disabled"/>
- </td>
- </mm:node>
- </mm:cloud>
- </tr>
+
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
+
<tr>
<td><fmt:message key="edit_defaults.source"
/>:</td>
<td><cmsc:text var="source" /></td>
Index: Content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Content.jsp 23 Jan 2009 09:51:37 -0000 1.7
+++ Content.jsp 23 Jan 2009 21:24:34 -0000 1.8
@@ -5,9 +5,6 @@
<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">
- <tr>
- <td colspan="3" align="center"><h4><fmt:message
key="edit_defaults.portletset"/></h4></td>
- </tr>
<%-- Portletdefinition display --%>
<c:import url="sections/definitiondisplay.jsp" />
@@ -16,27 +13,7 @@
<c:import url="sections/viewselector.jsp" />
<%-- Content element selector --%>
- <tr>
- <td colspan="3"><h4><fmt:message
key="edit_defaults.contentset"/></h4></td>
- </tr>
- <tr>
- <td><fmt:message
key="edit_defaults.contentelement" />:</td>
- <td align="right">
- <a href="<c:url
value='/editors/repository/select/index.jsp?contentnumber=${contentelement}' />"
- target="selectcontentelement"
onclick="openPopupWindow('selectcontentelement', 900, 400)">
- <img
src="<cmsc:staticurl page='/editors/gfx/icons/select.png'/>" alt="<fmt:message
key="edit_defaults.contentselect" />"/></a>
- <a
href="javascript:erase('contentelement');erase('contentelementtitle')">
- <img src="<cmsc:staticurl
page='/editors/gfx/icons/erase.png'/>" alt="<fmt:message
key="edit_defaults.erase"/>"/></a>
- </td>
- <td>
- <mm:cloud>
- <mm:node number="${contentelement}"
notfound="skip">
- <mm:field name="title"
id="contentelementtitle" write="false" />
- </mm:node>
- </mm:cloud>
- <input type="hidden" name="contentelement"
value="${contentelement}" />
- <input type="text" name="contentelementtitle"
value="${contentelementtitle}" disabled="true" />
- </tr>
+ <c:import url="sections/selectelement.jsp" />
<%-- Use lifecycle option--%>
<c:import url="sections/lifecycle.jsp" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
