From: Hypolite Petovan Date: Sun, 19 May 2019 18:59:28 +0000 (-0400) Subject: Merge pull request #7169 from annando/send-suggest X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3ca64185a6d1740b535282267a12b0f924a6010f;hp=a6cf036db26f9a7f399f7440c574c12d03821fa7;p=friendica.git Merge pull request #7169 from annando/send-suggest Sending contact suggestions does work again --- diff --git a/mod/cal.php b/mod/cal.php index 4b41c24e35..3f3cba466f 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -59,7 +59,7 @@ function cal_init(App $a) $account_type = Contact::getAccountType($profile); - $tpl = Renderer::getMarkupTemplate("vcard-widget.tpl"); + $tpl = Renderer::getMarkupTemplate("widget/vcard.tpl"); $vcard_widget = Renderer::replaceMacros($tpl, [ '$name' => $profile['name'], diff --git a/mod/common.php b/mod/common.php index 6b6090e19b..a2821921c6 100644 --- a/mod/common.php +++ b/mod/common.php @@ -47,7 +47,7 @@ function common_content(App $a) $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]); if (DBA::isResult($contact)) { - $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("vcard-widget.tpl"), [ + $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("widget/vcard.tpl"), [ '$name' => $contact['name'], '$photo' => $contact['photo'], 'url' => 'contact/' . $cid diff --git a/mod/photos.php b/mod/photos.php index db9beb6685..7c0ca1b7ba 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -61,7 +61,7 @@ function photos_init(App $a) { $account_type = Contact::getAccountType($profile); - $tpl = Renderer::getMarkupTemplate("vcard-widget.tpl"); + $tpl = Renderer::getMarkupTemplate("widget/vcard.tpl"); $vcard_widget = Renderer::replaceMacros($tpl, [ '$name' => $profile['name'], diff --git a/mod/videos.php b/mod/videos.php index 728a71bb5d..3fb36a73e4 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -49,7 +49,7 @@ function videos_init(App $a) $account_type = Contact::getAccountType($profile); - $tpl = Renderer::getMarkupTemplate("vcard-widget.tpl"); + $tpl = Renderer::getMarkupTemplate("widget/vcard.tpl"); $vcard_widget = Renderer::replaceMacros($tpl, [ '$name' => $profile['name'], diff --git a/src/App/Router.php b/src/App/Router.php index 373bb1c32e..f4db879e22 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -105,7 +105,6 @@ class Router $collector->addRoute(['GET'], '/{id:\d+}/posts', Module\Contact::class); $collector->addRoute(['GET'], '/{id:\d+}/update', Module\Contact::class); $collector->addRoute(['GET'], '/{id:\d+}/updateprofile', Module\Contact::class); - $collector->addRoute(['GET'], '/all', Module\Contact::class); $collector->addRoute(['GET'], '/archived', Module\Contact::class); $collector->addRoute(['GET', 'POST'], '/batch', Module\Contact::class); $collector->addRoute(['GET'], '/blocked', Module\Contact::class); diff --git a/src/Content/Widget.php b/src/Content/Widget.php index b7fa5ab4e8..b5f83a803e 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -31,7 +31,7 @@ class Widget */ public static function follow($value = "") { - return Renderer::replaceMacros(Renderer::getMarkupTemplate('follow.tpl'), array( + return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/follow.tpl'), array( '$connect' => L10n::t('Add New Contact'), '$desc' => L10n::t('Enter address or web location'), '$hint' => L10n::t('Example: bob@example.com, http://example.com/barbara'), @@ -74,7 +74,7 @@ class Widget $aside = []; $aside['$nv'] = $nv; - return Renderer::replaceMacros(Renderer::getMarkupTemplate('peoplefind.tpl'), $aside); + return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/peoplefind.tpl'), $aside); } /** @@ -120,6 +120,46 @@ class Widget return $network_filter; } + /** + * @param string $type + * @param string $title + * @param string $desc + * @param string $all + * @param string $baseUrl + * @param array $options + * @param string $selected + * @return string + * @throws \Exception + */ + public static function filter($type, $title, $desc, $all, $baseUrl, array $options, $selected = null) + { + $queryString = parse_url($baseUrl, PHP_URL_QUERY); + $queryArray = []; + + if ($queryString) { + parse_str($queryString, $queryArray); + unset($queryArray[$type]); + + if (count($queryArray)) { + $baseUrl = substr($baseUrl, 0, strpos($baseUrl, '?')) . '?' . http_build_query($queryArray) . '&'; + } else { + $baseUrl = substr($baseUrl, 0, strpos($baseUrl, '?')) . '?'; + } + } else { + $baseUrl = trim($baseUrl, '?') . '?'; + } + + return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/filter.tpl'), [ + '$type' => $type, + '$title' => $title, + '$desc' => $desc, + '$selected' => $selected, + '$all_label' => $all, + '$options' => $options, + '$base' => $baseUrl, + ]); + } + /** * Return networks widget * @@ -146,7 +186,7 @@ class Widget $nets = array(); while ($rr = DBA::fetch($r)) { - $nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' )); + $nets[] = ['ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network'])]; } DBA::close($r); @@ -154,14 +194,15 @@ class Widget return ''; } - return Renderer::replaceMacros(Renderer::getMarkupTemplate('nets.tpl'), array( - '$title' => L10n::t('Protocols'), - '$desc' => '', - '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => L10n::t('All Protocols'), - '$nets' => $nets, - '$base' => $baseurl, - )); + return self::filter( + 'nets', + L10n::t('Protocols'), + '', + L10n::t('All Protocols'), + $baseurl, + $nets, + $selected + ); } /** @@ -183,25 +224,26 @@ class Widget return; } - $matches = false; + $matches = []; $terms = array(); $cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { $unescaped = XML::escape(FileTag::decode($mtch[1])); - $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); + $terms[] = ['ref' => $unescaped, 'name' => $unescaped]; } } - return Renderer::replaceMacros(Renderer::getMarkupTemplate('fileas_widget.tpl'), array( - '$title' => L10n::t('Saved Folders'), - '$desc' => '', - '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => L10n::t('Everything'), - '$terms' => $terms, - '$base' => $baseurl, - )); + return self::filter( + 'file', + L10n::t('Saved Folders'), + '', + L10n::t('Everything'), + $baseurl, + $terms, + $selected + ); } /** @@ -225,25 +267,26 @@ class Widget return; } - $matches = false; + $matches = []; $terms = array(); $cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { $unescaped = XML::escape(FileTag::decode($mtch[1])); - $terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : '')); + $terms[] = ['ref' => $unescaped, 'name' => $unescaped]; } } - return Renderer::replaceMacros(Renderer::getMarkupTemplate('categories_widget.tpl'), array( - '$title' => L10n::t('Categories'), - '$desc' => '', - '$sel_all' => (($selected == '') ? 'selected' : ''), - '$all' => L10n::t('Everything'), - '$terms' => $terms, - '$base' => $baseurl, - )); + return self::filter( + 'category', + L10n::t('Categories'), + '', + L10n::t('Everything'), + $baseurl, + $terms, + $selected + ); } /** @@ -319,7 +362,7 @@ class Widget $entries[] = $entry; } - $tpl = Renderer::getMarkupTemplate('remote_friends_common.tpl'); + $tpl = Renderer::getMarkupTemplate('widget/remote_friends_common.tpl'); return Renderer::replaceMacros($tpl, [ '$desc' => L10n::tt("%d contact in common", "%d contacts in common", $t), '$base' => System::baseUrl(), diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php index 120af99d00..84482f638b 100644 --- a/src/Content/Widget/CalendarExport.php +++ b/src/Content/Widget/CalendarExport.php @@ -59,7 +59,7 @@ class CalendarExport // of the profile page it should be the personal /events page. So we can use $a->user. $user = defaults($a->data['user'], 'nickname', $a->user['nickname']); - $tpl = Renderer::getMarkupTemplate("events_aside.tpl"); + $tpl = Renderer::getMarkupTemplate("widget/events.tpl"); $return = Renderer::replaceMacros($tpl, [ '$etitle' => L10n::t("Export"), '$export_ical' => L10n::t("Export calendar as ical"), diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php index 6c77e7f3fd..f4fdea2fb4 100644 --- a/src/Content/Widget/ContactBlock.php +++ b/src/Content/Widget/ContactBlock.php @@ -26,7 +26,7 @@ class ContactBlock /** * Get HTML for contact block * - * @template contact_block.tpl + * @template widget/contacts.tpl * @hook contact_block_end (contacts=>array, output=>string) * @return string */ @@ -102,7 +102,7 @@ class ContactBlock DBA::close($contact_ids_stmt); } - $tpl = Renderer::getMarkupTemplate('contact_block.tpl'); + $tpl = Renderer::getMarkupTemplate('widget/contacts.tpl'); $o = Renderer::replaceMacros($tpl, [ '$contacts' => $contacts_title, '$nickname' => $profile['nickname'], diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php index 8413eccd19..bbf8c38858 100644 --- a/src/Content/Widget/TagCloud.php +++ b/src/Content/Widget/TagCloud.php @@ -49,7 +49,7 @@ class TagCloud $tags[] = $tag; } - $tpl = Renderer::getMarkupTemplate('tagblock_widget.tpl'); + $tpl = Renderer::getMarkupTemplate('widget/tagcloud.tpl'); $o = Renderer::replaceMacros($tpl, [ '$title' => L10n::t('Tags'), '$tags' => $tags diff --git a/src/Module/Contact.php b/src/Module/Contact.php index b1c37e21ad..4429573ab7 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -18,6 +18,8 @@ use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\Model; +use Friendica\Network\HTTPException\BadRequestException; +use Friendica\Network\HTTPException\NotFoundException; use Friendica\Network\Probe; use Friendica\Util\DateTimeFormat; use Friendica\Util\Proxy as ProxyUtils; @@ -30,102 +32,6 @@ use Friendica\Util\Strings; */ class Contact extends BaseModule { - public static function init() - { - $a = self::getApp(); - - if (!local_user()) { - return; - } - - $nets = defaults($_GET, 'nets', ''); - - if (empty($a->page['aside'])) { - $a->page['aside'] = ''; - } - - $contact_id = null; - $contact = null; - // @TODO: Replace with parameter from router - if ($a->argc == 2 && intval($a->argv[1]) - || $a->argc == 3 && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations']) - ) { - $contact_id = intval($a->argv[1]); - $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]); - - if (!DBA::isResult($contact)) { - $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0, 'deleted' => false]); - } - - // Don't display contacts that are about to be deleted - if ($contact['network'] == Protocol::PHANTOM) { - $contact = false; - } - } - - if (DBA::isResult($contact)) { - if ($contact['self']) { - // @TODO: Replace with parameter from router - if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) { - $a->internalRedirect('profile/' . $contact['nick']); - } else { - $a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile'); - } - } - - $a->data['contact'] = $contact; - - if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) { - $network_link = Strings::formatNetworkName($contact['network'], $contact['url']); - } else { - $network_link = ''; - } - - $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('vcard-widget.tpl'), [ - '$name' => $contact['name'], - '$photo' => $contact['photo'], - '$url' => Model\Contact::MagicLink($contact['url']), - '$addr' => defaults($contact, 'addr', ''), - '$network_link' => $network_link, - '$network' => L10n::t('Network:'), - '$account_type' => Model\Contact::getAccountType($contact) - ]); - - $findpeople_widget = ''; - $follow_widget = ''; - $networks_widget = ''; - } else { - $vcard_widget = ''; - $networks_widget = Widget::networks('contact', $nets); - if (isset($_GET['add'])) { - $follow_widget = Widget::follow($_GET['add']); - } else { - $follow_widget = Widget::follow(); - } - - $findpeople_widget = Widget::findPeople(); - } - - if ($contact['uid'] != 0) { - $groups_widget = Model\Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact_id); - } else { - $groups_widget = null; - } - - $a->page['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contacts-widget-sidebar.tpl'), [ - '$vcard_widget' => $vcard_widget, - '$findpeople_widget' => $findpeople_widget, - '$follow_widget' => $follow_widget, - '$groups_widget' => $groups_widget, - '$networks_widget' => $networks_widget - ]); - - $tpl = Renderer::getMarkupTemplate('contacts-head.tpl'); - $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ - '$baseurl' => $a->getBaseURL(true), - ]); - } - private static function batchActions(App $a) { if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) { @@ -353,7 +259,93 @@ class Contact extends BaseModule public static function content($update = 0) { + if (!local_user()) { + return Login::form($_SERVER['REQUET_URI']); + } + $a = self::getApp(); + + $nets = defaults($_GET, 'nets', ''); + + if (empty($a->page['aside'])) { + $a->page['aside'] = ''; + } + + $contact_id = null; + $contact = null; + // @TODO: Replace with parameter from router + if ($a->argc == 2 && intval($a->argv[1]) + || $a->argc == 3 && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations']) + ) { + $contact_id = intval($a->argv[1]); + $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]); + + if (!DBA::isResult($contact)) { + $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0, 'deleted' => false]); + } + + // Don't display contacts that are about to be deleted + if ($contact['network'] == Protocol::PHANTOM) { + $contact = false; + } + } + + if (DBA::isResult($contact)) { + if ($contact['self']) { + // @TODO: Replace with parameter from router + if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) { + $a->internalRedirect('profile/' . $contact['nick']); + } else { + $a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile'); + } + } + + $a->data['contact'] = $contact; + + if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) { + $network_link = Strings::formatNetworkName($contact['network'], $contact['url']); + } else { + $network_link = ''; + } + + $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [ + '$name' => $contact['name'], + '$photo' => $contact['photo'], + '$url' => Model\Contact::magicLinkByContact($contact, $contact['url']), + '$addr' => defaults($contact, 'addr', ''), + '$network_link' => $network_link, + '$network' => L10n::t('Network:'), + '$account_type' => Model\Contact::getAccountType($contact) + ]); + + $findpeople_widget = ''; + $follow_widget = ''; + $networks_widget = ''; + } else { + $vcard_widget = ''; + $findpeople_widget = Widget::findPeople(); + if (isset($_GET['add'])) { + $follow_widget = Widget::follow($_GET['add']); + } else { + $follow_widget = Widget::follow(); + } + + $networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets); + } + + if ($contact['uid'] != 0) { + $groups_widget = Model\Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact_id); + } else { + $groups_widget = null; + } + + $a->page['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget; + + $tpl = Renderer::getMarkupTemplate('contacts-head.tpl'); + $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ + '$baseurl' => $a->getBaseURL(true), + ]); + $sort_type = 0; $o = ''; Nav::setSelected('contact'); @@ -366,7 +358,7 @@ class Contact extends BaseModule if ($a->argc == 3) { $contact_id = intval($a->argv[1]); if (!$contact_id) { - return; + throw new BadRequestException(); } // @TODO: Replace with parameter from router @@ -374,9 +366,7 @@ class Contact extends BaseModule $orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false, 'deleted' => false]); if (!DBA::isResult($orig_record)) { - notice(L10n::t('Could not access contact record.') . EOL); - $a->internalRedirect('contact'); - return; // NOTREACHED + throw new NotFoundException(L10n::t('Contact not found')); } if ($cmd === 'update' && ($orig_record['uid'] != 0)) { @@ -398,7 +388,7 @@ class Contact extends BaseModule info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL); $a->internalRedirect('contact/' . $contact_id); - return; // NOTREACHED + // NOTREACHED } if ($cmd === 'ignore') { @@ -408,7 +398,7 @@ class Contact extends BaseModule info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL); $a->internalRedirect('contact/' . $contact_id); - return; // NOTREACHED + // NOTREACHED } if ($cmd === 'archive' && ($orig_record['uid'] != 0)) { @@ -419,7 +409,7 @@ class Contact extends BaseModule } $a->internalRedirect('contact/' . $contact_id); - return; // NOTREACHED + // NOTREACHED } if ($cmd === 'drop' && ($orig_record['uid'] != 0)) { @@ -459,7 +449,7 @@ class Contact extends BaseModule info(L10n::t('Contact has been removed.') . EOL); $a->internalRedirect('contact'); - return; // NOTREACHED + // NOTREACHED } if ($cmd === 'posts') { return self::getPostsHTML($a, $contact_id); @@ -664,30 +654,24 @@ class Contact extends BaseModule return $arr['output']; } - $blocked = false; - $hidden = false; - $ignored = false; - $archived = false; - $all = false; - // @TODO: Replace with parameter from router - if (($a->argc == 2) && ($a->argv[1] === 'all')) { - $sql_extra = ''; - $all = true; - } elseif (($a->argc == 2) && ($a->argv[1] === 'blocked')) { - $sql_extra = " AND `blocked` = 1 "; - $blocked = true; - } elseif (($a->argc == 2) && ($a->argv[1] === 'hidden')) { - $sql_extra = " AND `hidden` = 1 "; - $hidden = true; - } elseif (($a->argc == 2) && ($a->argv[1] === 'ignored')) { - $sql_extra = " AND `readonly` = 1 "; - $ignored = true; - } elseif (($a->argc == 2) && ($a->argv[1] === 'archived')) { - $sql_extra = " AND `archive` = 1 "; - $archived = true; - } else { - $sql_extra = " AND `blocked` = 0 "; + $type = defaults($a->argv, 1, ''); + + switch ($type) { + case 'blocked': + $sql_extra = " AND `blocked` = 1"; + break; + case 'hidden': + $sql_extra = " AND `hidden` = 1 AND `blocked` = 0"; + break; + case 'ignored': + $sql_extra = " AND `readonly` = 1 AND `blocked` = 0"; + break; + case 'archived': + $sql_extra = " AND `archive` = 1 AND `blocked` = 0"; + break; + default: + $sql_extra = " AND `blocked` = 0"; } $sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM); @@ -696,34 +680,18 @@ class Contact extends BaseModule $nets = Strings::escapeTags(trim(defaults($_GET, 'nets' , ''))); $tabs = [ - [ - 'label' => L10n::t('Suggestions'), - 'url' => 'suggest', - 'sel' => '', - 'title' => L10n::t('Suggest potential friends'), - 'id' => 'suggestions-tab', - 'accesskey' => 'g', - ], [ 'label' => L10n::t('All Contacts'), - 'url' => 'contact/all', - 'sel' => ($all) ? 'active' : '', + 'url' => 'contact', + 'sel' => !$type ? 'active' : '', 'title' => L10n::t('Show all contacts'), 'id' => 'showall-tab', 'accesskey' => 'l', ], - [ - 'label' => L10n::t('Unblocked'), - 'url' => 'contact', - 'sel' => ((!$all) && (!$blocked) && (!$hidden) && (!$search) && (!$nets) && (!$ignored) && (!$archived)) ? 'active' : '', - 'title' => L10n::t('Only show unblocked contacts'), - 'id' => 'showunblocked-tab', - 'accesskey' => 'o', - ], [ 'label' => L10n::t('Blocked'), 'url' => 'contact/blocked', - 'sel' => ($blocked) ? 'active' : '', + 'sel' => $type == 'blocked' ? 'active' : '', 'title' => L10n::t('Only show blocked contacts'), 'id' => 'showblocked-tab', 'accesskey' => 'b', @@ -731,7 +699,7 @@ class Contact extends BaseModule [ 'label' => L10n::t('Ignored'), 'url' => 'contact/ignored', - 'sel' => ($ignored) ? 'active' : '', + 'sel' => $type == 'ignored' ? 'active' : '', 'title' => L10n::t('Only show ignored contacts'), 'id' => 'showignored-tab', 'accesskey' => 'i', @@ -739,7 +707,7 @@ class Contact extends BaseModule [ 'label' => L10n::t('Archived'), 'url' => 'contact/archived', - 'sel' => ($archived) ? 'active' : '', + 'sel' => $type == 'archived' ? 'active' : '', 'title' => L10n::t('Only show archived contacts'), 'id' => 'showarchived-tab', 'accesskey' => 'y', @@ -747,7 +715,7 @@ class Contact extends BaseModule [ 'label' => L10n::t('Hidden'), 'url' => 'contact/hidden', - 'sel' => ($hidden) ? 'active' : '', + 'sel' => $type == 'hidden' ? 'active' : '', 'title' => L10n::t('Only show hidden contacts'), 'id' => 'showhidden-tab', 'accesskey' => 'h', @@ -755,7 +723,7 @@ class Contact extends BaseModule [ 'label' => L10n::t('Groups'), 'url' => 'group', - 'sel' => ($hidden) ? 'active' : '', + 'sel' => '', 'title' => L10n::t('Organize your contact groups'), 'id' => 'contactgroups-tab', 'accesskey' => 'e', @@ -809,9 +777,18 @@ class Contact extends BaseModule } } + switch ($type) { + case 'blocked': $header .= ' - ' . L10n::t('Blocked'); break; + case 'hidden': $header .= ' - ' . L10n::t('Hidden'); break; + case 'ignored': $header .= ' - ' . L10n::t('Ignored'); break; + case 'archived': $header .= ' - ' . L10n::t('Archived'); break; + } + + $header .= $nets ? ' - ' . ContactSelector::networkToName($nets) : ''; + $tpl = Renderer::getMarkupTemplate('contacts-template.tpl'); $o .= Renderer::replaceMacros($tpl, [ - '$header' => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''), + '$header' => $header, '$tabs' => $t, '$total' => $total, '$search' => $search_hdr, diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index e83732ffe2..f74b572949 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1893,17 +1893,17 @@ class DFRN */ private static function processSuggestion($xpath, $suggestion, $importer) { - Logger::log("Processing suggestions"); + Logger::log('Processing suggestions'); /// @TODO Rewrite this to one statement $suggest = []; - $suggest["uid"] = $importer["importer_uid"]; - $suggest["cid"] = $importer["id"]; - $suggest["url"] = $xpath->query("dfrn:url/text()", $suggestion)->item(0)->nodeValue; - $suggest["name"] = $xpath->query("dfrn:name/text()", $suggestion)->item(0)->nodeValue; - $suggest["photo"] = $xpath->query("dfrn:photo/text()", $suggestion)->item(0)->nodeValue; - $suggest["request"] = $xpath->query("dfrn:request/text()", $suggestion)->item(0)->nodeValue; - $suggest["body"] = $xpath->query("dfrn:note/text()", $suggestion)->item(0)->nodeValue; + $suggest['uid'] = $importer['importer_uid']; + $suggest['cid'] = $importer['id']; + $suggest['url'] = $xpath->query('dfrn:url/text()', $suggestion)->item(0)->nodeValue; + $suggest['name'] = $xpath->query('dfrn:name/text()', $suggestion)->item(0)->nodeValue; + $suggest['photo'] = $xpath->query('dfrn:photo/text()', $suggestion)->item(0)->nodeValue; + $suggest['request'] = $xpath->query('dfrn:request/text()', $suggestion)->item(0)->nodeValue; + $suggest['body'] = $xpath->query('dfrn:note/text()', $suggestion)->item(0)->nodeValue; // Does our member already have a friend matching this description? @@ -1914,22 +1914,19 @@ class DFRN * * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246 */ - $condition = ['name' => $suggest["name"], 'nurl' => Strings::normaliseLink($suggest["url"]), - 'uid' => $suggest["uid"]]; + $condition = ['nurl' => Strings::normaliseLink($suggest['url']), 'uid' => $suggest['uid']]; if (DBA::exists('contact', $condition)) { return false; } - // Do we already have an fcontact record for this person? $fid = 0; - $condition = ['url' => $suggest["url"], 'name' => $suggest["name"], 'request' => $suggest["request"]]; - $fcontact = DBA::selectFirst('fcontact', ['id'], $condition); + $fcontact = DBA::selectFirst('fcontact', ['id'], ['url' => $suggest['url']]); if (DBA::isResult($fcontact)) { - $fid = $fcontact["id"]; + $fid = $fcontact['id']; // OK, we do. Do we already have an introduction for this person? - if (DBA::exists('intro', ['uid' => $suggest["uid"], 'fid' => $fid])) { + if (DBA::exists('intro', ['uid' => $suggest['uid'], 'fid' => $fid])) { /* * The valid result means the friend we're about to send a friend * suggestion already has them in their contact, which means no further @@ -1940,58 +1937,44 @@ class DFRN return false; } } + if (!$fid) { - $r = q( - "INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')", - DBA::escape($suggest["name"]), - DBA::escape($suggest["url"]), - DBA::escape($suggest["photo"]), - DBA::escape($suggest["request"]) - ); - $fid = $r[0]["id"]; + $fields = ['name' => $suggest['name'], 'url' => $suggest['url'], + 'photo' => $suggest['photo'], 'request' => $suggest['request']]; + DBA::insert('fcontact', $fields); + $fid = DBA::lastInsertId(); } - $condition = ['url' => $suggest["url"], 'name' => $suggest["name"], 'request' => $suggest["request"]]; - $fcontact = DBA::selectFirst('fcontact', ['id'], $condition); - /* * If no record in fcontact is found, below INSERT statement will not * link an introduction to it. */ - if (!DBA::isResult($fcontact)) { + if (empty($fid)) { // Database record did not get created. Quietly give up. exit(); } $hash = Strings::getRandomHex(); - q( - "INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`) - VALUES(%d, %d, %d, '%s', '%s', '%s', %d)", - intval($suggest["uid"]), - intval($fid), - intval($suggest["cid"]), - DBA::escape($suggest["body"]), - DBA::escape($hash), - DBA::escape(DateTimeFormat::utcNow()), - intval(0) - ); + $fields = ['uid' => $suggest['uid'], 'fid' => $fid, 'contact-id' => $suggest['cid'], + 'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false]; + DBA::insert('intro', $fields); notification( [ - "type" => NOTIFY_SUGGEST, - "notify_flags" => $importer["notify-flags"], - "language" => $importer["language"], - "to_name" => $importer["username"], - "to_email" => $importer["email"], - "uid" => $importer["importer_uid"], - "item" => $suggest, - "link" => System::baseUrl()."/notifications/intros", - "source_name" => $importer["name"], - "source_link" => $importer["url"], - "source_photo" => $importer["photo"], - "verb" => ACTIVITY_REQ_FRIEND, - "otype" => "intro"] + 'type' => NOTIFY_SUGGEST, + 'notify_flags' => $importer['notify-flags'], + 'language' => $importer['language'], + 'to_name' => $importer['username'], + 'to_email' => $importer['email'], + 'uid' => $importer['importer_uid'], + 'item' => $suggest, + 'link' => System::baseUrl().'/notifications/intros', + 'source_name' => $importer['name'], + 'source_link' => $importer['url'], + 'source_photo' => $importer['photo'], + 'verb' => ACTIVITY_REQ_FRIEND, + 'otype' => 'intro'] ); return true; diff --git a/view/templates/categories_widget.tpl b/view/templates/categories_widget.tpl deleted file mode 100644 index e3cf0fc32c..0000000000 --- a/view/templates/categories_widget.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -
-

{{$title}}

-
{{$desc nofilter}}
- - - -
diff --git a/view/templates/contact_block.tpl b/view/templates/contact_block.tpl deleted file mode 100644 index 49a0e43582..0000000000 --- a/view/templates/contact_block.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -
-

{{$contacts}}

-{{if $micropro}} - {{$viewcontacts}} -
- {{foreach $micropro as $m}} - {{$m nofilter}} - {{/foreach}} -
-{{/if}} -
-
diff --git a/view/templates/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl deleted file mode 100644 index af578acdaa..0000000000 --- a/view/templates/contacts-widget-sidebar.tpl +++ /dev/null @@ -1,7 +0,0 @@ - -{{$vcard_widget nofilter}} -{{$findpeople_widget nofilter}} -{{$follow_widget nofilter}} -{{$groups_widget nofilter}} -{{$networks_widget nofilter}} - diff --git a/view/templates/events_aside.tpl b/view/templates/events_aside.tpl deleted file mode 100644 index e9b54771d1..0000000000 --- a/view/templates/events_aside.tpl +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/view/templates/fileas_widget.tpl b/view/templates/fileas_widget.tpl deleted file mode 100644 index a55c90bc93..0000000000 --- a/view/templates/fileas_widget.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -
-

{{$title}}

-
{{$desc nofilter}}
- - - -
diff --git a/view/templates/follow.tpl b/view/templates/follow.tpl deleted file mode 100644 index 12a5621235..0000000000 --- a/view/templates/follow.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-

{{$connect}}

-
{{$desc nofilter}}
-
- -
-
- diff --git a/view/templates/nets.tpl b/view/templates/nets.tpl deleted file mode 100644 index 5ea602aadd..0000000000 --- a/view/templates/nets.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-

{{$title}}

-
{{$desc nofilter}}
- {{$all}} - -
diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl deleted file mode 100644 index d4d99c2dac..0000000000 --- a/view/templates/peoplefind.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -
-

{{$nv.findpeople}}

-
{{$nv.desc}}
-
- -
- - - - - - {{if $nv.inv}} - - {{/if}} -
- diff --git a/view/templates/remote_friends_common.tpl b/view/templates/remote_friends_common.tpl deleted file mode 100644 index 4ae682f436..0000000000 --- a/view/templates/remote_friends_common.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -
-
{{$desc nofilter}}      {{if $linkmore}}{{$more}}{{/if}}
- {{if $items}} - {{foreach $items as $item}} -
-
- - {{$item.name}} - -
-
-
- {{$item.name}} -
-
-
- {{/foreach}} - {{/if}} -
-
- diff --git a/view/templates/tagblock_widget.tpl b/view/templates/tagblock_widget.tpl deleted file mode 100644 index fd007c9c10..0000000000 --- a/view/templates/tagblock_widget.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -
-

{{$title}}

- -
- {{foreach $tags as $tag}} - - #{{$tag.name}} - - {{/foreach}} -
-
-
diff --git a/view/templates/vcard-widget.tpl b/view/templates/vcard-widget.tpl deleted file mode 100644 index 240466460e..0000000000 --- a/view/templates/vcard-widget.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -
-
{{$name}}
- {{if $addr}}
{{$addr}}
{{/if}} - {{if $pdesc}}
{{$pdesc}}
{{/if}} - {{if $url}} -
{{$name}}
- {{else}} -
{{$name}}
- {{/if}} - {{if $account_type}}{{/if}} - {{if $network_link}}
{{$network}}
{{$network_link nofilter}}
{{/if}} -
-
diff --git a/view/templates/widget/contacts.tpl b/view/templates/widget/contacts.tpl new file mode 100644 index 0000000000..fa6e223d7c --- /dev/null +++ b/view/templates/widget/contacts.tpl @@ -0,0 +1,13 @@ + +
+

{{$contacts}}

+{{if $micropro}} + {{$viewcontacts}} +
+ {{foreach $micropro as $m}} + {{$m nofilter}} + {{/foreach}} +
+{{/if}} +
+
diff --git a/view/templates/widget/events.tpl b/view/templates/widget/events.tpl new file mode 100644 index 0000000000..e9b54771d1 --- /dev/null +++ b/view/templates/widget/events.tpl @@ -0,0 +1,9 @@ + + diff --git a/view/templates/widget/filter.tpl b/view/templates/widget/filter.tpl new file mode 100644 index 0000000000..bef4969b3e --- /dev/null +++ b/view/templates/widget/filter.tpl @@ -0,0 +1,11 @@ + +
+

{{$title}}

+
{{$desc nofilter}}
+ +
diff --git a/view/templates/widget/follow.tpl b/view/templates/widget/follow.tpl new file mode 100644 index 0000000000..12a5621235 --- /dev/null +++ b/view/templates/widget/follow.tpl @@ -0,0 +1,9 @@ + +
+

{{$connect}}

+
{{$desc nofilter}}
+
+ +
+
+ diff --git a/view/templates/widget/peoplefind.tpl b/view/templates/widget/peoplefind.tpl new file mode 100644 index 0000000000..d4d99c2dac --- /dev/null +++ b/view/templates/widget/peoplefind.tpl @@ -0,0 +1,17 @@ + +
+

{{$nv.findpeople}}

+
{{$nv.desc}}
+
+ +
+ + + + + + {{if $nv.inv}} + + {{/if}} +
+ diff --git a/view/templates/widget/remote_friends_common.tpl b/view/templates/widget/remote_friends_common.tpl new file mode 100644 index 0000000000..4ae682f436 --- /dev/null +++ b/view/templates/widget/remote_friends_common.tpl @@ -0,0 +1,22 @@ + +
+
{{$desc nofilter}}      {{if $linkmore}}{{$more}}{{/if}}
+ {{if $items}} + {{foreach $items as $item}} +
+
+ + {{$item.name}} + +
+
+
+ {{$item.name}} +
+
+
+ {{/foreach}} + {{/if}} +
+
+ diff --git a/view/templates/widget/tagcloud.tpl b/view/templates/widget/tagcloud.tpl new file mode 100644 index 0000000000..fd007c9c10 --- /dev/null +++ b/view/templates/widget/tagcloud.tpl @@ -0,0 +1,13 @@ + +
+

{{$title}}

+ +
+ {{foreach $tags as $tag}} + + #{{$tag.name}} + + {{/foreach}} +
+
+
diff --git a/view/templates/widget/vcard.tpl b/view/templates/widget/vcard.tpl new file mode 100644 index 0000000000..240466460e --- /dev/null +++ b/view/templates/widget/vcard.tpl @@ -0,0 +1,14 @@ + +
+
{{$name}}
+ {{if $addr}}
{{$addr}}
{{/if}} + {{if $pdesc}}
{{$pdesc}}
{{/if}} + {{if $url}} +
{{$name}}
+ {{else}} +
{{$name}}
+ {{/if}} + {{if $account_type}}{{/if}} + {{if $network_link}}
{{$network}}
{{$network_link nofilter}}
{{/if}} +
+
diff --git a/view/theme/duepuntozero/deriv/darkzero.css b/view/theme/duepuntozero/deriv/darkzero.css index 908574f706..3b6fa92e3b 100644 --- a/view/theme/duepuntozero/deriv/darkzero.css +++ b/view/theme/duepuntozero/deriv/darkzero.css @@ -153,7 +153,7 @@ input#acl-search { background:#2e2f2e; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected{ +.widget .selected, .group-selected { background:#2e2f2e; } diff --git a/view/theme/duepuntozero/deriv/slackr.css b/view/theme/duepuntozero/deriv/slackr.css index 3b42cdd10b..c096ffa7df 100644 --- a/view/theme/duepuntozero/deriv/slackr.css +++ b/view/theme/duepuntozero/deriv/slackr.css @@ -126,7 +126,7 @@ nav #site-location { } -.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected { +.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .widget .selected, #profile-jot-submit { border-radius: 3px; -moz-border-radius: 3px; box-shadow: 4px 4px 3px 0 #444444; diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 7cda87c1e4..f586d6e04d 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -386,7 +386,7 @@ div.wall-item-content-wrapper.shiny { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected, .forum-selected { +.widget .selected, .group-selected, .forum-selected { padding: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -2124,11 +2124,11 @@ a.mail-list-link { list-style: none; } -.nets-ul, .fileas-ul, .categories-ul, .datebrowse-ul { +.nets-ul, .fileas-ul, .category-ul, .datebrowse-ul { list-style-type: none; } -.nets-ul li, .fileas-ul li, .categories-ul li, .datebrowse-ul li { +.nets-ul li, .fileas-ul li, .category-ul li, .datebrowse-ul li { margin-top: 10px; } @@ -2139,11 +2139,11 @@ a.mail-list-link { margin-left: 42px; } -.fileas-link, .categories-link { +.fileas-link, .category-link { margin-left: 24px; } -.fileas-all, .categories-all { +.fileas-all, .category-all { margin-left: 0px; } diff --git a/view/theme/frio/templates/contact_block.tpl b/view/theme/frio/templates/contact_block.tpl deleted file mode 100644 index 0ae6479790..0000000000 --- a/view/theme/frio/templates/contact_block.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -
-

{{$contacts}}

- - {{if $micropro}} - - - {{$viewcontacts}} - - -
- {{foreach $micropro as $m}} - {{$m nofilter}} - {{/foreach}} -
- {{/if}} -
-
diff --git a/view/theme/frio/templates/fileas_widget.tpl b/view/theme/frio/templates/fileas_widget.tpl deleted file mode 100644 index b7d867e82a..0000000000 --- a/view/theme/frio/templates/fileas_widget.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -
-

{{$title}}

-
{{$desc nofilter}}
- - - -
diff --git a/view/theme/frio/templates/follow.tpl b/view/theme/frio/templates/follow.tpl deleted file mode 100644 index fadd0a6dfb..0000000000 --- a/view/theme/frio/templates/follow.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -
-

{{$connect}}

- -
- - {{* The input field - For visual consistence we are using a search input field*}} -
- - -
-
-
- diff --git a/view/theme/frio/templates/nets.tpl b/view/theme/frio/templates/nets.tpl deleted file mode 100644 index 8bc0c91d65..0000000000 --- a/view/theme/frio/templates/nets.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-

{{$title}}

-
{{$desc nofilter}}
- -
diff --git a/view/theme/frio/templates/peoplefind.tpl b/view/theme/frio/templates/peoplefind.tpl deleted file mode 100644 index fc5d249b4b..0000000000 --- a/view/theme/frio/templates/peoplefind.tpl +++ /dev/null @@ -1,23 +0,0 @@ -
-

{{$nv.findpeople}}

- -
- {{* The search field *}} - -
- - -
-
- - {{* Directory links *}} - - - {{* Additional links *}} - - - - {{if $nv.inv}} - - {{/if}} -
diff --git a/view/theme/frio/templates/vcard-widget.tpl b/view/theme/frio/templates/vcard-widget.tpl deleted file mode 100644 index d1b41728b1..0000000000 --- a/view/theme/frio/templates/vcard-widget.tpl +++ /dev/null @@ -1,38 +0,0 @@ -
- -
- {{if $url}} - {{$name}} - {{else}} - {{$name}} - {{/if}} -
- - {{* The short information which will appended to the second navbar by scrollspy *}} - - -
-
-

{{$name}}

- - {{if $addr}}
{{$addr}}
{{/if}} - - {{if $account_type}}{{/if}} - - {{if $pdesc}}
{{$pdesc}}
{{/if}} - - {{if $network_link}}
{{$network}}
{{$network_link nofilter}}
{{/if}} -
-
-
diff --git a/view/theme/frio/templates/widget/contacts.tpl b/view/theme/frio/templates/widget/contacts.tpl new file mode 100644 index 0000000000..e084381fbd --- /dev/null +++ b/view/theme/frio/templates/widget/contacts.tpl @@ -0,0 +1,18 @@ + +
+

{{$contacts}}

+ +{{if $micropro}} + + + {{$viewcontacts}} + + +
+ {{foreach $micropro as $m}} + {{$m nofilter}} + {{/foreach}} +
+{{/if}} +
+
diff --git a/view/theme/frio/templates/widget/follow.tpl b/view/theme/frio/templates/widget/follow.tpl new file mode 100644 index 0000000000..fadd0a6dfb --- /dev/null +++ b/view/theme/frio/templates/widget/follow.tpl @@ -0,0 +1,14 @@ + +
+

{{$connect}}

+ +
+ + {{* The input field - For visual consistence we are using a search input field*}} +
+ + +
+
+
+ diff --git a/view/theme/frio/templates/widget/peoplefind.tpl b/view/theme/frio/templates/widget/peoplefind.tpl new file mode 100644 index 0000000000..fc5d249b4b --- /dev/null +++ b/view/theme/frio/templates/widget/peoplefind.tpl @@ -0,0 +1,23 @@ +
+

{{$nv.findpeople}}

+ +
+ {{* The search field *}} + +
+ + +
+
+ + {{* Directory links *}} + + + {{* Additional links *}} + + + + {{if $nv.inv}} + + {{/if}} +
diff --git a/view/theme/frio/templates/widget/vcard.tpl b/view/theme/frio/templates/widget/vcard.tpl new file mode 100644 index 0000000000..d1b41728b1 --- /dev/null +++ b/view/theme/frio/templates/widget/vcard.tpl @@ -0,0 +1,38 @@ +
+ +
+ {{if $url}} + {{$name}} + {{else}} + {{$name}} + {{/if}} +
+ + {{* The short information which will appended to the second navbar by scrollspy *}} + + +
+
+

{{$name}}

+ + {{if $addr}}
{{$addr}}
{{/if}} + + {{if $account_type}}{{/if}} + + {{if $pdesc}}
{{$pdesc}}
{{/if}} + + {{if $network_link}}
{{$network}}
{{$network_link nofilter}}
{{/if}} +
+
+
diff --git a/view/theme/quattro/templates/fileas_widget.tpl b/view/theme/quattro/templates/fileas_widget.tpl deleted file mode 100644 index 7946e8f833..0000000000 --- a/view/theme/quattro/templates/fileas_widget.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-

{{$title}}

-
{{$desc nofilter}}
- - - -
diff --git a/view/theme/quattro/templates/nets.tpl b/view/theme/quattro/templates/nets.tpl deleted file mode 100644 index 2d488dc4fa..0000000000 --- a/view/theme/quattro/templates/nets.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-

{{$title}}

-
{{$desc nofilter}}
- - - -
diff --git a/view/theme/quattro/templates/widget/filter.tpl b/view/theme/quattro/templates/widget/filter.tpl new file mode 100644 index 0000000000..8a44beccbb --- /dev/null +++ b/view/theme/quattro/templates/widget/filter.tpl @@ -0,0 +1,14 @@ +
+

{{$title}}

+{{if $desc}} +
{{$desc nofilter}}
+{{/if}} + + + +
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 9866bc362a..9bbf00c780 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -962,10 +962,9 @@ li.widget-list { top: 1px; } -.group-selected, -.nets-selected, -.fileas-selected, -.categories-selected { + +.widget .selected, +.group-selected { padding-bottom: 0px; padding-left: 2px; padding-right: 2px; @@ -1006,13 +1005,13 @@ ul .sidebar-group-li .icon { width: 12px; } -.nets-ul, .fileas-ul, .categories-ul, .datebrowse-ul { +.nets-ul, .fileas-ul, .category-ul, .datebrowse-ul { list-style-type: none; } .nets-ul li, .fileas-ul li, -.categories-ul li, +.category-ul li, .datebrowse-link { } @@ -1029,12 +1028,12 @@ ul .sidebar-group-li .icon { } .fileas-link, -.categories-link { +.category-link { margin-left: 0px; } .fileas-all, -.categories-all { +.category-all { margin-left: 0px; } @@ -4627,7 +4626,7 @@ hr.line-dots { #birthday-notice {} #nav-notifications-template {} -#categories-sidebar {} +#category-sidebar {} #nets-desc {} #status-tab {} #page-footer {} diff --git a/view/theme/smoothly/templates/follow.tpl b/view/theme/smoothly/templates/follow.tpl deleted file mode 100644 index 4d5248530e..0000000000 --- a/view/theme/smoothly/templates/follow.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-

{{$connect}}

-
{{$desc nofilter}}
-
- -
-
- diff --git a/view/theme/smoothly/templates/widget/follow.tpl b/view/theme/smoothly/templates/widget/follow.tpl new file mode 100644 index 0000000000..4d5248530e --- /dev/null +++ b/view/theme/smoothly/templates/widget/follow.tpl @@ -0,0 +1,9 @@ + +
+

{{$connect}}

+
{{$desc nofilter}}
+
+ +
+
+ diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index eedbe09a45..3dc9b46491 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -448,7 +448,7 @@ pre code { /* color: #000; */ } -.group-selected, .nets-selected, .fileas-selected, .forum-selected { +.widget .selected, .forum-selected { font-weight: bold; } diff --git a/view/theme/vier/templates/communityhome.tpl b/view/theme/vier/templates/communityhome.tpl index 618ba8e1e5..94c8abcd7b 100644 --- a/view/theme/vier/templates/communityhome.tpl +++ b/view/theme/vier/templates/communityhome.tpl @@ -39,7 +39,7 @@ {{/if}} {{if $nv}} -{{include file='peoplefind.tpl' nv=$nv}} +{{include file='widget/peoplefind.tpl' nv=$nv}} {{/if}} {{if $lastusers_title}}