Merge pull request #411 from tobiasd/20170421-superblock

Superblock

diff --git a/superblock/lang/C/messages.po b/superblock/lang/C/messages.po
index 8089438bb9d43626768e28b16aedabeab9baaa62..035c0f7c28df9f03535a997ab3b8484880ae53dc 100644 (file)
--- a/superblock/lang/C/messages.po
+++ b/superblock/lang/C/messages.po
@@ -1,6 +1,6 @@
-# ADDON blockem
+# ADDON superblock
 # Copyright (C) 
-# This file is distributed under the same license as the Friendica blockem addon package.
+# This file is distributed under the same license as the Friendica superblock addon package.
 # 
 #
 #, fuzzy
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2017-04-21 08:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,35 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blockem.php:51
-msgid "\"Blockem\" Settings"
+#: superblock.php:53 superblock.php:57
+msgid "\"Superblock\""
 msgstr ""
 
-#: blockem.php:53
+#: superblock.php:60
 msgid "Comma separated profile URLS to block"
 msgstr ""
 
-#: blockem.php:57
-msgid "Submit"
+#: superblock.php:64
+msgid "Save Settings"
 msgstr ""
 
-#: blockem.php:70
-msgid "BLOCKEM Settings saved."
+#: superblock.php:76
+msgid "SUPERBLOCK Settings saved."
 msgstr ""
 
-#: blockem.php:105
-#, php-format
-msgid "Blocked %s - Click to open/close"
+#: superblock.php:148
+msgid "Block Completely"
 msgstr ""
 
-#: blockem.php:160
-msgid "Unblock Author"
-msgstr ""
-
-#: blockem.php:162
-msgid "Block Author"
-msgstr ""
-
-#: blockem.php:194
-msgid "blockem settings updated"
+#: superblock.php:168
+msgid "superblock settings updated"
 msgstr ""

diff --git a/superblock/superblock.php b/superblock/superblock.php
index 1462c184df56defa62dc5521c45d4e266a9d4bff..c86c6aadc7950635703bbced3789e2c0eaade93f 100755 (executable)
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -6,7 +6,7 @@
  * Description: block people
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * 
+ *
  */
 
 function superblock_install() {
@@ -36,29 +36,34 @@ function superblock_uninstall() {
 
 function superblock_addon_settings(&$a,&$s) {
 
-       if(! local_user())
+       if(! local_user()) {
                return;
+       }
 
-    /* Add our stylesheet to the page so we can make our settings look nice */
-
-    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
+       /* Add our stylesheet to the page so we can make our settings look nice */
 
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
 
        $words = get_pconfig(local_user(),'system','blocked');
-       if(! $words)
+       if(! $words) {
                $words = '';
+       }
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('"Superblock" Settings') . '</h3>';
-    $s .= '<div id="superblock-wrapper">';
-    $s .= '<label id="superblock-label" for="superblock-words">' . t('Comma separated profile URLS to block') . ' </label>';
-    $s .= '<textarea id="superblock-words" type="text" name="superblock-words" >' . htmlspecialchars($words) . '</textarea>';
-    $s .= '</div><div class="clear"></div>';
+       $s .= '<span id="settings_superblock_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_superblock_expanded\'); openClose(\'settings_superblock_inflated\');">';
+       $s .= '<h3>' . t('"Superblock"') . '</h3>';
+       $s .= '</span>';
+       $s .= '<div id="settings_superblock_expanded" class="settings-block" style="display: none;">';
+       $s .= '<span class="fakelink" onclick="openClose(\'settings_superblock_expanded\'); openClose(\'settings_superblock_inflated\');">';
+       $s .= '<h3>' . t('"Superblock"') . '</h3>';
+       $s .= '</span>';
+       $s .= '<div id="superblock-wrapper">';
+       $s .= '<label id="superblock-label" for="superblock-words">' . t('Comma separated profile URLS to block') . ' </label>';
+       $s .= '<textarea id="superblock-words" type="text" name="superblock-words" >' . htmlspecialchars($words) . '</textarea>';
+       $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
 
        return;
-
 }
 
 function superblock_addon_settings_post(&$a,&$b) {