[jboss-cvs] jboss-seam/examples/wiki/view/includes ...
Christian Bauer
christian at hibernate.org
Tue Jan 1 08:00:22 EST 2008
User: cbauer
Date: 08/01/01 08:00:21
Modified: examples/wiki/view/includes popupDialog.xhtml
tagEditor.xhtml userControl.xhtml
Log:
JBSEAM-1863 - Pager plugin for previous/next document, also on forum header
Revision Changes Path
1.8 +1 -1 jboss-seam/examples/wiki/view/includes/popupDialog.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: popupDialog.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/popupDialog.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- popupDialog.xhtml 19 Dec 2007 04:29:19 -0000 1.7
+++ popupDialog.xhtml 1 Jan 2008 13:00:20 -0000 1.8
@@ -30,7 +30,7 @@
<s:div styleClass="popupDialogControls" id="#{dialogId}Controls">
<h:panelGroup>
<ui:insert name="dialogControls"/>
- <h:outputLink value="#" rendered="#{!hideCancelButton}"
+ <h:outputLink rendered="#{!hideCancelButton}"
styleClass="buttonNonpersistent closeDialog">
<h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.Cancel']}"/>
</h:outputLink>
1.2 +2 -1 jboss-seam/examples/wiki/view/includes/tagEditor.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: tagEditor.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/tagEditor.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tagEditor.xhtml 19 Dec 2007 04:29:19 -0000 1.1
+++ tagEditor.xhtml 1 Jan 2008 13:00:20 -0000 1.2
@@ -45,7 +45,8 @@
<s:fragment rendered="#{not home.isTagInTagString(tagCount.tag)}">
<h:outputLink value="#" styleClass="sessionEventTrigger"
onclick="appendTag('#{tagCount.tag}')">#{tagCount.tag}</h:outputLink>
-   
+ <h:outputText rendered="#{home.popularTags.indexOf(tagCount) < home.popularTags.size()-1}"
+ value=" | "/>
</s:fragment>
</s:span>
</ui:repeat>
1.19 +90 -10 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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- userControl.xhtml 30 Dec 2007 02:33:20 -0000 1.18
+++ userControl.xhtml 1 Jan 2008 13:00:20 -0000 1.19
@@ -1,20 +1,97 @@
-<h:form id="userControl" styleClass="userControlForm"
+<s:fragment
xmlns="http://www.w3.org/1999/xhtml"
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:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:s="http://jboss.com/products/seam/taglib">
+
+<s:fragment rendered="#{not identity.loggedIn}">
+ <ui:decorate template="popupDialog.xhtml">
+
+ <ui:param name="dialogId" value="passwordReset"/>
+ <ui:param name="hideCancelButton" value="true"/>
+ <ui:param name="disableResize" value="true"/>
+ <ui:define name="dialogInit">
+ <script type="text/javascript">jQuery(function() {
+ var offset = jQuery("#userControl\\:openPasswordResetPopup").offset();
+ jsf('passwordResetPopup')
+ .css({ width: "400px", height: "115px",
+ top: offset.top+10+"px", left: offset.left-200+"px"
+ })
+ .jqm({
+ trigger: jQuery("#userControl\\:openPasswordResetPopup"),
+ closeClass: "closeDialog",
+ onShow: fadeInPopupDialog,
+ onHide: fadeOutPopupDialog
+ });
+ });</script>
+ </ui:define>
+ <ui:define name="dialogTitle">#{messages['lacewiki.label.resetPassword.DialogTitle']}</ui:define>
+ <ui:define name="dialogContent">
+ <h:form id="resetPasswordForm" styleClass="resetPasswordForm">
+ <div class="form">
+ <div class="formFields">
+
+ <s:decorate id="nameDecorate" template="formFieldDecorate.xhtml">
+ <ui:param name="fieldId" value="resetPasswordUsername"/>
+ <ui:define name="label">#{messages['lacewiki.label.resetPassword.Username']}</ui:define>
+ <h:inputText tabindex="51" size="16" maxlength="16" value="#{authenticator.resetPasswordUsername}"/>
+ </s:decorate>
+
+ <s:decorate id="emailDecorate" template="formFieldDecorate.xhtml">
+ <ui:param name="fieldId" value="resetPasswordEmail"/>
+ <ui:define name="label">#{messages['lacewiki.label.resetPassword.Email']}</ui:define>
+ <h:inputText tabindex="51" size="32" maxlength="255" value="#{authenticator.resetPasswordEmail}"/>
+ </s:decorate>
+
+ </div>
+ <div class="formControls">
+ <div class="entry">
+ <div class="label"> </div>
+ <div class="input">
+ <a:commandLink styleClass="buttonNonpersistent sessionEventTrigger closeDialog" tabindex="51"
+ reRender="messageBoxContainer, passwordReset"
+ oncomplete="onAjaxRequestComplete()"
+ action="#{authenticator.sendResetPasswordEmail}">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.resetPassword.Reset']}"/>
+ </a:commandLink>
+
+ <h:outputLink styleClass="buttonNonpersistent closeDialog" tabindex="51">
+ <h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.Cancel']}"/>
+ </h:outputLink>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
+</s:fragment>
+
+<h:form id="userControl" styleClass="userControlForm">
+
<s:div rendered="#{not identity.loggedIn}">
<h:panelGroup styleClass="userControlPanel">
<s:span styleClass="sessionEventTrigger">
+
<h:outputLabel styleClass="userControlLabel" for="loginUsername" value="#{messages['lacewiki.label.userControl.Username']}:"/>
<h:inputText styleClass="userControlInput" id="loginUsername" value="#{identity.username}" size="8" tabindex="50"/>
- <h:outputLabel styleClass="userControlLabel" for="loginPassword" value="#{messages['lacewiki.label.userControl.Password']}:"/>
+
+ <h:outputLabel styleClass="userControlLabel" for="loginPassword" value="#{messages['lacewiki.label.userControl.Password']}"/>
+ <h:outputText value="("/>
+ <h:outputLink value="#" id="openPasswordResetPopup"
+ styleClass="userControlLink" style="padding:0;margin:0;border:0;" tabindex="50">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.ResetPassword']}"/>
+ </h:outputLink>
+ <h:outputText value="):" style="padding-right:5px;"/>
<h:inputSecret styleClass="userControlInput" id="loginPassword" value="#{identity.password}" size="8" tabindex="50"/>
+
<h:commandLink styleClass="userControlLink" action="#{identity.login}" tabindex="50"
accesskey="#{messages['lacewiki.button.userControl.Login.accesskey']}">
<h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Login']}"/>
@@ -81,3 +158,6 @@
</s:div>
</h:form>
+
+</s:fragment>
+
More information about the jboss-cvs-commits
mailing list