[jboss-cvs] JBossBlog SVN: r279 - in trunk: view/manage/remote and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2008-03-29 12:36:49 -0400 (Sat, 29 Mar 2008)
New Revision: 279

Modified:
   trunk/resources/WEB-INF/urlrewrite.xml
   trunk/view/manage/remote/remote_mod.xhtml
Log:


Modified: trunk/resources/WEB-INF/urlrewrite.xml
===================================================================
--- trunk/resources/WEB-INF/urlrewrite.xml	2008-03-29 11:27:37 UTC (rev 278)
+++ trunk/resources/WEB-INF/urlrewrite.xml	2008-03-29 16:36:49 UTC (rev 279)
@@ -66,5 +66,12 @@
         <from>^/feeds/view/feed.seam\?(cid=\d+&amp;)?(from=\d+)&amp;name=([a-z0-9_]+)(.*)$</from>
         <to>/feeds/view/$3?$1$2$4</to>
     </outbound-rule>
+
+    <!-- Legacy Labs URLs -->
+
+    <rule>
+        <from>^/([a-zA-Z0-9_]+)/(rss2|atom|rdf)$</from>
+        <to type="permanent-redirect">/feeds/xml/$1?type=atom</to>
+    </rule>
 </urlrewrite>
 

Modified: trunk/view/manage/remote/remote_mod.xhtml
===================================================================
--- trunk/view/manage/remote/remote_mod.xhtml	2008-03-29 11:27:37 UTC (rev 278)
+++ trunk/view/manage/remote/remote_mod.xhtml	2008-03-29 16:36:49 UTC (rev 279)
@@ -65,12 +65,12 @@
     </h:panelGroup>
 
     <h:outputLabel id="includeCategoryHeader">
-        <s:fragment rendered="#{remoteFeedMod.parseOk or !new}">
+        <s:fragment rendered="#{(remoteFeedMod.parseOk or !new) and (remoteFeedMod.includeCategories.size() > 2)}">
             <span class="required">*</span> Include only posts from category:
         </s:fragment>
     </h:outputLabel>
     <h:panelGroup id="includeCategoryBody">
-        <s:fragment rendered="#{remoteFeedMod.parseOk or !new}">
+        <s:fragment rendered="#{(remoteFeedMod.parseOk or !new) and (remoteFeedMod.includeCategories.size() > 2)}">
             <h:selectOneMenu id="includeCategory" required="true" value="#{remoteFeedMod.includeCategory}"
                              style="width: 200px">
                 <f:selectItems value="#{remoteFeedMod.includeCategories}" />