do some generic rss cleanup and actually make use of the default rss feed type setting

2 files changed, 42 insertions, 34 deletions

diff --git a/index.php b/index.php
index 5c4c93d..b146b73 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_rss/index.php,v 1.3 2006/07/17 09:56:03 nickpalmer Exp $
+ * $Header: /cvsroot/bitweaver/_bit_rss/index.php,v 1.4 2006/12/09 23:42:07 squareing Exp $
  *
  * Copyright ( c ) 2004 bitweaver.org
  * Copyright ( c ) 2003 tikwiki.org
@@ -8,7 +8,7 @@
  * All Rights Reserved. See copyright.txt for details and a complete list of authors.
  * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
  *
- * $Id: index.php,v 1.3 2006/07/17 09:56:03 nickpalmer Exp $
+ * $Id: index.php,v 1.4 2006/12/09 23:42:07 squareing Exp $
  * @package pigeonholes
  * @subpackage functions
  */
@@ -23,7 +23,7 @@ $gBitSystem->verifyPackage( 'rss' );
 foreach( $gBitSystem->mPackages as $pkg => $pkgInfo ) {
   	// Install may be chmod 000 if user followed directions
 	if( $pkg != 'install' && is_file( $pkgInfo['path'].$pkg.'_rss.php' ) ) {
-		$pkgs[$pkg] = $pkg;
+		$pkgs[$pkg] = ( $gBitSystem->isFeatureActive( $pkg."_rss_title" ) ? $gBitSystem->getConfig( $pkg."_rss_title" ) : $pkg );
 	}
 }
 $gBitSmarty->assign( "pkgs", $pkgs );
diff --git a/templates/rss.tpl b/templates/rss.tpl
index f9451f3..bedf4ff 100644
--- a/templates/rss.tpl
+++ b/templates/rss.tpl
@@ -1,36 +1,44 @@
 {strip}
-{form}
-	{legend legend="Syndication Feeds"}
-		{if $feedlink}
-			<div id="rssid" class="fade-000000 row">
-				{formlabel label="Requested Feed"}
-				{forminput}
-					<strong><a href="{$feedlink.url}">{$feedlink.title|escape}</a></strong>
-					{formhelp note="Use this link for your feed aggregator."}
-				{/forminput}
-			</div>
-			<hr />
-		{/if}
+<div class="display rss">
+	<div class="header">
+		<h1>{tr}RSS Syndication{/tr}</h1>
+	</div>
 
-		<div class="row">
-			{formlabel label="Feed Format" for="format"}
-			{forminput}
-				{html_options name=format id=format values=$feedFormat options=$feedFormat selected=$feedlink.format}
-				{formhelp note="Select your preferred feed format."}
-			{/forminput}
-		</div>
+	<div class="body">
+		{form}
+			{legend legend="Syndication Feeds"}
+				{if $feedlink}
+					<div id="rssid" class="fade-000000 row">
+						{formlabel label="Requested Feed"}
+						{forminput}
+							<strong><a href="{$feedlink.url}">{$feedlink.title|escape}</a></strong>
+							{formhelp note="Use this link for your feed aggregator."}
+						{/forminput}
+					</div>
+					<hr />
+				{/if}
 
-		<div class="row">
-			{formlabel label="Feed" for="pkg"}
-			{forminput}
-				{html_options name=pkg id=pkg values=$pkgs options=$pkgs selected=$feedlink.pkg}
-				{formhelp note=""}
-			{/forminput}
-		</div>
+				<div class="row">
+					{formlabel label="Feed Format" for="format"}
+					{forminput}
+						{html_options name=format id=format values=$feedFormat options=$feedFormat selected=$feedlink.format}
+						{formhelp note="Select your preferred feed format."}
+					{/forminput}
+				</div>
 
-		<div class="row submit">
-			<input type="submit" name="get_feed" value="Get Feed" />
-		</div>
-	{/legend}
-{/form}
+				<div class="row">
+					{formlabel label="Feed" for="pkg"}
+					{forminput}
+						{html_options name=pkg id=pkg values=$pkgs options=$pkgs selected=$feedlink.pkg}
+						{formhelp note=""}
+					{/forminput}
+				</div>
+
+				<div class="row submit">
+					<input type="submit" name="get_feed" value="Get Feed" />
+				</div>
+			{/legend}
+		{/form}
+	</div><!-- end .body -->
+</div><!-- end .___ -->
 {/strip}