merge recent changes from R1 to HEAD

3 files changed, 24 insertions, 24 deletions

diff --git a/templates/admin_rssmodules.tpl b/templates/admin_rssmodules.tpl
index 7ec4024..266a0a7 100644
--- a/templates/admin_rssmodules.tpl
+++ b/templates/admin_rssmodules.tpl
@@ -22,11 +22,11 @@
 
 {if $rss_id > 0}
 <h2>{tr}Edit this RSS module:{/tr} {$name}</h2>
-<a href="{$gBitLoc.RSS_PKG_URL}admin/index.php">{tr}Create new RSS module{/tr}</a>
+<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="{$gBitLoc.RSS_PKG_URL}admin/index.php" method="post">
+<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>
@@ -72,7 +72,7 @@
 <table class="find">
 <tr><td>{tr}Find{/tr}</td>
    <td>
-   <form method="get" action="{$gBitLoc.RSS_PKG_URL}admin/index.php">
+   <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}" />
@@ -83,14 +83,14 @@
 
 <table class="data">
 <tr>
-<th><a href="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.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><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}
@@ -105,9 +105,9 @@
 <td>{$channels[user].show_title}</td>
 <td>{$channels[user].show_pub_date}</td>
 <td>
-   <a href="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.RSS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;view={$channels[user].rss_id}">{tr}view{/tr}</a>
+   <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}
@@ -119,17 +119,17 @@
 
 <div class="pagination">
 {if $prev_offset >= 0}
-[<a href="{$gBitLoc.RSS_PKG_URL}admin/index.php?find={$find}&amp;offset={$prev_offset}&amp;sort_mode={$sort_mode}">{tr}prev{/tr}</a>]&nbsp;
+[<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="{$gBitLoc.RSS_PKG_URL}admin/index.php?find={$find}&amp;offset={$next_offset}&amp;sort_mode={$sort_mode}">{tr}next{/tr}</a>]
+&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="{$gBitLoc.RSS_PKG_URL}admin/index.php?find={$find}&amp;offset={$selector_offset}&amp;sort_mode={$sort_mode}">
+<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}
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
index 8b24190..2f764d7 100644
--- a/templates/header_inc.tpl
+++ b/templates/header_inc.tpl
@@ -1,11 +1,11 @@
-{* $Header: /cvsroot/bitweaver/_bit_rss/templates/header_inc.tpl,v 1.2 2005/07/17 17:36:14 squareing Exp $ *}
+{* $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 $gBitLoc.ACTIVE_PACKAGE eq 'blogs' and $gBitUser->hasPermission( 'bit_p_read_blog' )}
-		<link rel="alternate" type="application/rss+xml" title="{$title}{$post_info.blogtitle}" href="{$gBitLoc.BLOGS_PKG_URL}blogs_rss.php?blog_id={$blog_id}" />
+	{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 $gBitLoc.ACTIVE_PACKAGE eq 'wiki' and $gBitUser->hasPermission( 'bit_p_view' )}
-		<link rel="alternate" type="application/rss+xml" title="{$siteTitle} - wiki" href="{$gBitLoc.RSS_PKG_URL}wiki_rss.php" />
+	{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_admin.tpl b/templates/menu_rss_admin.tpl
index 9f8fb80..9131411 100644
--- a/templates/menu_rss_admin.tpl
+++ b/templates/menu_rss_admin.tpl
@@ -1,6 +1,6 @@
 {strip}
 <ul>
-	<li><a class="item" href="{$gBitLoc.KERNEL_PKG_URL}admin/index.php?page=rss" title="{tr}RSS{/tr}" >{tr}RSS{/tr} Settings</a></li>
-	<li><a class="item" href="{$gBitLoc.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}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>
 </ul>
 {/strip}
\ No newline at end of file