[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian.bauer at jboss.com
Thu Feb 22 06:52:25 EST 2007
User: cbauer
Date: 07/02/22 06:52:25
Modified: examples/wiki/view dirEdit.xhtml docEdit.xhtml
profile.xhtml dirDisplay.xhtml docDisplay.xhtml
Log:
Full keyboard/shortcut navigation
Revision Changes Path
1.4 +35 -24 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- dirEdit.xhtml 21 Feb 2007 16:24:11 -0000 1.3
+++ dirEdit.xhtml 22 Feb 2007 11:52:25 -0000 1.4
@@ -29,8 +29,8 @@
</ui:define>
<ui:define name="control">
- <s:link id="exit" value="Exit Editor" styleClass="linkNavigation"
- action="#{browser.redirectToLastBrowsedPage()}" propagation="end"/>
+ <s:link id="exit" styleClass="linkNavigation" accesskey="E"
+ action="#{browser.redirectToLastBrowsedPage()}" propagation="end"><u>E</u>xit Editor</s:link>
</ui:define>
<ui:define name="content">
@@ -66,7 +66,7 @@
<div class="entry">
<div class="label">Name:</div>
<div class="input">
- <h:inputText size="40" maxlength="255" id="name" required="true"
+ <h:inputText size="40" maxlength="255" id="name" required="true" tabindex="1"
value="#{directoryHome.instance.name}"/>
</div>
</div>
@@ -87,14 +87,14 @@
cellpadding="0" cellspacing="0" border="0">
<h:column>
- <h:commandLink id="nodeUp"
+ <h:commandLink id="nodeUp" tabindex="1"
action="#{directoryHome.moveNodeUpInList}"
rendered="#{uiBindings.childNodeTable.rowIndex > 0}">
<h:graphicImage value="/themes/#{globalPrefs.themeName}/img/up.gif" width="18" height="18"/>
</h:commandLink>
</h:column>
<h:column>
- <h:commandLink id="nodeDown"
+ <h:commandLink id="nodeDown" tabindex="2"
action="#{directoryHome.moveNodeDownInList}"
rendered="#{uiBindings.childNodeTable.rowIndex+1 lt uiBindings.childNodeTable.rowCount}">
<h:graphicImage value="/themes/#{globalPrefs.themeName}/img/down.gif" width="18" height="18"/>
@@ -105,14 +105,14 @@
<f:facet name="header">
Menu Item
</f:facet>
- <h:selectBooleanCheckbox value="#{node.menuItem}"/>
+ <h:selectBooleanCheckbox value="#{node.menuItem}" tabindex="3"/>
</h:column>
<h:column>
<f:facet name="header">
Start Document
</f:facet>
- <h:commandLink id="defaultDocument"
+ <h:commandLink id="defaultDocument" tabindex="4"
action="#{directoryHome.selectDefaultDocument}"
rendered="#{directoryHome.instance.defaultDocument != node and wiki:isDocument(node)}">
<h:graphicImage value="/themes/#{globalPrefs.themeName}/img/right.gif" width="18" height="18"/>
@@ -147,23 +147,34 @@
<div class="entry">
<div class="label"> </div>
<div class="input">
- <h:commandButton id="preview" value="Preview" styleClass="buttonNonpersistent"
- action="#{directoryHome.previewMenuItems()}"
- rendered="#{childNodes.rowCount>0}"/>
- <h:commandButton id="save" value="Save" styleClass="button"
- action="#{directoryHome.persist}"
- rendered="#{!directoryHome.managed}"/>
+ <h:commandLink id="preview" styleClass="buttonNonpersistentHidden"
+ action="#{directoryHome.previewMenuItems()}"
+ rendered="#{childNodes.rowCount>0}"
+ tabindex="5" accesskey="P"/>
+ <h:outputLabel for="preview" styleClass="buttonNonpersistent" rendered="#{childNodes.rowCount>0}"><u>P</u>review</h:outputLabel>
+
+ <h:commandLink id="save" styleClass="buttonHidden" action="#{directoryHome.persist}"
+ rendered="#{!directoryHome.managed}"
+ tabindex="6" accesskey="S"/>
+ <h:outputLabel for="save" styleClass="button" rendered="#{!directoryHome.managed}"><u>S</u>ave</h:outputLabel>
- <h:commandButton id="update" value="Update" styleClass="button"
+ <h:commandLink id="update" styleClass="buttonHidden"
action="#{directoryHome.update}"
- rendered="#{directoryHome.managed}"/>
+ rendered="#{directoryHome.managed}"
+ tabindex="7" accesskey="U"/>
+ <h:outputLabel for="update" styleClass="button" rendered="#{directoryHome.managed}"><u>U</u>pdate</h:outputLabel>
- <h:commandButton id="delete" value="Delete" styleClass="button"
+ <h:commandLink id="delete" styleClass="buttonHidden"
action="#{directoryHome.remove}"
rendered="#{directoryHome.managed
and !empty directoryHome.instance.parent
- and empty directoryHome.instance.children}"/>
+ and empty directoryHome.instance.children}"
+ tabindex="8" accesskey="D"/>
+ <h:outputLabel for="delete" styleClass="button"
+ rendered="#{directoryHome.managed
+ and !empty directoryHome.instance.parent
+ and empty directoryHome.instance.children}"><u>D</u>elete</h:outputLabel>
</div>
</div>
1.4 +25 -17 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- docEdit.xhtml 21 Feb 2007 16:24:11 -0000 1.3
+++ docEdit.xhtml 22 Feb 2007 11:52:25 -0000 1.4
@@ -29,8 +29,8 @@
</ui:define>
<ui:define name="control">
- <s:link id="exit" value="Exit Editor" styleClass="linkNavigation"
- action="#{browser.redirectToLastBrowsedPage()}" propagation="end"/>
+ <s:link id="exit" styleClass="linkNavigation" accesskey="E"
+ action="#{browser.redirectToLastBrowsedPage()}" propagation="end"><u>E</u>xit Editor</s:link>
</ui:define>
<ui:define name="content">
@@ -56,7 +56,7 @@
<div class="entry">
<div class="label">Name:</div>
<div class="input">
- <h:inputText size="80" maxlength="255" id="name" required="true"
+ <h:inputText tabindex="1" size="80" maxlength="255" id="name" required="true"
value="#{documentHome.instance.name}"/>
</div>
</div>
@@ -66,7 +66,7 @@
<div class="entry">
<div class="label">Content:</div>
<div class="input">
- <h:inputTextarea id="content" required="true" cols="80" rows="30"
+ <h:inputTextarea tabindex="2" id="content" required="true" cols="80" rows="30"
value="#{documentHome.formContent}"/>
</div>
</div>
@@ -80,20 +80,28 @@
<div class="entry">
<div class="label"> </div>
<div class="input">
- <h:commandButton id="preview" value="Preview" styleClass="buttonNonpersistent"
- action="#{documentHome.setEnabledPreview(true)}"/>
- <h:commandButton id="save" value="Save" styleClass="button"
- action="#{documentHome.persist}"
- rendered="#{!documentHome.managed}"/>
+ <h:commandLink id="preview" styleClass="buttonNonpersistentHidden"
+ action="#{documentHome.setEnabledPreview(true)}"
+ tabindex="3" accesskey="P"/>
+ <h:outputLabel for="preview" styleClass="buttonNonpersistent"><u>P</u>review</h:outputLabel>
+
+ <h:commandLink id="save" styleClass="buttonHidden" action="#{documentHome.persist}"
+ rendered="#{!documentHome.managed}"
+ tabindex="4" accesskey="S"/>
+ <h:outputLabel for="save" styleClass="button" rendered="#{!documentHome.managed}"><u>S</u>ave</h:outputLabel>
- <h:commandButton id="update" value="Update" styleClass="button"
+ <h:commandLink id="update" styleClass="buttonHidden"
action="#{documentHome.update}"
- rendered="#{documentHome.managed}"/>
+ rendered="#{documentHome.managed}"
+ tabindex="5" accesskey="U"/>
+ <h:outputLabel for="update" styleClass="button" rendered="#{documentHome.managed}"><u>U</u>pdate</h:outputLabel>
- <h:commandButton id="delete" value="Delete" styleClass="button"
+ <h:commandLink id="delete" styleClass="buttonHidden"
action="#{documentHome.remove}"
- rendered="#{documentHome.managed}"/>
+ rendered="#{documentHome.managed}"
+ tabindex="6" accesskey="D"/>
+ <h:outputLabel for="delete" styleClass="button" rendered="#{documentHome.managed}"><u>D</u>elete</h:outputLabel>
</div>
</div>
1.3 +31 -29 jboss-seam/examples/wiki/view/profile.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: profile.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/profile.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- profile.xhtml 21 Feb 2007 20:06:56 -0000 1.2
+++ profile.xhtml 22 Feb 2007 11:52:25 -0000 1.3
@@ -26,8 +26,9 @@
</ui:define>
<ui:define name="control">
- <s:link id="cancel" value="Cancel" styleClass="linkNavigation"
- action="#{browser.redirectToLastBrowsedPage()}" propagation="end"/>
+ <s:link id="cancel" styleClass="linkNavigation"
+ action="#{browser.redirectToLastBrowsedPage()}" propagation="end"
+ accesskey="E">Canc<u>e</u>l</s:link>
</ui:define>
<ui:define name="content">
@@ -47,7 +48,7 @@
<div class="entry">
<div class="label">First name:</div>
<div class="input">
- <h:inputText size="40" maxlength="63" id="firstname" required="true"
+ <h:inputText tabindex="1" size="40" maxlength="63" id="firstname" required="true"
value="#{userHome.instance.firstname}"/>
</div>
</div>
@@ -57,7 +58,7 @@
<div class="entry">
<div class="label">Last name:</div>
<div class="input">
- <h:inputText size="40" maxlength="63" id="lastname" required="true"
+ <h:inputText tabindex="2" size="40" maxlength="63" id="lastname" required="true"
value="#{userHome.instance.lastname}"/>
</div>
</div>
@@ -67,7 +68,7 @@
<div class="entry">
<div class="label">E-Mail:</div>
<div class="input">
- <h:inputText size="40" maxlength="255" id="email" required="true"
+ <h:inputText tabindex="3" size="40" maxlength="255" id="email" required="true"
value="#{userHome.instance.email}"/>
</div>
</div>
@@ -77,7 +78,7 @@
<div class="entry">
<div class="label">Username:</div>
<div class="input">
- <h:inputText size="16" maxlength="16" id="username" required="true"
+ <h:inputText tabindex="4" size="16" maxlength="16" id="username" required="true"
value="#{userHome.instance.username}"/>
</div>
</div>
@@ -87,7 +88,7 @@
<div class="entry">
<div class="label">Password:</div>
<div class="input">
- <h:inputSecret size="15" maxlength="15" id="password"
+ <h:inputSecret tabindex="5" size="15" maxlength="15" id="password"
redisplay="true"
value="#{userHome.password}"/>
</div>
@@ -98,30 +99,28 @@
<div class="entry">
<div class="label">Repeat password:</div>
<div class="input">
- <h:inputSecret size="15" maxlength="15" id="passwordControl"
+ <h:inputSecret tabindex="6" size="15" maxlength="15" id="passwordControl"
redisplay="true"
value="#{userHome.passwordControl}"/>
</div>
</div>
</s:decorate>
- <s:div rendered="#{not identity.loggedIn}">
- <div class="entry">
+ <s:div styleClass="entry" rendered="#{not identity.loggedIn}">
<div class="label">Verification image:</div>
<div class="output">
<h:graphicImage value="/seam/resource/captcha?#{captcha.id}" style="border: 1px solid black;"/>
</div>
- </div>
+ </s:div>
<s:decorate>
- <div class="entry">
+ <s:div styleClass="entry" rendered="#{not identity.loggedIn}">
<div class="label">Enter the letters:</div>
<div class="input">
- <h:inputText id="verifyCaptcha" value="#{captcha.response}" required="true"/>
+ <h:inputText tabindex="7" size="15" id="verifyCaptcha" value="#{captcha.response}" required="true"/>
</div>
- </div>
- </s:decorate>
</s:div>
+ </s:decorate>
</s:validateAll>
@@ -132,13 +131,16 @@
<div class="entry">
<div class="label"> </div>
<div class="input">
- <h:commandButton id="register" value="Register" styleClass="button"
- action="#{userHome.persist}"
- rendered="#{!userHome.managed}"/>
-
- <h:commandButton id="update" value="Update" styleClass="button"
- action="#{userHome.update}"
- rendered="#{userHome.managed}"/>
+
+ <h:commandLink id="register" styleClass="buttonHidden" action="#{userHome.persist}"
+ rendered="#{!userHome.managed}"
+ tabindex="8" accesskey="G"/>
+ <h:outputLabel for="register" styleClass="button" rendered="#{!userHome.managed}">Re<u>g</u>ister</h:outputLabel>
+
+ <h:commandLink id="update" styleClass="buttonHidden" action="#{userHome.update}"
+ rendered="#{userHome.managed}"
+ tabindex="9" accesskey="U"/>
+ <h:outputLabel for="update" styleClass="button" rendered="#{userHome.managed}"><u>U</u>pdate</h:outputLabel>
</div>
</div>
1.3 +8 -8 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- dirDisplay.xhtml 21 Feb 2007 16:24:11 -0000 1.2
+++ dirDisplay.xhtml 22 Feb 2007 11:52:25 -0000 1.3
@@ -30,15 +30,15 @@
<!-- Real directory -->
<h:panelGroup rendered="#{!empty currentDirectory.parent}">
- <s:link id="createDir" styleClass="linkNavigation" value="New Subdirectory" action="createDir"/>
- <s:link id="editDir" styleClass="linkNavigation" value="Edit Directory" action="editDir"/>
- <s:link id="createDoc" styleClass="linkNavigation" value="New Document" action="createDoc"/>
+ <s:link id="createDir" styleClass="linkNavigation" action="createDir" accesskey="S">New <u>S</u>ubdirectory</s:link>
+ <s:link id="editDir" styleClass="linkNavigation" action="editDir" accesskey="E"><u>E</u>dit Directory</s:link>
+ <s:link id="createDoc" styleClass="linkNavigation" action="createDoc" accesskey="N"><u>N</u>ew Document</s:link>
</h:panelGroup>
<!-- Virtual root directory -->
<h:panelGroup rendered="#{empty currentDirectory.parent}">
- <s:link id="createArea" styleClass="linkNavigation" value="New Area" action="createDir"/>
- <s:link id="editArea" styleClass="linkNavigation" value="Edit Areas" action="editDir"/>
+ <s:link id="createArea" styleClass="linkNavigation" action="createDir" accesskey="N"><u>N</u>ew Area</s:link>
+ <s:link id="editArea" styleClass="linkNavigation" action="editDir" accesskey="E"><u>E</u>dit Area</s:link>
</h:panelGroup>
</div>
@@ -49,7 +49,7 @@
<div class="directoryPathPanel">
<h:panelGroup>
<ui:repeat var="directory" value="#{currentDirectoryPath}">
- <s:button view="/dirDisplay.xhtml" value="#{directory.name}" styleClass="directoryButton" propagation="none">
+ <s:button view="/dirDisplay.xhtml" value="#{directory.name}" styleClass="directoryButton" propagation="none" tabindex="1">
<f:param name="nodeId" value="#{directory.id}"/>
</s:button>
<h:outputText value="/" styleClass="directorySeparator" rendered="#{directory != currentDirectory}"/>
@@ -84,12 +84,12 @@
<h:column>
<s:div rendered="#{wiki:isDirectory(node)}">
- <s:link id="browseDirectory" value="#{node.name}" view="/dirDisplay.xhtml" propagation="none">
+ <s:link id="browseDirectory" value="#{node.name}" view="/dirDisplay.xhtml" propagation="none" tabindex="2">
<f:param name="nodeId" value="#{node.id}"/>
</s:link>
</s:div>
<s:div rendered="#{wiki:isDocument(node)}">
- <h:outputLink value="#{wiki:renderURL(node)}">#{node.name}</h:outputLink>
+ <h:outputLink value="#{wiki:renderURL(node)}" tabindex="2">#{node.name}</h:outputLink>
</s:div>
</h:column>
1.4 +8 -5 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- docDisplay.xhtml 21 Feb 2007 16:24:11 -0000 1.3
+++ docDisplay.xhtml 22 Feb 2007 11:52:25 -0000 1.4
@@ -10,6 +10,7 @@
<ui:define name="pluginCSS">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
+ <link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/breadcrumb.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
</ui:define>
@@ -22,7 +23,9 @@
<ui:define name="headerBottomLeft">
<ui:include src="plugins/breadcrumb/plugin.xhtml"/>
</ui:define>
-<ui:define name="headerBottomRight"> </ui:define>
+<ui:define name="headerBottomRight">
+ <ui:include src="plugins/searchControl/plugin.xhtml"/>
+</ui:define>
<ui:define name="sidebar">
@@ -33,10 +36,10 @@
<div>
<h:panelGroup>
- <s:link id="createDoc" styleClass="linkNavigation" value="Create" action="createDoc"/>
- <s:link id="editDoc" styleClass="linkNavigation" value="Edit" action="editDoc"/>
- <s:link id="discussDoc" styleClass="linkNavigation" value="Discuss"/>
- <s:link id="browseDir" styleClass="linkNavigation" value="Browse" action="browseDir"/>
+ <s:link id="createDoc" styleClass="linkNavigation" action="createDoc" accesskey="C"><u>C</u>reate</s:link>
+ <s:link id="editDoc" styleClass="linkNavigation" action="editDoc" accesskey="E"><u>E</u>dit</s:link>
+ <s:link id="discussDoc" styleClass="linkNavigation" accesskey="D"><u>D</u>iscuss</s:link>
+ <s:link id="browseDir" styleClass="linkNavigation" action="browseDir" accesskey="B"><u>B</u>rowse</s:link>
</h:panelGroup>
</div>
More information about the jboss-cvs-commits
mailing list