[jboss-cvs] JBossBlog SVN: r193 - in trunk/view: layout and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 6 08:05:55 EST 2008
Author: adamw
Date: 2008-02-06 08:05:55 -0500 (Wed, 06 Feb 2008)
New Revision: 193
Added:
trunk/view/common/ajax_status.xhtml
Modified:
trunk/view/layout/template.xhtml
trunk/view/manage/aggregated/aggregated_mod.xhtml
trunk/view/manage/feed_mod.xhtml
trunk/view/manage/group/group_add.xhtml
trunk/view/manage/group/group_edit.xhtml
trunk/view/manage/group/group_list.xhtml
trunk/view/manage/group/group_mod.xhtml
trunk/view/manage/remote/remote_mod.xhtml
Log:
Added: trunk/view/common/ajax_status.xhtml
===================================================================
--- trunk/view/common/ajax_status.xhtml (rev 0)
+++ trunk/view/common/ajax_status.xhtml 2008-02-06 13:05:55 UTC (rev 193)
@@ -0,0 +1,17 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a="http://richfaces.org/a4j">
+ <a:status stopStyleClass="ajaxStatus" startStyleClass="ajaxStatus">
+ <f:facet name="start">
+ <img src="/blog/images/wait.gif" alt="" /> Please wait ...
+ </f:facet>
+ <f:facet name="stop">
+ </f:facet>
+ </a:status>
+</ui:composition>
\ No newline at end of file
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-02-06 12:25:04 UTC (rev 192)
+++ trunk/view/layout/template.xhtml 2008-02-06 13:05:55 UTC (rev 193)
@@ -20,17 +20,8 @@
<div id="contentcontainer">
<div id="ORGContent">
- <div id='orgprojectdetailstriple'>
+ <div id='orgprojectdetailstriple'>
<h3 id="majorsectiontitle" style="margin-bottom: 0"><ui:insert name="header"/></h3>
-
- <a:status>
- <f:facet name="start">
- <img src="/blog/images/wait.gif" alt="" /> Please wait ...
- </f:facet>
- <f:facet name="stop">
-
- </f:facet>
- </a:status>
</div>
<div id="orghomemaximized">
<div>
Modified: trunk/view/manage/aggregated/aggregated_mod.xhtml
===================================================================
--- trunk/view/manage/aggregated/aggregated_mod.xhtml 2008-02-06 12:25:04 UTC (rev 192)
+++ trunk/view/manage/aggregated/aggregated_mod.xhtml 2008-02-06 13:05:55 UTC (rev 193)
@@ -134,6 +134,9 @@
<li>
<s:button value="Cancel" view="/manage/index.xhtml" propagation="end" styleClass="submit" />
</li>
+ <li>
+ <ui:include src="../../common/ajax_status.xhtml" />
+ </li>
</ul>
</div>
</div>
Modified: trunk/view/manage/feed_mod.xhtml
===================================================================
--- trunk/view/manage/feed_mod.xhtml 2008-02-06 12:25:04 UTC (rev 192)
+++ trunk/view/manage/feed_mod.xhtml 2008-02-06 13:05:55 UTC (rev 193)
@@ -85,7 +85,7 @@
<h:message for="group" styleClass="error" />
</a:outputPanel>
- <s:link value="Add new group" action="#{groupMod.add}" />
+ <span><s:link value="Add new group" action="#{groupMod.add}" /></span>
</h:panelGroup>
<h:outputLabel for="maxPostsInFeed">
Modified: trunk/view/manage/group/group_add.xhtml
===================================================================
--- trunk/view/manage/group/group_add.xhtml 2008-02-06 12:25:04 UTC (rev 192)
+++ trunk/view/manage/group/group_add.xhtml 2008-02-06 13:05:55 UTC (rev 193)
@@ -8,9 +8,11 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
template="../../layout/template.xhtml">
+ <ui:define name="header">
+ Add feed group
+ </ui:define>
+
<ui:define name="body">
- <h1>Add feed group</h1>
-
<ui:include src="group_mod.xhtml">
<ui:param name="new" value="true" />
</ui:include>
Modified: trunk/view/manage/group/group_edit.xhtml
===================================================================
--- trunk/view/manage/group/group_edit.xhtml 2008-02-06 12:25:04 UTC (rev 192)
+++ trunk/view/manage/group/group_edit.xhtml 2008-02-06 13:05:55 UTC (rev 193)
@@ -8,9 +8,11 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
template="../../layout/template.xhtml">
+ <ui:define name="header">
+ Edit feed group: #{groupMod.group.displayName}
+ </ui:define>
+
<ui:define name="body">
- <h1>Edit feed group: #{groupMod.group.displayName}</h1>
-
<ui:include src="group_mod.xhtml">
<ui:param name="new" value="false" />
</ui:include>
Modified: trunk/view/manage/group/group_list.xhtml
===================================================================
--- trunk/view/manage/group/group_list.xhtml 2008-02-06 12:25:04 UTC (rev 192)
+++ trunk/view/manage/group/group_list.xhtml 2008-02-06 13:05:55 UTC (rev 193)
@@ -7,9 +7,11 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="../../layout/template.xhtml">
+ <ui:define name="header">
+ Manage groups
+ </ui:define>
+
<ui:define name="body">
- <h1>Manage groups</h1>
-
<s:link value="Add new group" action="#{groupMod.add}" />
<h3>Current groups:</h3>
Modified: trunk/view/manage/group/group_mod.xhtml
===================================================================
--- trunk/view/manage/group/group_mod.xhtml 2008-02-06 12:25:04 UTC (rev 192)
+++ trunk/view/manage/group/group_mod.xhtml 2008-02-06 13:05:55 UTC (rev 193)
@@ -8,40 +8,52 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:blog="http://jboss.org/blog/tags"
xmlns:a="http://richfaces.org/a4j">
- <h:form>
- <h:panelGrid columns="2">
- <h:outputLabel for="name"><span class="required">*</span> Name (to use in URLs):</h:outputLabel>
- <h:panelGroup>
- <h:inputText id="name" value="#{groupMod.group.name}" required="true" size="32">
- <blog:uniqueGroupNameValidator entityId="#{groupMod.group.id}" />
- <a:support event="onblur" reRender="nameMessage" ajaxSingle="true" bypassUpdates="true"/>
- <s:validate />
- </h:inputText>
+ <div class="adminforms">
+ <h:form>
+ <h:panelGrid columns="2">
+ <h:outputLabel for="name"><span class="required">*</span> Name (to use in URLs):</h:outputLabel>
+ <h:panelGroup>
+ <h:inputText id="name" value="#{groupMod.group.name}" required="true" size="32">
+ <blog:uniqueGroupNameValidator entityId="#{groupMod.group.id}" />
+ <a:support event="onblur" reRender="nameMessage" ajaxSingle="true" bypassUpdates="true"/>
+ <s:validate />
+ </h:inputText>
- <a:outputPanel id="nameMessage">
- <h:message for="name" styleClass="error" />
- </a:outputPanel>
- </h:panelGroup>
+ <a:outputPanel id="nameMessage">
+ <h:message for="name" styleClass="error" />
+ </a:outputPanel>
+ </h:panelGroup>
- <h:outputLabel for="displayName"><span class="required">*</span> Display name:</h:outputLabel>
- <h:panelGroup>
- <h:inputText id="displayName" value="#{groupMod.group.displayName}" required="true" size="32">
- <a:support event="onblur" reRender="displayNameMessage" ajaxSingle="true" bypassUpdates="true"/>
- <s:validate />
- </h:inputText>
+ <h:outputLabel for="displayName"><span class="required">*</span> Display name:</h:outputLabel>
+ <h:panelGroup>
+ <h:inputText id="displayName" value="#{groupMod.group.displayName}" required="true" size="32">
+ <a:support event="onblur" reRender="displayNameMessage" ajaxSingle="true" bypassUpdates="true"/>
+ <s:validate />
+ </h:inputText>
- <a:outputPanel id="displayNameMessage">
- <h:message for="displayName" styleClass="error" />
- </a:outputPanel>
- </h:panelGroup>
+ <a:outputPanel id="displayNameMessage">
+ <h:message for="displayName" styleClass="error" />
+ </a:outputPanel>
+ </h:panelGroup>
+ </h:panelGrid>
- <h:outputLabel />
- <h:panelGroup>
- <h:commandButton value="Add" action="#{groupMod.saveNew}" rendered="#{new}" />
- <h:commandButton value="Save" action="#{groupMod.saveExisting}" rendered="#{!new}" />
- <s:button value="Cancel" action="#{groupMod.cancel}" />
- </h:panelGroup>
- </h:panelGrid>
-
- </h:form>
+ <div id="proceed" class="formbuttons">
+ <ul>
+ <s:fragment rendered="#{new}">
+ <li>
+ <h:commandButton value="Add" action="#{groupMod.saveNew}" styleClass="submit" />
+ </li>
+ </s:fragment>
+ <s:fragment rendered="#{!new}">
+ <li>
+ <h:commandButton value="Save" action="#{groupMod.saveExisting}" styleClass="submit" />
+ </li>
+ </s:fragment>
+ <li>
+ <s:button value="Cancel" action="#{groupMod.cancel}" styleClass="submit" />
+ </li>
+ </ul>
+ </div>
+ </h:form>
+ </div>
</ui:composition>
Modified: trunk/view/manage/remote/remote_mod.xhtml
===================================================================
--- trunk/view/manage/remote/remote_mod.xhtml 2008-02-06 12:25:04 UTC (rev 192)
+++ trunk/view/manage/remote/remote_mod.xhtml 2008-02-06 13:05:55 UTC (rev 193)
@@ -7,57 +7,70 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j">
- <h:form>
- <h:panelGrid columns="2">
- <h:panelGroup rendered="#{showCaptcha}">
- <span class="required">*</span>
- <h:graphicImage value="/seam/resource/captcha/#{captchaTools.id}" id="captchaGraphic"/>
- </h:panelGroup>
- <h:panelGroup rendered="#{showCaptcha}">
- <h:inputText id="verifyCaptcha" value="#{captcha.response}" required="true">
- <s:validate />
- </h:inputText>
- <a:outputPanel id="captchaMessage">
- <h:message for="verifyCaptcha" styleClass="error" />
- </a:outputPanel>
- </h:panelGroup>
+ <div class="adminforms">
+ <h:form>
+ <h:panelGrid columns="2">
+ <h:panelGroup rendered="#{showCaptcha}">
+ <span class="required">*</span>
+ <h:graphicImage value="/seam/resource/captcha/#{captchaTools.id}" id="captchaGraphic"/>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{showCaptcha}">
+ <h:inputText id="verifyCaptcha" value="#{captcha.response}" required="true">
+ <s:validate />
+ </h:inputText>
+ <a:outputPanel id="captchaMessage">
+ <h:message for="verifyCaptcha" styleClass="error" />
+ </a:outputPanel>
+ </h:panelGroup>
- <h:outputLabel><span class="required">*</span> Remote feed address:</h:outputLabel>
- <h:panelGroup>
- <h:inputText id="link" value="#{remoteFeedMod.remoteFeed.remoteLink}" required="true" size="64">
- <s:validate />
- </h:inputText>
- <a:outputPanel id="linkMessage">
- <h:message for="link" styleClass="error" />
- </a:outputPanel>
- </h:panelGroup>
+ <h:outputLabel><span class="required">*</span> Remote feed address:</h:outputLabel>
+ <h:panelGroup>
+ <h:inputText id="link" value="#{remoteFeedMod.remoteFeed.remoteLink}" required="true" size="64">
+ <s:validate />
+ </h:inputText>
+ <a:outputPanel id="linkMessage">
+ <h:message for="link" styleClass="error" />
+ </a:outputPanel>
+ </h:panelGroup>
- <h:panelGroup />
- <h:panelGroup>
- <a:commandButton action="#{remoteFeedMod.parseFeed}" value="Read and parse the feed"
- reRender="parseStatus,proceed,linkMessage,link,captchaGraphic,captchaMessage" />
- <a:status stopText="" startText="Wait ..." />
- </h:panelGroup>
-
- <h:panelGroup />
- <h:panelGroup id="parseStatus">
- <h:panelGroup rendered="#{remoteFeedMod.parseOk}">
- Parsing the feed was successfull! You can proceed.
+ <h:panelGroup />
+ <h:panelGroup id="parseStatus">
+ <h:panelGroup rendered="#{remoteFeedMod.parseOk}">
+ Parsing the feed was successfull! You can proceed.
+ </h:panelGroup>
+ <h:panelGroup rendered="#{!remoteFeedMod.parseOk and remoteFeedMod.parseException != null}">
+ Parsing the feed failed, because of the following exception:
+ #{remoteFeedMod.parseException.message}
+ </h:panelGroup>
</h:panelGroup>
- <h:panelGroup rendered="#{!remoteFeedMod.parseOk and remoteFeedMod.parseException != null}">
- Parsing the feed failed, because of the following exception:
- #{remoteFeedMod.parseException.message}
- </h:panelGroup>
- </h:panelGroup>
+ </h:panelGrid>
- <h:panelGroup />
- <h:panelGroup id="proceed">
- <h:commandButton rendered="#{remoteFeedMod.parseOk and new}" value="Next »"
- action="#{remoteFeedMod.saveNew}" />
- <h:commandButton rendered="#{remoteFeedMod.parseOk and !new}" value="Save"
- action="#{remoteFeedMod.saveExisting}" />
- <s:button value="Cancel" view="/manage/index.html" propagation="end" />
- </h:panelGroup>
- </h:panelGrid>
- </h:form>
+ <div id="proceed" class="formbuttons">
+ <ul>
+ <s:fragment>
+ <li>
+ <a:commandButton action="#{remoteFeedMod.parseFeed}" value="Read and parse the feed"
+ styleClass="submit"
+ reRender="parseStatus,proceed,linkMessage,link,captchaGraphic,captchaMessage" />
+ </li>
+ </s:fragment>
+ <s:fragment rendered="#{remoteFeedMod.parseOk and new}">
+ <li>
+ <h:commandButton value="Next »" action="#{remoteFeedMod.saveNew}"
+ styleClass="submit" />
+ </li>
+ </s:fragment>
+ <s:fragment rendered="#{remoteFeedMod.parseOk and !new}">
+ <li>
+ <h:commandButton value="Save" action="#{remoteFeedMod.saveExisting}"
+ styleClass="submit" />
+ </li>
+ </s:fragment>
+ <li>
+ <s:button value="Cancel" view="/manage/index.html" propagation="end" styleClass="submit" />
+ </li>
+ </ul>
+ </div>
+ </h:form>
+ </div>
</ui:composition>
More information about the jboss-cvs-commits
mailing list