Update of
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
In directory
james.mmbase.org:/tmp/cvs-serv31345/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults
Modified Files:
xslt.jsp Menu.jsp PortletSelect.jsp RelatedContent.jsp
Iframe.jsp ServerSideInclude.jsp ContentChannel.jsp
Content.jsp Jsp.jsp
Log Message:
CMSC-1253 - Reduce code duplication in edit_default templates - First attempt
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- xslt.jsp 24 Oct 2008 09:30:22 -0000 1.4
+++ xslt.jsp 23 Jan 2009 09:51:37 -0000 1.5
@@ -1,93 +1,24 @@
-<%...@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">
-
-<script type="text/javascript">
- function selectElement(contentelement, title) {
- document.forms['<portlet:namespace
/>form'].contentelement.value = contentelement;
- document.forms['<portlet:namespace
/>form'].contentelementtitle.value = title;
- }
- function selectPage(page, path, positions) {
- document.forms['<portlet:namespace />form'].page.value = page;
- document.forms['<portlet:namespace />form'].pagepath.value =
path;
-
- var selectWindow = document.forms['<portlet:namespace
/>form'].window;
- for (var i = selectWindow.options.length -1 ; i >=0 ; i--) {
- selectWindow.options[i] = null;
- }
- for (var i = 0 ; i < positions.length ; i++) {
- var position = positions[i];
- selectWindow.options[selectWindow.options.length] = new
Option(position, position);
- }
- }
- function erase(field) {
- document.forms['<portlet:namespace />form'][field].value = '';
- }
- function eraseList(field) {
- document.forms['<portlet:namespace
/>form'][field].selectedIndex = -1;
- }
-</script>
-
-<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">
+ <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">
<tr>
<td colspan="2"><fmt:message key="edit_defaults.source" />:</td>
<td><cmsc:text var="source" /></td>
</tr>
- <tr>
- <td colspan="2"><fmt:message key="edit_defaults.view" />:</td>
- <td>
- <cmsc:select var="view">
- <c:forEach var="v" items="${views}">
- <cmsc:option value="${v.id}"
name="${v.title}" />
- </c:forEach>
- </cmsc:select>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- <h4><fmt:message key="edit_defaults.clickpage" /></h4>
- </td>
- </tr>
- <tr>
- <td><fmt:message key="edit_defaults.page" />:</td>
- <td align="right">
- <a href="<c:url
value='/editors/site/select/SelectorPage.do?channel=${page}' />"
- target="selectpage"
onclick="openPopupWindow('selectpage', 340, 400)">
- <img src="<cmsc:staticurl
page='/editors/gfx/icons/select.png'/>" alt="<fmt:message
key="edit_defaults.pageselect" />"/></a>
- <a
href="javascript:erase('page');erase('pagepath');eraseList('window')">
- <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="${page}" notfound="skip">
- <mm:field name="path" id="pagepath"
write="false" />
- </mm:node>
- </mm:cloud>
- <input type="hidden" name="page" value="${page}" />
- <input type="text" name="pagepath" value="${pagepath}"
disabled="true" />
- </tr>
- <tr>
- <td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
- <cmsc:select var="window">
- <c:forEach var="position"
items="${pagepositions}">
- <cmsc:option value="${position}" />
- </c:forEach>
- </cmsc:select>
- </td>
- </tr>
+ <%-- View selector --%>
+ <c:import url="sections/viewselector.jsp" />
- <tr>
- <td colspan="3">
- <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>
-</form>
+ <%-- Click to page options --%>
+ <c:import url="sections/clicktopage.jsp" />
+
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
\ No newline at end of file
Index: Menu.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Menu.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Menu.jsp 23 Jun 2008 05:32:27 -0000 1.6
+++ Menu.jsp 23 Jan 2009 09:51:37 -0000 1.7
@@ -1,37 +1,21 @@
-<%...@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>
+ <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 method="POST" name="<portlet:namespace />form"
action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>" target="_parent">
+ <table class="editcontent">
-<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>
- <tr>
- <td><fmt:message key="edit_defaults.view" />:</td>
- <td>
- <cmsc:select var="view">
- <c:forEach var="v" items="${views}">
- <cmsc:option value="${v.id}"
name="${v.title}" />
- </c:forEach>
- </cmsc:select>
- </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>
-</form>
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
+
+ <%-- View selector --%>
+ <c:import url="sections/viewselector.jsp" />
+
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
Index: PortletSelect.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/PortletSelect.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PortletSelect.jsp 12 Dec 2006 09:38:19 -0000 1.4
+++ PortletSelect.jsp 23 Jan 2009 09:51:37 -0000 1.5
@@ -1,11 +1,10 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp"%>
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
<div class="portlet-config-canvas">
<c:if test="${not empty definitions}">
<h3><fmt:message key="edit_defaults.createportlet" /></h3>
- <form name="<portlet:namespace />create_form" method="post"
target="_parent"
- action="<cmsc:actionURL><cmsc:param name="action"
value="create"/></cmsc:actionURL>">
-
+ <form name="<portlet:namespace />create_form" method="post"
target="_parent" action="<cmsc:actionURL><cmsc:param name="action"
value="create"/></cmsc:actionURL>">
<table class="editcontent">
<tr>
<td>
@@ -95,7 +94,8 @@
<tr>
<td colspan="2">
<a
href="javascript:document.forms['<portlet:namespace />select_form'].submit()"
class="button">
- <img src="<cmsc:staticurl
page='/editors/gfx/icons/save.png'/>" alt=""/> <fmt:message
key="edit_defaults.select" /></a>
+ <img src="<cmsc:staticurl
page='/editors/gfx/icons/save.png'/>" alt=""/> <fmt:message
key="edit_defaults.select" />
+ </a>
</td>
</tr>
</table>
Index: RelatedContent.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/RelatedContent.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RelatedContent.jsp 23 Aug 2007 11:27:29 -0000 1.1
+++ RelatedContent.jsp 23 Jan 2009 09:51:37 -0000 1.2
@@ -1,19 +1,14 @@
<%...@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>
+ <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">
-<form name="<portlet:namespace />form" method="post" target="_parent"
- action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>">
+ <%-- View selector --%>
+ <c:import url="sections/viewselector.jsp" />
-<table class="editcontent">
- <tr>
- <td colspan="2"><fmt:message key="edit_defaults.view" />:</td>
- <td><cmsc:select var="view">
- <c:forEach var="v" items="${views}">
- <cmsc:option value="${v.id}" name="${v.title}"
/>
- </c:forEach>
- </cmsc:select></td>
- </tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
<td>
@@ -25,12 +20,9 @@
</td>
</tr>
- <tr>
- <td colspan="3">
- <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>
-</form>
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
\ No newline at end of file
Index: Iframe.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Iframe.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Iframe.jsp 26 Jun 2008 12:44:47 -0000 1.7
+++ Iframe.jsp 23 Jan 2009 09:51:37 -0000 1.8
@@ -1,10 +1,10 @@
<%...@include file="/WEB-INF/templates/portletglobals.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">
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
-<table class="editcontent">
+<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">
<tr>
<td><fmt:message key="edit_defaults.define"/></td>
<mm:cloud>
@@ -88,12 +88,9 @@
</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>
-</form>
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
\ No newline at end of file
Index: ServerSideInclude.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ServerSideInclude.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ServerSideInclude.jsp 12 Dec 2006 09:38:19 -0000 1.4
+++ ServerSideInclude.jsp 23 Jan 2009 09:51:37 -0000 1.5
@@ -1,20 +1,18 @@
<%...@include file="/WEB-INF/templates/portletglobals.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">
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
-<table class="editcontent">
+<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">
<tr>
<td><fmt:message key="edit_defaults.source" />:</td>
<td><cmsc:text var="source" /></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>
-</form>
+
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
\ No newline at end of file
Index: ContentChannel.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/ContentChannel.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ContentChannel.jsp 18 Dec 2008 09:56:44 -0000 1.10
+++ ContentChannel.jsp 23 Jan 2009 09:51:37 -0000 1.11
@@ -1,93 +1,36 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp"%>
-<div class="portlet-config-canvas">
-<script type="text/javascript">
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
-function selectChannel(channel, path) {
- document.forms['<portlet:namespace />form'].contentchannel.value = channel;
- document.forms['<portlet:namespace />form'].contentchannelpath.value = path;
-}
-function selectPage(page, path, positions) {
- document.forms['<portlet:namespace />form'].page.value = page;
- document.forms['<portlet:namespace />form'].pagepath.value = path;
-
- var selectWindow = document.forms['<portlet:namespace />form'].window;
- for (var i = selectWindow.options.length -1 ; i >=0 ; i--) {
- selectWindow.options[i] = null;
- }
- for (var i = 0 ; i < positions.length ; i++) {
- var position = positions[i];
- selectWindow.options[selectWindow.options.length] = new Option(position,
position);
- }
-}
-function erase(field) {
- document.forms['<portlet:namespace />form'][field].value = '';
-}
-function eraseList(field) {
- document.forms['<portlet:namespace />form'][field].selectedIndex = -1;
-}
-
-var repositoryUrl = "<cmsc:staticurl page='/editors/repository/index.jsp'/>";
-function openRepositoryWithChannel() {
- contentchannel = document.forms['<portlet:namespace
/>form'].contentchannel.value;
- if(contentchannel == undefined || contentchannel == '') {
- alert('<fmt:message key="edit_defaults.preview.noChannel"/>');
- }
- else {
- if(confirm('<fmt:message key="edit_defaults.preview.loseChanges"/>')) {
- window.top.bottompane.location = repositoryUrl + '?channel=' +
contentchannel;
- }
- }
-}
-</script>
+<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">
-<form name="<portlet:namespace />form" method="post" target="_parent"
- action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>">
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
-<table class="editcontent">
- <tr>
- <td colspan="3">
- <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>
<tr>
<td colspan="3"><h3><fmt:message
key="edit_defaults.portletset"/></h3></td>
</tr>
- <tr>
- <td colspan="2"><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>
- <tr>
- <td colspan="2"><fmt:message key="edit_defaults.view" />:</td>
- <td>
- <cmsc:select var="view">
- <c:forEach var="v" items="${views}">
- <cmsc:option value="${v.id}" name="${v.title}" />
- </c:forEach>
- </cmsc:select>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- <h3><fmt:message key="edit_defaults.title" /></h3>
- </td>
- </tr>
+
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
+
+ <%-- View selector --%>
+ <c:import url="sections/viewselector.jsp" />
+
<tr>
<td><fmt:message key="edit_defaults.channel" />:</td>
<td align="right">
<a href="javascript:openRepositoryWithChannel()">
- <img src="<cmsc:staticurl page='/editors/gfx/icons/preview.png'/>"
alt="<fmt:message key="edit_defaults.preview"/>"/></a>
- <a href="<c:url
value='/editors/repository/select/SelectorChannel.do?channel=${contentchannel}'
/>"
- target="selectchannel" onclick="openPopupWindow('selectchannel',
340, 400)">
- <img src="<cmsc:staticurl
page='/editors/gfx/icons/select.png'/>" alt="<fmt:message
key="edit_defaults.channelselect" />"/></a>
+ <img src="<cmsc:staticurl
page='/editors/gfx/icons/preview.png'/>" alt="<fmt:message
key="edit_defaults.preview"/>"/>
+ </a>
+ <a href="<c:url
value='/editors/repository/select/SelectorChannel.do?channel=${contentchannel}'
/>" target="selectchannel" onclick="openPopupWindow('selectchannel', 340,
400)">
+ <img
src="<cmsc:staticurl page='/editors/gfx/icons/select.png'/>" alt="<fmt:message
key="edit_defaults.channelselect" />"/>
+ </a>
<a
href="javascript:erase('contentchannel');erase('contentchannelpath')">
- <img src="<cmsc:staticurl page='/editors/gfx/icons/erase.png'/>"
alt="<fmt:message key="edit_defaults.erase"/>"/></a>
+ <img src="<cmsc:staticurl
page='/editors/gfx/icons/erase.png'/>" alt="<fmt:message
key="edit_defaults.erase"/>"/>
+ </a>
</td>
<td>
<mm:cloud>
@@ -101,35 +44,37 @@
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.viewtype" />:</td>
- <td><cmsc:select var="viewtype">
+ <td>
+ <cmsc:select var="viewtype">
<cmsc:option value="oneDetail"
message="edit_defaults.viewtype.oneDetail" />
<cmsc:option value="list" message="edit_defaults.viewtype.list" />
<cmsc:option value="detail" message="edit_defaults.viewtype.detail" />
- </cmsc:select></td>
+ </cmsc:select>
+ </td>
</tr>
<tr>
<td colspan="3">
<h4><fmt:message key="edit_defaults.content" /></h4>
</td>
</tr>
- <tr>
- <td colspan="2"><fmt:message key="edit_defaults.uselifecycle" />:</td>
- <td><cmsc:select var="useLifecycle">
- <cmsc:option value="true" message="edit_defaults.yes" />
- <cmsc:option value="false" message="edit_defaults.no" />
- </cmsc:select></td>
- </tr>
+
+ <%-- Use lifecycle option--%>
+ <c:import url="sections/lifecycle.jsp" />
+
<tr>
<td colspan="2"><fmt:message key="edit_defaults.archive" />:</td>
- <td><cmsc:select var="archive">
+ <td>
+ <cmsc:select var="archive">
<cmsc:option value="all" message="edit_defaults.archive.all" />
<cmsc:option value="new" message="edit_defaults.archive.new" />
<cmsc:option value="old" message="edit_defaults.archive.old" />
- </cmsc:select></td>
+ </cmsc:select>
+ </td>
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.orderby" />:</td>
- <td><cmsc:select var="orderby">
+ <td>
+ <cmsc:select var="orderby">
<cmsc:option value="" message="edit_defaults.orderby.channelposition"
/>
<cmsc:option value="title" message="edit_defaults.orderby.title" />
<cmsc:option value="description"
message="edit_defaults.orderby.description" />
@@ -137,14 +82,17 @@
<cmsc:option value="lastmodifieddate"
message="edit_defaults.orderby.lastmodifieddate" />
<cmsc:option value="publishdate"
message="edit_defaults.orderby.publishdate" />
<cmsc:option value="expiredate"
message="edit_defaults.orderby.expiredate" />
- </cmsc:select></td>
+ </cmsc:select>
+ </td>
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.direction" />:</td>
- <td><cmsc:select var="direction">
+ <td>
+ <cmsc:select var="direction">
<cmsc:option value="DOWN" message="edit_defaults.descending" />
<cmsc:option value="UP" message="edit_defaults.ascending" />
- </cmsc:select></td>
+ </cmsc:select>
+ </td>
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.startindex" />:</td>
@@ -171,22 +119,27 @@
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.usepaging" />:</td>
- <td><cmsc:select var="usePaging" default="false">
+ <td>
+ <cmsc:select var="usePaging"
default="false">
<cmsc:option value="true" message="edit_defaults.yes" />
<cmsc:option value="false" message="edit_defaults.no" />
- </cmsc:select></td>
+ </cmsc:select>
+ </td>
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.position" />:</td>
- <td><cmsc:select var="position">
+ <td>
+ <cmsc:select var="position">
<cmsc:option value="both" message="edit_defaults.position.both" />
<cmsc:option value="top" message="edit_defaults.position.top" />
<cmsc:option value="bottom" message="edit_defaults.position.bottom" />
- </cmsc:select></td>
+ </cmsc:select>
+ </td>
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.elementsperpage" />:</td>
- <td><cmsc:select var="elementsPerPage">
+ <td>
+ <cmsc:select var="elementsPerPage">
<cmsc:option value="" message="edit_defaults.unlimited" />
<cmsc:option value="5" />
<cmsc:option value="10" />
@@ -194,66 +147,38 @@
<cmsc:option value="20" />
<cmsc:option value="25" />
<cmsc:option value="50" />
- </cmsc:select></td>
+ </cmsc:select>
+ </td>
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.numberofpages" />:</td>
- <td><cmsc:select var="showPages">
+ <td>
+ <cmsc:select var="showPages">
<cmsc:option value="" message="edit_defaults.unlimited" />
<cmsc:option value="5" />
<cmsc:option value="10" />
<cmsc:option value="15" />
<cmsc:option value="20" />
- </cmsc:select></td>
+ </cmsc:select>
+ </td>
</tr>
<tr>
<td colspan="2"><fmt:message key="edit_defaults.pagesindex" />:</td>
- <td><cmsc:select var="pagesIndex">
+ <td>
+ <cmsc:select var="pagesIndex">
<cmsc:option value="center" message="edit_defaults.pagesindex.center"
/>
<cmsc:option value="forward"
message="edit_defaults.pagesindex.forward" />
<cmsc:option value="half-full"
message="edit_defaults.pagesindex.half-full" />
- </cmsc:select></td>
- </tr>
- <tr>
- <td colspan="3">
- <h4><fmt:message key="edit_defaults.clickpage" /></h4>
- </td>
- </tr>
- <tr>
- <td><fmt:message key="edit_defaults.page" />:</td>
- <td align="right">
- <a href="<c:url
value='/editors/site/select/SelectorPage.do?channel=${page}' />"
- target="selectpage" onclick="openPopupWindow('selectpage', 340,
400)">
- <img src="<cmsc:staticurl
page='/editors/gfx/icons/select.png'/>" alt="<fmt:message
key="edit_defaults.channelselect" />"/></a>
- <a
href="javascript:erase('page');erase('pagepath');eraseList('window')">
- <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="${page}" notfound="skip">
- <mm:field name="path" id="pagepath" write="false" />
- </mm:node>
- </mm:cloud>
- <input type="hidden" name="page" value="${page}" />
- <input type="text" name="pagepath" value="${pagepath}" disabled="true" />
- </tr>
- <tr>
- <td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
- <cmsc:select var="window">
- <c:forEach var="position" items="${pagepositions}">
- <cmsc:option value="${position}" />
- </c:forEach>
</cmsc:select>
</td>
</tr>
- <tr>
- <td colspan="3">
- <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>
-</form>
+ <%-- Click to page options --%>
+ <c:import url="sections/clicktopage.jsp" />
+
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
\ No newline at end of file
Index: Content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Content.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Content.jsp 23 Jun 2008 05:32:27 -0000 1.6
+++ Content.jsp 23 Jan 2009 09:51:37 -0000 1.7
@@ -1,60 +1,21 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp"%>
-<div class="portlet-config-canvas">
-<script type="text/javascript">
- function selectElement(contentelement, title) {
- document.forms['<portlet:namespace
/>form'].contentelement.value = contentelement;
- document.forms['<portlet:namespace
/>form'].contentelementtitle.value = title;
- }
- function selectPage(page, path, positions) {
- document.forms['<portlet:namespace />form'].page.value = page;
- document.forms['<portlet:namespace />form'].pagepath.value =
path;
-
- var selectWindow = document.forms['<portlet:namespace
/>form'].window;
- for (var i = selectWindow.options.length -1 ; i >=0 ; i--) {
- selectWindow.options[i] = null;
- }
- for (var i = 0 ; i < positions.length ; i++) {
- var position = positions[i];
- selectWindow.options[selectWindow.options.length] = new
Option(position, position);
- }
- }
- function erase(field) {
- document.forms['<portlet:namespace />form'][field].value = '';
- }
- function eraseList(field) {
- document.forms['<portlet:namespace
/>form'][field].selectedIndex = -1;
- }
-</script>
-
-<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>">
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
-<table class="editcontent">
+<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">
<tr>
<td colspan="3" align="center"><h4><fmt:message
key="edit_defaults.portletset"/></h4></td>
</tr>
- <tr>
- <td colspan="2"><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>
- <tr>
- <td colspan="2"><fmt:message key="edit_defaults.view" />:</td>
- <td>
- <cmsc:select var="view">
- <c:forEach var="v" items="${views}">
- <cmsc:option value="${v.id}"
name="${v.title}" />
- </c:forEach>
- </cmsc:select>
- </td>
- </tr>
+
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
+
+ <%-- View selector --%>
+ <c:import url="sections/viewselector.jsp" />
+
+ <%-- Content element selector --%>
<tr>
<td colspan="3"><h4><fmt:message
key="edit_defaults.contentset"/></h4></td>
</tr>
@@ -76,53 +37,16 @@
<input type="hidden" name="contentelement"
value="${contentelement}" />
<input type="text" name="contentelementtitle"
value="${contentelementtitle}" disabled="true" />
</tr>
- <tr>
- <td colspan="2"><fmt:message key="edit_defaults.uselifecycle"
/>:</td>
- <td><cmsc:select var="useLifecycle">
- <cmsc:option value="true" message="edit_defaults.yes" />
- <cmsc:option value="false" message="edit_defaults.no" />
- </cmsc:select></td>
- </tr>
- <tr>
- <td colspan="3">
- <h4><fmt:message key="edit_defaults.clickpage" /></h4>
- </td>
- </tr>
- <tr>
- <td><fmt:message key="edit_defaults.page" />:</td>
- <td align="right">
- <a href="<c:url
value='/editors/site/select/SelectorPage.do?channel=${page}' />"
- target="selectpage"
onclick="openPopupWindow('selectpage', 340, 400)">
- <img src="<cmsc:staticurl
page='/editors/gfx/icons/select.png'/>" alt="<fmt:message
key="edit_defaults.pageselect" />"/></a>
- <a
href="javascript:erase('page');erase('pagepath');eraseList('window')">
- <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="${page}" notfound="skip">
- <mm:field name="path" id="pagepath"
write="false" />
- </mm:node>
- </mm:cloud>
- <input type="hidden" name="page" value="${page}" />
- <input type="text" name="pagepath" value="${pagepath}"
disabled="true" />
- </tr>
- <tr>
- <td colspan="2"><fmt:message key="edit_defaults.window" />:</td>
- <td>
- <cmsc:select var="window">
- <c:forEach var="position"
items="${pagepositions}">
- <cmsc:option value="${position}" />
- </c:forEach>
- </cmsc:select>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- <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>
-</form>
+ <%-- Use lifecycle option--%>
+ <c:import url="sections/lifecycle.jsp" />
+
+ <%-- Click to page options --%>
+ <c:import url="sections/clicktopage.jsp" />
+
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
\ No newline at end of file
Index: Jsp.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/edit_defaults/Jsp.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Jsp.jsp 23 Jun 2008 05:32:27 -0000 1.6
+++ Jsp.jsp 23 Jan 2009 09:51:37 -0000 1.7
@@ -1,37 +1,21 @@
-<%...@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>
+ <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 method="POST" name="<portlet:namespace />form"
action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>" target="_parent">
+ <table class="editcontent">
-<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>
- <tr>
- <td><fmt:message key="edit_defaults.view" />:</td>
- <td>
- <cmsc:select var="view">
- <c:forEach var="v" items="${views}">
- <cmsc:option value="${v.id}"
name="${v.title}" />
- </c:forEach>
- </cmsc:select>
- </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>
-</form>
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
+
+ <%-- View selector --%>
+ <c:import url="sections/viewselector.jsp" />
+
+ <%-- 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
