From fb198b8a058b7a9f4a1730a7cb44c3aeac745925 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 13 Feb 2015 10:01:26 +0100 Subject: item_unseen update --- include/attach.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/attach.php b/include/attach.php index 3350a591e..f973102e8 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1082,6 +1082,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $arr['mid'] = $mid; $arr['parent_mid'] = $mid; $arr['item_flags'] = $item_flags; + $arr['item_unseen'] = 1; $arr['author_xchan'] = $poster['xchan_hash']; $arr['owner_xchan'] = $poster['xchan_hash']; $arr['title'] = ''; -- cgit v1.2.3 From 8696795ce69ee50c7a4e63f5a7e740de466f5df6 Mon Sep 17 00:00:00 2001 From: Alexandre Hannud Abdo Date: Fri, 13 Feb 2015 06:54:49 -0200 Subject: Fixes tag delivery regex for when multiple tags are present Previous regex would cause matches to span several tags when present, thus never recognizing the mention. --- include/items.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index 717a4bf71..18ce149ed 100755 --- a/include/items.php +++ b/include/items.php @@ -2861,7 +2861,7 @@ function tag_deliver($uid,$item_id) { if(preg_match($pattern,$body,$matches)) $tagged = true; - $pattern = '/@\!?\[zrl\=(.*?)\](.*?)\+\[\/zrl\]/'; + $pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/'; if(preg_match_all($pattern,$body,$matches,PREG_SET_ORDER)) { $max_forums = get_config('system','max_tagged_forums'); @@ -3022,7 +3022,7 @@ function tgroup_check($uid,$item) { // $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'] . '+','/') . '\[\/zrl\]/'; - $pattern = '/@\!?\[zrl\=(.*?)\](.*?)\+\[\/zrl\]/'; + $pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/'; $found = false; -- cgit v1.2.3 From 4616c13f3b324553f4320cb14306ec098eeeccfa Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 13 Feb 2015 10:40:52 +0100 Subject: yet another icon change --- view/css/conversation.css | 7 ++++++- view/theme/redbasic/css/style.css | 4 ---- view/tpl/conv_item.tpl | 12 ++++++------ view/tpl/conv_list.tpl | 12 ++++++------ 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index 8bc71bb6d..591a4e767 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -261,7 +261,12 @@ a.wall-item-name-link { cursor: default; } +.item-verified { + color: darkgreen; + font-size: 1em !important; +} + .item-forged { color: #FF0000; - font-size: 1.5em !important; + font-size: 1em !important; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b62136427..6a46d7429 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1907,10 +1907,6 @@ img.mail-list-sender-photo { box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } -.wall-item-ago .icon-ok { - color: darkgreen; -} - .wall-item-ago { color: #777; font-size: 0.833em; diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 4791d5bae..01833068b 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -28,7 +28,7 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
- {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
@@ -67,10 +67,10 @@ {{/if}} {{if $item.isevent}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index caa4ef45e..1231b4d79 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -28,7 +28,7 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
- {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
@@ -68,10 +68,10 @@ {{if $item.isevent}}
-- cgit v1.2.3 From 46964a8a889517e92dcb78da2675804eed3dbe1c Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Fri, 13 Feb 2015 02:57:28 -0800 Subject: make sql work on both db types --- install/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/update.php b/install/update.php index d2f1ead3c..86731e165 100644 --- a/install/update.php +++ b/install/update.php @@ -1560,7 +1560,7 @@ function update_r1135() { } function update_r1136() { - $r1 = q("alter table item add item_unseen smallint(1) not null default '0' "); + $r1 = q("alter table item add item_unseen smallint not null default '0' "); $r2 = q("create index item_unseen on item ( item_unseen ) "); $r3 = q("update item set item_unseen = 1 where ( item_flags & 2 ) > 0 "); -- cgit v1.2.3 From 7c45f23f8f517253f0de7da29e485b9ca417ee7c Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 13 Feb 2015 12:37:05 +0100 Subject: some shifting to make button groups render properly --- view/tpl/conv_item.tpl | 38 +++++++++++++++---------------- view/tpl/conv_list.tpl | 61 +++++++++++++++++++++++++++----------------------- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 01833068b..a575df554 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -140,31 +140,29 @@ {{else}} {{/if}} + {{if $response.list_part}} + + {{/if}} {{/if}} - - {{if $response.list_part}} - - {{/if}} {{/foreach}} {{/if}} -
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 1231b4d79..818517c46 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -130,14 +130,21 @@
+
+ +
+ {{if $item.unseen_comments}} +
+ +
+ {{/if}} - -
{{if $item.unseen_comments}}
{{/if}} - - {{if $item.responses }} -
- {{foreach $item.responses as $verb=>$response}} + {{if $item.responses }} + {{foreach $item.responses as $verb=>$response}} {{if $response.count}}
@@ -146,31 +153,29 @@ {{else}} {{/if}} + {{if $response.list_part}} + + {{/if}}
{{/if}} - - {{if $response.list_part}} - + {{/foreach}} {{/if}} - {{/foreach}}
- {{/if}} -
-- cgit v1.2.3