[jboss-cvs] jboss-seam/examples/wiki/view/includes ...
Christian Bauer
christian at hibernate.org
Fri Nov 9 10:08:25 EST 2007
User: cbauer
Date: 07/11/09 10:08:25
Modified: examples/wiki/view/includes accessLevelSelector.xhtml
deleteConfirmation.xhtml statusIndicator.xhtml
commentsDisplay.xhtml commentForm.xhtml
helpPopup.xhtml wikiTextEditor.xhtml
Log:
Various updates to core classes and views, required for forum plugin
Revision Changes Path
1.6 +6 -6 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- accessLevelSelector.xhtml 12 Oct 2007 16:31:26 -0000 1.5
+++ accessLevelSelector.xhtml 9 Nov 2007 15:08:25 -0000 1.6
@@ -10,12 +10,12 @@
<s:div styleClass="entry">
<div class="label">#{messages['lacewiki.label.ReadableBy']}:</div>
<div class="input">
- <h:selectOneMenu value="#{nodePermissions.readAccessLevel}" tabindex="1">
+ <h:selectOneMenu value="#{nodeHome.readAccessLevel}" tabindex="1">
<s:selectItems value="#{assignableAccessLevelsList}"
var="aLvl"
label="Role: #{wiki:truncateString(aLvl.roleNames, 40, '...')}"
- noSelectionLabel="#{currentUser.id == currentNode.createdBy.id
- || empty currentNode.createdBy
+ noSelectionLabel="#{currentUser.id == nodeHome.instance.createdBy.id
+ || empty nodeHome.instance.createdBy
? wiki:concat('User: ', currentUser.username)
: null}"/>
</h:selectOneMenu>
@@ -25,12 +25,12 @@
<s:div styleClass="entry">
<div class="label">#{messages['lacewiki.label.WritableBy']}:</div>
<div class="input">
- <h:selectOneMenu value="#{nodePermissions.writeAccessLevel}" tabindex="1">
+ <h:selectOneMenu value="#{nodeHome.writeAccessLevel}" tabindex="1">
<s:selectItems value="#{assignableAccessLevelsList}"
var="aLvl"
label="Role: #{wiki:truncateString(aLvl.roleNames, 40, '...')}"
- noSelectionLabel="#{currentUser.id == currentNode.createdBy.id
- || empty currentNode.createdBy
+ noSelectionLabel="#{currentUser.id == nodeHome.instance.createdBy.id
+ || empty nodeHome.instance.createdBy
? wiki:concat('User: ', currentUser.username)
: null}"/>
</h:selectOneMenu>
1.9 +1 -1 jboss-seam/examples/wiki/view/includes/deleteConfirmation.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: deleteConfirmation.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/deleteConfirmation.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- deleteConfirmation.xhtml 12 Oct 2007 16:31:26 -0000 1.8
+++ deleteConfirmation.xhtml 9 Nov 2007 15:08:25 -0000 1.9
@@ -36,7 +36,7 @@
<ui:define name="dialogContent"><p align="center">#{messages['lacewiki.label.AreYouSureYouWantToDelete']} <br/>'#{home.instance}'?</p></ui:define>
<ui:define name="dialogControls">
<h:form style="display:inline" id="deleteDialog">
- <a:commandLink id="delete" action="#{home.remove}" styleClass="button" reRender="#{reRender}">
+ <a:commandLink id="delete" action="#{home.remove}" styleClass="button closeDialog" reRender="#{reRender}">
<h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.OK']}"/>
</a:commandLink>
</h:form>
1.3 +0 -0 jboss-seam/examples/wiki/view/includes/statusIndicator.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
1.16 +2 -2 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- commentsDisplay.xhtml 22 Oct 2007 05:15:28 -0000 1.15
+++ commentsDisplay.xhtml 9 Nov 2007 15:08:25 -0000 1.16
@@ -28,7 +28,7 @@
<a id="comment#{c.id}"/>
<div class="commentSubject undecoratedLink">
- <h:outputLink value="#{wiki:renderURL(currentDocument)}#comment#{c.id}">
+ <h:outputLink value="#{wiki:renderCommentURL(currentDocument, c)}">
<h:outputText value="#{c.subject}" rendered="#{documentHome.instance.name != c.subject}"/>
</h:outputLink>
</div>
@@ -43,7 +43,7 @@
<s:span> (
<s:span styleClass="commentAuthor" rendered="#{empty c.fromUserHomepage}">#{c.fromUserName}</s:span>
<s:span styleClass="commentAuthor" rendered="#{!empty c.fromUserHomepage}"><a
- href="http://#{c.fromUserHomepage}">#{c.fromUserName}</a></s:span>
+ href="#{c.fromUserHomepage}">#{c.fromUserName}</a></s:span>
<s:span styleClass="commentAuthor" rendered="#{!empty c.fromUserEmail}">, 
<h:outputLink value="#{wiki:escapeEmailURL(wiki:concat('mailto:', c.fromUserEmail))}">#{wiki:escapeAtSymbol(c.fromUserEmail)}</h:outputLink>
</s:span>)
1.16 +1 -1 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- commentForm.xhtml 12 Oct 2007 16:31:26 -0000 1.15
+++ commentForm.xhtml 9 Nov 2007 15:08:25 -0000 1.16
@@ -67,7 +67,7 @@
<ui:param name="namingContainer" value="commentForm"/>
<ui:param name="label" value="#{messages['lacewiki.label.commentForm.Comment']}"/>
<ui:param name="valueBinding" value="#{commentHome.comment.text}"/>
- <ui:param name="valueMaxLength" value="8000"/>
+ <ui:param name="valueMaxLength" value="32768"/>
<ui:param name="valueRequired" value="true"/>
<ui:param name="textEditorColumns" value="50"/>
<ui:param name="textEditorRows" value="10"/>
1.4 +0 -1 jboss-seam/examples/wiki/view/includes/helpPopup.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: helpPopup.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/helpPopup.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- helpPopup.xhtml 12 Oct 2007 16:31:26 -0000 1.3
+++ helpPopup.xhtml 9 Nov 2007 15:08:25 -0000 1.4
@@ -65,7 +65,6 @@
styleClass="buttonNonpersistent"
tabindex="1">
<h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.help.OpenFullscreen']}"/>
-
</h:outputLink>
</s:span>
1.8 +1 -1 jboss-seam/examples/wiki/view/includes/wikiTextEditor.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: wikiTextEditor.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/wikiTextEditor.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- wikiTextEditor.xhtml 12 Oct 2007 16:31:26 -0000 1.7
+++ wikiTextEditor.xhtml 9 Nov 2007 15:08:25 -0000 1.8
@@ -108,7 +108,7 @@
reRender="#{textEditorId}MessageLabel, #{textPreviewId}"
status="#{namingContainer}:status"
ignoreDupResponses="true"
- requestDelay="5000"
+ requestDelay="3000"
ajaxSingle="true"
eventsQueue="textEditKeyPress"
rendered="#{not empty textPreviewId}"/>
More information about the jboss-cvs-commits
mailing list