diff options
Diffstat (limited to 'theme/default/html')
-rw-r--r-- | theme/default/html/feed/item.php (renamed from theme/default/html/feed/item_post.php) | 0 | ||||
-rw-r--r-- | theme/default/html/feed/item_page.php | 27 | ||||
-rw-r--r-- | theme/default/html/feed/main.php | 32 | ||||
-rw-r--r-- | theme/default/html/home.php | 3 | ||||
-rw-r--r-- | theme/default/html/main.php | 5 | ||||
-rw-r--r-- | theme/default/html/page/list.php | 2 | ||||
-rw-r--r-- | theme/default/html/post/list.php | 2 |
7 files changed, 11 insertions, 60 deletions
diff --git a/theme/default/html/feed/item_post.php b/theme/default/html/feed/item.php index 0bf23fc..0bf23fc 100644 --- a/theme/default/html/feed/item_post.php +++ b/theme/default/html/feed/item.php diff --git a/theme/default/html/feed/item_page.php b/theme/default/html/feed/item_page.php deleted file mode 100644 index 82568a1..0000000 --- a/theme/default/html/feed/item_page.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -# Feed Item Template [page] [Thomas Lange <code@nerdmind.de>] # -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -# # -# [see documentation] # -# # -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# - -$HTML = $PAGE['BODY']['HTML'](); -?> -<item> - <title><?=escapeHTML($PAGE['ATTR']['NAME'])?></title> - <link><?=$PAGE['URL']?></link> - <guid isPermaLink="false"><?=$PAGE['GUID']?></guid> - <pubDate><?=parseDatetime($PAGE['ATTR']['TIME_INSERT'], '[RFC2822]')?></pubDate> - <dc:creator><?=escapeHTML($USER['ATTR']['FULLNAME'])?></dc:creator> - <description><?=escapeHTML(description($HTML, 400))?></description> - <content:encoded> - <![CDATA[ - <?=$HTML?> - ]]> - </content:encoded> - <?php foreach($PAGE['FILE']['LIST'] as $fileURL): ?> - <media:content url="<?=$fileURL?>" medium="image"></media:content> - <?php endforeach; ?> -</item> diff --git a/theme/default/html/feed/main.php b/theme/default/html/feed/main.php index 317bd31..bdd0a48 100644 --- a/theme/default/html/feed/main.php +++ b/theme/default/html/feed/main.php @@ -7,24 +7,12 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# -$BLOGMETA_NAME = escapeHTML($BLOGMETA['NAME']); - -switch($FEED['TYPE']) { - case 'post': - $title = $Language->text('feed_name_posts', $BLOGMETA_NAME); - $self = Application::getURL('feed/post/'); - break; - case 'page': - $title = $Language->text('feed_name_pages', $BLOGMETA_NAME); - $self = Application::getURL('feed/page/'); - break; - default: - $title = $Language->text('feed_name_items', $BLOGMETA_NAME); - $self = Application::getURL('feed/'); -} +$title = escapeHTML($BLOGMETA['NAME']); +$self = Application::getURL('feed/'); ?> <?='<?xml version="1.0" encoding="UTF-8" ?>'?> -<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:media="http://search.yahoo.com/mrss/"> +<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:media="http://search.yahoo.com/mrss/"> <channel> <title><?=$title?></title> <link><?=Application::getURL()?></link> @@ -39,14 +27,8 @@ switch($FEED['TYPE']) { <link><?=Application::getURL()?></link> </image> - <!-- Feed items of type "post" --> - <?php foreach($FEED['LIST']['POSTS'] as $item): ?> - <?php echo $item ?> - <?php endforeach; ?> - - <!-- Feed items of type "page" --> - <?php foreach($FEED['LIST']['PAGES'] as $item): ?> - <?php echo $item ?> - <?php endforeach; ?> + <?php foreach($FEED['LIST']['POSTS'] as $post): ?> + <?php echo $post ?> + <?php endforeach ?> </channel> </rss> diff --git a/theme/default/html/home.php b/theme/default/html/home.php index b412f22..22406e8 100644 --- a/theme/default/html/home.php +++ b/theme/default/html/home.php @@ -7,7 +7,7 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -<h1><i class="fa fa-home"></i><?=$Language->text('home_heading_text', escapeHTML(Application::get('BLOGMETA.NAME')))?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/')?>" title="<?=$Language->text('feed_name_items', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> +<h1><i class="fa fa-home"></i><?=$Language->text('home_heading_text', escapeHTML(Application::get('BLOGMETA.NAME')))?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/')?>" title="<?=$Language->text('feed_subscribe')?>">Feed</a></span></h1> <p><?=$Language->text('home_heading_desc', Application::get('POST.LIST_SIZE'))?></p> <div class="item-container post"> @@ -17,4 +17,3 @@ </div> <?=$PAGINATION['HTML']?> - diff --git a/theme/default/html/main.php b/theme/default/html/main.php index 5a067ef..18d5d40 100644 --- a/theme/default/html/main.php +++ b/theme/default/html/main.php @@ -42,10 +42,7 @@ $BLOGMETA_DESC = escapeHTML($BLOGMETA['DESC']); <link rel="icon" href="<?=Application::getTemplateURL('rsrc/favicon.ico')?>" /> <link rel="stylesheet" href="<?=Application::getTemplateURL('rsrc/css/main.css')?>" title="<?=$BLOGMETA_NAME?>" /> - - <link rel="alternate" type="application/rss+xml" title="<?=$Language->text('feed_name_items', $BLOGMETA_NAME)?>" href="<?=Application::getURL('feed/')?>" /> - <link rel="alternate" type="application/rss+xml" title="<?=$Language->text('feed_name_posts', $BLOGMETA_NAME)?>" href="<?=Application::getURL('feed/post/')?>" /> - <link rel="alternate" type="application/rss+xml" title="<?=$Language->text('feed_name_pages', $BLOGMETA_NAME)?>" href="<?=Application::getURL('feed/page/')?>" /> + <link rel="alternate" type="application/rss+xml" title="<?=$BLOGMETA_NAME?>" href="<?=Application::getURL('feed/')?>" /> <script defer src="<?=Application::getTemplateURL('rsrc/main.js')?>"></script> diff --git a/theme/default/html/page/list.php b/theme/default/html/page/list.php index 665301e..46a0a09 100644 --- a/theme/default/html/page/list.php +++ b/theme/default/html/page/list.php @@ -7,7 +7,7 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -<h1><i class="fa fa-file-text-o"></i><?=$Language->text('page_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/page/')?>" title="<?=$Language->text('feed_name_pages', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> +<h1><i class="fa fa-file-text-o"></i><?=$Language->text('page_overview')?></h1> <p><?=$Language->text('page_overview_heading_desc', $PAGINATION['THIS'])?></p> <div class="item-container page"> diff --git a/theme/default/html/post/list.php b/theme/default/html/post/list.php index 37fca86..fa063bb 100644 --- a/theme/default/html/post/list.php +++ b/theme/default/html/post/list.php @@ -7,7 +7,7 @@ # # #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# ?> -<h1><i class="fa fa-newspaper-o"></i><?=$Language->text('post_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/post/')?>" title="<?=$Language->text('feed_name_posts', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1> +<h1><i class="fa fa-newspaper-o"></i><?=$Language->text('post_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/')?>" title="<?=$Language->text('feed_subscribe')?>">Feed</a></span></h1> <p><?=$Language->text('post_overview_heading_desc', $PAGINATION['THIS'])?></p> <div class="item-container post"> |