From 8e1d25356870b34b56b57b1b8e05b2c38006d17e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 3 Mar 2013 23:44:50 +0100 Subject: [PATCH 1/4] OStatus conversation: now the creation date of the item is store with the conversation vier: The link color and the color of the top bar is changed. --- include/ostatus_conversation.php | 4 +- object/Item.php | 2 +- view/theme/vier/style.css | 144 +++++++++++++++++++------------ 3 files changed, 91 insertions(+), 59 deletions(-) diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php index 36ba207abe..ef9e4f1793 100644 --- a/include/ostatus_conversation.php +++ b/include/ostatus_conversation.php @@ -46,7 +46,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio //logger('complete_conversation: completing conversation url '.$conversation_url.' for id '.$itemid); - $messages = q("SELECT `uid`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid)); + $messages = q("SELECT `uid`, `parent`, `created` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid)); if (!$messages) return; $message = $messages[0]; @@ -57,7 +57,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio if (!$conversation) { $r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`, `url`) VALUES (%d, %d, %d, %d, '%s', '%s')", - intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc(datetime_convert()), dbesc($conversation_url)); + intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc($message["created"]), dbesc($conversation_url)); logger('complete_conversation: Storing conversation url '.$conversation_url.' for id '.$itemid); } diff --git a/object/Item.php b/object/Item.php index 139a81f71f..fef928c289 100644 --- a/object/Item.php +++ b/object/Item.php @@ -232,7 +232,7 @@ class Item extends BaseObject { localize_item($item); - if ($item["postopts"]) { + if ($item["postopts"] and !get_config("system", "suppress_language")) { //$langdata = explode(";", $item["postopts"]); //$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)"; $langstr = ""; diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 4a116c5b72..7fd23afecc 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -238,7 +238,18 @@ div.pager { margin-top: 5px; } +.shared_header a { + color: black; +} + +.shared_header a:hover { + color: #36c; +} + .shared_header img { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; float: left; } @@ -279,7 +290,8 @@ body { /* background-color: #ddd; */ background-color: #F2F2F2; color: #2d2d2d; - margin: 37px 0px 0px 0px; + /* margin: 37px 0px 0px 0px; */ + margin: 32px 0px 0px 0px; display: table; /* width: 100% */ } @@ -288,14 +300,14 @@ h4 { } a { - /* color: #36C; */ + color: #36C; /* color: #3e3e8c; */ /* color: #3465A4; */ - color: #3E3E8C; + /*color: #3E3E8C; */ text-decoration: none; } a:hover { - color: blue; + /* color: blue; */ text-decoration: underline } @@ -323,15 +335,15 @@ a:hover { clear: both; } .fakelink { - /* color: #36c; */ + color: #36c; /* color: #3e3e8c; */ /* color: #3465A4; */ - color: #3E3E8C; + /* color: #3E3E8C; */ text-decoration: none; cursor: pointer; } .fakelink:hover { - color: blue; + /*color: blue;*/ /*color: #005c94; */ text-decoration: underline; } @@ -514,30 +526,42 @@ nav { top: 0px; padding: 0px; padding-left: 0px; - background: #364A84; + background: #2d2d2d; + /*background: #364A84; background: -moz-linear-gradient(top, #516499 0%, #364a84 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84)); background: -webkit-linear-gradient(top, #516499 0%,#364a84 100%); background: -o-linear-gradient(top, #516499 0%,#364a84 100%); background: -ms-linear-gradient(top, #516499 0%,#364a84 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); - background: linear-gradient(top, #516499 0%,#364a84 100%); + background: linear-gradient(top, #516499 0%,#364a84 100%); */ color: #ffffff; z-index: 100; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + /*-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - border-bottom: 5px solid #F80; + border-bottom: 5px solid #F80; */ } -nav a, + nav a:active, nav a:visited, nav a:link, -nav a:hover { - color: #ffffff; +nav a { text-decoration: none; outline: none; + color: #ccc; + padding-bottom: 8px; + padding-top: 8px; } + +nav a:hover { + text-decoration: none; + outline: none; + color: #fff; + padding-bottom: 8px; + padding-top: 8px; +} + nav ul { margin: 0px; padding: 0px 10px; @@ -557,15 +581,16 @@ nav #search-box #search-text { /*background-image: url('icons/lupe.png'); background-repeat:no-repeat; */ padding-left:0px; - border-top-left-radius: 15px; + /*border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; - border-bottom-left-radius: 15px; + border-bottom-left-radius: 15px;*/ position: relative; height: 17px; margin: 4px 0px 4px 4px; width: 150px; max-width: 150px; + background-color: #eee; } nav .nav-menu-icon { @@ -597,17 +622,20 @@ nav .nav-menu { padding-left: 5px; padding-right: 5px; margin: 3px 3px 0px; - font-size: 14px; - border-bottom: 3px solid #364A84; + font-size: 13px; + /* border-bottom: 3px solid #364A84; */ + color: #ccc; } nav .nav-menu.selected { border-bottom: 3px solid #9eabb0; /* background-color: #364E59; */ } + nav .nav-menu:hover { - color: #fff !important; + /* color: #fff !important; */ + color: #fff; /* text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); */ - background: #4c619c; +/* background: #4c619c; */ text-decoration: none; } nav .nav-notify { @@ -627,6 +655,7 @@ nav .nav-notify { min-width: 15px; /* text-align: right; */ text-align: center; + color: white; } nav .nav-notify.show { display: block; @@ -816,7 +845,7 @@ aside { /* border-right: 1px solid #D2D2D2; */ /* background-color: #ECECF2; */ background-color: #F2F2F2; - font-size: 14px; + font-size: 13px; /* background: #F1F1F1; */ } aside .vcard .fn { @@ -883,14 +912,14 @@ aside #search-text, aside #side-follow-url, aside #side-peoplefind-url { width: 150px; height: 17px; padding-left: 10px; - border-top-left-radius: 15px; + /*border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; border-bottom-left-radius: 15px; -moz-border-bottom-colors: #dbdbdb; -moz-border-top-colors: #999; -moz-border-left-colors: #999; - -moz-border-right-colors: #dbdbdb; + -moz-border-right-colors: #dbdbdb;*/ } aside h4 { @@ -1083,10 +1112,12 @@ border-bottom: 1px solid #D2D2D2; width: 50px; margin-left: 10px; color: #999; + font-size: 12px; } .wall-item-location { width: 350px; float: left; + font-size: 12px; } .wall-item-container .wall-item-content { @@ -1141,7 +1172,13 @@ border-bottom: 1px solid #D2D2D2; -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } + +.wall-item-container .wall-item-name:hover { + color: #36c; +} + .wall-item-container .wall-item-name { + color: black; font-weight: bold; } .wall-item-container .wall-item-actions-author { @@ -1308,6 +1345,7 @@ border-bottom: 1px solid #D2D2D2; .wall-item-tags { padding-top: 1px; padding-bottom: 2px; + font-size: 12px; /*display: none;*/ } @@ -1356,7 +1394,11 @@ border-bottom: 1px solid #D2D2D2; height: 48px; overflow: hidden; display: block; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } + .contact-photo img { width: 48px; height: 48px; @@ -1685,9 +1727,13 @@ border-bottom: 1px solid #D2D2D2; ul.tabs { list-style-type: none; padding-bottom: 10px; - font-size: 14px; padding-left: 0px; - margin-bottom: 30px; + margin-bottom: 5px; + line-height: 27px; + height: 27px; + font-size: 11px; + font-weight: bold; + /* margin-bottom: 30px; */ } ul.tabs li { float: left; @@ -1698,52 +1744,38 @@ ul.tabs li { }*/ ul.tabs a { + /* min-width: 34px; */ display: block; float: left; + padding-bottom: 0px; + padding: 0px 12px 0px 12px; + color: #444; +} + +div.pager, .birthday-notice, #jot-preview-link, .comment-edit-submit-wrapper .fakelink { + padding: 2px 7px 2px 7px; + color: black; } div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-wrapper .fakelink { border: 1px solid lightgray; - color: black; background: #F2F2F2; - padding: 2px 7px 2px 7px; margin-top: 2px; margin-bottom: 2px; - - /* padding: 0px 10px 1px 10px; */ - /*padding: 0px 5px 1px 5px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - border: 1px solid #ECECF2; - font-weight: bold; - line-height: 1.4em; - color: #3e3e8c; - text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9); - background: #ececf2; - background: -moz-linear-gradient(top, #ffffff 0%, #ececf2 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ececf2)); - background: -webkit-linear-gradient(top, #ffffff 0%,#ececf2 100%); - background: -o-linear-gradient(top, #ffffff 0%,#ececf2 100%); - background: -ms-linear-gradient(top, #ffffff 0%,#ececf2 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ececf2',GradientType=0 ); - background: linear-gradient(top, #ffffff 0%,#ececf2 100%);*/ } -#event-notice:hover, #birthday-notice:hover, ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover { +ul.tabs a:hover { + color: #333; +} + +#event-notice:hover, #birthday-notice:hover, ul.tabs li .active, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover { color: black; +} + +ul.tabs a:hover, #event-notice:hover, #birthday-notice:hover, ul.tabs li .active, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover { background-color: #e5e5e5; text-decoration: none; border: 1px solid darkgray; - - /*text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - background: -moz-linear-gradient(top, #7b8dbb 0%, #364a84 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84)); - background: -webkit-linear-gradient(top, #7b8dbb 0%,#364a84 100%); - background: -o-linear-gradient(top, #7b8dbb 0%,#364a84 100%); - background: -ms-linear-gradient(top, #7b8dbb 0%,#364a84 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 ); - background: linear-gradient(top, #7b8dbb 0%,#364a84 100%);*/ } .comment-edit-bb { From 478a0796657fb949ef76e66cc726c0de90737824 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 4 Mar 2013 00:04:06 +0100 Subject: [PATCH 2/4] Vier: Further changes: profile border is rounded. --- view/theme/vier/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 7fd23afecc..278a1ddde7 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -608,6 +608,9 @@ nav .nav-menu-icon.selected { nav .nav-menu-icon img { width: 22px; height: 22px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } nav .nav-menu-icon .nav-notify { top: 3px; @@ -865,6 +868,7 @@ aside .vcard dl { aside select { background-color: white; width: 165px; + border-color: #ccc; } aside .vcard dt { From 8bb6b51967a3fa5e461ea3cb51e5033604e26426 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 4 Mar 2013 21:11:31 +0100 Subject: [PATCH 3/4] Vier: Some more transition effects --- view/theme/vier/search_item.tpl | 4 ++-- view/theme/vier/smarty3/search_item.tpl | 4 ++-- view/theme/vier/smarty3/wall_thread.tpl | 4 ++-- view/theme/vier/style.css | 30 +++++++++++++++++++++++++ view/theme/vier/wall_thread.tpl | 4 ++-- 5 files changed, 38 insertions(+), 8 deletions(-) diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl index 846f5ccff7..334e33fca7 100644 --- a/view/theme/vier/search_item.tpl +++ b/view/theme/vier/search_item.tpl @@ -23,9 +23,9 @@
$item.name - -   + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} + {{ if $item.lock }}$item.lock {{ endif }}
diff --git a/view/theme/vier/smarty3/search_item.tpl b/view/theme/vier/smarty3/search_item.tpl index c6c83f8b86..0a62fd5843 100644 --- a/view/theme/vier/smarty3/search_item.tpl +++ b/view/theme/vier/smarty3/search_item.tpl @@ -28,9 +28,9 @@
{{$item.name}} - -   + {{if $item.plink}}{{$item.ago}}{{else}} {{$item.ago}} {{/if}} - {{if $item.lock}} - {{$item.lock}} {{/if}} + {{if $item.lock}}{{$item.lock}} {{/if}}
diff --git a/view/theme/vier/smarty3/wall_thread.tpl b/view/theme/vier/smarty3/wall_thread.tpl index adaf0b639f..f2f6f186e8 100644 --- a/view/theme/vier/smarty3/wall_thread.tpl +++ b/view/theme/vier/smarty3/wall_thread.tpl @@ -58,9 +58,9 @@
{{$item.name}} {{if $item.owner_url}}{{$item.via}} {{$item.owner_name}} {{/if}} - - + {{if $item.plink}}{{$item.ago}}{{else}} {{$item.ago}} {{/if}} - {{if $item.lock}} - {{$item.lock}} {{/if}} + {{if $item.lock}}{{$item.lock}} {{/if}}
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 278a1ddde7..a489b48b96 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1185,6 +1185,36 @@ border-bottom: 1px solid #D2D2D2; color: black; font-weight: bold; } + +.wall-item-container:hover .wall-item-name { + color: #36c; + font-weight: bold; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} + +.toplevel_item .wall-item-content a, +.wall-item-container .wall-item-content a, +.toplevel_item .fakelink, +.wall-item-container .fakelink { + color: black; +} + +.toplevel_item:hover .fakelink, +.wall-item-container:hover .fakelink, +.toplevel_item:hover .wall-item-content a, +.wall-item-container:hover .wall-item-content a { + color: #36c; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} + .wall-item-container .wall-item-actions-author { width: 100%; margin-bottom: 0.3em; diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl index 7ca07d8591..756015bc0f 100644 --- a/view/theme/vier/wall_thread.tpl +++ b/view/theme/vier/wall_thread.tpl @@ -53,9 +53,9 @@
$item.name {{ if $item.owner_url }}$item.via $item.owner_name {{ endif }} - - + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} + {{ if $item.lock }}$item.lock {{ endif }}
From 86e19dda224b688a4b8fbd893610b15918784a8f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 5 Mar 2013 00:46:11 +0100 Subject: [PATCH 4/4] Vier: Some more changes to the theme. Added a switch to suppress displaying of the tags. --- mod/settings.php | 38 ++++++++++++++++----------------- object/Item.php | 26 +++++++++++----------- view/theme/vier/nav.tpl | 2 +- view/theme/vier/smarty3/nav.tpl | 2 +- view/theme/vier/style.css | 25 +++++++++++++++++----- 5 files changed, 55 insertions(+), 38 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 8b3cebfa35..75c11e8819 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -30,7 +30,7 @@ function settings_init(&$a) { 'label' => t('Account settings'), 'url' => $a->get_baseurl(true).'/settings', 'selected' => (($a->argc == 1)?'active':''), - ), + ), array( 'label' => t('Additional features'), 'url' => $a->get_baseurl(true).'/settings/features', @@ -40,8 +40,8 @@ function settings_init(&$a) { 'label' => t('Display settings'), 'url' => $a->get_baseurl(true).'/settings/display', 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), - ), - + ), + array( 'label' => t('Connector settings'), 'url' => $a->get_baseurl(true).'/settings/connectors', @@ -68,7 +68,7 @@ function settings_init(&$a) { 'selected' => '' ) ); - + $tabtpl = get_markup_template("generic_links_widget.tpl"); $a->page['aside'] = replace_macros($tabtpl, array( '$title' => t('Settings'), @@ -96,19 +96,19 @@ function settings_post(&$a) { if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){ check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); - + $key = $_POST['remove']; q("DELETE FROM tokens WHERE id='%s' AND uid=%d", dbesc($key), local_user()); goaway($a->get_baseurl(true)."/settings/oauth/"); - return; + return; } if(($a->argc > 2) && ($a->argv[1] === 'oauth') && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) { - + check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); - + $name = ((x($_POST,'name')) ? $_POST['name'] : ''); $key = ((x($_POST,'key')) ? $_POST['key'] : ''); $secret = ((x($_POST,'secret')) ? $_POST['secret'] : ''); @@ -116,7 +116,7 @@ function settings_post(&$a) { $icon = ((x($_POST,'icon')) ? $_POST['icon'] : ''); if ($name=="" || $key=="" || $secret==""){ notice(t("Missing some important data!")); - + } else { if ($_POST['submit']==t("Update")){ $r = q("UPDATE clients SET @@ -236,7 +236,7 @@ function settings_post(&$a) { call_hooks('connector_settings_post', $_POST); return; } - + if(($a->argc > 1) && ($a->argv[1] === 'features')) { check_form_security_token_redirectOnErr('/settings/features', 'settings_features'); foreach($_POST as $k => $v) { @@ -249,7 +249,7 @@ function settings_post(&$a) { } if(($a->argc > 1) && ($a->argv[1] === 'display')) { - + check_form_security_token_redirectOnErr('/settings/display', 'settings_display'); $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->user['theme']); @@ -611,8 +611,8 @@ function settings_content(&$a) { WHERE clients.uid IN (%d,0)", local_user(), local_user()); - - + + $tpl = get_markup_template("settings_oauth.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_oauth"), @@ -627,19 +627,19 @@ function settings_content(&$a) { '$apps' => $r, )); return $o; - + } if(($a->argc > 1) && ($a->argv[1] === 'addon')) { $settings_addons = ""; - + $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' "); if(! count($r)) $settings_addons = t('No Plugin settings configured'); call_hooks('plugin_settings', $settings_addons); - - + + $tpl = get_markup_template("settings_addons.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_addon"), @@ -650,7 +650,7 @@ function settings_content(&$a) { } if(($a->argc > 1) && ($a->argv[1] === 'features')) { - + $arr = array(); $features = get_features(); foreach($features as $fname => $fdata) { @@ -675,7 +675,7 @@ function settings_content(&$a) { if(($a->argc > 1) && ($a->argv[1] === 'connectors')) { $settings_connectors = ""; - + call_hooks('connector_settings', $settings_connectors); $diasp_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((get_config('system','diaspora_enabled')) ? t('enabled') : t('disabled'))); diff --git a/object/Item.php b/object/Item.php index 75656a76f7..575a28f58f 100644 --- a/object/Item.php +++ b/object/Item.php @@ -158,22 +158,24 @@ class Item extends BaseObject { $hashtags = array(); $mentions = array(); - $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", - intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); + if (!get_config('system','suppress_tags')) { + $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", + intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); - foreach($taglist as $tag) { + foreach($taglist as $tag) { - if ($tag["url"] == "") - $tag["url"] = $searchpath.strtolower($tag["term"]); + if ($tag["url"] == "") + $tag["url"] = $searchpath.strtolower($tag["term"]); - if ($tag["type"] == TERM_HASHTAG) { - $hashtags[] = "#".$tag["term"].""; - $prefix = "#"; - } elseif ($tag["type"] == TERM_MENTION) { - $mentions[] = "@".$tag["term"].""; - $prefix = "@"; + if ($tag["type"] == TERM_HASHTAG) { + $hashtags[] = "#".$tag["term"].""; + $prefix = "#"; + } elseif ($tag["type"] == TERM_MENTION) { + $mentions[] = "@".$tag["term"].""; + $prefix = "@"; + } + $tags[] = $prefix."".$tag["term"].""; } - $tags[] = $prefix."".$tag["term"].""; } /*foreach(explode(',',$item['tag']) as $tag){ diff --git a/view/theme/vier/nav.tpl b/view/theme/vier/nav.tpl index dd41d844a1..dfb35a62c0 100644 --- a/view/theme/vier/nav.tpl +++ b/view/theme/vier/nav.tpl @@ -35,7 +35,7 @@ {{ endif }} -