[jboss-cvs] jboss-seam/examples/seambay/view ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/07/16 23:37:23

  Modified:    examples/seambay/view    auction.xhtml bid.xhtml
                        search.xhtml
  Log:
  lots of little bug fixes
  
  Revision  Changes    Path
  1.10      +29 -8     jboss-seam/examples/seambay/view/auction.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: auction.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/view/auction.xhtml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- auction.xhtml	16 Jul 2007 10:56:33 -0000	1.9
  +++ auction.xhtml	17 Jul 2007 03:37:23 -0000	1.10
  @@ -73,9 +73,16 @@
                 </s:fragment>            
               </label>
               <div>
  +              <s:fragment rendered="#{auction.highBid ne null}">
  +                $<b><h:outputText value="#{auction.highBid.actualAmount}">
  +                  <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
  +                </h:outputText></b>
  +              </s:fragment>
  +              <s:fragment rendered="#{auction.highBid eq null}">
                 $<b><h:outputText value="#{auction.price}">
                   <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
                 </h:outputText></b>
  +              </s:fragment>
               </div>
             </div>
             
  @@ -199,10 +206,24 @@
             <h:form>
   
               <div class="bidRow">
  -              <h:outputLabel>Current bid:</h:outputLabel>              
  +              <s:fragment rendered="#{auction.highBid ne null}">
  +                <label>Current bid:</label>
  +              </s:fragment>
  +              <s:fragment rendered="#{auction.highBid eq null}">
  +                <label>Starting price:</label>
  +              </s:fragment>            
  +                            
  +              <s:fragment rendered="#{auction.highBid ne null}">
  +                <span>$ </span><b><h:outputText value="#{auction.highBid.actualAmount}">
  +                  <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
  +                </h:outputText></b>
  +              </s:fragment>
  +              <s:fragment rendered="#{auction.highBid eq null}">
                 <span>$ </span><b><h:outputText value="#{auction.price}">
                   <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>              
                 </h:outputText></b>
  +              </s:fragment>              
  +              
               </div>
             
               <div class="bidRow">
  
  
  
  1.5       +19 -6     jboss-seam/examples/seambay/view/bid.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: bid.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/view/bid.xhtml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- bid.xhtml	16 Jul 2007 10:56:33 -0000	1.4
  +++ bid.xhtml	17 Jul 2007 03:37:23 -0000	1.5
  @@ -63,11 +63,24 @@
           ${bidAction.bid.auction.title}<br/>
           
           <div class="itemDetailRow">
  +          <s:fragment rendered="#{auction.highBid ne null}">        
             <label>Current bid:</label>
  +          </s:fragment>
  +          <s:fragment rendered="#{auction.highBid eq null}">
  +            <label>Starting price:</label>
  +          </s:fragment>
  +          
             <div>
  +            <s:fragment rendered="#{auction.highBid ne null}">
  +              AU $<h:outputText value="#{bidAction.bid.auction.highBid.actualAmount}">
  +                  <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
  +               </h:outputText>
  +            </s:fragment>              
  +            <s:fragment rendered="#{auction.highBid eq null}">              
               AU $<h:outputText value="#{bidAction.bid.auction.price}">
                 <f:convertNumber minFractionDigits="2" maxFractionDigits="2"/>
               </h:outputText>
  +            </s:fragment>            
             </div>
           </div>
           
  
  
  
  1.10      +5 -3      jboss-seam/examples/seambay/view/search.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: search.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/view/search.xhtml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- search.xhtml	3 May 2007 03:23:19 -0000	1.9
  +++ search.xhtml	17 Jul 2007 03:37:23 -0000	1.10
  @@ -62,9 +62,11 @@
         	             rowClasses="resultRowOdd,resultRowEven"
         	             columnClasses="imageColumn,itemColumn,bidsColumn,priceColumn,timeColumn">
         	  <h:column>
  -      	    <s:graphicImage rendered="#{auction.image ne null}" value="#{auction.image.data}">
  +      	    <h:outputLink value="#{facesContext.externalContext.requestContextPath}/itemdetail/#{auction.auctionId}">
  +        	    <s:graphicImage rendered="#{auction.image ne null}" value="#{auction.image.data}" styleClass="thumbnail">
                 <s:transformImageSize width="80" maintainRatio="true"/>
         	    </s:graphicImage>
  +        	  </h:outputLink>
         	  </h:column>
         		<h:column>
         			<f:facet name="header">Item</f:facet>