[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Sat Sep 1 04:42:47 EDT 2007
User: cbauer
Date: 07/09/01 04:42:47
Modified: examples/wiki/view docEdit.xhtml adminHome.xhtml
docHistory.xhtml userList.xhtml docDisplay.xhtml
userHome.xhtml
Log:
UI improvements
Revision Changes Path
1.42 +13 -14 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.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- docEdit.xhtml 31 Aug 2007 17:54:36 -0000 1.41
+++ docEdit.xhtml 1 Sep 2007 08:42:47 -0000 1.42
@@ -27,10 +27,6 @@
<ui:define name="content">
- <script type="text/javascript">jQuery(function() {
- clearContentBackground();
- });</script>
-
<s:span rendered="#{documentHome.managed}">
<ui:include src="includes/directorySelector.xhtml">
<ui:param name="home" value="#{documentHome}"/>
@@ -50,7 +46,7 @@
</s:span>
- <div id="docEditFormContainer" class="shadowContainer"><div class="shadow1"><div class="shadow2">
+ <div id="docEditFormContainer" class="box">
<h:form id="docEditForm">
<div class="form">
@@ -125,10 +121,10 @@
</div>
</s:div>
<s:div id="pushOnSiteFeedSwitchUnmanaged">
- <s:div styleClass="entry" rendered="#{documentHome.pushOnFeeds}">
+ <s:div styleClass="entry">
<div class="label"> </div>
<div class="input">
- <h:selectBooleanCheckbox value="#{documentHome.pushOnSiteFeed}" tabindex="3"/>
+ <h:selectBooleanCheckbox disabled="#{not documentHome.pushOnFeeds}" value="#{documentHome.pushOnSiteFeed}" tabindex="3"/>
Create entry on global site feed
</div>
</s:div>
@@ -156,10 +152,10 @@
</div>
</s:div>
<s:div id="pushOnSiteFeedSwitch">
- <s:div styleClass="entry" rendered="#{documentHome.pushOnFeeds}">
+ <s:div styleClass="entry">
<div class="label"> </div>
<div class="input">
- <h:selectBooleanCheckbox value="#{documentHome.pushOnSiteFeed}" tabindex="3"/>
+ <h:selectBooleanCheckbox disabled="#{not documentHome.pushOnFeeds}" value="#{documentHome.pushOnSiteFeed}" tabindex="3"/>
Create entry on global site feed
</div>
</s:div>
@@ -258,10 +254,10 @@
</s:div>
<s:div id="commentFormSwitch">
- <s:div styleClass="entry" rendered="#{documentHome.instance.enableComments}">
+ <s:div styleClass="entry">
<div class="label"> </div>
<div class="input">
- <h:selectBooleanCheckbox value="#{documentHome.instance.enableCommentForm}" tabindex="3"/>
+ <h:selectBooleanCheckbox disabled="#{not documentHome.instance.enableComments}" value="#{documentHome.instance.enableCommentForm}" tabindex="3"/>
Allow posting of new comments
</div>
</s:div>
@@ -298,14 +294,17 @@
</div>
</h:form>
- </div></div></div>
+ </div>
<br/>
<s:div id="preview">
<s:div id="documentDisplayContainer"
rendered="#{documentHome.enabledPreview}"
- styleClass="shadowContainer"><div class="shadow1"><div class="shadow2">
+ styleClass="box">
+ <script type="text/javascript">jQuery(function() {
+ wrapBoxes();
+ });</script>
<s:div id="documentDisplay" styleClass="documentDisplay"><j4j:idProxy id="documentDisplay_" />
<s:div rendered="#{documentHome.instance.nameAsTitle}"><h1 class="documentTitle">#{documentHome.instance.name}</h1></s:div>
<wiki:formattedText value="#{documentHome.instance.content}"
@@ -317,7 +316,7 @@
renderBaseDirectory="#{documentHome.parentDirectory}"
enablePlugins="true"/>
</s:div>
- </div></div></s:div>
+ </s:div>
<s:div rendered="#{documentHome.enabledPreview}">
<ui:include src="includes/attachmentDisplay.xhtml"/>
1.11 +17 -9 jboss-seam/examples/wiki/view/adminHome.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: adminHome.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/adminHome.xhtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- adminHome.xhtml 25 Aug 2007 17:59:21 -0000 1.10
+++ adminHome.xhtml 1 Sep 2007 08:42:47 -0000 1.11
@@ -52,20 +52,28 @@
}
</script>
-<h:form><div class="form">
+<h:form id="adminForm">
+ <div class="form">
+
+ <ui:include src="includes/statusIndicator.xhtml"/>
<script type="text/javascript">jQuery(function() {
- jQuery('#formTabs').tabs({onClick: function(){formTabClicked()} });
+ jQuery('#formTabs').tabs(2, {onClick: function(){formTabClicked()} });
});</script>
<div id="formTabs">
<ul>
+ <li class="formTabsTitle">
+ <h:outputText value="Administration"/>
+ </li>
<li id="systemStatsTab"><a href="#systemStats" accesskey="Y">S<u>y</u>stem Statistics</a></li>
<li id="rolesPermissionsTab"><a href="#rolesPermissions" accesskey="O">R<u>o</u>les & Permissions</a></li>
<li id="linkProtocolsTab"><a href="#linkProtocols" accesskey="L"><u>L</u>ink Protocols</a></li>
<li id="systemPrefsTab"><a href="#systemPrefs" accesskey="R">P<u>r</u>eferences</a></li>
</ul>
+ <div id="formTabsTitle"/>
+
<div id="systemStats">
<div class="formFields" style="padding: 20px;">
<a:region>
@@ -119,7 +127,7 @@
<script type="text/javascript">
jQuery(function(){ getIndexingProgress("#{ie.clazz.name}") });
</script>
- <a:commandLink id="resetSearchIndex" styleClass="button resetIndexButton" reRender="indexStatistics"
+ <a:commandLink status="adminForm:status" id="resetSearchIndex" styleClass="button resetIndexButton" reRender="indexStatistics"
action="#{adminHome.resetSearchIndex()}"><span class="buttonLabel">Rebuild Index</span></a:commandLink>
</h:column>
</h:dataTable>
@@ -167,7 +175,7 @@
#{lp.link}
</h:column>
<h:column>
- <a:commandLink id="removeLinkProtocol" styleClass="buttonNonpersistent" reRender="linkProtocolTable"
+ <a:commandLink status="adminForm:status" id="removeLinkProtocol" styleClass="buttonNonpersistent" reRender="linkProtocolTable"
action="#{adminHome.removeLinkProtocol()}"><span class="buttonLabel">Remove</span></a:commandLink>
</h:column>
</h:dataTable>
@@ -189,7 +197,7 @@
<div class="entry">
<div class="label"> </div>
<div class="input">
- <a:commandLink id="addLinkProtocol" styleClass="buttonNonpersistent" reRender="linkProtocolTable, linkProtocolForm"
+ <a:commandLink status="adminForm:status" id="addLinkProtocol" styleClass="buttonNonpersistent" reRender="linkProtocolTable, linkProtocolForm"
action="#{adminHome.addLinkProtocol}"><span class="buttonLabel">Add</span></a:commandLink>
</div>
</div>
@@ -216,7 +224,7 @@
<div class="label"> </div>
<div class="input">
- <a:commandLink id="update" styleClass="button saveButton" reRender="body"
+ <a:commandLink status="adminForm:status" id="update" styleClass="button saveButton" reRender="body"
action="#{adminHome.update}"
tabindex="9" accesskey="S"><span class="buttonLabel"><u>S</u>ave Settings</span></a:commandLink>
1.11 +1 -1 jboss-seam/examples/wiki/view/docHistory.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docHistory.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory.xhtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- docHistory.xhtml 25 Aug 2007 17:59:21 -0000 1.10
+++ docHistory.xhtml 1 Sep 2007 08:42:47 -0000 1.11
@@ -104,7 +104,7 @@
</h:form>
<s:div id="diffResult">
- <s:div id="diffOutput" rendered="#{not empty nodeHistory.diffResult}">
+ <s:div styleClass="diffOutput" rendered="#{not empty nodeHistory.diffResult}">
<h:outputText value="#{nodeHistory.diffResult}" escape="false"/>
</s:div>
</s:div>
1.20 +40 -36 jboss-seam/examples/wiki/view/userList.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userList.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList.xhtml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- userList.xhtml 25 Aug 2007 17:59:21 -0000 1.19
+++ userList.xhtml 1 Sep 2007 08:42:47 -0000 1.20
@@ -22,16 +22,18 @@
<ui:define name="content">
- <h:form>
+ <h:form id="userSearchForm">
<div class="form" id="userSearchControl">
+ <ui:include src="includes/statusIndicator.xhtml"/>
+
<h:panelGrid columns="6"
- styleClass="datatable"
- headerClass="regularHeader"
+ styleClass="datatable topLeftBottomBorder"
+ headerClass="regularHeader rightBorder"
columnClasses="tenPercentColumn formFields, tenPercentColumn formFields, tenPercentColumn formFields,
tenPercentColumn formFields, twentyPercentColumn alignRight formFields,
- defaultColumn alignRight formFields"
+ defaultColumn alignRight formFields rightBorder"
cellpadding="0" cellspacing="0" border="0">
<f:facet name="header">
@@ -75,6 +77,7 @@
</div>
+ <s:div id="userListPager">
<h:panelGrid columns="5" styleClass="pager"
columnClasses="pagerIconColumn,pagerIconColumn,pagerTextColumn,pagerIconColumn,pagerIconColumn"
cellpadding="0" cellspacing="0" border="0"
@@ -107,6 +110,7 @@
rendered="#{!userSearch.nextPageAvailable}"/>
</h:panelGrid>
+ </s:div>
<h:dataTable id="userTable" var="u"
value="#{usersList}"
1.24 +2 -6 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.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- docDisplay.xhtml 31 Aug 2007 17:54:36 -0000 1.23
+++ docDisplay.xhtml 1 Sep 2007 08:42:47 -0000 1.24
@@ -43,11 +43,7 @@
<ui:define name="content">
- <script type="text/javascript">jQuery(function() {
- clearContentBackground();
- });</script>
-
- <div id="documentDisplayContainer" class="shadowContainer"><div class="shadow1"><div class="shadow2">
+ <div id="documentDisplayContainer" class="box">
<s:div id="documentDisplay" styleClass="documentDisplay"><j4j:idProxy id="documentDisplay_" />
<s:div rendered="#{documentHome.instance.nameAsTitle}"><h1 class="documentTitle">#{documentHome.instance.name}</h1></s:div>
<wiki:formattedText value="#{documentHome.instance.content}"
@@ -59,7 +55,7 @@
renderBaseDirectory="#{documentHome.parentDirectory}"
enablePlugins="true"/>
</s:div>
- </div></div></div>
+ </div>
<ui:include src="includes/attachmentDisplay.xhtml"/>
1.14 +1 -0 jboss-seam/examples/wiki/view/userHome.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userHome.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome.xhtml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- userHome.xhtml 31 Aug 2007 15:18:26 -0000 1.13
+++ userHome.xhtml 1 Sep 2007 08:42:47 -0000 1.14
@@ -36,6 +36,7 @@
<script type="text/javascript">jQuery(function() {
jQuery('#formTabs').tabs(2, {onClick: function(){formTabClicked()} });
});</script>
+
<div id="formTabs">
<ul>
More information about the jboss-cvs-commits
mailing list