Merge pull request #169 from annando/master

[friendica-addons.git] / fromgplus / fromgplus.php

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 97213d38e992b68e7ee11d29fe2bffb39c733493..1c047663fb661557a9e54eba4fa6210b8ab1fc55 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -33,8 +33,14 @@ function fromgplus_addon_settings(&$a,&$s) {
        $enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
        $account = get_pconfig(local_user(),'fromgplus','account');
 
-       $s .= '<div class="settings-block">';
+       $s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
        $s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+       $s .= '</span>';
+       $s .= '<div id="settings_fromgplus_expanded" class="settings-block" style="display: none;">';
+       $s .= '<span class="fakelink" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
+       $s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+       $s .= '</span>';
+
        $s .= '<div id="fromgplus-wrapper">';
 
        $s .= '<label id="fromgplus-enable-label" for="fromgplus-enable">'.t('Enable Google+ Import').'</label>';
@@ -241,6 +247,7 @@ function fromgplus_cleantext($text) {
 function fromgplus_handleattachments($item, $displaytext) {
        $post = "";
        $quote = "";
+       $type = "";
 
        foreach ($item->object->attachments as $attachment) {
                switch($attachment->objectType) {
@@ -256,7 +263,7 @@ function fromgplus_handleattachments($item, $displaytext) {
                                break;
 
                        case "article":
-                               $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+                               $post .= "\n\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
 
                                $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
                                //if ($images["preview"] != "")
@@ -270,6 +277,8 @@ function fromgplus_handleattachments($item, $displaytext) {
                                $quote = trim(fromgplus_html2bbcode($attachment->content));
                                if ($quote != "")
                                        $quote = "\n[quote]".$quote."[/quote]";
+
+                               $quote .= "[/class]";
                                break;
 
                        case "photo":