From ea849d7c68cc3de33825c1daafd06b9f8bbf747c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 7 Dec 2014 15:03:42 +0100
Subject: Prepare better organization of view files for exts

View files must be well-splitted to simplify work for extensions.

See https://github.com/FreshRSS/FreshRSS/issues/252
---
 app/views/helpers/index/normal/entry_bottom.phtml | 84 +++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 app/views/helpers/index/normal/entry_bottom.phtml

(limited to 'app/views/helpers/index/normal/entry_bottom.phtml')

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
new file mode 100644
index 000000000..704644f99
--- /dev/null
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -0,0 +1,84 @@
+<?php
+	$sharing = array();
+	if (FreshRSS_Auth::hasAccess()) {
+		$sharing = FreshRSS_Context::$conf->sharing;
+	}
+
+	$bottomline_read = FreshRSS_Context::$conf->bottomline_read;
+	$bottomline_favorite = FreshRSS_Context::$conf->bottomline_favorite;
+	$bottomline_sharing = FreshRSS_Context::$conf->bottomline_sharing && (count($sharing) > 0);
+	$bottomline_tags = FreshRSS_Context::$conf->bottomline_tags;
+	$bottomline_date = FreshRSS_Context::$conf->bottomline_date;
+	$bottomline_link = FreshRSS_Context::$conf->bottomline_link;
+?><ul class="horizontal-list bottom"><?php
+	if (FreshRSS_Auth::hasAccess()) {
+		if ($bottomline_read) {
+			?><li class="item manage"><?php
+				$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $this->entry->id()));
+				if ($this->entry->isRead()) {
+					$arUrl['params']['is_read'] = 0;
+				}
+				?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
+					echo _i($this->entry->isRead() ? 'read' : 'unread'); ?></a><?php
+			?></li><?php
+		}
+		if ($bottomline_favorite) {
+			?><li class="item manage"><?php
+				$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $this->entry->id()));
+				if ($this->entry->isFavorite()) {
+					$arUrl['params']['is_favorite'] = 0;
+				}
+				?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
+					echo _i($this->entry->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
+			?></li><?php
+		}
+	} ?>
+	<li class="item"><?php
+			if ($bottomline_sharing) {
+				$link = urlencode($this->entry->link());
+				$title = urlencode($this->entry->title() . ' · ' . $feed->name());
+		?><div class="dropdown">
+			<div id="dropdown-share-<?php echo $this->entry->id();?>" class="dropdown-target"></div>
+			<a class="dropdown-toggle" href="#dropdown-share-<?php echo $this->entry->id();?>">
+				<?php echo _i('share'); ?>
+				<?php echo _t('share'); ?>
+			</a>
+
+			<ul class="dropdown-menu">
+				<li class="dropdown-close"><a href="#close">❌</a></li>
+				<?php foreach ($sharing as $share) :?>
+					<li class="item share">
+						<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $this->entry->link(), $this->entry->title() . ' . ' . $feed->name())?>">
+							<?php echo _t($share['name']);?>
+						</a>
+					</li>
+				<?php endforeach;?>
+			</ul>
+		</div>
+		<?php } ?>
+	</li><?php
+	$tags = $bottomline_tags ? $this->entry->tags() : null;
+	if (!empty($tags)) {
+	?><li class="item">
+		<div class="dropdown">
+			<div id="dropdown-tags-<?php echo $this->entry->id();?>" class="dropdown-target"></div>
+			<?php echo _i('tag'); ?>
+			<a class="dropdown-toggle" href="#dropdown-tags-<?php echo $this->entry->id();?>"><?php
+				echo _t('related_tags');
+			?></a>
+			<ul class="dropdown-menu">
+				<li class="dropdown-close"><a href="#close">❌</a></li><?php
+				foreach($tags as $tag) {
+					?><li class="item"><a href="<?php echo _url('index', 'index', 'search', urlencode('#' . $tag)); ?>"><?php echo $tag; ?></a></li><?php
+				} ?>
+			</ul>
+		</div>
+	</li><?php
+	}
+	if ($bottomline_date) {
+		?><li class="item date"><?php echo $this->entry->date(); ?></li><?php
+	}
+	if ($bottomline_link) {
+		?><li class="item link"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo _i('link'); ?></a></li><?php
+	} ?>
+</ul>
-- 
cgit v1.2.3


From 930026df2159b027bc035f4ed15c39a43eb0e9fe Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 17 Dec 2014 21:24:49 +0100
Subject: Fix bug with new file organisation

entry_bottom.phtml didn't find $feed variable. It's fixed now.
---
 app/views/helpers/index/normal/entry_bottom.phtml | 4 ++--
 app/views/helpers/index/normal/entry_header.phtml | 9 +--------
 app/views/index/normal.phtml                      | 9 +++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'app/views/helpers/index/normal/entry_bottom.phtml')

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 704644f99..e1961e2aa 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -36,7 +36,7 @@
 	<li class="item"><?php
 			if ($bottomline_sharing) {
 				$link = urlencode($this->entry->link());
-				$title = urlencode($this->entry->title() . ' · ' . $feed->name());
+				$title = urlencode($this->entry->title() . ' · ' . $this->feed->name());
 		?><div class="dropdown">
 			<div id="dropdown-share-<?php echo $this->entry->id();?>" class="dropdown-target"></div>
 			<a class="dropdown-toggle" href="#dropdown-share-<?php echo $this->entry->id();?>">
@@ -48,7 +48,7 @@
 				<li class="dropdown-close"><a href="#close">❌</a></li>
 				<?php foreach ($sharing as $share) :?>
 					<li class="item share">
-						<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $this->entry->link(), $this->entry->title() . ' . ' . $feed->name())?>">
+						<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $this->entry->link(), $this->entry->title() . ' . ' . $this->feed->name())?>">
 							<?php echo _t($share['name']);?>
 						</a>
 					</li>
diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml
index b751b884f..3d8b089b9 100644
--- a/app/views/helpers/index/normal/entry_header.phtml
+++ b/app/views/helpers/index/normal/entry_header.phtml
@@ -26,14 +26,7 @@
 			?></li><?php
 		}
 	}
-	$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $this->entry->feed());	//We most likely already have the feed object in cache
-	if ($feed == null) {
-		$feed = $this->entry->feed(true);
-		if ($feed == null) {
-			$feed = FreshRSS_Feed::example();
-		}
-	}
-	?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
+	?><li class="item website"><a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id()); ?>"><img class="favicon" src="<?php echo $this->feed->favicon(); ?>" alt="✇" /> <span><?php echo $this->feed->name(); ?></span></a></li>
 	<li class="item title"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo $this->entry->title(); ?></a></li>
 	<?php if ($topline_date) { ?><li class="item date"><?php echo $this->entry->date(); ?> </li><?php } ?>
 	<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $this->entry->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index fd2289365..f2e1c5012 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -25,6 +25,15 @@ if (!empty($this->entries)) {
 			continue;
 		}
 
+		// We most likely already have the feed object in cache
+		$this->feed = FreshRSS_CategoryDAO::findFeed($this->categories, $this->entry->feed());
+		if ($this->feed == null) {
+			$this->feed = $this->entry->feed(true);
+			if ($this->feed == null) {
+				$this->feed = FreshRSS_Feed::example();
+			}
+		}
+
 		if ($display_today && $this->entry->isDay(FreshRSS_Days::TODAY, $today)) {
 			?><div class="day" id="day_today"><?php
 				echo _t('today');
-- 
cgit v1.2.3


From 03db0b5d3c431deb8c4f099b77e045160548f1b6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 8 Jan 2015 21:37:59 +0100
Subject: Fix a bug related to sharing

$item and $feed were not existing, replaced by other names.
Introduce by the merging of dev in extension branch.
---
 app/views/helpers/index/normal/entry_bottom.phtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/views/helpers/index/normal/entry_bottom.phtml')

diff --git a/app/views/helpers/index/normal/entry_bottom.phtml b/app/views/helpers/index/normal/entry_bottom.phtml
index 32317d027..20b4b332c 100644
--- a/app/views/helpers/index/normal/entry_bottom.phtml
+++ b/app/views/helpers/index/normal/entry_bottom.phtml
@@ -36,16 +36,16 @@
 	<li class="item"><?php
 			if ($bottomline_sharing) {
 		?><div class="dropdown">
-			<div id="dropdown-share-<?php echo $item->id();?>" class="dropdown-target"></div>
-			<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id();?>">
+			<div id="dropdown-share-<?php echo $this->entry->id();?>" class="dropdown-target"></div>
+			<a class="dropdown-toggle" href="#dropdown-share-<?php echo $this->entry->id();?>">
 				<?php echo _i('share'); ?>
 				<?php echo _t('index.share'); ?>
 			</a>
 
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li><?php
-					$link = $item->link();
-					$title = $item->title() . ' · ' . $feed->name();
+					$link = $this->entry->link();
+					$title = $this->entry->title() . ' · ' . $this->feed->name();
 					foreach (FreshRSS_Context::$user_conf->sharing as $share_options) {
 						$share = FreshRSS_Share::get($share_options['type']);
 						$share_options['link'] = $link;
-- 
cgit v1.2.3