[jboss-cvs] JBossBlog SVN: r262 - in trunk: view/manage and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 13 13:36:41 EDT 2008
Author: adamw
Date: 2008-03-13 13:36:41 -0400 (Thu, 13 Mar 2008)
New Revision: 262
Modified:
trunk/src/model/org/jboss/blog/model/feed/Feed.java
trunk/view-portlet/view.jsp
trunk/view/manage/index.xhtml
Log:
Modified: trunk/src/model/org/jboss/blog/model/feed/Feed.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/feed/Feed.java 2008-03-13 13:37:45 UTC (rev 261)
+++ trunk/src/model/org/jboss/blog/model/feed/Feed.java 2008-03-13 17:36:41 UTC (rev 262)
@@ -32,7 +32,7 @@
private Group group;
@NotEmpty
- @Length(max = 16)
+ @Length(max = 32)
@Column(unique = true)
@Pattern(regex = "^[a-z0-9_]*$", message = "#{messages['blog.feed.new.invalidname']}")
private String name;
Modified: trunk/view/manage/index.xhtml
===================================================================
--- trunk/view/manage/index.xhtml 2008-03-13 13:37:45 UTC (rev 261)
+++ trunk/view/manage/index.xhtml 2008-03-13 17:36:41 UTC (rev 262)
@@ -12,109 +12,119 @@
Manage feeds
</ui:define>
<ui:define name="body">
- <div class="adminlist">
- <dl>
- <s:fragment rendered="#{propositionsCount.pendingPropositions > 0 ||
+<div class="TwoColumnBlogSubnav">
+ <h4>Tips</h4>
+ <ul>
+ <li>
+ <p>The <a href="http://labs.jboss.com/files/jbosslabs/feeds_tutorial/tutorial.html">tutorial</a> may be
+ helpful.</p>
+ </li>
+ </ul>
+</div>
+
+<div class="adminlist">
+ <dl>
+ <s:fragment rendered="#{propositionsCount.pendingPropositions > 0 ||
identity.hasPermission('feed', 'add_any')}">
- <dt>New feed operations:</dt>
- <hr />
- <s:fragment rendered="#{propositionsCount.pendingPropositions > 0}">
+ <dt>New feed operations:</dt>
+ <hr />
+ <s:fragment rendered="#{propositionsCount.pendingPropositions > 0}">
+ <dd>
+ <s:link value="Pending feed propositions (#{propositionsCount.pendingPropositions})"
+ view="/manage/proposition/proposition_list.xhtml" />
+ </dd>
+ </s:fragment>
+ <s:fragment rendered="#{identity.hasPermission('feed', 'add_any')}">
+ <ui:repeat var="feedType" value="#{feedTypes.allTypes}">
<dd>
- <s:link value="Pending feed propositions (#{propositionsCount.pendingPropositions})"
- view="/manage/proposition/proposition_list.xhtml" />
+ <s:link value="Add a new #{feedType.name()} feed" view="#{feedType.addPage()}" />
</dd>
- </s:fragment>
- <s:fragment rendered="#{identity.hasPermission('feed', 'add_any')}">
- <ui:repeat var="feedType" value="#{feedTypes.allTypes}">
- <dd>
- <s:link value="Add a new #{feedType.name()} feed" view="#{feedType.addPage()}" />
- </dd>
- </ui:repeat>
- </s:fragment>
+ </ui:repeat>
</s:fragment>
- <s:fragment rendered="#{identity.hasPermission('management_groups', 'view') ||
+ </s:fragment>
+ <s:fragment rendered="#{identity.hasPermission('management_groups', 'view') ||
identity.hasPermission('management_template', 'view') ||
identity.hasPermission('management_update', 'view') ||
identity.hasPermission('security', 'view')}">
- <dt>Other operations:</dt>
- <hr />
- <s:fragment rendered="#{identity.hasPermission('management_groups', 'view')}">
- <dd><s:link value="Manage feed groups" view="/manage/group/group_list.xhtml" /></dd>
- </s:fragment>
- <s:fragment rendered="#{identity.hasPermission('management_template', 'view')}">
- <dd><s:link value="Manage feed templates" view="/manage/template/template_list.xhtml" /></dd>
- </s:fragment>
- <s:fragment rendered="#{identity.hasPermission('management_update', 'view')}">
- <dd><s:link value="Manage updates" view="/manage/update_manager.xhtml" /></dd>
- </s:fragment>
- <s:fragment rendered="#{identity.hasPermission('management_configuration', 'view')}">
- <dd><s:link value="Manage configuration" view="/manage/configuration_manager.xhtml" /></dd>
- </s:fragment>
- <s:fragment rendered="#{identity.hasPermission('security', 'view')}">
- <dd><s:link value="Manage security" view="/security/security_manager.xhtml" /></dd>
- </s:fragment>
+ <dt>Other operations:</dt>
+ <hr />
+ <s:fragment rendered="#{identity.hasPermission('management_groups', 'view')}">
+ <dd><s:link value="Manage feed groups" view="/manage/group/group_list.xhtml" /></dd>
</s:fragment>
- <s:fragment rendered="#{identity.hasPermission('admin', null)}">
- <dt>Global posts operations:</dt>
- <hr />
- <dd><s:link value="Fix html in all posts" action="#{feedView.fixHtml}" /></dd>
- <s:fragment rendered="false">
- <dd><s:link value="Re-index posts (for search)" action="#{postSearch.reindex}" /></dd>
- </s:fragment>
+ <s:fragment rendered="#{identity.hasPermission('management_template', 'view')}">
+ <dd><s:link value="Manage feed templates" view="/manage/template/template_list.xhtml" /></dd>
</s:fragment>
- <dt>Existing feed operations:</dt>
+ <s:fragment rendered="#{identity.hasPermission('management_update', 'view')}">
+ <dd><s:link value="Manage updates" view="/manage/update_manager.xhtml" /></dd>
+ </s:fragment>
+ <s:fragment rendered="#{identity.hasPermission('management_configuration', 'view')}">
+ <dd><s:link value="Manage configuration" view="/manage/configuration_manager.xhtml" /></dd>
+ </s:fragment>
+ <s:fragment rendered="#{identity.hasPermission('security', 'view')}">
+ <dd><s:link value="Manage security" view="/security/security_manager.xhtml" /></dd>
+ </s:fragment>
+ </s:fragment>
+ <s:fragment rendered="#{identity.hasPermission('admin', null)}">
+ <dt>Global posts operations:</dt>
<hr />
- </dl>
- </div>
+ <dd><s:link value="Fix html in all posts" action="#{feedView.fixHtml}" /></dd>
+ <s:fragment rendered="false">
+ <dd><s:link value="Re-index posts (for search)" action="#{postSearch.reindex}" /></dd>
+ </s:fragment>
+ </s:fragment>
+ <dt>Existing feed operations:</dt>
+ <hr />
+ </dl>
+</div>
- <table border="0" width="100%" cellpadding="0" cellspacing="0" class="basetablestyle" style="margin-top:12px;">
- <tr class="header">
- <td class="tableheaderfirst" style="width:160px;">Feed title</td>
- <td class="tableheader">Feed name</td>
- <td class="tableheader">Feed type</td>
- <td class="tableheader">Edit common feed properties</td>
- <td class="tableheader">Edit feed-type-specific properties</td>
- <td class="tableheader">Delete the feed</td>
- </tr>
+<table border="0" width="100%" cellpadding="0" cellspacing="0" class="basetablestyle" style="margin-top:12px;">
+ <tr class="header">
+ <td class="tableheaderfirst" style="width:160px;">Feed title</td>
+ <td class="tableheader">Feed name</td>
+ <td class="tableheader">Feed type</td>
+ <td class="tableheader">Edit common feed properties</td>
+ <td class="tableheader">Edit feed-type-specific properties</td>
+ <td class="tableheader">Delete the feed</td>
+ </tr>
- <ui:repeat var="group" value="#{groupsService.allGroups}">
- <s:fragment rendered="#{groupsService.acceptedFeeds(group).size() > 0 and
+ <ui:repeat var="group" value="#{groupsService.allGroups}">
+ <s:fragment rendered="#{groupsService.acceptedFeeds(group).size() > 0 and
identity.hasPermission('management_group', 'view', group, groupsService.acceptedFeeds(group))}">
- <tr>
- <td colspan="7" class="categoryRow">#{group.displayName}</td>
- </tr>
+ <tr>
+ <td colspan="7" class="categoryRow">#{group.displayName}</td>
+ </tr>
- <a:repeat var="feed" value="#{groupsService.acceptedFeeds(group)}" rowKeyVar="rowNumber">
- <s:fragment rendered="#{identity.hasPermission('feed', 'edit', feed, group) ||
+ <a:repeat var="feed" value="#{groupsService.acceptedFeeds(group)}" rowKeyVar="rowNumber">
+ <s:fragment rendered="#{identity.hasPermission('feed', 'edit', feed, group) ||
identity.hasPermission('feed', 'delete', feed, group)}">
- <tr class="#{(rowNumber%2 == 0) ? 'evenRow' : 'oddRow'}">
- <td class="rowlinefirst" style="font-weight:bold;">#{feed.title}</td>
- <td class="rowline">#{feed.name}</td>
- <td class="rowline">#{feedTypes.getFeedType(feed).name()}</td>
- <td class="rowline">
- <s:link view="/manage/feed_edit.xhtml" value="Edit common"
- rendered="#{identity.hasPermission('feed', 'edit', feed, group)}">
- <f:param name="name" value="#{feed.name}" />
- </s:link>
- </td>
- <td class="rowline">
- <s:link view="#{feedTypes.getFeedType(feed).editPage()}" value="Edit specific"
- rendered="#{identity.hasPermission('feed', 'edit', feed, group)}">
- <f:param name="name" value="#{feed.name}" />
- </s:link>
- </td>
- <td class="rowline">
- <s:link view="/manage/feed_delete.xhtml" action="#{feedMod.delete}" value="Delete"
- onclick="if (!confirm('Are you sure you want to delete this feed?')) return false"
- rendered="#{identity.hasPermission('feed', 'delete', feed, group)}">
- <f:param name="name" value="#{feed.name}" />
- </s:link>
- </td>
- </tr>
- </s:fragment>
- </a:repeat>
- </s:fragment>
- </ui:repeat>
- </table>
+ <tr class="#{(rowNumber%2 == 0) ? 'evenRow' : 'oddRow'}">
+ <td class="rowlinefirst" style="font-weight:bold;">#{feed.title}</td>
+ <td class="rowline">#{feed.name}</td>
+ <td class="rowline">#{feedTypes.getFeedType(feed).name()}</td>
+ <td class="rowline">
+ <s:link view="/manage/feed_edit.xhtml" value="Edit common"
+ rendered="#{identity.hasPermission('feed', 'edit', feed, group)}">
+ <f:param name="name" value="#{feed.name}" />
+ </s:link>
+ </td>
+ <td class="rowline">
+ <s:link view="#{feedTypes.getFeedType(feed).editPage()}" value="Edit specific"
+ rendered="#{identity.hasPermission('feed', 'edit', feed, group)}">
+ <f:param name="name" value="#{feed.name}" />
+ </s:link>
+ </td>
+ <td class="rowline">
+ <s:link view="/manage/feed_delete.xhtml" action="#{feedMod.delete}" value="Delete"
+ onclick="if (!confirm('Are you sure you want to delete this feed?')) return false"
+ rendered="#{identity.hasPermission('feed', 'delete', feed, group)}">
+ <f:param name="name" value="#{feed.name}" />
+ </s:link>
+ </td>
+ </tr>
+ </s:fragment>
+ </a:repeat>
+ </s:fragment>
+ </ui:repeat>
+</table>
</ui:define>
</ui:composition>
Modified: trunk/view-portlet/view.jsp
===================================================================
--- trunk/view-portlet/view.jsp 2008-03-13 13:37:45 UTC (rev 261)
+++ trunk/view-portlet/view.jsp 2008-03-13 17:36:41 UTC (rev 262)
@@ -46,6 +46,9 @@
<span>
<%= StringTools.createSummary(post.getContent(), (Integer) request.getAttribute("summaryLength")) %>
</span>
+
+ <br />
+ <br />
</c:if>
</p>
</c:forEach>
More information about the jboss-cvs-commits
mailing list