[jboss-cvs] jboss-seam/examples/dvdstore/web/WEB-INF/incl ...

[Norman Richards]

  User: nrichards
  Date: 07/03/16 20:35:33

  Modified:    examples/dvdstore/web/WEB-INF/incl  searchbox.xhtml
  Log:
  remove a few redundant classes
  
  Revision  Changes    Path
  1.8       +36 -41    jboss-seam/examples/dvdstore/web/WEB-INF/incl/searchbox.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: searchbox.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/WEB-INF/incl/searchbox.xhtml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- searchbox.xhtml	14 Dec 2006 03:12:43 -0000	1.7
  +++ searchbox.xhtml	17 Mar 2007 00:35:33 -0000	1.8
  @@ -1,44 +1,39 @@
   <div class="menu"
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:ui="http://java.sun.com/jsf/facelets"
  +	 xmlns:s="http://jboss.com/products/seam/taglib"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html">
  -    <dl>
  +<dl>
           <dt class="menuHeader">#{messages.browseSearchHeader}</dt>
  -        <dd class="menuForm">
  -            <h:form>
  +	<dd class="menuForm"><h:form>
                   <dl>
                       <dt><h:outputText value="#{messages.searchTitle}" /></dt>
  -                    <dd><h:inputText value="#{search.title}" size="15"/></dd>
  +			<dd><h:inputText value="#{search.title}" size="15" /></dd>
   
                       <dt><h:outputText value="#{messages.searchActor}" /></dt>
  -                    <dd><h:inputText value="#{search.actor}" size="15"/></dd>
  +			<dd><h:inputText value="#{search.actor}" size="15" /></dd>
                       
                       <dt><h:outputText value="#{messages.searchCategory}" /></dt>
  -                    <dd>
  -                        <h:selectOneMenu value="#{search.category}"
  -                                         converter="#{catbean.converter}">
  -                            <f:selectItem  itemLabel="Any" itemValue="#{catbean.nullCategory}" />
  -                            <f:selectItems value="#{catbean.categories}" />
  -                        </h:selectOneMenu>
  -                    </dd>
  +			<dd><h:selectOneMenu value="#{search.category}">
  +				<s:convertEntity />
  +				<ui:remove> <f:selectItem itemLabel="Any" itemValue="#{anyCategory}" /></ui:remove>
  +				<s:selectItems value="#{allCategories.resultList}" var="category"				
  +				               label="#{category.name}"
  +				               noSelectionLabel="ANY" />
  +			</h:selectOneMenu></dd>
                       <dt><h:outputText value="#{messages.searchPageSize}" /></dt>
  -                    <dd>
  -                        <h:selectOneMenu value="#{search.pageSize}">
  +			<dd><h:selectOneMenu value="#{search.pageSize}">
                               <f:selectItem itemLabel="10" itemValue="10" />
                               <f:selectItem itemLabel="15" itemValue="15" />
                               <f:selectItem itemLabel="20" itemValue="20" />
                               <f:selectItem itemLabel="30" itemValue="30" />
  -                        </h:selectOneMenu>
  -                    </dd>
  +			</h:selectOneMenu></dd>
                       
  -                    <dd>
  -                        <h:commandButton action="#{search.doSearch}" 
  -                                         value="#{messages.searchButton}"
  -                                         styleClass="formButton" style="width: 166px;"/>
  -                    </dd>
  -                </dl>
  -            </h:form>
  -        </dd>
  +			<dd><h:commandButton action="#{search.doSearch}"
  +				value="#{messages.searchButton}" styleClass="formButton"
  +				style="width: 166px;" /></dd>
       </dl>
  +	</h:form></dd>
  +</dl>
   </div>