[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Sun Mar 18 15:01:14 EDT 2007
User: cbauer
Date: 07/03/18 15:01:14
Modified: examples/wiki/view dirEdit.xhtml docEdit.xhtml
docDisplay.xhtml
Log:
Fixed file download servlet and attachment display
Revision Changes Path
1.11 +1 -1 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- dirEdit.xhtml 18 Mar 2007 15:44:36 -0000 1.10
+++ dirEdit.xhtml 18 Mar 2007 19:01:14 -0000 1.11
@@ -83,7 +83,7 @@
</s:validateAll>
- <s:div styleClass="entry">
+ <s:div styleClass="entry" rendered="#{directoryHome.managed}">
<div class="label">Default document:</div>
<div class="input">
<h:selectOneMenu value="#{directoryHome.instance.defaultDocument}" converter="#{restrictedEntityConverter}" tabindex="2">
1.13 +6 -35 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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- docEdit.xhtml 18 Mar 2007 15:44:36 -0000 1.12
+++ docEdit.xhtml 18 Mar 2007 19:01:14 -0000 1.13
@@ -88,11 +88,11 @@
id="contentNoPreview"
rendered="#{!documentHome.enabledPreview}"
value="#{documentHome.formContent}"/>
- <h:inputTextarea tabindex="3" required="true" cols="80" rows="25"
+ <h:inputTextarea tabindex="3" required="true" cols="80" rows="8"
id="contentWithPreview"
rendered="#{documentHome.enabledPreview}"
value="#{documentHome.formContent}">
- <a:support event="onkeyup" reRender="preview"/>
+ <a:support event="onkeyup" reRender="preview,attachmentDisplay" requestDelay="3000" eventQueue="editKeyPress"/>
</h:inputTextarea>
</s:div>
</div>
@@ -102,7 +102,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.enabledPreview}" tabindex="3">
- <a:support event="onchange" reRender="preview,content"/>
+ <a:support event="onchange" reRender="preview,attachmentDisplay,content"/>
</h:selectBooleanCheckbox>
Show interactive preview
</div>
@@ -161,43 +161,14 @@
<s:div styleClass="documentDisplay" id="preview">
<wiki:formattedText value="#{documentHome.instance.content}"
+ rendered="#{documentHome.enabledPreview}"
linkStyleClass="regularLink"
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
- rendered="#{documentHome.enabledPreview}"
inlineLinkStyleClass="regularLink"/>
- </s:div>
- <s:div styleClass="attachmentDisplay" rendered="#{not empty wikiTextAttachments}">
- <div class="formHead">Attachments:</div>
- <h:dataTable value="#{wikiTextAttachments}" var="link"
- binding="#{wikiUtil.datatable}"
- styleClass="directoryList"
- columnClasses="iconColumn,iconColumn,nameColumn"
- rowClasses="rowOdd,rowEven"
- cellpadding="0" cellspacing="0" border="0">
- <h:column>
- <h:panelGroup>
- <a name="attachment#{wikiUtil.datatable.rowIndex + 1}"/>
- <h:outputText value="# #{wikiUtil.datatable.rowIndex + 1}"/>
- </h:panelGroup>
- </h:column>
- <h:column>
- <h:panelGroup>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/#{fileMetaMap[link.node.contentType].displayIcon}"
- width="18" height="20"/>
- </h:panelGroup>
- </h:column>
- <h:column>
- <h:panelGroup>
- <h:outputLink value="#{link.url}">
- <h:outputText value="#{link.node.name}"/>
-  
- <h:outputText value="(#{link.node.filename}, #{link.node.humanReadableFilesize}, #{link.node.contentType})"/>
- </h:outputLink>
- </h:panelGroup>
- </h:column>
- </h:dataTable>
+ <ui:include src="includes/attachmentDisplay.xhtml"/>
+
</s:div>
</ui:define>
1.9 +3 -31 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- docDisplay.xhtml 18 Mar 2007 15:44:36 -0000 1.8
+++ docDisplay.xhtml 18 Mar 2007 19:01:14 -0000 1.9
@@ -50,40 +50,12 @@
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
inlineLinkStyleClass="regularLink"/>
- </s:div>
- <s:div styleClass="attachmentDisplay" rendered="#{not empty wikiTextAttachments}">
- <div class="formHead">Attachments:</div>
- <h:dataTable value="#{wikiTextAttachments}" var="link"
- binding="#{wikiUtil.datatable}"
- styleClass="directoryList"
- columnClasses="iconColumn,iconColumn,nameColumn"
- rowClasses="rowOdd,rowEven"
- cellpadding="0" cellspacing="0" border="0">
- <h:column>
- <h:panelGroup>
- <a name="attachment#{wikiUtil.datatable.rowIndex + 1}"/>
- <h:outputText value="# #{wikiUtil.datatable.rowIndex + 1}"/>
- </h:panelGroup>
- </h:column>
- <h:column>
- <h:panelGroup>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/#{fileMetaMap[link.node.contentType].displayIcon}"
- width="18" height="20"/>
- </h:panelGroup>
- </h:column>
- <h:column>
- <h:panelGroup>
- <h:outputLink value="#{link.url}">
- <h:outputText value="#{link.node.name}"/>
-  
- <h:outputText value="(#{link.node.filename}, #{link.node.humanReadableFilesize}, #{link.node.contentType})"/>
- </h:outputLink>
- </h:panelGroup>
- </h:column>
- </h:dataTable>
+ <ui:include src="includes/attachmentDisplay.xhtml"/>
+
</s:div>
+
</ui:define>
<ui:define name="footer"> </ui:define>
More information about the jboss-cvs-commits
mailing list