Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-search/src/webapp/WEB-INF/templates/edit_defaults/search
In directory 
james.mmbase.org:/tmp/cvs-serv10020/portlets-search/src/webapp/WEB-INF/templates/edit_defaults/search

Modified Files:
        Search.jsp 
Log Message:
CMSC-1253 - Reduce code duplication in edit_default templates


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-search/src/webapp/WEB-INF/templates/edit_defaults/search
See also: http://www.mmbase.org/jira/browse/CMSC-1253


Index: Search.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-search/src/webapp/WEB-INF/templates/edit_defaults/search/Search.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Search.jsp  7 Mar 2007 19:36:50 -0000       1.1
+++ Search.jsp  21 Feb 2009 09:37:56 -0000      1.2
@@ -1,24 +1,19 @@
-<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
+<%...@include file="/WEB-INF/templates/portletglobals.jsp"%>
+<%...@include file="/WEB-INF/templates/edit_defaults/sections/globals.jsp"%>
 <%@ taglib uri="http://www.luceus.com/taglib"; prefix="lm"%>
 
 <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 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" />
+               
+                       <%-- View selector --%>
+                       <c:import url="sections/viewselector.jsp" />
 
-<table class="editcontent">
-   <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><br />
-      </td>
-   </tr>
    <tr>
-      <td><fmt:message key="edit_defaults.elementsperpage" />:</td>
+                               <td colspan="2"><fmt:message 
key="edit_defaults.elementsperpage" />:</td>
       <td><cmsc:select var="elementsPerPage">
          <cmsc:option value="" message="edit_defaults.unlimited" /> 
          <cmsc:option value="5" />
@@ -30,7 +25,7 @@
       </cmsc:select></td>
    </tr>
    <tr>
-      <td><fmt:message key="edit_defaults.numberofpages" />:</td>
+                               <td colspan="2"><fmt:message 
key="edit_defaults.numberofpages" />:</td>
       <td><cmsc:select var="showPages">
          <cmsc:option value="" message="edit_defaults.unlimited" /> 
          <cmsc:option value="5" />
@@ -39,25 +34,22 @@
          <cmsc:option value="20" />
       </cmsc:select></td>
    </tr>
-
    <tr>
-      <td><fmt:message key="edit_defaults.maxelements" />:</td>
+                               <td colspan="2"><fmt:message 
key="edit_defaults.maxelements" />:</td>
       <td>
          <input type="text" name="maxElements" value="${maxElements}" />
       </td>
    </tr>
-
        <tr>
-               <td><fmt:message key="edit_defaults.pagesindex" />:</td>
+                               <td colspan="2"><fmt:message 
key="edit_defaults.pagesindex" />:</td>
                <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><fmt:message key="edit_defaults.indexname" />:</td>
+                               <td colspan="2"><fmt:message 
key="edit_defaults.indexname" />:</td>
       <td><lm:listindexes var="indexes"/>
          <cmsc:select var="indexName">
             <c:forEach var="idx" items="${indexes}">
@@ -67,12 +59,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>
+                       <%-- Save button --%>
+                       <c:import url="sections/savebutton.jsp" />
 
+               </table>
+       </form>
 </div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to