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

Gavin King gavin.king at jboss.com
Wed Oct 11 01:14:25 EDT 2006


  User: gavin   
  Date: 06/10/11 01:14:25

  Modified:    examples/blog/view        accessible.css print.xhtml
                        printable.css screen.css template.xhtml
  Added:       examples/blog/view        menu.xhtml nav.xhtml
  Log:
  use ui:include and page params
  
  Revision  Changes    Path
  1.4       +3 -0      jboss-seam/examples/blog/view/accessible.css
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: accessible.css
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/blog/view/accessible.css,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- accessible.css	11 Oct 2006 00:27:31 -0000	1.3
  +++ accessible.css	11 Oct 2006 05:14:25 -0000	1.4
  @@ -18,6 +18,9 @@
     margin-left: auto;
     margin-right: auto;
   }
  +#menu form {
  +  text-align: right;
  +}
   #container {
     background: transparent url(header.png) no-repeat top center;
     width: 600px;
  
  
  
  1.5       +3 -19     jboss-seam/examples/blog/view/print.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: print.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/blog/view/print.xhtml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- print.xhtml	11 Oct 2006 00:27:31 -0000	1.4
  +++ print.xhtml	11 Oct 2006 05:14:25 -0000	1.5
  @@ -17,25 +17,9 @@
   
      <body>
         <div id="menu">
  -         <h:form>
  -            <h:outputLink value="search.xhtml">
  -               [All posts]
  -               <f:param name="searchPattern" value=""/>
  -            </h:outputLink>
  -            <h:outputLink value="index.xhtml">[Recent posts]</h:outputLink>
  +         <ui:include src="nav.xhtml"/>
               &#160;&#160;
  -            <h:inputText value="#{searchService.searchPattern}"/>
  -            <h:commandButton value="Search" action="/search.xhtml"/>
  -            &#160;&#160;
  -            <h:selectOneMenu value="#{themeSelector.theme}">
  -               <f:selectItems value="#{themeSelector.themes}"/>
  -            </h:selectOneMenu>
  -            <h:commandLink action="#{themeSelector.select}">
  -               <h:commandButton value="Select Theme"/>
  -               <f:param name="blogEntryId" value="#{blogEntry.id}"/>
  -               <f:param name="searchPattern" value="#{searchService.searchPattern}"/>
  -            </h:commandLink>
  -         </h:form>
  +         <ui:include src="menu.xhtml"/>
         </div>
         <div id="container">
            <h3>#{blog.name}: #{blog.description}</h3>
  
  
  
  1.2       +3 -0      jboss-seam/examples/blog/view/printable.css
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: printable.css
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/blog/view/printable.css,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- printable.css	22 Jun 2006 06:16:28 -0000	1.1
  +++ printable.css	11 Oct 2006 05:14:25 -0000	1.2
  @@ -53,3 +53,6 @@
   .blogEntry {
     margin-top: 20px;
   }
  \ No newline at end of file
  +#menu form {
  +  display: inline;
  +}
  \ No newline at end of file
  
  
  
  1.6       +3 -0      jboss-seam/examples/blog/view/screen.css
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: screen.css
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/blog/view/screen.css,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- screen.css	11 Oct 2006 00:27:31 -0000	1.5
  +++ screen.css	11 Oct 2006 05:14:25 -0000	1.6
  @@ -18,6 +18,9 @@
     margin-left: auto;
     margin-right: auto;
   }
  +#menu form {
  +  text-align: right;
  +}
   #container {
     background: transparent url(header.png) no-repeat top center;
     width: 600px;
  
  
  
  1.10      +2 -20     jboss-seam/examples/blog/view/template.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: template.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/blog/view/template.xhtml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- template.xhtml	11 Oct 2006 00:27:31 -0000	1.9
  +++ template.xhtml	11 Oct 2006 05:14:25 -0000	1.10
  @@ -17,19 +17,7 @@
   
      <body>
         <div id="menu">
  -         <h:form>
  -            <h:inputText value="#{searchService.searchPattern}"/>
  -            <h:commandButton value="Search" action="/search.xhtml"/>
  -            &#160;&#160;
  -            <h:selectOneMenu value="#{themeSelector.theme}">
  -               <f:selectItems value="#{themeSelector.themes}"/>
  -            </h:selectOneMenu>
  -            <h:commandLink action="#{themeSelector.select}">
  -               <h:commandButton value="Select Theme"/>
  -               <f:param name="blogEntryId" value="#{blogEntry.id}"/>
  -               <f:param name="searchPattern" value="#{searchService.searchPattern}"/>
  -            </h:commandLink>
  -         </h:form>
  +         <ui:include src="menu.xhtml"/>
         </div>
         <div id="container">
            <h1>#{blog.name}</h1>
  @@ -37,13 +25,7 @@
            <ui:insert name="content"/>
            <div class="blogEntry">
               #{blog.name}: 
  -            <h:outputLink value="search.xhtml">
  -               [All posts]
  -               <f:param name="searchPattern" value=""/>
  -            </h:outputLink>
  -            <h:outputLink value="index.xhtml">[Recent posts]</h:outputLink>
  -            <h:outputLink value="post.xhtml">[Write new post]</h:outputLink>
  -            <h:outputLink value="index.rss">[RSS]</h:outputLink>
  +            <ui:include src="nav.xhtml"/>
               <br/>
               Total pageviews: #{blog.hitCount.pageviews}
            </div>
  
  
  
  1.1      date: 2006/10/11 05:14:25;  author: gavin;  state: Exp;jboss-seam/examples/blog/view/menu.xhtml
  
  Index: menu.xhtml
  ===================================================================
  <h:form xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:h="http://java.sun.com/jsf/html"
       xmlns:f="http://java.sun.com/jsf/core">
  
     <h:inputText value="#{searchService.searchPattern}"/>
     <h:commandButton value="Search" action="/search.xhtml"/>
     &#160;&#160;
     <h:selectOneMenu value="#{themeSelector.theme}">
        <f:selectItems value="#{themeSelector.themes}"/>
     </h:selectOneMenu>
     <h:commandButton action="#{themeSelector.select}" value="Select Theme"/>
  
  </h:form>
  
  
  
  1.1      date: 2006/10/11 05:14:25;  author: gavin;  state: Exp;jboss-seam/examples/blog/view/nav.xhtml
  
  Index: nav.xhtml
  ===================================================================
  <span xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:h="http://java.sun.com/jsf/html"
       xmlns:f="http://java.sun.com/jsf/core">
  
       <h:outputLink value="search.xhtml">
          [All posts]
          <f:param name="searchPattern" value=""/>
       </h:outputLink>
       <h:outputLink value="index.xhtml">[Recent posts]</h:outputLink>
       <h:outputLink value="post.xhtml">[Write new post]</h:outputLink>
       <h:outputLink value="index.rss">[RSS]</h:outputLink>
  
  </span>
  
  
  



More information about the jboss-cvs-commits mailing list