[jboss-cvs] jboss-seam/examples/wiki/view/includes ...

Christian Bauer christian at hibernate.org
Fri Jul 6 10:38:36 EDT 2007


  User: cbauer  
  Date: 07/07/06 10:38:36

  Modified:    examples/wiki/view/includes        formFieldDecorate.xhtml
                        breadcrumb.xhtml commentsDisplay.xhtml
                        ownerSelector.xhtml accessLevelSelector.xhtml
                        commentForm.xhtml attachmentDisplay.xhtml
  Log:
  Compiles and runs on latest Seam CVS
  
  Revision  Changes    Path
  1.2       +1 -1      jboss-seam/examples/wiki/view/includes/formFieldDecorate.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: formFieldDecorate.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/formFieldDecorate.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- formFieldDecorate.xhtml	7 May 2007 11:42:31 -0000	1.1
  +++ formFieldDecorate.xhtml	6 Jul 2007 14:38:36 -0000	1.2
  @@ -9,7 +9,7 @@
           <s:div rendered="#{not empty tabId}">
               <s:span rendered="#{invalid}">
                   <script type="text/javascript">jQuery(function() {
  -                    formTabRaiseError("#{tabId}", "#{fieldId}", '<s:message/>');
  +                    formTabRaiseError("#{tabId}", "#{fieldId}", '<ui:insert name="label"/>:&#160; <s:message/>');
                   });</script>
               </s:span>
               <s:span rendered="#{!invalid}">
  
  
  
  1.2       +4 -3      jboss-seam/examples/wiki/view/includes/breadcrumb.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: breadcrumb.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/breadcrumb.xhtml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- breadcrumb.xhtml	18 Mar 2007 23:29:19 -0000	1.1
  +++ breadcrumb.xhtml	6 Jul 2007 14:38:36 -0000	1.2
  @@ -9,13 +9,14 @@
       <h:panelGroup>
           <ui:repeat var="directory" value="#{currentDirectoryPath}">
               <h:outputLink value="#{wiki:renderURL(directory)}" styleClass="itemLink" rendered="#{!empty directory.parent}">
  -                #{directory.name}
  +                <h:outputText value="#{wiki:truncateString(directory.name, 25, '...')}"/>
               </h:outputLink>
  -            <h:outputText styleClass="itemSeparator" value="&#183;"
  +            <!-- middot: &#183; -->
  +            <h:outputText styleClass="itemSeparator" value="/"
                             rendered="#{!empty currentDocument and !empty directory.parent}"/>
           </ui:repeat>
   
  -        <h:outputText styleClass="itemText" value="#{currentDocument.name}"/>
  +        <h:outputText styleClass="itemText" value="#{wiki:truncateString(currentDocument.name, 40, '...')}"/>
   
       </h:panelGroup>
   
  
  
  
  1.6       +8 -6      jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: commentsDisplay.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- commentsDisplay.xhtml	26 Apr 2007 15:11:52 -0000	1.5
  +++ commentsDisplay.xhtml	6 Jul 2007 14:38:36 -0000	1.6
  @@ -1,13 +1,14 @@
  -<div id="commentsDisplay"
  +<s:div styleClass="shadowContainer" style="margin-top:25px"
  +     rendered="#{not empty commentHome.comments and currentDocument.enableComments}"
        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"
        xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  -     xmlns:s="http://jboss.com/products/seam/taglib">
  +     xmlns:s="http://jboss.com/products/seam/taglib"><div class="shadow1"><div class="shadow2">
  +<s:div id="commentsDisplay">
   
  -    <h:dataTable value="#{commentHome.comments}" var="c" style="margin-top:10px;"
  -                 rendered="#{not empty commentHome.comments and currentDocument.enableComments}"
  +    <h:dataTable value="#{commentHome.comments}" var="c"
                    styleClass="datatable rightBorder leftBorder topBorder bottomBorder"
                    headerClass="regularHeader alignLeft"
                    columnClasses="commentColumn"
  @@ -42,7 +43,7 @@
   
               <div align="right">
                   <h:form rendered="#{s:hasPermission('Comment', 'delete', currentDocument)}">
  -                    <a:commandLink action="#{commentHome.remove(c.id)}" reRender="body"
  +                    <a:commandLink action="#{commentHome.remove(c.id)}" reRender="content"
                                      styleClass="button"><span class="buttonLabel">Remove Comment</span></a:commandLink>
                   </h:form>
               </div>
  @@ -50,4 +51,5 @@
           </h:column>
       </h:dataTable>
   
  -</div>
  +</s:div>
  +</div></div></s:div>
  
  
  
  1.5       +8 -4      jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ownerSelector.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ownerSelector.xhtml	8 May 2007 06:12:06 -0000	1.4
  +++ ownerSelector.xhtml	6 Jul 2007 14:38:36 -0000	1.5
  @@ -11,7 +11,7 @@
       <ui:define name="dialogInit">
           <script type="text/javascript">jQuery(function() {
               jsf('dialogOwnerSelectionPopup')
  -                .css({ minWidth: "750px", maxWidth:"900px", minHeight: "420px", width: "750px;", height: "450px;", top: "100px", left: "100px"})
  +                .css({ minWidth: "750px", maxWidth:"900px", minHeight: "420px", width: "750px;", height: "450px;", top: "100px", left: "150px"})
                   .jqm({
                       trigger: jsf("openDialogOwnerSelection"),
                       closeClass: "closeDialog",
  @@ -24,7 +24,9 @@
       <ui:define name="dialogContent">
   
           <h:form>
  -        <div class="form" id="userSearchControl" style="margin-bottom: 15px;">
  +        <div class="shadowContainer"><div class="shadow1"><div class="shadow2">
  +
  +        <div class="form" id="userSearchControl">
               <h:panelGrid columns="6"
                            styleClass="datatable topLeftBottomBorder"
                            headerClass="regularHeader rightBorder"
  @@ -53,7 +55,7 @@
                       <h:inputText id="email" value="#{userSearch.exampleUser.email}" maxlength="35" size="10" tabindex="20"/>
                   </h:panelGroup>
   
  -                <a:commandLink id="find" styleClass="button" reRender="dialogOwnerSelectionContent"
  +                <a:commandLink id="find" styleClass="buttonNonpersistent" reRender="dialogOwnerSelectionContent"
                                  oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
                                  action="#{userSearch.find()}"
                                  tabindex="20" accesskey="F"><span class="buttonLabel"><u>F</u>ind</span></a:commandLink>
  @@ -104,7 +106,7 @@
               </h:panelGrid>
           </s:div>
   
  -        <s:div id="userTableContainer" style="margin-bottom: 15px;">
  +        <s:div id="userTableContainer">
               <h:dataTable id="userTable" var="u"
                            value="#{usersList}"
                            rendered="#{usersList.rowCount >0}"
  @@ -183,6 +185,8 @@
   
               </h:dataTable>
           </s:div>
  +
  +        </div></div></div>
           </h:form>
   
       </ui:define>
  
  
  
  1.4       +2 -2      jboss-seam/examples/wiki/view/includes/accessLevelSelector.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: accessLevelSelector.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/accessLevelSelector.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- accessLevelSelector.xhtml	12 Jun 2007 18:18:43 -0000	1.3
  +++ accessLevelSelector.xhtml	6 Jul 2007 14:38:36 -0000	1.4
  @@ -10,7 +10,7 @@
       <s:div styleClass="entry">
           <div class="label">Readable by:</div>
           <div class="input">
  -            <h:selectOneMenu value="#{nodePermissions.readAccessLevel}" tabindex="1" converter="accessLevelConverter">
  +            <h:selectOneMenu value="#{nodePermissions.readAccessLevel}" tabindex="1">
                   <s:selectItems value="#{assignableAccessLevelsList}"
                                  var="aLvl"
                                  label="Role: #{wiki:truncateString(aLvl.roleNames, 40, '...')}"
  @@ -25,7 +25,7 @@
       <s:div styleClass="entry">
           <div class="label">Writable by:</div>
           <div class="input">
  -            <h:selectOneMenu value="#{nodePermissions.writeAccessLevel}" tabindex="1" converter="accessLevelConverter">
  +            <h:selectOneMenu value="#{nodePermissions.writeAccessLevel}" tabindex="1">
                   <s:selectItems value="#{assignableAccessLevelsList}"
                                  var="aLvl"
                                  label="Role: #{wiki:truncateString(aLvl.roleNames, 40, '...')}"
  
  
  
  1.6       +8 -5      jboss-seam/examples/wiki/view/includes/commentForm.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: commentForm.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/commentForm.xhtml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- commentForm.xhtml	7 May 2007 11:42:31 -0000	1.5
  +++ commentForm.xhtml	6 Jul 2007 14:38:36 -0000	1.6
  @@ -1,12 +1,14 @@
  -<div id="commentForm"
  +<s:div styleClass="shadowContainer"  style="margin-top:25px"
  +     rendered="#{currentDocument.enableComments and currentDocument.enableCommentForm}"
        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"
        xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  -     xmlns:s="http://jboss.com/products/seam/taglib">
  +     xmlns:s="http://jboss.com/products/seam/taglib"><div class="shadow1"><div class="shadow2">
   
  -    <h:form styleClass="commentForm" rendered="#{currentDocument.enableComments and currentDocument.enableCommentForm}">
  +<div id="commentForm">
  +    <h:form styleClass="commentForm">
           <div class="form">
               <div class="formHead">Post new comment:</div>
   
  @@ -76,7 +78,7 @@
                       <div class="label">&#160;</div>
                       <div class="input">
   
  -                        <a:commandLink action="#{commentHome.persist}" tabindex="102" reRender="documentDisplay"
  +                        <a:commandLink action="#{commentHome.persist}" tabindex="102" reRender="content"
                                          styleClass="button"><span class="buttonLabel">Post Comment</span></a:commandLink>
   
                       </div>
  @@ -87,3 +89,4 @@
       </h:form>
   
   </div>
  \ No newline at end of file
  +</div></div></s:div>
  \ No newline at end of file
  
  
  
  1.10      +6 -5      jboss-seam/examples/wiki/view/includes/attachmentDisplay.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: attachmentDisplay.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/attachmentDisplay.xhtml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- attachmentDisplay.xhtml	3 May 2007 14:10:48 -0000	1.9
  +++ attachmentDisplay.xhtml	6 Jul 2007 14:38:36 -0000	1.10
  @@ -1,14 +1,14 @@
  -<s:div
  -     styleClass="attachmentDisplay"
  +<s:div styleClass="shadowContainer" style="margin-top:25px"
        rendered="#{wiki:sizeOf(wikiTextAttachments) > 0}"
        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"
  -     xmlns:wiki="http://jboss.com/products/seam/wiki"
  -     xmlns:s="http://jboss.com/products/seam/taglib">
  +     xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  +     xmlns:s="http://jboss.com/products/seam/taglib"><div class="shadow1"><div class="shadow2">
  +<s:div id="attachmentDisplay" styleClass="attachmentDisplay">
   
  -    <h:dataTable value="#{wikiTextAttachments}" var="link" style="width:450px;"
  +    <h:dataTable value="#{wikiTextAttachments}" var="link"
            binding="#{wikiUtil.datatable}"
            styleClass="datatable rightBorder leftBorder topBorder bottomBorder"
            headerClass="regularHeader alignLeft"
  @@ -36,3 +36,4 @@
       </h:dataTable>
   
   </s:div>
  +</div></div></s:div>
  \ No newline at end of file
  
  
  



More information about the jboss-cvs-commits mailing list