Google+/Facebook: Merged settings, added icons for the settings of the other connectors #187

Merged
annando merged 3 commits from master into master 2014-04-24 10:53:09 +02:00
10 changed files with 25 additions and 20 deletions
Showing only changes of commit e97a64a735 - Show all commits

View file

@ -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">';

View file

@ -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">';

View file

@ -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) {

View file

@ -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;
}

View file

@ -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">';

View file

@ -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">';

View file

@ -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) ) {

View file

@ -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">';

View file

@ -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);

View file

@ -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>';