[jboss-cvs] JBossBlog SVN: r278 - in trunk: resources/META-INF and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 29 07:27:37 EDT 2008
Author: adamw
Date: 2008-03-29 07:27:37 -0400 (Sat, 29 Mar 2008)
New Revision: 278
Modified:
trunk/docs/tutorial.html
trunk/resources/META-INF/application.xml
trunk/resources/WEB-INF/components.xml
trunk/resources/WEB-INF/urlrewrite.xml
trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java
trunk/view-portlet/view.jsp
trunk/view-portlet/view_main.jsp
trunk/view/common/ajax_status.xhtml
trunk/view/home.xhtml
trunk/view/images/propose_blog.png
trunk/view/images/propose_blog_full.png
trunk/view/layout/template.xhtml
trunk/view/manage/remote/remote_add.xhtml
trunk/view/manage/remote/remote_edit.xhtml
trunk/view/manage/remote/remote_mod.xhtml
trunk/view/manage/remote/remote_propose.xhtml
trunk/view/stylesheet/blog.css
trunk/view/view/right_box.xhtml
Log:
Modified: trunk/docs/tutorial.html
===================================================================
--- trunk/docs/tutorial.html 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/docs/tutorial.html 2008-03-29 11:27:37 UTC (rev 278)
@@ -161,11 +161,11 @@
users can, for example, add comments. The URL schemes are:</p>
<div class="itemizedlist">
<ul>
- <li><code>http://labs.jboss.com/blogs/view/FEED_ID?from=X</code> - for viewing a feed with id
+ <li><code>http://labs.jboss.com/feeds/view/FEED_ID?from=X</code> - for viewing a feed with id
<code>FEED_ID</code>, starting from post number <code>X</code>.</li>
- <li><code>http://labs.jboss.com/blogs/feed/FEED_ID?type=atom</code> - for getting an ATOM feed of a feed
+ <li><code>http://labs.jboss.com/feeds/xml/FEED_ID?type=atom</code> - for getting an ATOM feed of a feed
with id <code>FEED_ID</code>.</li>
- <li><code>http://labs.jboss.com/blogs/post/POST_ID</code> - for viewing a single post, with id
+ <li><code>http://labs.jboss.com/feeds/post/POST_ID</code> - for viewing a single post, with id
<code>POST_ID</code>.</li>
</ul>
</div>
Modified: trunk/resources/META-INF/application.xml
===================================================================
--- trunk/resources/META-INF/application.xml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/resources/META-INF/application.xml 2008-03-29 11:27:37 UTC (rev 278)
@@ -26,7 +26,7 @@
<module>
<web>
<web-uri>blog.war</web-uri>
- <context-root>/blogs</context-root>
+ <context-root>/feeds</context-root>
</web>
</module>
Modified: trunk/resources/WEB-INF/components.xml
===================================================================
--- trunk/resources/WEB-INF/components.xml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/resources/WEB-INF/components.xml 2008-03-29 11:27:37 UTC (rev 278)
@@ -61,6 +61,6 @@
<component name="linkService">
<property name="serverAddress">http://localhost:8080</property>
- <property name="contextName">blogs</property>
+ <property name="contextName">feeds</property>
</component>
</components>
Modified: trunk/resources/WEB-INF/urlrewrite.xml
===================================================================
--- trunk/resources/WEB-INF/urlrewrite.xml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/resources/WEB-INF/urlrewrite.xml 2008-03-29 11:27:37 UTC (rev 278)
@@ -17,8 +17,8 @@
</rule>
<outbound-rule>
- <from>^/blogs/home.seam$</from>
- <to>/blogs/</to>
+ <from>^/feeds/home.seam$</from>
+ <to>/feeds/</to>
</outbound-rule>
<!-- Posts view -->
@@ -29,30 +29,30 @@
</rule>
<outbound-rule>
- <from>^/blogs/view/post.seam\?post=(\w+)$</from>
- <to>/blogs/post/$1</to>
+ <from>^/feeds/view/post.seam\?post=(\w+)$</from>
+ <to>/feeds/post/$1</to>
</outbound-rule>
<outbound-rule>
- <from>^/blogs/view/post.seam\?post=(\w+)&(.+)$</from>
- <to>/blogs/post/$1?$2</to>
+ <from>^/feeds/view/post.seam\?post=(\w+)&(.+)$</from>
+ <to>/feeds/post/$1?$2</to>
</outbound-rule>
<outbound-rule>
- <from>^/blogs/view/post.seam\?cid=(\d+)&post=(\w+)(.*)$</from>
- <to>/blogs/post/$2?cid=$1$3</to>
+ <from>^/feeds/view/post.seam\?cid=(\d+)&post=(\w+)(.*)$</from>
+ <to>/feeds/post/$2?cid=$1$3</to>
</outbound-rule>
<!-- Feeds -->
<rule>
- <from>^/feed/([a-z0-9_]+)(\?.+)?$</from>
+ <from>^/xml/([a-z0-9_]+)(\?.+)?$</from>
<to>/feeds.seam?name=$1</to>
</rule>
<outbound-rule>
- <from>^/blogs/feeds.seam\?type=(\w+)&name=([a-z0-9_]*)$</from>
- <to>/blogs/feed/$2?type=$1</to>
+ <from>^/feeds/feeds.seam\?type=(\w+)&name=([a-z0-9_]*)$</from>
+ <to>/feeds/xml/$2?type=$1</to>
</outbound-rule>
<!-- Feed view -->
@@ -63,8 +63,8 @@
</rule>
<outbound-rule>
- <from>^/blogs/view/feed.seam\?(cid=\d+&)?(from=\d+)&name=([a-z0-9_]+)(.*)$</from>
- <to>/blogs/view/$3?$1$2$4</to>
+ <from>^/feeds/view/feed.seam\?(cid=\d+&)?(from=\d+)&name=([a-z0-9_]+)(.*)$</from>
+ <to>/feeds/view/$3?$1$2$4</to>
</outbound-rule>
</urlrewrite>
Modified: trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/src/action/org/jboss/blog/session/view/LinkServiceImpl.java 2008-03-29 11:27:37 UTC (rev 278)
@@ -37,7 +37,7 @@
}
public String generateFeedLink(Feed feed, XmlType type) {
- return serverAddress + "/" + contextName + "/feed/" + feed.getName() + "?type=" + type.toString().toLowerCase();
+ return serverAddress + "/" + contextName + "/xml/" + feed.getName() + "?type=" + type.toString().toLowerCase();
}
public String generateFeedPageLink(Feed feed) {
Modified: trunk/view/common/ajax_status.xhtml
===================================================================
--- trunk/view/common/ajax_status.xhtml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view/common/ajax_status.xhtml 2008-03-29 11:27:37 UTC (rev 278)
@@ -9,7 +9,7 @@
xmlns:a="http://richfaces.org/a4j">
<a:status stopStyleClass="ajaxStatus" startStyleClass="ajaxStatus">
<f:facet name="start">
- <img src="/blogs/images/wait.gif" alt="" /> Please wait ...
+ <img src="/feeds/images/wait.gif" alt="" /> Please wait ...
</f:facet>
<f:facet name="stop">
</f:facet>
Modified: trunk/view/home.xhtml
===================================================================
--- trunk/view/home.xhtml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view/home.xhtml 2008-03-29 11:27:37 UTC (rev 278)
@@ -15,7 +15,7 @@
<div id="columnrightBLOG">
<div id="TwoColumnBlogJelly">
<s:link value="" view="/manage/remote/remote_propose.xhtml" propagation="none">
- <img src="/blogs/images/propose_blog.png"
+ <img src="/feeds/images/propose_blog.png"
alt="Propose a Blog! If you are blogging on a JBoss-related subject, aggregate it in our system!" />
</s:link>
</div>
Modified: trunk/view/images/propose_blog.png
===================================================================
(Binary files differ)
Modified: trunk/view/images/propose_blog_full.png
===================================================================
(Binary files differ)
Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view/layout/template.xhtml 2008-03-29 11:27:37 UTC (rev 278)
@@ -9,9 +9,9 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>JBoss.ORG Feeds</title>
- <link href="/blogs/stylesheet/org_main.css" rel="stylesheet" type="text/css" />
- <link href="/blogs/stylesheet/org_layout.css" rel="stylesheet" type="text/css" />
- <link href="/blogs/stylesheet/blog.css" rel="stylesheet" type="text/css" />
+ <link href="/feeds/stylesheet/org_main.css" rel="stylesheet" type="text/css" />
+ <link href="/feeds/stylesheet/org_layout.css" rel="stylesheet" type="text/css" />
+ <link href="/feeds/stylesheet/blog.css" rel="stylesheet" type="text/css" />
<ui:insert name="additional_headers" />
</head>
Modified: trunk/view/manage/remote/remote_add.xhtml
===================================================================
--- trunk/view/manage/remote/remote_add.xhtml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view/manage/remote/remote_add.xhtml 2008-03-29 11:27:37 UTC (rev 278)
@@ -27,6 +27,7 @@
<ui:include src="remote_mod.xhtml">
<ui:param name="new" value="true" />
+ <ui:param name="inlineTips" value="false" />
<ui:param name="showCaptcha" value="false" />
<ui:param name="backTo" value="/manage/index.html" />
</ui:include>
Modified: trunk/view/manage/remote/remote_edit.xhtml
===================================================================
--- trunk/view/manage/remote/remote_edit.xhtml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view/manage/remote/remote_edit.xhtml 2008-03-29 11:27:37 UTC (rev 278)
@@ -27,7 +27,8 @@
</div>
<ui:include src="remote_mod.xhtml">
- <ui:param name="new" value="false" />
+ <ui:param name="new" value="false" />
+ <ui:param name="inlineTips" value="false" />
<ui:param name="showCaptcha" value="false" />
<ui:param name="backTo" value="/manage/index.html" />
</ui:include>
Modified: trunk/view/manage/remote/remote_mod.xhtml
===================================================================
--- trunk/view/manage/remote/remote_mod.xhtml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view/manage/remote/remote_mod.xhtml 2008-03-29 11:27:37 UTC (rev 278)
@@ -34,6 +34,18 @@
</a:outputPanel>
</h:panelGroup>
+ <h:panelGroup rendered="#{inlineTips}" />
+ <h:panelGroup rendered="#{inlineTips}" styleClass="instructional_text">
+ <p>
+ #{messages['blog.feed.remote.adding.quickstart']}
+ After submitting, your feed will be added to the propositions queue and reviewed.
+ <br /><br />
+ If you are blogging on a wider area of subjects, please submit a feed of only jboss-related
+ entries (for example a feed of one category/ tag), or, if category information is included
+ in the entries of the feed, select a category after parsing the feed.
+ </p>
+ </h:panelGroup>
+
<h:outputLabel for="postAuthorType"><span class="required">*</span> How to determine posts authors:</h:outputLabel>
<h:panelGroup>
<h:selectOneMenu id="postAuthorType" value="#{remoteFeedMod.remoteFeed.postAuthorType}"
@@ -47,6 +59,11 @@
</h:selectOneMenu>
</h:panelGroup>
+ <h:panelGroup rendered="#{inlineTips}" />
+ <h:panelGroup rendered="#{inlineTips}" styleClass="instructional_text">
+ <p>#{messages['blog.feed.remote.mod.authors']}</p>
+ </h:panelGroup>
+
<h:outputLabel id="includeCategoryHeader">
<s:fragment rendered="#{remoteFeedMod.parseOk or !new}">
<span class="required">*</span> Include only posts from category:
Modified: trunk/view/manage/remote/remote_propose.xhtml
===================================================================
--- trunk/view/manage/remote/remote_propose.xhtml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view/manage/remote/remote_propose.xhtml 2008-03-29 11:27:37 UTC (rev 278)
@@ -13,32 +13,9 @@
</ui:define>
<ui:define name="body">
- <div><ul class="messages"><li class="messages_info">
- If you are blogging on a JBoss-related subject, you can aggregate your blog on JBoss.ORG!
- Blogs written by the JBoss Community members are very valuable, and we'd like
- to make them much more visible!
- </li></ul></div>
-
- <div class="TwoColumnBlogSubnav">
- <h4>Tips</h4>
- <ul>
- <li>
- #{messages['blog.feed.remote.adding.quickstart']}
- After submitting, your feed will be added to the propositions queue and reviewed.
- </li>
- <li>
- If you are blogging on a wider area of subjects, please submit a feed of only jboss-related
- entries (for example a feed of one category/ tag), or, if category information is included
- in the entries of the feed, select a category after parsing the feed.
- </li>
- <li class="last">
- #{messages['blog.feed.remote.mod.authors']}
- </li>
- </ul>
- </div>
-
<ui:include src="remote_mod.xhtml">
<ui:param name="new" value="true" />
+ <ui:param name="inlineTips" value="true" />
<ui:param name="showCaptcha" value="true" />
<ui:param name="backTo" value="/home.xhtml" />
</ui:include>
Modified: trunk/view/stylesheet/blog.css
===================================================================
--- trunk/view/stylesheet/blog.css 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view/stylesheet/blog.css 2008-03-29 11:27:37 UTC (rev 278)
@@ -379,6 +379,14 @@
height:20px;
}
+span.instructional_text p {
+ background-color: #f6f6f6;
+ color:#535353;
+ font-size: 10px;
+ padding: 12px;
+ margin: 0px 0 10px 0;
+}
+
/* Feeds Pages: Right column - Subnav list */
.feedsRightsidebox {
@@ -485,4 +493,3 @@
border-bottom: 1px dashed #d5d5d5;
background-color:#FFFFFF;
}
-
Modified: trunk/view/view/right_box.xhtml
===================================================================
--- trunk/view/view/right_box.xhtml 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view/view/right_box.xhtml 2008-03-29 11:27:37 UTC (rev 278)
@@ -19,7 +19,7 @@
<div id="TwoColumnBlogJelly">
<s:link value="" view="/manage/remote/remote_propose.xhtml" propagation="none">
- <img src="/blogs/images/propose_blog_full.png"
+ <img src="/feeds/images/propose_blog_full.png"
alt="Propose a Blog! If you are blogging on a JBoss-related subject, aggregate it in our system!" />
</s:link>
</div>
Modified: trunk/view-portlet/view.jsp
===================================================================
--- trunk/view-portlet/view.jsp 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view-portlet/view.jsp 2008-03-29 11:27:37 UTC (rev 278)
@@ -12,7 +12,7 @@
<portlet:defineObjects />
<head>
- <link href="/blogs/stylesheet/blog.css" rel="stylesheet" type="text/css" />
+ <link href="/feeds/stylesheet/blog.css" rel="stylesheet" type="text/css" />
</head>
<%
@@ -62,7 +62,7 @@
</a>
</li>
<li>
- <a href="/blogs" class="standardLinkArrow">
+ <a href="/feeds" class="standardLinkArrow">
Go to JBoss.ORG Feeds home
</a>
</li>
Modified: trunk/view-portlet/view_main.jsp
===================================================================
--- trunk/view-portlet/view_main.jsp 2008-03-27 12:36:23 UTC (rev 277)
+++ trunk/view-portlet/view_main.jsp 2008-03-29 11:27:37 UTC (rev 278)
@@ -12,7 +12,7 @@
<portlet:defineObjects />
<head>
- <link href="/blogs/stylesheet/blog.css" rel="stylesheet" type="text/css" />
+ <link href="/feeds/stylesheet/blog.css" rel="stylesheet" type="text/css" />
</head>
<%
@@ -58,7 +58,7 @@
</a>
</li>
<li>
- <a href="/blogs" class="standardLinkArrow">
+ <a href="/feeds" class="standardLinkArrow">
Go to JBoss.ORG Feeds home
</a>
</li>
More information about the jboss-cvs-commits
mailing list