merge recent changes into HEAD

6 files changed, 193 insertions, 174 deletions

diff --git a/templates/admin_rss.tpl b/templates/admin_rss.tpl
index 5ade60f..f9efa62 100644
--- a/templates/admin_rss.tpl
+++ b/templates/admin_rss.tpl
@@ -2,12 +2,12 @@
 
 {form}
 	{jstabs}
-		{jstab title="RSS Feeds"}
-			{legend legend="RSS Feeds"}
+		{jstab title="Syndication Feeds"}
+			{legend legend="Syndication Feeds"}
 				<input type="hidden" name="page" value="{$page}" />
 				{foreach from=$formRSSFeeds key=rss_pkg item=output}
 					<div class="row">
-						{formlabel label="RSS feed for `$output.label`" for=$rss_pkg}
+						{formlabel label="Feed for `$output.label`" for=$rss_pkg}
 						{forminput}
 							{html_checkboxes name="$rss_pkg" values="y" checked=`$gBitSystemPrefs.$rss_pkg` labels=false id=$rss_pkg}
 							{assign var="max_rss" value="max_`$rss_pkg`"}
@@ -18,32 +18,28 @@
 					</div>
 
 					<div class="row">
-						{formlabel label="Items" for=$rss_pkg}
+						{formlabel label="Items" for=`$rss_pkg`_items}
 						{forminput}
-							<input type="text" name="{$max_rss}" size="5" value="{$gBitSystemPrefs.$max_rss|default:10}" />
+							<input type="text" id="{$rss_pkg}_items" name="{$max_rss}" size="5" value="{$gBitSystemPrefs.$max_rss|default:10}" />
 						{/forminput}
 					</div>
 
 					<div class="row">
-						{formlabel label="Title" for=$rss_pkg}
+						{formlabel label="Title" for=`$rss_pkg`_title}
 						{forminput}
-							<input type="text" name="{$title_rss}" size="35" value="{$gBitSystemPrefs.$title_rss}" />
+							<input type="text" id="{$rss_pkg}_title" name="{$title_rss}" size="35" value="{$gBitSystemPrefs.$title_rss}" />
 						{/forminput}
 					</div>
 
 					<div class="row">
-						{formlabel label="Description" for=$rss_pkg}
+						{formlabel label="Description" for=`$rss_pkg`_desc}
 						{forminput}
-							<input type="text" name="{$desc_rss}" size="35" value="{$gBitSystemPrefs.$desc_rss}" />
+							<input type="text" id="{$rss_pkg}_desc" name="{$desc_rss}" size="35" value="{$gBitSystemPrefs.$desc_rss}" />
 						{/forminput}
 					</div>
 					<hr />
 				{/foreach}
 
-				<div class="row submit">
-					<input type="submit" name="feedsTabSubmit" value="{tr}Change preferences{/tr}" />
-				</div>
-
 				{formhelp note="<dl>
 					<dt>Title</dt>
 					<dd>Name that appears when user calls RSS feed. In some cases, such as blogs, the Title is prepended to the actual title of the blog. If you prefer using the blog title as the title on it's own, please leave this blank.</dd>
@@ -51,25 +47,16 @@
 					<dd>Description of the RSS feed. In some cases, such as blogs, the description is prepended to the actual description of the blog. If you prefer using the blog description as the description on it's own, please leave this blank.</dd>
 					<dt>Items</dt>
 					<dd>Maximum number of items that are broadcast when accessing the RSS feed.</dd></dl>"}
-
 			{/legend}
 		{/jstab}
 
-		{jstab title="RSS Settings"}
-			{legend legend="RSS Settings"}
-				<div class="row">
-					{formlabel label="Default RDF version" for="rssfeed_default_version"}
-					{forminput}
-						<input type="text" name="rssfeed_default_version" id="rssfeed_default_version" size="1" value="{$gBitSystemPrefs.rssfeed_default_version}" />.0
-						{formhelp note="<a class=\"external\" href=\"http://www.w3.org/TR/rdf-schema/\">{tr}RDF 1.0 Specification{/tr}</a> and <a class=\"external\" href=\"http://blogs.law.harvard.edu/tech/rss#optionalChannelElements\" title=\"RDF Documentation\">RDF 2.0 Specification</a>"}
-					{/forminput}
-				</div>
-
+		{jstab title="Syndication Settings"}
+			{legend legend="Syndication Settings"}
 				<div class="row">
-					{formlabel label="Append CSS file" for="rssfeed_css"}
+					{formlabel label="Default Feed Type" for="rssfeed_default_version"}
 					{forminput}
-						<input type="checkbox" name="rssfeed_css" id="rssfeed_css" value="y" {if $gBitSystem->isFeatureActive( 'rssfeed_css' )}checked="checked"{/if} />
-						{formhelp note=""}
+						{html_options name=rssfeed_default_version id=rssfeed_default_version values=$feedTypes options=$feedTypes selected=$gBitSystem->mPrefs.rssfeed_default_version}
+						{formhelp note="Even after settings this, it will still be possible to use the other types of feeds."}
 					{/forminput}
 				</div>
 
@@ -82,15 +69,13 @@
 						{/forminput}
 					</div>
 				{/foreach}
-
-				{formhelp note="More help regarding RSS feeds can be found here: <a class=\"external\" href=\"http://www.w3.org/TR/rdf-schema/\">{tr}RDF 1.0 Specification{/tr}</a> and <a class=\"external\" href=\"http://blogs.law.harvard.edu/tech/rss#optionalChannelElements\" title=\"RDF Documentation\">RDF 2.0 Specification</a>"}
-
-				<div class="row submit">
-					<input type="submit" name="settingsTabSubmit" value="{tr}Change preferences{/tr}" />
-				</div>
 			{/legend}
 		{/jstab}
 	{/jstabs}
+
+	<div class="row submit">
+		<input type="submit" name="feed_settings" value="{tr}Change preferences{/tr}" />
+	</div>
 {/form}
 
 {/strip}
diff --git a/templates/admin_rssmodules.tpl b/templates/admin_rssmodules.tpl
index 266a0a7..e1a7b32 100644
--- a/templates/admin_rssmodules.tpl
+++ b/templates/admin_rssmodules.tpl
@@ -1,138 +1,142 @@
+{strip}
 <div class="floaticon">{bithelp}</div>
 
 <div class="admin rssmodules">
-<div class="header">
-<h1>{tr}Admin RSS modules{/tr}</h1>
-</div>
+	<div class="header">
+		<h1>{tr}Admin RSS modules{/tr}</h1>
+	</div>
 
-<div class="body">
+	<div class="body">
 
-{if $preview eq 'y'}
-<div class="admin box">
-<div class="boxtitle">{tr}Content for the feed{/tr}</div>
-<div class="boxcontent">
-<ul>
-{section name=ix loop=$items}
-<li><a href="{$items[ix].link}">{$items[ix].title}</a></li>
-{/section}
-</ul>
-</div>
-</div>
-{/if}
+		{if $items}
+			{box title="Feed Preview"}
+				<ul>
+					{section name=ix loop=$items}
+						<li><a href="{$items[ix].link}">{$items[ix].title}</a></li>
+					{/section}
+				</ul>
+			{/box}
+		{/if}
 
-{if $rss_id > 0}
-<h2>{tr}Edit this RSS module:{/tr} {$name}</h2>
-<a href="{$smarty.const.RSS_PKG_URL}admin/index.php">{tr}Create new RSS module{/tr}</a>
-{else}
-<h2>{tr}Create new RSS module{/tr}</h2>
-{/if}
-<form action="{$smarty.const.RSS_PKG_URL}admin/index.php" method="post">
-<input type="hidden" name="rss_id" value="{$rss_id|escape}" />
-<table class="panel">
-<tr><td>
-{tr}Name{/tr}:</td><td>
-<input type="text" name="name" value="{$name|escape}" />
-</td></tr>
-<tr><td>
-{tr}Description{/tr}:</td><td>
-<textarea name="description" rows="4" cols="40">{$description|escape}</textarea>
-</td></tr>
-<tr><td>
-{tr}URL{/tr}:</td><td>
-<input size="47" type="text" name="url" value="{$url|escape}" />
-</td></tr>
-<tr><td>
-{tr}Refresh rate{/tr}:</td><td>
-<select name="refresh">
-<option value="1" {if $minutes eq 60}selected="selected"{/if}>{tr}1 minute{/tr}</option>
-<option value="5" {if $refresh eq 300}selected="selected"{/if}>{tr}5 minutes{/tr}</option>
-<option value="10" {if $refresh eq 600}selected="selected"{/if}>{tr}10 minutes{/tr}</option>
-<option value="15" {if $refresh eq 900}selected="selected"{/if}>{tr}15 minutes{/tr}</option>
-<option value="20" {if $refresh eq 1200}selected="selected"{/if}>{tr}20 minutes{/tr}</option>
-<option value="30" {if $refresh eq 1800}selected="selected"{/if}>{tr}30 minutes{/tr}</option>
-<option value="45" {if $refresh eq 2700}selected="selected"{/if}>{tr}45 minutes{/tr}</option>
-<option value="60" {if $refresh eq 3600}selected{/if}>{tr}1 hour{/tr}</option>
-<option value="90" {if $refresh eq 5400}selected="selected"{/if}>{tr}1.5 hours{/tr}</option>
-<option value="120" {if $refresh eq 7200}selected="selected"{/if}>{tr}2 hours{/tr}</option>
-<option value="360" {if $refresh eq 21600}selected="selected"{/if}>{tr}6 hours{/tr}</option>
-<option value="720" {if $refresh eq 43200}selected="selected"{/if}>{tr}12 hours{/tr}</option>
-<option value="1440" {if $refresh eq 86400}selected="selected"{/if}>{tr}1 day{/tr}</option>
-</select>
-</td></tr>
-<tr><td>
-{tr}show feed title{/tr}:<b>(work in progress)</b></td><td>
-<input type="checkbox" name="show_title" {if $show_title eq 'y'}checked="checked"{/if}>
-</td></tr>
-<tr><td>{tr}show publish date{/tr}:</td><td><input type="checkbox" name="show_pub_date" {if $show_pub_date eq 'y'}checked="checked"{/if}></td></tr>
-<tr><td>&nbsp;</td><td><input type="submit" name="save" value="{tr}Save{/tr}" /></td></tr>
-</table>
-</form>
+		{form legend="Create / Edit Syndication Module"}
+			<input type="hidden" name="rss_id" value="{$rss_id}" />
+			<div class="row">
+				{formlabel label="Title" for="name"}
+				{forminput}
+					<input type="text" name="name" id="name" value="{$name|escape}" />
+					{formhelp note="This will appear at the top of the module."}
+				{/forminput}
+			</div>
 
-<h2>{tr}Rss channels{/tr}</h2>
-<table class="find">
-<tr><td>{tr}Find{/tr}</td>
-   <td>
-   <form method="get" action="{$smarty.const.RSS_PKG_URL}admin/index.php">
-     <input type="text" name="find" value="{$find|escape}" />
-     <input type="submit" value="{tr}find{/tr}" name="search" />
-     <input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
-   </form>
-   </td>
-</tr>
-</table>
+			<div class="row">
+				{formlabel label="Description" for="description"}
+				{forminput}
+					<textarea name="description" id="description" rows="3" cols="40">{$description|escape}</textarea>
+					{formhelp note=""}
+				{/forminput}
+			</div>
 
-<table class="data">
-<tr>
-<th><a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'rss_id_desc'}rss_id_asc{else}rss_id_desc{/if}">{tr}ID{/tr}</a></th>
-<th><a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}Name{/tr}</a></th>
-<th><a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'description_desc'}description_asc{else}description_desc{/if}">{tr}Description{/tr}</a></th>
-<th><a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'url_desc'}url_asc{else}url_desc{/if}">{tr}URI{/tr}</a></th>
-<th><a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'last_updated_desc'}last_updated_asc{else}last_updated_desc{/if}">{tr}Last update{/tr}</a></th>
-<th><a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'refresh_desc'}refresh_asc{else}refresh_desc{/if}">{tr}refresh{/tr}</a></th>
-<th><a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'last_updated_desc'}show_title_asc{else}show_title_desc{/if}">{tr}Show feed title{/tr}</a></th>
-<th><a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'refresh_desc'}show_pub_date_asc{else}show_pub_date_desc{/if}">{tr}Show publication date{/tr}</a></th>
-<th>{tr}action{/tr}</th>
-</tr>
-{cycle values="even,odd" print=false}
-{section name=user loop=$channels}
-<tr class="{cycle}">
-<td>{$channels[user].rss_id}</td>
-<td>{$channels[user].name}</td>
-<td>{$channels[user].description}</td>
-<td>{$channels[user].url}</td>
-<td>{$channels[user].last_updated|bit_short_datetime}</td>
-<td>{$channels[user].minutes} min</td>
-<td>{$channels[user].show_title}</td>
-<td>{$channels[user].show_pub_date}</td>
-<td>
-   <a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].rss_id}">{tr}remove{/tr}</a>
-   <a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;rss_id={$channels[user].rss_id}">{tr}edit{/tr}</a>
-   <a href="{$smarty.const.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;view={$channels[user].rss_id}">{tr}view{/tr}</a>
-</td>
-</tr>
-{sectionelse}
-<tr class="norecords"><td colspan="9">{tr}No records found{/tr}</td></tr>
-{/section}
-</table>
+			<div class="row">
+				{formlabel label="URL" for="url"}
+				{forminput}
+					<input size="50" type="text" name="url" id="url" value="{$url|escape}" />
+					{formhelp note=""}
+				{/forminput}
+			</div>
 
-</div> {* end .body *}
+			<div class="row">
+				{formlabel label="Refresh Rate" for="refresh"}
+				{forminput}
+					<select name="refresh" id="refresh">
+						<option value="1"    {if $minutes eq 60}selected="selected"{/if}   >1   </option>
+						<option value="5"    {if $refresh eq 300}selected="selected"{/if}  >5   </option>
+						<option value="10"   {if $refresh eq 600}selected="selected"{/if}  >10  </option>
+						<option value="15"   {if $refresh eq 900}selected="selected"{/if}  >15  </option>
+						<option value="20"   {if $refresh eq 1200}selected="selected"{/if} >20  </option>
+						<option value="30"   {if $refresh eq 1800}selected="selected"{/if} >30  </option>
+						<option value="45"   {if $refresh eq 2700}selected="selected"{/if} >45  </option>
+						<option value="60"   {if $refresh eq 3600}selected="selected"{/if} >60  </option>
+						<option value="90"   {if $refresh eq 5400}selected="selected"{/if} >90  </option>
+						<option value="120"  {if $refresh eq 7200}selected="selected"{/if} >120 </option>
+						<option value="360"  {if $refresh eq 21600}selected="selected"{/if}>360 </option>
+						<option value="720"  {if $refresh eq 43200}selected="selected"{/if}>720 </option>
+						<option value="1440" {if $refresh eq 86400}selected="selected"{/if}>1440</option>
+					</select> {tr}minutes{/tr}
+					{formhelp note=""}
+				{/forminput}
+			</div>
 
-<div class="pagination">
-{if $prev_offset >= 0}
-[<a href="{$smarty.const.RSS_PKG_URL}admin/index.php?find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
-{/if}
-{tr}Page{/tr}: {$actual_page}/{$cant_pages}
-{if $next_offset >= 0}
-&nbsp;[<a href="{$smarty.const.RSS_PKG_URL}admin/index.php?find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
-{/if}
-{if $direct_pagination eq 'y'}
-<br />
-{section loop=$cant_pages name=foo}
-{assign var=selector_offset value=$smarty.section.foo.index|times:$maxRecords}
-<a href="{$smarty.const.RSS_PKG_URL}admin/index.php?find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
-{$smarty.section.foo.index_next}</a>&nbsp;
-{/section}
-{/if}
-</div>
+			<div class="row">
+				{formlabel label="Show Feed Title" for="show-title"}
+				{forminput}
+					<input type="checkbox" name="show_title" id="show-title" {if $show_title eq 'y'}checked="checked"{/if} />
+					{formhelp note="Might not work as expected."}
+				{/forminput}
+			</div>
 
-</div> {* end .admin *}
+			<div class="row">
+				{formlabel label="Publication Time" for="pub-date"}
+				{forminput}
+					<input type="checkbox" name="show_pub_date" id="pub-date" {if $show_pub_date eq 'y'}checked="checked"{/if} />
+					{formhelp note="Show the time at which the feed was published."}
+				{/forminput}
+			</div>
+
+			<div class="row submit">
+				<input type="submit" name="save" value="{tr}Save{/tr}" />
+			</div>
+		{/form}
+
+		{minifind}
+
+		<table class="data">
+			<caption>{tr}RSS Modules{/tr}</caption>
+			<tr>
+				<th>{smartlink ititle="ID" isort=rss_id offset=$offset}</th>
+				<th>
+					{smartlink ititle="Name" isort=name offset=$offset}
+					<br />
+					{smartlink ititle="Description" isort=description offset=$offset}
+					<br />
+					{smartlink ititle="URL" isort=url offset=$offset}
+				</th>
+				<th>{smartlink ititle="Last Update" isort=last_updated offset=$offset}</th>
+				<th>{smartlink ititle="Refresh" isort=refresh offset=$offset}</th>
+				<th>
+					{smartlink ititle="Feed Title" isort=show_title offset=$offset}
+					<br />
+					{smartlink ititle="Publication Date" isort=show_pub_date offset=$offset}
+				</th>
+				<th>{tr}Actions{/tr}</th>
+			</tr>
+			{section name=user loop=$channels}
+			<tr class="{cycle values='odd,even'}">
+				<td>{$channels[user].rss_id}</td>
+				<td>
+					<h2>{$channels[user].name}</h2>
+					{$channels[user].description}
+					<br />
+					{$channels[user].url}
+				</td>
+				<td>{$channels[user].last_updated|bit_short_datetime}</td>
+				<td>{$channels[user].minutes} min</td>
+				<td style="text-align:center;">
+					{if $channels[user].show_title eq 'y'}{biticon ipackage=liberty iname=active iexplain="Show Title"}{else}{biticon ipackage=liberty iname=inactive iexplain="Show Title"}{/if}
+					<br />
+					{if $channels[user].show_pub_date eq 'y'}{biticon ipackage=liberty iname=active iexplain="Show Publication Time"}{else}{biticon ipackage=liberty iname=inactive iexplain="Show Publication Time"}{/if}
+				</td>
+				<td>
+				   <a href="{$smarty.const.RSS_PKG_URL}admin/admin_rssmodules.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;view={$channels[user].rss_id}">{biticon ipackage=liberty iname=view iexplain=view}</a>
+				   <a href="{$smarty.const.RSS_PKG_URL}admin/admin_rssmodules.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;rss_id={$channels[user].rss_id}">{biticon ipackage=liberty iname=edit iexplain=edit}</a>
+				   <a href="{$smarty.const.RSS_PKG_URL}admin/admin_rssmodules.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].rss_id}">{biticon ipackage=liberty iname=delete iexplain=remove}</a>
+				</td>
+			</tr>
+			{sectionelse}
+				<tr class="norecords"><td colspan="9">{tr}No records found{/tr}</td></tr>
+			{/section}
+		</table>
+
+		{pagination}
+	</div><!-- end .body -->
+</div><!-- end .rss -->
+{/strip}
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
deleted file mode 100644
index 2f764d7..0000000
--- a/templates/header_inc.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{* $Header: /cvsroot/bitweaver/_bit_rss/templates/header_inc.tpl,v 1.3 2005/08/07 17:44:21 squareing Exp $ *}
-{strip}
-{if $gBitSystem->isPackageActive( 'rss' )}
-	{if $smarty.const.ACTIVE_PACKAGE eq 'blogs' and $gBitUser->hasPermission( 'bit_p_read_blog' )}
-		<link rel="alternate" type="application/rss+xml" title="{$title}{$post_info.blogtitle}" href="{$smarty.const.BLOGS_PKG_URL}blogs_rss.php?blog_id={$blog_id}" />
-	{/if}
-	{if $smarty.const.ACTIVE_PACKAGE eq 'wiki' and $gBitUser->hasPermission( 'bit_p_view' )}
-		<link rel="alternate" type="application/rss+xml" title="{$siteTitle} - wiki" href="{$smarty.const.RSS_PKG_URL}wiki_rss.php" />
-	{/if}
-{/if}
-{/strip}
diff --git a/templates/menu_rss.tpl b/templates/menu_rss.tpl
new file mode 100644
index 0000000..21b7af8
--- /dev/null
+++ b/templates/menu_rss.tpl
@@ -0,0 +1,5 @@
+{strip}
+<ul>
+	<li><a class="item" href="{$smarty.const.RSS_PKG_URL}index.php" title="{tr}Syndication{/tr}" >{tr}Syndication{/tr}</a></li>
+</ul>
+{/strip}
diff --git a/templates/menu_rss_admin.tpl b/templates/menu_rss_admin.tpl
index 9131411..28d871f 100644
--- a/templates/menu_rss_admin.tpl
+++ b/templates/menu_rss_admin.tpl
@@ -1,6 +1,6 @@
 {strip}
 <ul>
-	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=rss" title="{tr}RSS{/tr}" >{tr}RSS{/tr} Settings</a></li>
-	<li><a class="item" href="{$smarty.const.RSS_PKG_URL}admin/index.php">{tr}RSS modules{/tr}</a></li>
+	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=rss" title="{tr}Syndication Settings{/tr}" >{tr}RSS Settings{/tr}</a></li>
+	<li><a class="item" href="{$smarty.const.RSS_PKG_URL}admin/admin_rssmodules.php" title="{tr}Syndication Modules{/tr}" >{tr}RSS Modules{/tr}</a></li>
 </ul>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/templates/rss.tpl b/templates/rss.tpl
new file mode 100644
index 0000000..f8a4e32
--- /dev/null
+++ b/templates/rss.tpl
@@ -0,0 +1,36 @@
+{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}</a></strong>
+					{formhelp note="Use this link for your feed aggregator."}
+				{/forminput}
+			</div>
+			<hr />
+		{/if}
+
+		<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">
+			{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}
+{/strip}