Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/WEB-INF/templates/edit_defaults
In directory
james.mmbase.org:/tmp/cvs-serv10020/portlets-tagcloud/src/webapp/WEB-INF/templates/edit_defaults
Modified Files:
Tag.jsp TagRelated.jsp TagCloud.jsp
Log Message:
CMSC-1253 - Reduce code duplication in edit_default templates
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/WEB-INF/templates/edit_defaults
See also: http://www.mmbase.org/jira/browse/CMSC-1253
Index: Tag.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/WEB-INF/templates/edit_defaults/Tag.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Tag.jsp 15 Sep 2008 09:40:19 -0000 1.1
+++ Tag.jsp 21 Feb 2009 09:37:56 -0000 1.2
@@ -1,81 +1,27 @@
<%...@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>
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
-<h3><fmt:message key="edit_defaults.title" /></h3>
+<div class="portlet-config-canvas">
+ <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>">
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
-<table class="editcontent">
+ <%-- View selector --%>
+ <c:import url="sections/viewselector.jsp" />
<tr>
<td colspan="2"><fmt:message key="edit_defaults.tag" />:</td>
<td><input type="text" name="tag" value="${tag}" /></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>
+
+ <%-- Click to page options --%>
+ <c:import url="sections/clicktopage.jsp" />
+
+ <%-- Save button --%>
+ <c:import url="sections/savebutton.jsp" />
+
+ </table>
+ </form>
</div>
Index: TagRelated.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/WEB-INF/templates/edit_defaults/TagRelated.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TagRelated.jsp 15 Sep 2008 09:40:19 -0000 1.1
+++ TagRelated.jsp 21 Feb 2009 09:37:56 -0000 1.2
@@ -1,45 +1,16 @@
<%...@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>
+ <form name="<portlet:namespace />form" method="post" target="_parent"
action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>">
+ <table class="editcontent">
-<h3><fmt:message key="edit_defaults.title" /></h3>
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
-<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>
@@ -50,45 +21,13 @@
</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>
+
+ <%-- 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: TagCloud.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/WEB-INF/templates/edit_defaults/TagCloud.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- TagCloud.jsp 17 Nov 2008 12:01:34 -0000 1.3
+++ TagCloud.jsp 21 Feb 2009 09:37:56 -0000 1.4
@@ -1,37 +1,15 @@
<%...@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>
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
-<h3><fmt:message key="edit_defaults.title" /></h3>
+<div class="portlet-config-canvas">
+ <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>">
+ <%-- Portletdefinition display --%>
+ <c:import url="sections/definitiondisplay.jsp" />
-<table class="editcontent">
+ <%-- View selector --%>
+ <c:import url="sections/viewselector.jsp" />
<tr>
<td colspan="2"><fmt:message key="edit_defaults.max_items"
/>:</td>
@@ -54,45 +32,13 @@
</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>
+
+ <%-- 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
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
