[jboss-cvs] jboss-seam/examples/wiki/view/includes ...
Christian Bauer
christian at hibernate.org
Tue Mar 20 14:40:32 EDT 2007
User: cbauer
Date: 07/03/20 14:40:32
Modified: examples/wiki/view/includes attachmentDisplay.xhtml
userControl.xhtml confirmationModalDialog.xhtml
Log:
Session timeout popup notice
Revision Changes Path
1.2 +7 -10 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- attachmentDisplay.xhtml 18 Mar 2007 19:01:16 -0000 1.1
+++ attachmentDisplay.xhtml 20 Mar 2007 18:40:32 -0000 1.2
@@ -8,24 +8,21 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:s="http://jboss.com/products/seam/taglib">
- <div class="formHead rightBorder leftBorder">Attachments:</div>
- <h:dataTable value="#{wikiTextAttachments}" var="link"
+ <h:dataTable value="#{wikiTextAttachments}" var="link" style="width:450px;"
binding="#{wikiUtil.datatable}"
- styleClass="datatable topLeftBottomBorder"
- columnClasses="onePercentColumn rightBorder alignLeft, onePercentColumn alignLeft, defaultColumn rightBorder alignLeft"
+ styleClass="datatable rightBorder leftBorder topBorder bottomBorder"
+ headerClass="regularHeader alignLeft"
+ columnClasses="fivePercentColumn alignLeft, defaultColumn alignLeft"
rowClasses="rowOdd,rowEven"
cellpadding="0" cellspacing="0" border="0">
<h:column>
- <h:panelGroup>
+ <f:facet name="header">Attachments:</f:facet>
+ <h:panelGrid columns="3" columnClasses="onePercentColumn alignRight, onePercentColumn alignLeft, onePercentColumn alignRight">
<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:panelGrid>
</h:column>
<h:column>
<h:panelGroup>
1.2 +27 -0 jboss-seam/examples/wiki/view/includes/userControl.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userControl.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/userControl.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- userControl.xhtml 18 Mar 2007 23:29:19 -0000 1.1
+++ userControl.xhtml 20 Mar 2007 18:40:32 -0000 1.2
@@ -3,6 +3,8 @@
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:rich="http://richfaces.ajax4jsf.org/rich"
xmlns:s="http://jboss.com/products/seam/taglib">
<s:div rendered="#{not identity.loggedIn}">
@@ -23,6 +25,31 @@
</s:div>
<s:div rendered="#{identity.loggedIn}">
+
+ <script type="text/javascript">
+ setTimeout( 'javascript:Richfaces.showModalPanel(\'timeoutNotice\', {width:280, height:120})', '#{wiki:getSessionTimeoutSeconds() * 1000}' );
+ </script>
+
+ <ui:decorate template="confirmationModalDialog.xhtml">
+ <ui:param name="confirmationModalDialogId" value="timeoutNotice"/>
+ <ui:param name="confirmationHideCancel" value="true"/>
+ <ui:define name="confirmationTitle">
+ Notice
+ </ui:define>
+ <ui:define name="confirmationContent">
+ <p>Your session has timed out, please login again.</p>
+ </ui:define>
+ <ui:define name="confirmationOption">
+ <h:outputLink id="OKRedirect"
+ onclick="Richfaces.hideModalPanel('#{confirmationModalDialogId}')"
+ value="#{wiki:renderURL(wikiStart)}"
+ styleClass="buttonNonpersistent"><span class="buttonLabel">Take me to the start page</span></h:outputLink>
+ <h:outputLink id="OK"
+ onclick="Richfaces.hideModalPanel('#{confirmationModalDialogId}')"
+ styleClass="buttonNonpersistent"><span class="buttonLabel">Close message</span></h:outputLink>
+ </ui:define>
+ </ui:decorate>
+
<h:form>
<h:panelGroup>
<h:outputText styleClass="userControlLabel" value="(#{currentUser.firstname} #{currentUser.lastname})"/>
1.3 +2 -1 jboss-seam/examples/wiki/view/includes/confirmationModalDialog.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: confirmationModalDialog.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/confirmationModalDialog.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- confirmationModalDialog.xhtml 20 Mar 2007 02:38:16 -0000 1.2
+++ confirmationModalDialog.xhtml 20 Mar 2007 18:40:32 -0000 1.3
@@ -18,7 +18,8 @@
<h:panelGroup>
<ui:insert name="confirmationOption"/>
<h:outputLink id="cancel" value="javascript:Richfaces.hideModalPanel('#{confirmationModalDialogId}')"
- accesskey="C" styleClass="buttonNonpersistent">
+ accesskey="C" styleClass="buttonNonpersistent"
+ rendered="#{!confirmationHideCancel}">
<span class="buttonLabel"><u>C</u>ancel</span>
</h:outputLink>
</h:panelGroup>
More information about the jboss-cvs-commits
mailing list