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

Christian Bauer christian at hibernate.org
Fri Aug 17 09:00:25 EDT 2007


  User: cbauer  
  Date: 07/08/17 09:00:25

  Modified:    examples/wiki/view              docHistory.xhtml
                        dirDisplay.xhtml message.xhtml dirEdit.xhtml
                        docDisplay.xhtml userHome.xhtml userRegister.xhtml
                        search.xhtml fileEdit.xhtml docEdit.xhtml
                        adminHome.xhtml userList.xhtml
  Removed:     examples/wiki/view              index.html
  Log:
  Major refactoring of core data schema and some new features
  
  Revision  Changes    Path
  1.9       +4 -18     jboss-seam/examples/wiki/view/docHistory.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docHistory.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory.xhtml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- docHistory.xhtml	6 Jul 2007 14:38:37 -0000	1.8
  +++ docHistory.xhtml	17 Aug 2007 13:00:25 -0000	1.9
  @@ -9,29 +9,14 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">Document History</ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
   <ui:define name="controlTwo">
  +
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
               accesskey="E"><u>E</u>xit</s:link>
  +
   </ui:define>
   
   <ui:define name="content">
  @@ -97,7 +82,8 @@
                           <h:outputText value="#{hnode.lastModifiedOn}">
                               <f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
                           </h:outputText>
  -                        (#{hnode.lastModifiedByUsername})
  +                        <h:outputText value="&#160;(#{hnode.lastModifiedByUsername})" rendered="#{!empty hnode.lastModifiedByUsername}"/>
  +                        <h:outputText value="&#160;(unknown)" rendered="#{empty hnode.lastModifiedByUsername}"/>
                       </h:column>
   
                       <h:column>
  
  
  
  1.20      +2 -19     jboss-seam/examples/wiki/view/dirDisplay.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirDisplay.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay.xhtml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- dirDisplay.xhtml	6 Jul 2007 14:38:37 -0000	1.19
  +++ dirDisplay.xhtml	17 Aug 2007 13:00:25 -0000	1.20
  @@ -8,25 +8,8 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">#{currentDirectory.name}</ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
   <ui:define name="controlTwo">
   
       <h:panelGroup rendered="#{!empty currentDirectory.parent}">
  @@ -96,8 +79,8 @@
                    styleClass="datatable topLeftBottomBorder"
                    headerClass="regularHeader rightBorder"
                    columnClasses="onePercentColumn rightBorder alignCenter, defaultColumn rightBorder alignLeft,
  -                                tenPercentColumn rightBorder alignLeft, twentyPercentColumn rightBorder alignLeft,
  -                                twentyPercentColumn rightBorder alignLeft,twentyPercentColumn rightBorder alignCenter"
  +                                tenPercentColumn rightBorder alignLeft, fifteenPercentColumn rightBorder alignLeft,
  +                                fifteenPercentColumn rightBorder alignLeft,twentyPercentColumn rightBorder alignCenter"
                    rowClasses="rowOdd,rowEven"
                    cellpadding="0" cellspacing="0" border="0">
   
  
  
  
  1.5       +2 -10     jboss-seam/examples/wiki/view/message.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: message.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/message.xhtml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- message.xhtml	6 Jul 2007 14:38:37 -0000	1.4
  +++ message.xhtml	17 Aug 2007 13:00:25 -0000	1.5
  @@ -10,19 +10,11 @@
   
   <ui:define name="screenname">Message</ui:define>
   
  -<ui:define name="headerTopTwo">&#160;</ui:define>
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -<ui:define name="headerBottomTwo">&#160;</ui:define>
  -
  -<ui:define name="sidebar">&#160;</ui:define>
  -
  -<ui:define name="control">&#160;</ui:define>
  -
   <ui:define name="content">
   
       <s:div id="stackTraceHandled" rendered="#{not empty org.jboss.seam.handledException}">
           Handled exception:
  -        <pre style="font-size:90%;">
  +        <pre style="font-size:75%;">
   
   Top level exception : #{org.jboss.seam.handledException.class.name}: #{org.jboss.seam.handledException.message}
   =========================================================================================================================
  @@ -40,7 +32,7 @@
   
       <s:div id="stackTrace" rendered="#{not empty org.jboss.seam.exception}">
           Unhandled exception:
  -        <pre style="font-size:90%;">
  +        <pre style="font-size:75%;">
   
   Top level exception : #{org.jboss.seam.exception.class.name}: #{org.jboss.seam.exception.message}
   =========================================================================================================================
  
  
  
  1.27      +48 -62    jboss-seam/examples/wiki/view/dirEdit.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: dirEdit.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirEdit.xhtml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- dirEdit.xhtml	9 Jul 2007 16:37:41 -0000	1.26
  +++ dirEdit.xhtml	17 Aug 2007 13:00:25 -0000	1.27
  @@ -7,32 +7,14 @@
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
  -                xmlns:rich="http://richfaces.ajax4jsf.org/rich"
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">
       <h:outputText value="Create directory" rendered="#{!directoryHome.managed}"/>
       <h:outputText value="Edit directory" rendered="#{directoryHome.managed}"/>
   </ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
   <ui:define name="controlTwo">
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
  @@ -41,13 +23,13 @@
   
   <ui:define name="content">
   
  -<s:span rendered="#{s:hasPermission('User', 'isAdmin', currentUser) and directoryHome.managed}">
  +<s:span rendered="#{s:hasPermission('User', 'isAdmin', currentUser) and directoryHome.managed and directoryHome.instance.id != wikiPreferences.memberAreaId}">
       <ui:include src="includes/ownerSelector.xhtml">
           <ui:param name="home" value="#{directoryHome}"/>
       </ui:include>
   </s:span>
   
  -<s:span rendered="#{directoryHome.managed and !empty directoryHome.instance.parent}">
  +<s:span rendered="#{directoryHome.managed and !empty directoryHome.instance.parent and directoryHome.instance.id != wikiPreferences.memberAreaId}">
       <ui:include src="includes/deleteConfirmation.xhtml">
           <ui:param name="home" value="#{directoryHome}"/>
       </ui:include>
  @@ -70,7 +52,7 @@
           <s:div styleClass="entry" rendered="#{!empty directoryHome.parentDirectory}">
               <div class="label">Parent:</div>
               <div class="output">
  -                <h:outputText value="#{directoryHome.parentDirectory}"/>
  +                <h:outputText value="#{directoryHome.parentDirectory.name}"/>
               </div>
           </s:div>
   
  @@ -82,7 +64,7 @@
                   </h:outputText>
                   <s:span id="ownerDisplay">&#160;(#{directoryHome.instance.createdBy.username})</s:span>
                   <h:outputLink id="selectOwner" value="#" tabindex="1" styleClass="buttonNonpersistent"
  -                              rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"><j4j:idProxy
  +                              rendered="#{s:hasPermission('User', 'isAdmin', currentUser) and directoryHome.instance.id != wikiPreferences.memberAreaId}"><j4j:idProxy
                                   id="openDialogOwnerSelection"/><span class="buttonLabel">...</span></h:outputLink>
               </div>
           </s:div>
  @@ -94,11 +76,14 @@
               </h:inputText>
           </s:decorate>
   
  +        <s:span rendered="#{directoryHome.instance.id != wikiPreferences.memberAreaId}">
           <ui:include src="includes/accessLevelSelector.xhtml"/>
  +        </s:span>
   
       </s:validateAll>
   
  -    <s:div styleClass="entry" rendered="#{directoryHome.managed and !empty directoryHome.instance.parent}">
  +    <s:span id="defaultDocumentSelector">
  +        <s:div styleClass="entry" rendered="#{directoryHome.managed and !empty directoryHome.instance.parent and !empty directoryHome.childDocuments}">
           <div class="label">Default document:</div>
           <div class="input">
               <h:selectOneMenu value="#{directoryHome.instance.defaultDocument}" converter="#{restrictedEntityConverter}" tabindex="2">
  @@ -109,64 +94,64 @@
               </h:selectOneMenu>
           </div>
       </s:div>
  -
  -    <rich:dragIndicator id="rowDragIndicator"/>
  +    </s:span>
   
       <s:div styleClass="entry"
  -           rendered="#{childNodes.rowCount>0 and s:hasPermission('Node', 'editMenu', directoryHome.instance)}">
  +           rendered="#{!empty directoryHome.instance.children and s:hasPermission('Node', 'editMenu', directoryHome.instance)}">
           <div class="label">Menu items:</div>
           <div class="input">
  -            <h:dataTable id="directoryFormTable" var="node" style="width:50%"
  -                         value="#{childNodes}"
  -                         binding="#{wikiUtil.datatable}"
  +
  +            <h:dataTable id="menuItemTable" var="node" style="width:50%"
  +                         value="#{directoryHome.instance.children}"
                            styleClass="datatable"
  -                         columnClasses="onePercentColumn alignCenter, onePercentColumn alignCenter, defaultColumn alignLeft"
  +                         columnClasses="onePercentColumn alignCenter, onePercentColumn alignCenter, onePercentColumn alignCenter, onePercentColumn alignCenter, defaultColumn alignLeft"
                            rowClasses="rowEven,rowOdd"
                            cellpadding="0" cellspacing="0" border="0">
   
                   <h:column>
  +                    <a:commandLink rendered="#{uiComponent['directoryEditForm:menuItemTable'].rowIndex != 0}"
  +                                   action="#{directoryHome.moveNode(uiComponent['directoryEditForm:menuItemTable'].rowIndex, uiComponent['directoryEditForm:menuItemTable'].rowIndex-1)}"
  +                                   reRender="menuItemTable, defaultDocumentSelector">
  +                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/up.gif" width="18" height="18"/>
  +                    </a:commandLink>
  +                </h:column>
  +                <h:column>
  +                    <a:commandLink rendered="#{uiComponent['directoryEditForm:menuItemTable'].rowIndex != uiComponent['directoryEditForm:menuItemTable'].rowCount-1}"
  +                                   action="#{directoryHome.moveNode(uiComponent['directoryEditForm:menuItemTable'].rowIndex, uiComponent['directoryEditForm:menuItemTable'].rowIndex+1)}"
  +                                   reRender="menuItemTable, defaultDocumentSelector">
  +                        <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/down.gif" width="18" height="18"/>
  +                    </a:commandLink>
  +                </h:column>
  +
  +                <h:column>
                       <h:selectBooleanCheckbox value="#{node.menuItem}" tabindex="3"/>
                   </h:column>
   
                   <h:column>
                       <a:outputPanel>
  -                        <rich:dropSupport id="dropZoneIcon" acceptedTypes="node" reRender="directoryFormTable"
  -                                          dropListener="#{directoryHome.dropMenuItem}" dropValue="#{wikiUtil.datatable.rowIndex}"/>
  -                        <rich:dragSupport dragIndicator=":directoryEditForm:rowDragIndicator"
  -                                          dragType="node"
  -                                          dragValue="#{node}">
  -                            <rich:dndParam name="label" type="drag"><h:outputText value="#{node.name}"/></rich:dndParam>
  -                        </rich:dragSupport>
                           <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dir.gif"
  -                                        width="18" height="20" style="cursor:move"
  +                                        width="18" height="20"
                                           rendered="#{wiki:isDirectory(node)}"/>
                           <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.gif"
  -                                        width="18" height="20" style="cursor:move"
  +                                        width="18" height="20"
                                           rendered="#{wiki:isDocument(node)}"/>
  -
                           <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{fileMetaMap[node.contentType].displayIcon}"
  -                                        width="18" height="20" style="cursor:move"
  +                                        width="18" height="20"
                                           rendered="#{wiki:isFile(node) and !empty fileMetaMap[node.contentType]}"/>
                           <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{fileMetaMap['generic'].displayIcon}"
  -                                        width="18" height="20" style="cursor:move"
  +                                        width="18" height="20"
                                           rendered="#{wiki:isFile(node) and empty fileMetaMap[node.contentType]}"/>
                       </a:outputPanel>
                   </h:column>
   
                   <h:column>
                       <a:outputPanel>
  -                        <rich:dropSupport id="dropZoneText" acceptedTypes="node" reRender="directoryFormTable"
  -                                          dropListener="#{directoryHome.dropMenuItem}" dropValue="#{wikiUtil.datatable.rowIndex}"/>
  -                        <rich:dragSupport dragIndicator=":directoryEditForm:rowDragIndicator"
  -                                          dragType="node"
  -                                          dragValue="#{node}">
  -                            <rich:dndParam name="label" type="drag"><h:outputText value="#{node.name}"/></rich:dndParam>
  -                        </rich:dragSupport>
  -                        <h:outputText value="#{wiki:truncateString(node.name, 40, '...')}" style="cursor:move"/>
  +                        <h:outputText value="#{wiki:truncateString(node.name, 40, '...')}"/>
                       </a:outputPanel>
                   </h:column>
   
               </h:dataTable>
  +
           </div>
       </s:div>
   
  @@ -201,7 +186,7 @@
                              tabindex="7" accesskey="U"><span class="buttonLabel"><u>U</u>pdate</span></h:commandLink>
   
               <h:outputLink id="delete" value="#" tabindex="8" accesskey="D" styleClass="button"
  -                          rendered="#{directoryHome.managed and !empty directoryHome.instance.parent}"><j4j:idProxy
  +                          rendered="#{directoryHome.managed and !empty directoryHome.instance.parent and directoryHome.instance.id != wikiPreferences.memberAreaId}"><j4j:idProxy
                       id="openDialogDelete"/><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
   
           </div>
  @@ -212,6 +197,7 @@
   </div>
   </h:form>
   
  +
   </ui:define>
   
   <ui:define name="footer">&#160;</ui:define>
  
  
  
  1.20      +3 -13     jboss-seam/examples/wiki/view/docDisplay.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docDisplay.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay.xhtml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- docDisplay.xhtml	6 Jul 2007 14:38:37 -0000	1.19
  +++ docDisplay.xhtml	17 Aug 2007 13:00:25 -0000	1.20
  @@ -11,27 +11,15 @@
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
   <ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
       <link href="#{themePath}/css/breadcrumb.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
   </ui:define>
   
   <ui:define name="screenname">#{currentDocument.name}</ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
   <ui:define name="headerBottomOne">
       <ui:include src="includes/breadcrumb.xhtml"/>
   </ui:define>
   
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
   <ui:define name="controlTwo">
   
       <s:link id="createDoc" styleClass="linkNavigation" action="createDoc" accesskey="C"
  @@ -42,6 +30,7 @@
   
       <s:link id="showHistory" styleClass="linkNavigation" action="showHistory" accesskey="I">H<u>i</u>story</s:link>
       <s:link id="browseDir" styleClass="linkNavigation" action="browseDir" accesskey="B"><u>B</u>rowse</s:link>
  +
   </ui:define>
   
   <ui:define name="content">
  @@ -60,7 +49,8 @@
                                   attachmentLinkStyleClass="regularLink"
                                   thumbnailLinkStyleClass="regularLink"
                                   renderBaseDocument="#{currentDocument}"
  -                                renderBaseDirectory="#{currentDirectory}"/>
  +                                renderBaseDirectory="#{currentDirectory}"
  +                                enablePlugins="true"/>
           </s:div>
       </div></div></div>
   
  
  
  
  1.11      +83 -32    jboss-seam/examples/wiki/view/userHome.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userHome.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome.xhtml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- userHome.xhtml	6 Jul 2007 14:38:37 -0000	1.10
  +++ userHome.xhtml	17 Aug 2007 13:00:25 -0000	1.11
  @@ -10,33 +10,16 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">
       <h:outputText value="Member Account '#{userHome.instance.username}'"/>
   </ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="controlOne">&#160;</ui:define>
  -
   <ui:define name="controlTwo">
  +
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
               accesskey="E"><u>E</u>xit</s:link>
  +
   </ui:define>
   
   <ui:define name="content">
  @@ -47,7 +30,7 @@
       </ui:include>
   </s:span>
   
  -<h:form>
  +<h:form id="userHomeForm" enctype="multipart/form-data">
       <div class="form">
   
       <script type="text/javascript">jQuery(function() {
  @@ -56,18 +39,13 @@
       <div id="formTabs">
   
           <ul>
  -            <li id="userProfileTab"><a href="#userProfile" accesskey="o">Pr<u>o</u>file</a></li>
  -            <li id="userAccountTab"><a href="#userAccount" accesskey="c">A<u>c</u>count</a></li>
  -            <li id="userPrefsTab"><a href="#userPreferences" accesskey="r">P<u>r</u>eferences</a></li>
  +            <li id="userAccountTab"><a href="#userAccount" accesskey="N">Accou<u>n</u>t</a></li>
  +            <li id="userProfileTab"><a href="#userProfile" accesskey="F">Pro<u>f</u>ile</a></li>
  +            <li id="userPrefsTab"><a href="#userPreferences" accesskey="R">P<u>r</u>eferences</a></li>
           </ul>
   
  -        <div id="userProfile">
  -            Not Implemented
  -        </div>
  -
           <div id="userAccount">
   
  -            <a:region>
               <div class="formFields wideLabels">
                   <s:validateAll>
   
  @@ -161,7 +139,80 @@
   
                   </s:validateAll>
               </div>
  -            </a:region>
  +
  +        </div>
  +
  +        <div id="userProfile">
  +
  +            <div class="formFields wideLabels">
  +                <s:validateAll>
  +
  +                    <s:div styleClass="entry" rendered="#{!empty userHome.instance.profile.image}">
  +                        <div class="label">Portrait:</div>
  +                        <div class="output">
  +                            <s:graphicImage value="#{userHome.instance.profile.image}" style="border: 1px solid black;"/>
  +                        </div>
  +                    </s:div>
  +
  +                    <s:decorate id="uploadDecorate" template="includes/formFieldDecorate.xhtml">
  +                        <ui:param name="tabId" value="userProfileTab"/>
  +                        <ui:param name="fieldId" value="userimage"/>
  +                        <ui:define name="label">Upload Portrait (max. #{wiki:displayFilesize(200000)})</ui:define>
  +                        <s:fileUpload id="upload" data="#{userHome.portraitImageData}"
  +                                                  contentType="#{userHome.portraitContentType}"/>
  +                    </s:decorate>
  +
  +                    <ui:include src="includes/wikiTextEditor.xhtml">
  +                        <ui:param name="tabId" value="userProfileTab"/>
  +                        <ui:param name="textEditorId" value="bio"/>
  +                        <ui:param name="namingContainer" value="userHomeForm"/>
  +                        <ui:param name="label" value="Bio"/>
  +                        <ui:param name="valueBinding" value="#{userHome.instance.profile.bio}"/>
  +                        <ui:param name="valueMaxLength" value="1000"/>
  +                        <ui:param name="previewBaseDocument" value="#{wikiStart}"/>
  +                        <ui:param name="previewBaseDirectory" value="#{wikiStart.parent}"/>
  +                    </ui:include>
  +
  +                    <s:decorate id="websiteDecorate" template="includes/formFieldDecorate.xhtml">
  +                        <ui:param name="tabId" value="userProfileTab"/>
  +                        <ui:param name="fieldId" value="website"/>
  +                        <ui:define name="label">Website</ui:define>
  +                        <h:inputText tabindex="1" size="60" maxlength="1000" value="#{userHome.instance.profile.website}">
  +                            <a:support event="onblur" reRender="websiteDecorate"/>
  +                        </h:inputText>
  +                    </s:decorate>
  +
  +                    <s:decorate id="locationDecorate" template="includes/formFieldDecorate.xhtml">
  +                        <ui:param name="tabId" value="userProfileTab"/>
  +                        <ui:param name="fieldId" value="location"/>
  +                        <ui:define name="label">Location</ui:define>
  +                        <h:inputText tabindex="1" size="40" maxlength="255" value="#{userHome.instance.profile.location}">
  +                            <a:support event="onblur" reRender="locationDecorate"/>
  +                        </h:inputText>
  +                    </s:decorate>
  +
  +                    <s:decorate id="occupationDecorate" template="includes/formFieldDecorate.xhtml">
  +                        <ui:param name="tabId" value="userProfileTab"/>
  +                        <ui:param name="fieldId" value="occupation"/>
  +                        <ui:define name="label">Occupation</ui:define>
  +                        <h:inputText tabindex="1" size="60" maxlength="1000" value="#{userHome.instance.profile.occupation}">
  +                            <a:support event="onblur" reRender="occupationDecorate"/>
  +                        </h:inputText>
  +                    </s:decorate>
  +
  +                    <ui:include src="includes/wikiTextEditor.xhtml">
  +                        <ui:param name="tabId" value="userProfileTab"/>
  +                        <ui:param name="textEditorId" value="signature"/>
  +                        <ui:param name="namingContainer" value="userHomeForm"/>
  +                        <ui:param name="label" value="Signature"/>
  +                        <ui:param name="valueBinding" value="#{userHome.instance.profile.signature}"/>
  +                        <ui:param name="valueMaxLength" value="1000"/>
  +                        <ui:param name="previewBaseDocument" value="#{wikiStart}"/>
  +                        <ui:param name="previewBaseDirectory" value="#{wikiStart.parent}"/>
  +                    </ui:include>
  +
  +                </s:validateAll>
  +            </div>
               
           </div>
   
  @@ -188,9 +239,9 @@
                                              and s:hasPermission('User', 'isAdmin', currentUser)}"
                                  action="#{userHome.createHomeDirectory}"><span class="buttonLabel">Create Home Directory</span></h:commandLink>
   
  -                <a:commandLink id="update" styleClass="button saveButton" reRender="body"
  +                <h:commandLink id="update" styleClass="button saveButton"
                                  action="#{userHome.update}"
  -                               tabindex="9" accesskey="S"><span class="buttonLabel"><u>S</u>ave Settings</span></a:commandLink>
  +                               tabindex="9" accesskey="S"><span class="buttonLabel"><u>S</u>ave Settings</span></h:commandLink>
   
                   <h:outputLink id="delete" value="#" tabindex="9" accesskey="D" styleClass="button"
                                 rendered="#{s:hasPermission('User', 'delete', userHome.instance)}"><j4j:idProxy
  
  
  
  1.7       +2 -19     jboss-seam/examples/wiki/view/userRegister.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userRegister.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userRegister.xhtml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- userRegister.xhtml	6 Jul 2007 14:38:37 -0000	1.6
  +++ userRegister.xhtml	17 Aug 2007 13:00:25 -0000	1.7
  @@ -9,31 +9,14 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">Registration</ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -
  -</ui:define>
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="controlOne">&#160;</ui:define>
  -
   <ui:define name="controlTwo">
  +
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
               accesskey="E"><u>E</u>xit</s:link>
  +
   </ui:define>
   
   <ui:define name="content">
  
  
  
  1.4       +3 -18     jboss-seam/examples/wiki/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/wiki/view/search.xhtml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- search.xhtml	6 Jul 2007 14:38:37 -0000	1.3
  +++ search.xhtml	17 Aug 2007 13:00:25 -0000	1.4
  @@ -10,34 +10,19 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">Search: #{wikiSearch.simpleQuery}</ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
   <ui:define name="controlTwo">
  +
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
               accesskey="E"><u>E</u>xit</s:link>
  +
   </ui:define>
   
   <ui:define name="content">
   
  -    <h:form>
  +    <h:form id="searchForm">
           <s:div styleClass="form" id="searchControl">
   
               <a:region>
  
  
  
  1.19      +2 -17     jboss-seam/examples/wiki/view/fileEdit.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: fileEdit.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/fileEdit.xhtml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- fileEdit.xhtml	6 Jul 2007 14:38:37 -0000	1.18
  +++ fileEdit.xhtml	17 Aug 2007 13:00:25 -0000	1.19
  @@ -10,32 +10,17 @@
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">
       <h:outputText value="Upload File" rendered="#{!fileHome.managed}"/>
       <h:outputText value="Edit File" rendered="#{fileHome.managed}"/>
   </ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
   <ui:define name="controlTwo">
  +
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
               accesskey="E"><u>E</u>xit Editor</s:link>
  +
   </ui:define>
   
   <ui:define name="content">
  
  
  
  1.36      +33 -57    jboss-seam/examples/wiki/view/docEdit.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: docEdit.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit.xhtml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -b -r1.35 -r1.36
  --- docEdit.xhtml	6 Jul 2007 14:38:37 -0000	1.35
  +++ docEdit.xhtml	17 Aug 2007 13:00:25 -0000	1.36
  @@ -6,45 +6,28 @@
                   xmlns:f="http://java.sun.com/jsf/core"
                   xmlns:h="http://java.sun.com/jsf/html"
                   xmlns:a="https://ajax4jsf.dev.java.net/ajax"
  -                xmlns:rich="http://richfaces.ajax4jsf.org/rich"
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   xmlns:j4j="http://javascript4jsf.dev.java.net/"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">
       <h:outputText value="Create document" rendered="#{!documentHome.managed}"/>
       <h:outputText value="Edit document" rendered="#{documentHome.managed}"/>
   </ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
   <ui:define name="controlTwo">
   
  -    <s:link id="uploadFile" styleClass="linkNavigation" action="uploadFile" accesskey="F" propagation="none"
  +    <s:link id="uploadFile" styleClass="linkNavigation" action="uploadFile" accesskey="I" propagation="none"
               rendered="#{s:hasPermission('Node', 'create', documentHome.parentDirectory)}">
           <f:param name="lastConversationId" value="#{conversation.id}"/>
           <f:param name="parentDirId" value="#{documentHome.parentDirectory.id}"/>
  -        Upload <u>F</u>ile
  +        Upload F<u>i</u>le
       </s:link>
   
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
               accesskey="E"><u>E</u>xit Editor</s:link>
  +
   </ui:define>
   
   <ui:define name="content">
  @@ -109,10 +92,9 @@
   
                               <s:decorate id="contentDecorate" template="includes/formFieldDecorate.xhtml">
                                   <ui:param name="tabId" value="docContentTab"/>
  -                                <ui:param name="fieldId" value="content"/>
  +                                <ui:param name="fieldId" value="contentTextArea"/>
                                   <ui:define name="label">Content</ui:define>
                                   <script type="text/javascript">if(!$.browser.safari){jQuery(function() {
  -                                    jQuery("#contentTextEdit").append('&lt;div id="contentTextEditResizeHandle"/>');
                                       jQuery("#contentTextEdit").Resizable({
                                           minHeight: 50,
                                           handlers: {
  @@ -123,23 +105,17 @@
                                           }
                                       });
                                   })};</script>
  -                                <div id="contentTextEdit">
  -                                    <s:span rendered="#{documentHome.enabledPreview}">
  +                                <div id="contentTextEdit" class="textEditResizable">
                                           <h:inputTextarea tabindex="3"
  +                                                     required="true"
                                                            cols="#{docEditorPreferences.properties['regularEditAreaColumns']}"
                                                            rows="#{docEditorPreferences.properties['regularEditAreaRows']}"
  -                                                         id="contentTextAreaWithPreview"
  +                                                     id="contentTextArea"
                                                            value="#{documentHome.formContent}">
  -                                            <a:support event="onkeyup" reRender="preview" requestDelay="3000" eventsQueue="editKeyPress"/>
  +                                        <a:support rendered="#{documentHome.enabledPreview}" event="onkeyup" reRender="preview" requestDelay="3000" eventsQueue="editKeyPress"/>
  +                                        <a:support event="onblur" reRender="contentDecorate"/>
                                           </h:inputTextarea>
  -                                    </s:span>
  -                                    <s:span rendered="#{!documentHome.enabledPreview}">
  -                                        <h:inputTextarea tabindex="3"
  -                                                         cols="#{docEditorPreferences.properties['regularEditAreaColumns']}"
  -                                                         rows="#{docEditorPreferences.properties['regularEditAreaRows']}"
  -                                                         id="contentTextArea"
  -                                                         value="#{documentHome.formContent}"/>
  -                                    </s:span>
  +                                    <div id="contentTextEditResizeHandle" class="textEditResizeHandle"/>
                                   </div>
                               </s:decorate>
   
  @@ -275,7 +251,9 @@
       <br/>
   
       <s:div id="preview">
  -    <s:div id="documentDisplayContainer" rendered="#{documentHome.enabledPreview}" styleClass="shadowContainer"><div class="shadow1"><div class="shadow2">
  +        <s:div id="documentDisplayContainer"
  +               rendered="#{documentHome.enabledPreview}"
  +               styleClass="shadowContainer"><div class="shadow1"><div class="shadow2">
           <s:div id="documentDisplay" styleClass="documentDisplay"><j4j:idProxy id="documentDisplay_" />
               <s:div rendered="#{currentDocument.nameAsTitle}"><h1 class="documentTitle">#{currentDocument.name}</h1></s:div>
               <wiki:formattedText value="#{documentHome.instance.content}"
  @@ -284,18 +262,16 @@
                                   attachmentLinkStyleClass="regularLink"
                                   thumbnailLinkStyleClass="regularLink"
                                   renderBaseDocument="#{documentHome.instance}"
  -                                renderBaseDirectory="#{currentDirectory}"/>
  +                                    renderBaseDirectory="#{currentDirectory}"
  +                                    enablePlugins="true"/>
           </s:div>
       </div></div></s:div>
   
       <s:div rendered="#{documentHome.enabledPreview}">
  -        <br/>
           <ui:include src="includes/attachmentDisplay.xhtml"/>
       </s:div>
  -
       </s:div>
   
  -
   </ui:define>
   
   <ui:define name="footer">&#160;</ui:define>
  
  
  
  1.9       +2 -19     jboss-seam/examples/wiki/view/adminHome.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: adminHome.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/adminHome.xhtml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- adminHome.xhtml	6 Jul 2007 14:38:37 -0000	1.8
  +++ adminHome.xhtml	17 Aug 2007 13:00:25 -0000	1.9
  @@ -10,33 +10,16 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">
       <h:outputText value="System Administration"/>
   </ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="controlOne">&#160;</ui:define>
  -
   <ui:define name="controlTwo">
  +
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
               accesskey="E"><u>E</u>xit</s:link>
  +
   </ui:define>
   
   <ui:define name="content">
  
  
  
  1.18      +2 -17     jboss-seam/examples/wiki/view/userList.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userList.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList.xhtml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- userList.xhtml	6 Jul 2007 14:38:37 -0000	1.17
  +++ userList.xhtml	17 Aug 2007 13:00:25 -0000	1.18
  @@ -8,26 +8,10 @@
                   xmlns:wiki="http://jboss.com/products/seam/wiki"
                   template="themes/#{wikiPreferences.themeName}/template.xhtml">
   
  -<ui:define name="includeHeaders">
  -    <link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
  -    <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
  -</ui:define>
  -
   <ui:define name="screenname">Member List</ui:define>
   
  -<ui:define name="headerTopTwo">
  -    <ui:include src="includes/userControl.xhtml"/>
  -</ui:define>
  -
  -<ui:define name="headerBottomOne">&#160;</ui:define>
  -
  -<ui:define name="sidebar">
  -    <ui:include src="includes/searchControl.xhtml"/>
  -    <ui:include src="includes/mainMenu.xhtml"/>
  -</ui:define>
  -
   <ui:define name="controlTwo">
  +
       <s:link id="createUser" styleClass="linkNavigation" action="createUser" accesskey="C"
               rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}" propagation="none">
           <f:param name="lastConversationId" value="#{conversation.id}"/>
  @@ -36,6 +20,7 @@
       <s:link id="exit" styleClass="linkNavigation"
               action="#{browser.exitConversation(true)}"
               accesskey="E"><u>E</u>xit</s:link>
  +
   </ui:define>
   
   <ui:define name="content">
  
  
  



More information about the jboss-cvs-commits mailing list