[jboss-cvs] JBossBlog SVN: r192 - in trunk: src/action/org/jboss/blog/session/feed/mod and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 6 07:25:04 EST 2008
Author: adamw
Date: 2008-02-06 07:25:04 -0500 (Wed, 06 Feb 2008)
New Revision: 192
Added:
trunk/src/action/org/jboss/blog/session/feed/mod/FilterAddBean.java
trunk/view/images/
trunk/view/images/wait.gif
Modified:
trunk/resources/WEB-INF/components.xml
trunk/view/layout/template.xhtml
trunk/view/manage/add.xhtml
trunk/view/manage/aggregated/aggregated_add.xhtml
trunk/view/manage/aggregated/aggregated_edit.xhtml
trunk/view/manage/aggregated/aggregated_mod.xhtml
trunk/view/manage/aggregated/filter_add.xhtml
trunk/view/manage/feed_add.xhtml
trunk/view/manage/feed_edit.xhtml
trunk/view/manage/feed_mod.xhtml
trunk/view/manage/feed_propose.xhtml
trunk/view/manage/index.xhtml
trunk/view/manage/proposition/proposition_accept.xhtml
trunk/view/manage/proposition/proposition_list.xhtml
trunk/view/manage/remote/remote_add.xhtml
trunk/view/manage/remote/remote_edit.xhtml
trunk/view/manage/remote/remote_propose.xhtml
trunk/view/manage/template/template_add.xhtml
trunk/view/manage/template/template_edit.xhtml
trunk/view/manage/template/template_list.xhtml
trunk/view/stylesheet/blog.css
Log:
Modified: trunk/resources/WEB-INF/components.xml
===================================================================
--- trunk/resources/WEB-INF/components.xml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/resources/WEB-INF/components.xml 2008-02-06 12:25:04 UTC (rev 192)
@@ -23,7 +23,7 @@
<core:init debug="@debug@" jndi-pattern="@jndiPattern@"/>
<core:manager concurrent-request-timeout="500"
- conversation-timeout="120000"
+ conversation-timeout="300000"
conversation-id-parameter="cid"/>
<persistence:managed-persistence-context name="entityManager"
Copied: trunk/src/action/org/jboss/blog/session/feed/mod/FilterAddBean.java (from rev 190, trunk/src/model/org/jboss/blog/model/post/filter/FilterAddBean.java)
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/FilterAddBean.java (rev 0)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/FilterAddBean.java 2008-02-06 12:25:04 UTC (rev 192)
@@ -0,0 +1,60 @@
+package org.jboss.blog.session.feed.mod;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.ScopeType;
+import org.jboss.blog.model.post.PostFilter;
+import org.jboss.blog.model.post.filter.PodcastFilter;
+import org.jboss.blog.model.post.filter.NotPodcastFilter;
+import org.jboss.blog.model.post.filter.AuthorRegexpFilter;
+
+import java.util.List;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+ at Name("filterAdd")
+ at Scope(ScopeType.CONVERSATION)
+public class FilterAddBean {
+ private List<PostFilter> addToList;
+
+ private PodcastFilter podcastFilter;
+
+ private NotPodcastFilter notPodcastFilter;
+
+ private AuthorRegexpFilter authorRegexpFilter;
+
+ public PodcastFilter getPodcastFilter() {
+ if (podcastFilter == null) {
+ podcastFilter = new PodcastFilter();
+ }
+
+ return podcastFilter;
+ }
+
+ public NotPodcastFilter getNotPodcastFilter() {
+ if (notPodcastFilter == null) {
+ notPodcastFilter = new NotPodcastFilter();
+ }
+
+ return notPodcastFilter;
+ }
+
+ public AuthorRegexpFilter getAuthorRegexpFilter() {
+ if (authorRegexpFilter == null) {
+ authorRegexpFilter = new AuthorRegexpFilter();
+ }
+
+ return authorRegexpFilter;
+ }
+
+ public void add(PostFilter filter) {
+ addToList.add(filter);
+ }
+
+ public void addToList(List<PostFilter> addToList) {
+ this.addToList = addToList;
+ }
+
+ public void cancel() { }
+}
Added: trunk/view/images/wait.gif
===================================================================
(Binary files differ)
Property changes on: trunk/view/images/wait.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/layout/template.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -4,7 +4,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:s="http://jboss.com/products/seam/taglib">
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:a="http://richfaces.org/a4j">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>blog</title>
@@ -21,6 +22,15 @@
<div id="ORGContent">
<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/add.xhtml
===================================================================
--- trunk/view/manage/add.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/add.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -7,19 +7,23 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
template="../layout/template.xhtml">
+ <ui:define name="header">
+ Add a new feed
+ </ui:define>
<ui:define name="body">
+ <div class="adminlist">
+ <dl>
+ <ui:repeat var="feedType" value="#{feedTypes.allTypes}">
+ <dd>
+ <s:link value="Add a new #{feedType.name()} feed" view="#{feedType.addPage()}" />
+ </dd>
+ </ui:repeat>
+ </dl>
+ </div>
- <h:messages globalOnly="true" styleClass="message"/>
+ <ul>
- <h1>Add a new feed</h1>
-
- <ul>
- <ui:repeat var="feedType" value="#{feedTypes.allTypes}">
- <li>
- <s:link value="Add a new #{feedType.name()} feed" view="#{feedType.addPage()}" />
- </li>
- </ui:repeat>
</ul>
</ui:define>
</ui:composition>
Modified: trunk/view/manage/aggregated/aggregated_add.xhtml
===================================================================
--- trunk/view/manage/aggregated/aggregated_add.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/aggregated/aggregated_add.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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 aggregated feed
+ </ui:define>
+
<ui:define name="body">
- <h1>Add aggregated feed</h1>
-
<ui:include src="aggregated_mod.xhtml">
<ui:param name="new" value="true" />
</ui:include>
Modified: trunk/view/manage/aggregated/aggregated_edit.xhtml
===================================================================
--- trunk/view/manage/aggregated/aggregated_edit.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/aggregated/aggregated_edit.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -8,10 +8,11 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
template="../../layout/template.xhtml">
- <ui:define name="body">
- <h1>Edit aggregated feed: #{feedMod.feed.name}</h1>
+ <ui:define name="header">
+ Edit aggregated feed: #{feedMod.feed.name}
+ </ui:define>
- <ui:include src="aggregated_mod.xhtml">
+ <ui:define name="body"><ui:include src="aggregated_mod.xhtml">
<ui:param name="new" value="false" />
</ui:include>
</ui:define>
Modified: trunk/view/manage/aggregated/aggregated_mod.xhtml
===================================================================
--- trunk/view/manage/aggregated/aggregated_mod.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/aggregated/aggregated_mod.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -7,95 +7,135 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j">
+<div class="QuickstartMargin" id="QuickStart">
+ <ul>
+ <li>
+ <p>If you choose to aggregate a feed group, all feeds from that group will be aggregated.</p>
+ </li>
+ <li>
+ <p>Filters will be applied to each post in a feed, group, or to all posts (depending where you choose to
+ place the filter), and if the filter output is positive the post will be included in the aggregated
+ feed.</p>
+ </li>
+ </ul>
+</div>
- <h:form>
- <h:panelGrid columns="1">
- <h:outputLabel>Please select feeds to include:</h:outputLabel>
+<h:form>
+<div class="adminforms">
+<h4>Feeds to include:</h4>
- <h:panelGroup>
- <h:dataTable value="#{aggregatedFeedMod.availableFeeds}" var="feed" id="availableFeedsTable">
+<h:panelGroup>
+ <h:dataTable value="#{aggregatedFeedMod.availableFeeds}" var="feed" id="availableFeedsTable"
+ styleClass="basetablestyle" headerClass="header tableheader" rowClasses="oddRow,evenRow"
+ cellspacing="0" cellpadding="4">
+ <h:column>
+ <h:selectBooleanCheckbox value="#{aggregatedFeedMod.selectedFeeds[feed]}" styleClass="radios">
+ <a:support event="onclick" reRender="availableFeedsTable" />
+ </h:selectBooleanCheckbox>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ Feed name:
+ </f:facet>
+ #{feed.name}
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ Local filters, applied only to this feed:
+ </f:facet>
+ <h:panelGroup rendered="#{aggregatedFeedMod.selectedFeeds[feed]}">
+ <h:dataTable value="#{aggregatedFeedMod.selectedFeedsFilters[feed]}" var="filter">
<h:column>
- <h:selectBooleanCheckbox value="#{aggregatedFeedMod.selectedFeeds[feed]}">
- <a:support event="onclick" reRender="availableFeedsTable" />
- </h:selectBooleanCheckbox>
- #{feed.name}
+ #{filter}
</h:column>
<h:column>
- <h:panelGroup rendered="#{aggregatedFeedMod.selectedFeeds[feed]}">
- <h5>Local filters, applied only to this feed:</h5>
- <h:dataTable value="#{aggregatedFeedMod.selectedFeedsFilters[feed]}" var="filter">
- <h:column>
- #{filter}
- </h:column>
- <h:column>
- <h:commandButton
- action="#{aggregatedFeedMod.removeFilter(aggregatedFeedMod.selectedFeedsFilters[feed],filter)}"
- value="Remove" />
- </h:column>
- </h:dataTable>
-
- <h:commandLink action="#{filterAdd.addToList(aggregatedFeedMod.selectedFeedsFilters[feed])}"
- value="Add filter" />
- </h:panelGroup>
+ <h:commandButton
+ action="#{aggregatedFeedMod.removeFilter(aggregatedFeedMod.selectedFeedsFilters[feed],filter)}"
+ value="Remove" />
</h:column>
</h:dataTable>
- </h:panelGroup>
- <h:outputLabel>Please select groups to include:</h:outputLabel>
-
- <h:panelGroup>
- <h:dataTable value="#{aggregatedFeedMod.availableGroups}" var="group" id="availableGroupsTable">
- <h:column>
- <h:selectBooleanCheckbox value="#{aggregatedFeedMod.selectedGroups[group]}">
- <a:support event="onclick" reRender="availableGroupsTable" />
- </h:selectBooleanCheckbox>
- #{group.displayName}
- </h:column>
- <h:column>
- <h:panelGroup rendered="#{aggregatedFeedMod.selectedGroups[group]}">
- <h5>Local filters, applied only to this group:</h5>
- <h:dataTable value="#{aggregatedFeedMod.selectedGroupsFilters[group]}" var="filter">
- <h:column>
- #{filter}
- </h:column>
- <h:column>
- <h:commandButton
- action="#{aggregatedFeedMod.removeFilter(aggregatedFeedMod.selectedGroupsFilters[group],filter)}"
- value="Remove" />
- </h:column>
- </h:dataTable>
-
- <h:commandLink action="#{filterAdd.addToList(aggregatedFeedMod.selectedGroupsFilters[group])}"
- value="Add filter" />
- </h:panelGroup>
- </h:column>
- </h:dataTable>
+ <h:commandLink action="#{filterAdd.addToList(aggregatedFeedMod.selectedFeedsFilters[feed])}"
+ value="Add filter" />
</h:panelGroup>
+ </h:column>
+ </h:dataTable>
+</h:panelGroup>
- <h3>Global filters, applied to all feeds; this feed will only contain entries, satisfying:</h3>
+<h4>Feed groups to include:</h4>
- <h:panelGroup>
- <h:dataTable value="#{aggregatedFeedMod.globalFilters}" var="filter">
+<h:panelGroup>
+ <h:dataTable value="#{aggregatedFeedMod.availableGroups}" var="group" id="availableGroupsTable"
+ styleClass="basetablestyle" headerClass="header tableheader" rowClasses="oddRow,evenRow"
+ cellspacing="0" cellpadding="4">
+ <h:column>
+ <h:selectBooleanCheckbox value="#{aggregatedFeedMod.selectedGroups[group]}" styleClass="radios">
+ <a:support event="onclick" reRender="availableGroupsTable" />
+ </h:selectBooleanCheckbox>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ Group name:
+ </f:facet>
+ #{group.displayName}
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ Local filters, applied only to this group:
+ </f:facet>
+ <h:panelGroup rendered="#{aggregatedFeedMod.selectedGroups[group]}">
+ <h:dataTable value="#{aggregatedFeedMod.selectedGroupsFilters[group]}" var="filter">
<h:column>
#{filter}
</h:column>
<h:column>
<h:commandButton
- action="#{aggregatedFeedMod.removeFilter(aggregatedFeedMod.globalFilters,filter)}"
+ action="#{aggregatedFeedMod.removeFilter(aggregatedFeedMod.selectedGroupsFilters[group],filter)}"
value="Remove" />
</h:column>
</h:dataTable>
- <h:commandLink action="#{filterAdd.addToList(aggregatedFeedMod.globalFilters)}" value="Add filter" />
+ <h:commandLink action="#{filterAdd.addToList(aggregatedFeedMod.selectedGroupsFilters[group])}"
+ value="Add filter" />
</h:panelGroup>
+ </h:column>
+ </h:dataTable>
+</h:panelGroup>
- <h:panelGroup id="proceed">
- <h:commandButton rendered="#{new}" value="Next »"
- action="#{aggregatedFeedMod.saveNew}" />
- <h:commandButton rendered="#{!new}" value="Save"
- action="#{aggregatedFeedMod.saveExisting}" />
- <s:button value="Cancel" view="/manage/index.xhtml" propagation="end" />
- </h:panelGroup>
- </h:panelGrid>
- </h:form>
+<h4>Global filters, applied to all feeds:</h4>
+
+<h:panelGroup>
+ <h:dataTable value="#{aggregatedFeedMod.globalFilters}" var="filter">
+ <h:column>
+ #{filter}
+ </h:column>
+ <h:column>
+ <h:commandButton
+ action="#{aggregatedFeedMod.removeFilter(aggregatedFeedMod.globalFilters,filter)}"
+ value="Remove" />
+ </h:column>
+ </h:dataTable>
+
+ <h:commandLink action="#{filterAdd.addToList(aggregatedFeedMod.globalFilters)}" value="Add filter" />
+</h:panelGroup>
+
+<div id="proceed" class="formbuttons">
+ <ul>
+ <s:fragment rendered="#{new}">
+ <li>
+ <h:commandButton value="Next »" action="#{aggregatedFeedMod.saveNew}" styleClass="submit" />
+ </li>
+ </s:fragment>
+ <s:fragment rendered="#{!new}">
+ <li>
+ <h:commandButton value="Save" action="#{aggregatedFeedMod.saveExisting}" styleClass="submit" />
+ </li>
+ </s:fragment>
+ <li>
+ <s:button value="Cancel" view="/manage/index.xhtml" propagation="end" styleClass="submit" />
+ </li>
+ </ul>
+</div>
+</div>
+</h:form>
</ui:composition>
Modified: trunk/view/manage/aggregated/filter_add.xhtml
===================================================================
--- trunk/view/manage/aggregated/filter_add.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/aggregated/filter_add.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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 a filter feed
+ </ui:define>
+
<ui:define name="body">
- <h1>Add a filter feed</h1>
-
<h:panelGroup>
<h5>Only entries with enclosures filter (podcast)</h5>
<h:form>
Modified: trunk/view/manage/feed_add.xhtml
===================================================================
--- trunk/view/manage/feed_add.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/feed_add.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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 a new feed - edit data
+ </ui:define>
+
<ui:define name="body">
- <h1>Add a new feed - edit data</h1>
-
<ui:include src="feed_mod.xhtml">
<ui:param name="new" value="true" />
</ui:include>
Modified: trunk/view/manage/feed_edit.xhtml
===================================================================
--- trunk/view/manage/feed_edit.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/feed_edit.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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: #{feedMod.feed.name}
+ </ui:define>
+
<ui:define name="body">
- <h1>Edit feed: #{feedMod.feed.name}</h1>
-
<ui:include src="feed_mod.xhtml">
<ui:param name="new" value="false" />
</ui:include>
Modified: trunk/view/manage/feed_mod.xhtml
===================================================================
--- trunk/view/manage/feed_mod.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/feed_mod.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -9,6 +9,7 @@
xmlns:blog="http://jboss.org/blog/tags"
xmlns:a="http://richfaces.org/a4j">
<h:form>
+<div class="adminforms">
<h:panelGrid columns="2">
<h:outputLabel for="name"><span class="required">*</span> Name (to use in URLs):</h:outputLabel>
<h:panelGroup>
@@ -145,14 +146,26 @@
</h:dataTable>
</h:panelGroup>
-<h:outputLabel />
-<h:panelGroup>
- <h:commandButton value="Add" action="#{feedMod.saveNew}" rendered="#{new}" />
- <h:commandButton value="Save" action="#{feedMod.saveExisting}" rendered="#{!new}" />
- <s:button value="Cancel" view="/manage/index.html" propagation="end" />
-</h:panelGroup>
</h:panelGrid>
+<div class="formbuttons">
+ <ul>
+ <s:fragment rendered="#{new}">
+ <li>
+ <h:commandButton value="Add" action="#{feedMod.saveNew}" rendered="#{new}" styleClass="submit" />
+ </li>
+ </s:fragment>
+ <s:fragment rendered="#{!new}">
+ <li>
+ <h:commandButton value="Save" action="#{feedMod.saveExisting}" rendered="#{!new}" styleClass="submit" />
+ </li>
+ </s:fragment>
+ <li>
+ <s:button value="Cancel" view="/manage/index.html" propagation="end" styleClass="submit" />
+ </li>
+ </ul>
+</div>
+
<h3>Posts preview:</h3>
<h:panelGroup rendered="#{feedMod.feed.posts.size() == 0}">
@@ -190,5 +203,6 @@
</h:column>
</h:dataTable>
</h:panelGroup>
+</div>
</h:form>
</ui:composition>
Modified: trunk/view/manage/feed_propose.xhtml
===================================================================
--- trunk/view/manage/feed_propose.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/feed_propose.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -7,10 +7,12 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
- template="../layout/template.xhtml">
+ template="../layout/template.xhtml">
+ <ui:define name="header">
+ Propose a new feed - edit data
+ </ui:define>
+
<ui:define name="body">
- <h1>Propose a new feed - edit data</h1>
-
<ui:include src="feed_mod.xhtml">
<ui:param name="new" value="true" />
</ui:include>
Modified: trunk/view/manage/index.xhtml
===================================================================
--- trunk/view/manage/index.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/index.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -12,25 +12,23 @@
Manage feeds
</ui:define>
<ui:define name="body">
- <div class="projectsmainlayout" style="margin: 0 0 0 0">
- <div class="projectsmainlinkcol">
- <dl>
- <dt>New feed operations:</dt>
- <hr />
- <dd><s:link value="Add new feed" view="/manage/add.xhtml" /></dd>
- <dd><s:link value="Accept feed propositions" view="/manage/proposition/proposition_list.xhtml" /></dd>
- <dt>Other operations:</dt>
- <hr />
- <dd><s:link value="Manage feed groups" view="/manage/group/group_list.xhtml" /></dd>
- <dd><s:link value="Manage feed templates" view="/manage/template/template_list.xhtml" /></dd>
- <dt>Global posts operations:</dt>
- <hr />
- <dd><s:link value="Fix html in all posts" action="#{feedView.fixHtml}" /></dd>
- <dd><s:link value="Re-index posts (for search)" action="#{postSearch.reindex}" /></dd>
- <dt>Existing feed operations:</dt>
- <hr />
- </dl>
- </div>
+ <div class="adminlist">
+ <dl>
+ <dt>New feed operations:</dt>
+ <hr />
+ <dd><s:link value="Add new feed" view="/manage/add.xhtml" /></dd>
+ <dd><s:link value="Accept feed propositions" view="/manage/proposition/proposition_list.xhtml" /></dd>
+ <dt>Other operations:</dt>
+ <hr />
+ <dd><s:link value="Manage feed groups" view="/manage/group/group_list.xhtml" /></dd>
+ <dd><s:link value="Manage feed templates" view="/manage/template/template_list.xhtml" /></dd>
+ <dt>Global posts operations:</dt>
+ <hr />
+ <dd><s:link value="Fix html in all posts" action="#{feedView.fixHtml}" /></dd>
+ <dd><s:link value="Re-index posts (for search)" action="#{postSearch.reindex}" /></dd>
+ <dt>Existing feed operations:</dt>
+ <hr />
+ </dl>
</div>
<table border="0" width="100%" cellpadding="0" cellspacing="0" class="basetablestyle" style="margin-top:12px;">
Modified: trunk/view/manage/proposition/proposition_accept.xhtml
===================================================================
--- trunk/view/manage/proposition/proposition_accept.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/proposition/proposition_accept.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -8,9 +8,11 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
template="../../layout/template.xhtml">
+ <ui:define name="header">
+ Accept feed: #{feedMod.feed.name}
+ </ui:define>
+
<ui:define name="body">
- <h1>Accept feed: #{feedMod.feed.name}</h1>
-
<ui:include src="../feed_mod.xhtml">
<ui:param name="new" value="false" />
</ui:include>
Modified: trunk/view/manage/proposition/proposition_list.xhtml
===================================================================
--- trunk/view/manage/proposition/proposition_list.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/proposition/proposition_list.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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 feed propositions
+ </ui:define>
+
<ui:define name="body">
- <h1>Manage feed propositions</h1>
-
<ui:repeat var="group" value="#{feedsService.allGroups}">
<s:fragment rendered="#{groupsService.unacceptedFeeds(group).size() > 1}">
<p>#{group.displayName}</p>
Modified: trunk/view/manage/remote/remote_add.xhtml
===================================================================
--- trunk/view/manage/remote/remote_add.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/remote/remote_add.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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 remote feed
+ </ui:define>
+
<ui:define name="body">
- <h1>Add remote feed</h1>
-
<ui:include src="remote_mod.xhtml">
<ui:param name="new" value="true" />
<ui:param name="showCaptcha" value="false" />
Modified: trunk/view/manage/remote/remote_edit.xhtml
===================================================================
--- trunk/view/manage/remote/remote_edit.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/remote/remote_edit.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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 remote feed: #{feedMod.feed.name}
+ </ui:define>
+
<ui:define name="body">
- <h1>Edit remote feed: #{feedMod.feed.name}</h1>
-
<ui:include src="remote_mod.xhtml">
<ui:param name="new" value="false" />
<ui:param name="showCaptcha" value="false" />
Modified: trunk/view/manage/remote/remote_propose.xhtml
===================================================================
--- trunk/view/manage/remote/remote_propose.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/remote/remote_propose.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -8,9 +8,11 @@
xmlns:rich="http://richfaces.org/rich"
xmlns:a="http://richfaces.org/a4j"
template="../../layout/template.xhtml">
+ <ui:define name="header">
+ Propose a blog
+ </ui:define>
+
<ui:define name="body">
- <h1>Propose a blog</h1>
-
<ui:include src="remote_mod.xhtml">
<ui:param name="new" value="true" />
<ui:param name="showCaptcha" value="true" />
Modified: trunk/view/manage/template/template_add.xhtml
===================================================================
--- trunk/view/manage/template/template_add.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/template/template_add.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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 a new template
+ </ui:define>
+
<ui:define name="body">
- <h1>Add a new template</h1>
-
<ui:include src="template_mod.xhtml">
<ui:param name="new" value="true" />
</ui:include>
Modified: trunk/view/manage/template/template_edit.xhtml
===================================================================
--- trunk/view/manage/template/template_edit.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/template/template_edit.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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 template: #{templateMod.template.name}
+ </ui:define>
+
<ui:define name="body">
- <h1>Edit template: #{templateMod.template.name}</h1>
-
<ui:include src="template_mod.xhtml">
<ui:param name="new" value="false" />
</ui:include>
Modified: trunk/view/manage/template/template_list.xhtml
===================================================================
--- trunk/view/manage/template/template_list.xhtml 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/manage/template/template_list.xhtml 2008-02-06 12:25:04 UTC (rev 192)
@@ -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 templates
+ </ui:define>
+
<ui:define name="body">
- <h1>Manage templates</h1>
-
<s:link value="Add new template" view="/manage/template/template_add.xhtml" />
<h3>Current templates:</h3>
Modified: trunk/view/stylesheet/blog.css
===================================================================
--- trunk/view/stylesheet/blog.css 2008-02-06 10:44:02 UTC (rev 191)
+++ trunk/view/stylesheet/blog.css 2008-02-06 12:25:04 UTC (rev 192)
@@ -92,3 +92,71 @@
display: block;
padding:.25em 0px;
}
+
+/* --------------------- Admin list ------------------------ */
+
+.adminlist {
+ width: 200px
+}
+
+.adminlist h3 {
+ font-size:12px;
+ font-weight: bold;
+ margin:9px auto 9px auto;
+}
+
+.adminlist p {
+ margin:0 auto;
+ padding-bottom:1em;
+ }
+
+.adminlist dl {
+ margin-right:20px;
+}
+
+.adminlist dt {
+ font-size:12px;
+ font-weight:bold;
+ color:#CC0000;
+ margin:12px 0 1px 0;
+ padding:0;
+}
+
+.adminlist dd {
+ margin:0 0 3px 0;
+}
+
+.adminlist dt a {
+ color:#CC0000;
+ text-decoration:none;
+ background-image:none;
+ padding-left:0;
+}
+
+.adminlist dd a {
+ background-image:url(http://labs.jboss.com/file-access/default/theme/images/common/ico_linkarrow_blue.gif);
+ background-repeat: no-repeat;
+ background-position: 3px 3px;
+ padding-left: 12px;
+ white-space:nowrap;
+}
+
+.adminlist hr {
+ border-top:1px dashed #d5d5d5;
+ color: #ffffff;
+ border-bottom:0;
+ border-left:0;
+ border-right:0;
+ margin-bottom:6px;
+}
+
+span.error {
+ color: black;
+ background-color: #fef9e6;
+ border: 1px solid red;
+ padding: 5px;
+}
+
+span.required {
+ color: red;
+}
More information about the jboss-cvs-commits
mailing list