From 8bf1873f43b67f4bc6d227639161b4fd001fcd54 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Sun, 12 Aug 2012 14:52:00 -0400
Subject: opml icon in opening page: you know, Sunday jobs :P

---
 templates/part.nofeeds.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/part.nofeeds.php b/templates/part.nofeeds.php
index 070c90c60..3a9c14b14 100644
--- a/templates/part.nofeeds.php
+++ b/templates/part.nofeeds.php
@@ -2,7 +2,7 @@
 <div id="firstrun">
 	<?php echo $l->t('You have no feeds in your reader.') ?>
 	<div id="selections">
-		<input type="button" id="addfeed" value="<?php echo $l->t('Add feed') ?>" />
-		<input type="button" value="<?php echo $l->t('Import OPML') ?>" />
+		<input type="button" id="addfeedbtn" value="<?php echo $l->t('Add feed') ?>" />
+		<input type="button" id="importopmlbtn" value="<?php echo $l->t('Import OPML') ?>" />
 	</div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3


From d1459ce208daae48d2fa01ef3fe8131ce87b8cea Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Sun, 12 Aug 2012 21:58:39 -0400
Subject: fix small issues arising from merge

---
 templates/part.items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/part.items.php b/templates/part.items.php
index e481bd2d2..49423236c 100644
--- a/templates/part.items.php
+++ b/templates/part.items.php
@@ -36,7 +36,7 @@ foreach($items as $item) {
 
 		echo '<h1 class="item_title"><a target="_blank" href="' . $item->getUrl() . '">' . $item->getTitle() . '</a></h1>';	
 
-		echo '<h2 class="item_author">' . $l->t('from') . ' ' . parse_url($item->getUrl())['host'] . '</h2>';
+		echo '<h2 class="item_author">' . $l->t('from') . ' ' . parse_url($item->getUrl(), PHP_URL_PATH) . '</h2>';
 
 		echo '<div class="body">' . $item->getBody() . '</div>';
 
-- 
cgit v1.2.3