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

[Christian Bauer]

  User: cbauer  
  Date: 07/03/09 03:02:09

  Modified:    examples/wiki/view   fileEdit.xhtml dirDisplay.xhtml
  Log:
  Fixed file uploading
  
  Revision  Changes    Path
  1.4       +3 -5      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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- fileEdit.xhtml	8 Mar 2007 17:50:58 -0000	1.3
  +++ fileEdit.xhtml	9 Mar 2007 08:02:09 -0000	1.4
  @@ -109,7 +109,7 @@
                               <div class="label">Image Preview:</div>
                               <div class="output">
                                   <h:outputLink value="#{facesContext.externalContext.requestContextPath}/files/download?fileId=#{fileHome.instance.id}"><h:graphicImage
  -                                    value="/files/download?fileId=#{fileHome.instance.id}&amp;width=#{fileHome.imagePreviewSize}&amp;conversationId=#{conversation.id}"/>
  +                                    style="border: 1px solid black;" value="/files/download?fileId=#{fileHome.instance.id}&amp;width=#{fileHome.imagePreviewSize}&amp;conversationId=#{conversation.id}"/>
                                   </h:outputLink>
                                   
                               </div>
  @@ -144,11 +144,10 @@
   
                       </s:div>
   
  -                    <s:div rendered="#{!fileHome.managed}">
  -
  +                    <s:div>
                           <s:decorate>
                               <div class="entry">
  -                                <div class="label">Upload:</div>
  +                                <div class="label">Upload file:</div>
                                   <div class="input">
                                       <s:fileUpload data="#{fileHome.filedata}"
                                                     contentType="#{fileHome.contentType}"
  @@ -156,7 +155,6 @@
                                   </div>
                               </div>
                           </s:decorate>
  -                        
                       </s:div>
   
                   </s:validateAll>
  
  
  
  1.8       +7 -1      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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- dirDisplay.xhtml	8 Mar 2007 17:50:58 -0000	1.7
  +++ dirDisplay.xhtml	9 Mar 2007 08:02:09 -0000	1.8
  @@ -84,9 +84,15 @@
               <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/icon.doc.default.gif"
                               width="18" height="20"
                               rendered="#{wiki:isDocument(node) and node == currentDirectory.defaultDocument}"/>
  +
               <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/#{fileMetaMap[node.contentType].displayIcon}"
                               width="18" height="20"
  -                            rendered="#{wiki:isFile(node)}"/>
  +                            rendered="#{wiki:isFile(node) and !empty fileMetaMap[node.contentType]}"/>
  +
  +            <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/#{fileMetaMap['generic'].displayIcon}"
  +                            width="18" height="20"
  +                            rendered="#{wiki:isFile(node) and empty fileMetaMap[node.contentType]}"/>
  +
           </h:column>
   
           <h:column>