From d98a7d664486827c35867e7834ecda162647a22c Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sun, 7 Aug 2016 14:55:58 +0200 Subject: [PATCH 1/5] [HtmlFormat] Return to bridge #id when pressing 'back to rss-bridge' --- formats/HtmlFormat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php index 9b426948..e676df45 100644 --- a/formats/HtmlFormat.php +++ b/formats/HtmlFormat.php @@ -46,7 +46,7 @@ EOD;

{$title}

-
+
{$entries} From 75f7a32b99c322d55b6babafa0481f5b0aef2c0d Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sun, 7 Aug 2016 15:06:48 +0200 Subject: [PATCH 2/5] [index] Allow hiding of inactive bridges when shown --- index.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index ec74915c..11211c66 100644 --- a/index.php +++ b/index.php @@ -187,7 +187,13 @@ $formats = Format::searchInformation();
RSS-Bridge alpha 0.2 ~ Public Domain
/ active bridges.
-
+
'; + else + echo '
'; + ?>
From 3f83763ff96008458acdbed40b416f862ad1fcb8 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sun, 7 Aug 2016 15:15:55 +0200 Subject: [PATCH 3/5] [index] Don't render 'Show inactive bridges' if non inactive --- index.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index 11211c66..94c8a118 100644 --- a/index.php +++ b/index.php @@ -188,11 +188,13 @@ $formats = Format::searchInformation(); RSS-Bridge alpha 0.2 ~ Public Domain
/ active bridges.

'; - else - echo '
'; + if($activeFoundBridgeCount !== count($bridgeList)){ + // FIXME: This should be done in pure CSS + if(!$showInactive) + echo '
'; + else + echo '
'; + } ?> From 82f06ad2c5121f28383e587c52e833433fb1d3b1 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sun, 7 Aug 2016 15:29:59 +0200 Subject: [PATCH 4/5] [HtmlFormat] Add anchor for bridge URI to title --- css/HtmlFormat.css | 5 +++++ formats/HtmlFormat.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/css/HtmlFormat.css b/css/HtmlFormat.css index 2b8ddd5f..cee20207 100644 --- a/css/HtmlFormat.css +++ b/css/HtmlFormat.css @@ -53,6 +53,11 @@ h1.pagetitle { color: #2196F3; } + +h1.pagetitle > a { + color: #2196F3; +} + a.backlink, a.backlink:link, a.backlink:visited, a.itemtitle, a.itemtitle:link, a.itemtitle:visited { color: #2196F3; diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php index e676df45..20d49014 100644 --- a/formats/HtmlFormat.php +++ b/formats/HtmlFormat.php @@ -45,7 +45,7 @@ EOD; -

{$title}

+

{$title}

{$entries} From c0b607c841684eefc85e2bac457e7c6c0e702832 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sun, 7 Aug 2016 15:36:50 +0200 Subject: [PATCH 5/5] [index] Fix whitelist default array WikipediaBridge recently replaced WikipediaENBridge, WikipediaEOBridge and WikipediaFRBridge --- index.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/index.php b/index.php index 94c8a118..94406256 100644 --- a/index.php +++ b/index.php @@ -67,9 +67,7 @@ $whitelist_default = array( "PinterestBridge", "ScmbBridge", "TwitterBridge", - "WikipediaENBridge", - "WikipediaEOBridge", - "WikipediaFRBridge", + "WikipediaBridge", "YoutubeBridge"); if (!file_exists($whitelist_file)) {