From cd5a24d8b405902801ca710cb77d6cc3f802f90f Mon Sep 17 00:00:00 2001
From: Louis <spalax@web>
Date: Sat, 22 Feb 2014 22:30:09 +0000
Subject: pagestats: add disp parameter

---
 IkiWiki/Plugin/pagestats.pm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 460a5969a..b0ecf7eca 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -31,6 +31,19 @@ sub getsetup () {
 		},
 }
 
+sub linktext ($%) {
+	# Return the text of the link to a tag, depending on option linktext.
+	my ($page, %params) = @_;
+  if (exists $params{disp} && 
+      exists $pagestate{$page} &&
+      exists $pagestate{$page}{meta}{$params{disp}}) {
+    return $pagestate{$page}{meta}{$params{disp}};
+  }
+  else {
+    return undef;
+  }
+}
+
 sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
@@ -84,7 +97,7 @@ sub preprocess (@) {
 		return "<table class='".(exists $params{class} ? $params{class} : "pageStats")."'>\n".
 			join("\n", map {
 				"<tr><td>".
-				htmllink($params{page}, $params{destpage}, $_, noimageinline => 1).
+				htmllink($params{page}, $params{destpage}, $_, noimageinline => 1, linktext => linktext($_, %params)).
 				"</td><td>".$counts{$_}."</td></tr>"
 			}
 			sort { $counts{$b} <=> $counts{$a} } keys %counts).
@@ -107,7 +120,7 @@ sub preprocess (@) {
 			
 			$res.="<li>" if $style eq 'list';
 			$res .= "<span class=\"$class\">".
-			        htmllink($params{page}, $params{destpage}, $page).
+							htmllink($params{page}, $params{destpage}, $page, linktext => linktext($page, %params)).
 			        "</span>\n";
 			$res.="</li>" if $style eq 'list';
 
-- 
cgit v1.2.3


From 89492a62a76e1bf5f5a1d2b1d9ac82b042b7ec49 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 14 Sep 2014 15:51:22 +0100
Subject: pagestats: consistent indentation

---
 IkiWiki/Plugin/pagestats.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index b0ecf7eca..d0a4ec7aa 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -34,14 +34,14 @@ sub getsetup () {
 sub linktext ($%) {
 	# Return the text of the link to a tag, depending on option linktext.
 	my ($page, %params) = @_;
-  if (exists $params{disp} && 
-      exists $pagestate{$page} &&
-      exists $pagestate{$page}{meta}{$params{disp}}) {
-    return $pagestate{$page}{meta}{$params{disp}};
-  }
-  else {
-    return undef;
-  }
+	if (exists $params{disp} &&
+		exists $pagestate{$page} &&
+		exists $pagestate{$page}{meta}{$params{disp}}) {
+		return $pagestate{$page}{meta}{$params{disp}};
+	}
+	else {
+		return undef;
+	}
 }
 
 sub preprocess (@) {
-- 
cgit v1.2.3


From e3e6ca2777990caf96e524f59e22925841c79e6e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 14 Sep 2014 15:57:09 +0100
Subject: pagestats: rename disp to show, and document it

---
 IkiWiki/Plugin/pagestats.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index d0a4ec7aa..ac0a463e3 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -34,10 +34,10 @@ sub getsetup () {
 sub linktext ($%) {
 	# Return the text of the link to a tag, depending on option linktext.
 	my ($page, %params) = @_;
-	if (exists $params{disp} &&
+	if (exists $params{show} &&
 		exists $pagestate{$page} &&
-		exists $pagestate{$page}{meta}{$params{disp}}) {
-		return $pagestate{$page}{meta}{$params{disp}};
+		exists $pagestate{$page}{meta}{$params{show}}) {
+		return $pagestate{$page}{meta}{$params{show}};
 	}
 	else {
 		return undef;
-- 
cgit v1.2.3