From f4b0e9316eb77ac1acd28bc34ccf87bca9283059 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 25 Feb 2016 21:37:37 +0100 Subject: [PATCH 1/3] a missing break --- doc/BBCode.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/BBCode.md b/doc/BBCode.md index 803f716aeb..186b1cda93 100644 --- a/doc/BBCode.md +++ b/doc/BBCode.md @@ -174,7 +174,8 @@ that I wanted to share with you.[abstract] Today I was in the woods and took some real cool pictures ... -For Twitter and App.net the system will use the defined abstracts. For other networks (e.g. when you are using the "statusnet" connector that is used to post to GNU Social) the general abstract element will be used. +For Twitter and App.net the system will use the defined abstracts. +For other networks (e.g. when you are using the "statusnet" connector that is used to post to GNU Social) the general abstract element will be used. If you use (for example) the "buffer" connector to post to Facebook or Google+ you can use this element to define an abstract for a longer blogpost that you don't want to post completely to these networks. From 08a780211211c79053a710866fa2057f648a6d51 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 28 Feb 2016 08:30:45 +0100 Subject: [PATCH 2/3] old location might vanish, vinzv moved the GS API docs over here --- doc/api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api.md b/doc/api.md index c020f403ff..bf287585d3 100644 --- a/doc/api.md +++ b/doc/api.md @@ -1,6 +1,6 @@ Friendica API === -The Friendica API aims to be compatible to the [GNU Social API](http://skilledtests.com/wiki/Twitter-compatible_API) and the [Twitter API](https://dev.twitter.com/rest/public). +The Friendica API aims to be compatible to the [GNU Social API](http://wiki.gnusocial.de/gnusocial:api) and the [Twitter API](https://dev.twitter.com/rest/public). Please refer to the linked documentation for further information. From 09060c0ed30babe65f659a6a3122b8f148217d16 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 29 Feb 2016 17:24:34 +0100 Subject: [PATCH 3/3] adding some colors to the Federation Statistics page of the admin panel --- mod/admin.php | 8 +++++++- view/templates/admin_federation.tpl | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index ecd08bbe00..7a16820c44 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -270,6 +270,12 @@ function admin_page_federation(&$a) { // Add more platforms if you like, when one returns 0 known nodes it is not // displayed on the stats page. $platforms = array('Friendica', 'Diaspora', '%%red%%', 'Hubzilla', 'GNU Social', 'StatusNet'); + $colors = array('Friendica' => '#ffc018', // orange from the logo + 'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray + '%%red%%' => '#c50001', // fire red from the logo + 'Hubzilla' => '#43488a', // blue from the logo + 'GNU Social'=> '#a22430', // dark red from the logo + 'StatusNet' => '#789240'); // the green from the logo (red and blue have already others $counts = array(); $total = 0; @@ -340,7 +346,7 @@ function admin_page_federation(&$a) { // the 3rd array item is needed for the JavaScript graphs as JS does // not like some characters in the names of variables... - $counts[$p]=array($c[0], $v, str_replace(array(' ','%'),'',$p)); + $counts[$p]=array($c[0], $v, str_replace(array(' ','%'),'',$p), $colors[$p]); } // some helpful text diff --git a/view/templates/admin_federation.tpl b/view/templates/admin_federation.tpl index fad87da5b5..ee33df09b2 100644 --- a/view/templates/admin_federation.tpl +++ b/view/templates/admin_federation.tpl @@ -19,7 +19,7 @@