From ba0af314e3198172127e5e8c0f00a5cd5a758592 Mon Sep 17 00:00:00 2001 From: Max Kremmel Date: Sun, 23 Oct 2005 14:41:54 +0000 Subject: merge recent changes into HEAD --- templates/admin_rss.tpl | 51 +++----- templates/admin_rssmodules.tpl | 258 +++++++++++++++++++++-------------------- templates/header_inc.tpl | 11 -- templates/menu_rss.tpl | 5 + templates/menu_rss_admin.tpl | 6 +- templates/rss.tpl | 36 ++++++ 6 files changed, 193 insertions(+), 174 deletions(-) delete mode 100644 templates/header_inc.tpl create mode 100644 templates/menu_rss.tpl create mode 100644 templates/rss.tpl (limited to 'templates') 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"} {foreach from=$formRSSFeeds key=rss_pkg item=output}
- {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 @@
- {formlabel label="Items" for=$rss_pkg} + {formlabel label="Items" for=`$rss_pkg`_items} {forminput} - + {/forminput}
- {formlabel label="Title" for=$rss_pkg} + {formlabel label="Title" for=`$rss_pkg`_title} {forminput} - + {/forminput}
- {formlabel label="Description" for=$rss_pkg} + {formlabel label="Description" for=`$rss_pkg`_desc} {forminput} - + {/forminput}
{/foreach} -
- -
- {formhelp note="
Title
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.
@@ -51,25 +47,16 @@
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.
Items
Maximum number of items that are broadcast when accessing the RSS feed.
"} - {/legend} {/jstab} - {jstab title="RSS Settings"} - {legend legend="RSS Settings"} -
- {formlabel label="Default RDF version" for="rssfeed_default_version"} - {forminput} - .0 - {formhelp note="{tr}RDF 1.0 Specification{/tr} and RDF 2.0 Specification"} - {/forminput} -
- + {jstab title="Syndication Settings"} + {legend legend="Syndication Settings"}
- {formlabel label="Append CSS file" for="rssfeed_css"} + {formlabel label="Default Feed Type" for="rssfeed_default_version"} {forminput} - 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}
@@ -82,15 +69,13 @@ {/forminput} {/foreach} - - {formhelp note="More help regarding RSS feeds can be found here: {tr}RDF 1.0 Specification{/tr} and RDF 2.0 Specification"} - -
- -
{/legend} {/jstab} {/jstabs} + +
+ +
{/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}
{bithelp}
-
-

{tr}Admin RSS modules{/tr}

-
+
+

{tr}Admin RSS modules{/tr}

+
-
+
-{if $preview eq 'y'} -
-
{tr}Content for the feed{/tr}
-
- -
-
-{/if} + {if $items} + {box title="Feed Preview"} + + {/box} + {/if} -{if $rss_id > 0} -

{tr}Edit this RSS module:{/tr} {$name}

-{tr}Create new RSS module{/tr} -{else} -

{tr}Create new RSS module{/tr}

-{/if} -
- - - - - - - - - -
-{tr}Name{/tr}: - -
-{tr}Description{/tr}: - -
-{tr}URL{/tr}: - -
-{tr}Refresh rate{/tr}: - -
-{tr}show feed title{/tr}:(work in progress) - -
{tr}show publish date{/tr}:
 
-
+ {form legend="Create / Edit Syndication Module"} + +
+ {formlabel label="Title" for="name"} + {forminput} + + {formhelp note="This will appear at the top of the module."} + {/forminput} +
-

{tr}Rss channels{/tr}

- - - - -
{tr}Find{/tr} -
- - - -
-
+
+ {formlabel label="Description" for="description"} + {forminput} + + {formhelp note=""} + {/forminput} +
- - - - - - - - - - - - -{cycle values="even,odd" print=false} -{section name=user loop=$channels} - - - - - - - - - - - -{sectionelse} - -{/section} -
{tr}ID{/tr}{tr}Name{/tr}{tr}Description{/tr}{tr}URI{/tr}{tr}Last update{/tr}{tr}refresh{/tr}{tr}Show feed title{/tr}{tr}Show publication date{/tr}{tr}action{/tr}
{$channels[user].rss_id}{$channels[user].name}{$channels[user].description}{$channels[user].url}{$channels[user].last_updated|bit_short_datetime}{$channels[user].minutes} min{$channels[user].show_title}{$channels[user].show_pub_date} - {tr}remove{/tr} - {tr}edit{/tr} - {tr}view{/tr} -
{tr}No records found{/tr}
+
+ {formlabel label="URL" for="url"} + {forminput} + + {formhelp note=""} + {/forminput} +
-
{* end .body *} +
+ {formlabel label="Refresh Rate" for="refresh"} + {forminput} + {tr}minutes{/tr} + {formhelp note=""} + {/forminput} +
- +
+ {formlabel label="Show Feed Title" for="show-title"} + {forminput} + + {formhelp note="Might not work as expected."} + {/forminput} +
-
{* end .admin *} +
+ {formlabel label="Publication Time" for="pub-date"} + {forminput} + + {formhelp note="Show the time at which the feed was published."} + {/forminput} +
+ +
+ +
+ {/form} + + {minifind} + + + + + + + + + + + + {section name=user loop=$channels} + + + + + + + + + {sectionelse} + + {/section} +
{tr}RSS Modules{/tr}
{smartlink ititle="ID" isort=rss_id offset=$offset} + {smartlink ititle="Name" isort=name offset=$offset} +
+ {smartlink ititle="Description" isort=description offset=$offset} +
+ {smartlink ititle="URL" isort=url offset=$offset} + 		{smartlink ititle="Last Update" isort=last_updated offset=$offset}{smartlink ititle="Refresh" isort=refresh offset=$offset} + {smartlink ititle="Feed Title" isort=show_title offset=$offset} +
+ {smartlink ititle="Publication Date" isort=show_pub_date offset=$offset} + 		{tr}Actions{/tr}
{$channels[user].rss_id} +

{$channels[user].name}

+ {$channels[user].description} +
+ {$channels[user].url} + 		{$channels[user].last_updated|bit_short_datetime}{$channels[user].minutes} min + {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} +
+ {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} + 		+ {biticon ipackage=liberty iname=view iexplain=view} + {biticon ipackage=liberty iname=edit iexplain=edit} + {biticon ipackage=liberty iname=delete iexplain=remove} +
{tr}No records found{/tr}
+ + {pagination} +
+ +{/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' )} - - {/if} - {if $smarty.const.ACTIVE_PACKAGE eq 'wiki' and $gBitUser->hasPermission( 'bit_p_view' )} - - {/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} + +{/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} -{/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} +
+ {formlabel label="Requested Feed"} + {forminput} + {$feedlink.title} + {formhelp note="Use this link for your feed aggregator."} + {/forminput} +
+
+ {/if} + +
+ {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} +
+ +
+ {formlabel label="Feed" for="pkg"} + {forminput} + {html_options name=pkg id=pkg values=$pkgs options=$pkgs selected=$feedlink.pkg} + {formhelp note=""} + {/forminput} +
+ +
+ +
+ {/legend} +{/form} +{/strip} -- cgit v1.3