From e97a64a73525569faa6070db344efeb26acaa140 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 24 Apr 2014 10:33:16 +0200
Subject: [PATCH] The connector settings are now with logo.

---
 appnetpost/appnetpost.php | 4 ++--
 blogger/blogger.php       | 4 ++--
 diaspora/diaspora.php     | 4 ++--
 gpluspost/gpluspost.css   | 8 ++++++--
 libertree/libertree.php   | 4 ++--
 pumpio/pumpio.php         | 4 ++--
 statusnet/statusnet.php   | 4 ++--
 tumblr/tumblr.php         | 4 ++--
 twitter/twitter.php       | 5 +++--
 wppost/wppost.php         | 4 ++--
 10 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/appnetpost/appnetpost.php b/appnetpost/appnetpost.php
index 849bf2297..32312dd82 100644
--- a/appnetpost/appnetpost.php
+++ b/appnetpost/appnetpost.php
@@ -53,11 +53,11 @@ function appnetpost_settings(&$a,&$s) {
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
 	$s .= '<span id="settings_appnetpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
-	$s .= '<h3>' . t('App.net Export') . '</h3>';
+	$s .= '<img class="connector" src="images/appnet.png" /><h3 class="connector">'. t('App.net Export').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_appnetpost_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
-	$s .= '<h3>' . t('App.net Export') . '</h3>';
+	$s .= '<img class="connector" src="images/appnet.png" /><h3 class="connector">'. t('App.net Export').'</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="appnetpost-enable-wrapper">';
diff --git a/blogger/blogger.php b/blogger/blogger.php
index 852f1fc6b..17124b37e 100755
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -71,11 +71,11 @@ function blogger_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-    $s .= '<h3>' . t('Blogger Export') . '</h3>';
+    $s .= '<img class="connector" src="images/blogger.png" /><h3 class="connector">'. t('Blogger Export').'</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-    $s .= '<h3>' . t('Blogger Export') . '</h3>';
+    $s .= '<img class="connector" src="images/blogger.png" /><h3 class="connector">'. t('Blogger Export').'</h3>';
     $s .= '</span>';
 
     $s .= '<div id="blogger-enable-wrapper">';
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 45b59cc0e..53e1890c1 100755
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -146,11 +146,11 @@ function diaspora_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_diaspora_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
-	$s .= '<h3>' . t('Diaspora Export') . '</h3>';
+	$s .= '<img class="connector" src="images/diaspora-logo.png" /><h3 class="connector">'. t('Diaspora Export').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_diaspora_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
-	$s .= '<h3>' . t('Diaspora Export') . '</h3>';
+	$s .= '<img class="connector" src="images/diaspora-logo.png" /><h3 class="connector">'. t('Diaspora Export').'</h3>';
 	$s .= '</span>';
 
 	if ($status) {
diff --git a/gpluspost/gpluspost.css b/gpluspost/gpluspost.css
index a9bfb2b9e..b86364b4a 100755
--- a/gpluspost/gpluspost.css
+++ b/gpluspost/gpluspost.css
@@ -1,11 +1,15 @@
 
-#gpluspost-enable-label, #gpluspost-bydefault-label, #gpluspost-noloopprevention-label, #gpluspost-skipwithoutlink-label {
+#gpluspost-enable-label, #gpluspost-bydefault-label, #gpluspost-noloopprevention-label, 
+#gpluspost-skipwithoutlink-label, #gpluspost-mirror-label, #gpluspost-account-label,
+#gpluspost-username-label, #gpluspost-password-label, #gpluspost-page-label {
 	float: left;
 	width: 200px;
 	margin-top: 10px;
 }
 
-#gpluspost-checkbox, #gpluspost-bydefault, #gpluspost-noloopprevention, #gpluspost-skipwithoutlink {
+#gpluspost-checkbox, #gpluspost-bydefault, #gpluspost-noloopprevention, 
+#gpluspost-skipwithoutlink, #gpluspost-mirror, #gpluspost-account,
+#gpluspost-username, #gpluspost-password, #gpluspost-page {
 	float: left;
 	margin-top: 10px;
 }
diff --git a/libertree/libertree.php b/libertree/libertree.php
index b064c6bc2..123bfe2ba 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -64,11 +64,11 @@ function libertree_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<h3>' . t('libertree Export') . '</h3>';
+    $s .= '<img class="connector" src="images/libertree.png" /><h3 class="connector">'. t('libertree Export').'</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<h3>' . t('libertree Export') . '</h3>';
+    $s .= '<img class="connector" src="images/libertree.png" /><h3 class="connector">'. t('libertree Export').'</h3>';
     $s .= '</span>';
 
     $s .= '<div id="libertree-enable-wrapper">';
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 1575f14b2..3083d732e 100755
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -219,11 +219,11 @@ function pumpio_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-    $s .= '<h3>' . t('Pump.io Import/Export/Mirror') . '</h3>';
+    $s .= '<img class="connector" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-    $s .= '<h3>' . t('Pump.io Import/Export/Mirror') . '</h3>';
+    $s .= '<img class="connector" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
     $s .= '</span>';
 
     $s .= '<div id="pumpio-username-wrapper">';
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 6b7d35ab1..fd9c7b1ac 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -291,11 +291,11 @@ function statusnet_settings(&$a,&$s) {
 
 
 	$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<h3>'. t('StatusNet Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector" src="images/gnusocial.png" /><h3 class="connector">'. t('StatusNet Import/Export/Mirror').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<h3>'. t('StatusNet Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector" src="images/gnusocial.png" /><h3 class="connector">'. t('StatusNet Import/Export/Mirror').'</h3>';
 	$s .= '</span>';
 
 	if ( (!$ckey) && (!$csecret) ) {
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 06da4393f..61b9bef56 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -182,11 +182,11 @@ function tumblr_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
-    $s .= '<h3>' . t('Tumblr Export') . '</h3>';
+    $s .= '<img class="connector" src="images/tumblr.png" /><h3 class="connector">'. t('Tumblr Export').'</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
-    $s .= '<h3>' . t('Tumblr Export') . '</h3>';
+    $s .= '<img class="connector" src="images/tumblr.png" /><h3 class="connector">'. t('Tumblr Export').'</h3>';
     $s .= '</span>';
 
     $s .= '<div id="tumblr-username-wrapper">';
diff --git a/twitter/twitter.php b/twitter/twitter.php
index f1e0b097f..c14841f4c 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -233,11 +233,11 @@ function twitter_settings(&$a,&$s) {
 	$globalshortening = get_config('twitter','intelligent_shortening');
 
 	$s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<h3>'. t('Twitter Import/Export/Mirror') .'</h3>';
+	$s .= '<img class="connector" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<h3>'. t('Twitter Import/Export/Mirror') .'</h3>';
+	$s .= '<img class="connector" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
 	$s .= '</span>';
 
 	if ( (!$ckey) && (!$csecret) ) {
@@ -955,6 +955,7 @@ function twitter_fetchtimeline($a, $uid) {
 	$has_picture = false;
 
 	require_once('mod/item.php');
+	require_once('include/items.php');
 
 	require_once('library/twitteroauth.php');
 	$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
diff --git a/wppost/wppost.php b/wppost/wppost.php
index ac8566231..8436fd3ae 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -73,11 +73,11 @@ function wppost_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<h3>' . t('WordPress Export') . '</h3>';
+    $s .= '<img class="connector" src="images/wordpress.png" /><h3 class="connector">'. t('Wordpress Export').'</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<h3>' . t('WordPress Export') . '</h3>';
+    $s .= '<img class="connector" src="images/wordpress.png" /><h3 class="connector">'. t('Wordpress Export').'</h3>';
     $s .= '</span>';
     $s .= '<div id="wppost-enable-wrapper">';
     $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';