diff --git a/include/conversation.php b/include/conversation.php index 057526c54..fc12f0b3f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1056,6 +1056,9 @@ function builtin_activity_puller($item, &$conv_responses) { else $conv_responses[$mode][$item['thr-parent']] ++; + if((local_user()) && (local_user() == $item['uid']) && ($item['self'])) + $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1; + $conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url; // there can only be one activity verb per item so if we found anything, we can stop looking @@ -1435,6 +1438,7 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) { $ret[$v] = array(); $ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); $ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); + $ret[$v]['self'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); if(count($ret[$v]['list']) > MAX_LIKERS) { $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); array_push($ret[$v]['list_part'], ' {{if $item.vote}}
- - {{if $item.vote.dislike}}{{/if}} + + {{if $item.vote.dislike}}{{/if}} {{if $item.vote.share}}{{/if}}
@@ -88,9 +88,9 @@ {{/if}} {{if $item.isevent }}
- - - + + +
{{/if}}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 9732edb15..c1e806744 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1154,6 +1154,11 @@ input#dfrn-url { margin-right: 10px; } +.wall-item-like-buttons > a.active, +.wall-item-attend-wrapper > a.active { + background-color: rgba(52, 101, 164, .5); +} + .editpost { margin-left: 10px; float: left; diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 9a31a0caa..b5cb7368f 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3,7 +3,7 @@ To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates and open the template in the editor. */ -/* +/* Created on : 17.02.2016, 23:55:45 Author : rabuzarus */ @@ -171,7 +171,7 @@ a#item-delete-selected { background: $btn_primary_hover_color; border-color: none; } - + .btn-link { /* color: #6fdbe8;*/ color: $link_color; @@ -284,7 +284,7 @@ header #banner { whitespace: nowrap; padding-left: 55px; } -header #banner #logo-img, +header #banner #logo-img, .navbar-brand #logo-img { /*mask: url('network#m1');*/ /*mask-image: url('img/friendica-25.png');*/ @@ -416,7 +416,7 @@ nav.navbar .nav>li>a:focus{ top: 4px; right: -2px; background-color: #ff8989; - + /* text-transform: uppercase; display: inline-block; padding: 3px 5px 4px; @@ -1086,7 +1086,7 @@ aside #group-sidebar li .group-edit-tool:first-child { width: 90px;*/ } #contact-block contact-block-link { - + } #contact-block .contact-block-img { height: 75px; @@ -1463,14 +1463,19 @@ blockquote.shared_content { /* item social action buttons */ .wall-item-actions, .wall-item-actions a { font-size: 13px; - /*color: #aeaeae;*/ color: #555; margin-top: 15px; margin-bottom: 0; } +.wall-item-actions a.active { + font-weight: bold; +} .wall-item-actions a:hover { color: #555; } +.wall-item-actions a.active:hover { + color: $link_color; +} .wall-item-actions-left { display: table-cell; vertical-align: middle; @@ -1641,7 +1646,7 @@ img.acpopup-img { .wall-item-container.thread_level_6, .wall-item-container.thread_level_7 { margin-left: 15px; - + } /* Menubar Tabs */ #tabmenu, @@ -1674,7 +1679,7 @@ ul.tabs li { transition: all .15s ease; } /*ul.tabs.visible-xs > li.active { - min-width: 150px; This is a workaround to make the topbar-second dropdown better visible on mobile. We need something better here + min-width: 150px; This is a workaround to make the topbar-second dropdown better visible on mobile. We need something better here }*/ ul.tabs li a { margin-left: 10px; @@ -1888,7 +1893,7 @@ ul.viewcontact_wrapper > li { } .contact-wrapper .contact-photo-image-wrapper img.contact-photo.xl { height: 80px; - width: 80px; + width: 80px; } .contact-wrapper .contact-photo-image-wrapper img.contact-photo-xs { height: 48px; @@ -1905,7 +1910,7 @@ ul.viewcontact_wrapper > li { margin-top: -20px; } .contact-wrapper .media-body .contact-entry-name h4.media-heading a { - font-weight: bold !important; + font-weight: bold !important; color: $link_color; font-size: 15px !important; } @@ -2265,7 +2270,7 @@ ul.notif-network-list > li:hover .intro-action-buttons { /* Search Page */ -/* This is a little bit hacky. Since the search page is used for diferent +/* This is a little bit hacky. Since the search page is used for diferent content types we can't apply the generic-page-wrapper class. So we apply the css of the generic-page-wrapper class to the ul element with some little modifications to emulate a standard page template */ @@ -2374,7 +2379,7 @@ main .nav-tabs>li.active>a:hover { #contact-list ul.dropdown-menu.textcomplete-dropdown.media-list > li:first-child { display: none; } -#contact-list ul.dropdown-menu.textcomplete-dropdown.media-list +#contact-list ul.dropdown-menu.textcomplete-dropdown.media-list .textcomplete-item > a { padding: 0 !important; border-left: none; diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl index 9722a6e1d..90fbe03bb 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -7,7 +7,7 @@ -
+
{{* Put additional actions in a top-right dropdown menu *}} @@ -170,7 +170,7 @@ {{* Buttons for like and dislike *}} {{if $item.vote}} {{if $item.vote.like}} - {{$item.vote.like.0}} + {{$item.vote.like.0}} {{/if}} {{if $item.vote.like AND $item.vote.dislike}} @@ -178,7 +178,7 @@ {{/if}} {{if $item.vote.dislike}} - {{$item.vote.dislike.0}} + {{$item.vote.dislike.0}} {{/if}} {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}} @@ -207,9 +207,9 @@ {{* Event attendance buttons *}} {{if $item.isevent}}
- {{$item.attend.0}} - {{$item.attend.1}} - {{$item.attend.2}} + {{$item.attend.0}} + {{$item.attend.1}} + {{$item.attend.2}}
{{/if}} diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 21792d41c..2e05cf752 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -3,7 +3,7 @@ It would be better if it would be done in friendica core but since core lacks this functionality it is done in the theme -In short: the piece of code counts the total number of children of the toplevelpost +In short: the piece of code counts the total number of children of the toplevelpost - this are usaly all posts with thread_level = 2 - and stores it in variable $top_children_total. The first time a children which hits thread_level = 2 and $top_child = 1 opens the div. @@ -41,9 +41,9 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.thread_level<3}}
- {{$item.num_comments}} - {{$item.hide_text}}
@@ -59,7 +59,6 @@ as the value of $top_child_total (this is done at the end of this file) @@ -73,7 +72,7 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}}
{{* Put addional actions in a top-right dropdown menu *}} - +
  • {{$item.network_name}}
    • @@ -191,6 +190,7 @@ as the value of $top_child_total (this is done at the end of this file)
    {{if $item.location}} @@ -285,7 +285,7 @@ as the value of $top_child_total (this is done at the end of this file) {{* Buttons for like and dislike *}} {{if $item.vote}} {{if $item.vote.like}} -  {{$item.vote.like.1}} +  {{$item.vote.like.1}} {{/if}} {{if $item.vote.like AND $item.vote.dislike}} @@ -293,7 +293,7 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}} {{if $item.vote.dislike}} -  {{$item.vote.dislike.1}} +  {{$item.vote.dislike.1}} {{/if}} {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}} @@ -312,7 +312,7 @@ as the value of $top_child_total (this is done at the end of this file)  •  {{/if}} {{if $item.vote.share}} -  {{$item.vote.share.0}} +  {{$item.vote.share.1}} {{/if}} {{/if}}
    @@ -321,9 +321,9 @@ as the value of $top_child_total (this is done at the end of this file) {{* Event attendance buttons *}} {{if $item.isevent}}
    - {{$item.attend.0}} - {{$item.attend.1}} - {{$item.attend.2}} + {{$item.attend.0}} + {{$item.attend.1}} + {{$item.attend.2}}
    {{/if}} diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 36b621b76..c005e838f 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -1549,8 +1549,16 @@ input#dfrn-url { background-repeat: repeat-x;*/ padding: 5px 5px 0px; height: 32px; - } +.wall-item-tools a { + border-radius: 8px; + padding: 2px; + background-position: center; +} +.wall-item-tools a.active { + background-color: rgba(59, 101, 164, 0.5); +} + .wall-item-author { /* margin-top: 10px;*/ margin-top: 0px; @@ -3896,7 +3904,7 @@ aside input[type='text'] { .icon.like { display: block; width: 26px; height: 28px;/*31 33*/ margin-right: 7px; - background-size: 100% 100%; + background-size: 26px 28px; background-image: url('images/approve.png'); background-repeat: no-repeat; opacity: 0.5; @@ -3904,7 +3912,7 @@ aside input[type='text'] { .icon.link { display: block; width: 22px; height: 24px; - background-size: 100% 100%; + background-size: 22px 24px; background-image: url('images/link.png'); background-repeat: no-repeat; @@ -3913,14 +3921,14 @@ aside input[type='text'] { /*.globe { background-position: 0px -16px;}*/ .icon.globe { display: block; width: 28px; height: 28px; - background-size: 100% 100%; + background-size: 28px 28px; background-image: url('images/globe.png'); background-repeat: no-repeat; } /*.noglobe { background-position: -16px -16px;}*/ .icon.noglobe { display: block; width: 24px; height: 24px; - background-size: 100% 100%; + background-size: 24px 24px; background-image: url('images/noglobe.png'); background-repeat: no-repeat; } @@ -3931,14 +3939,14 @@ aside input[type='text'] { .small-pencil { background-position: -96px -16px;}*/ .icon.pencil { display: block; width: 28px; height: 28px; - background-size: 100% 100%; + background-size: 28px 28px; background-image: url('images/pencil.png'); background-repeat: no-repeat; opacity: 0.5; } .icon.small-pencil { display: block; width: 28px; height: 28px; - background-size: 100% 100%; + background-size: 28px 28px; background-image: url('images/pencil.png'); background-repeat: no-repeat; opacity: 0.5; @@ -3947,7 +3955,7 @@ aside input[type='text'] { .icon.recycle { display: block; width: 28px; height: 27px;/*33 32*/ - background-size: 100% 100%; + background-size: 28px 27px; background-image: url('images/recycle.png'); background-repeat: no-repeat; opacity: 0.5; @@ -3957,7 +3965,7 @@ aside input[type='text'] { /* display: block;*/ display: none; width: 28px; height: 28px; - background-size: 100% 100%; + background-size: 28px 28px; background-image: url('images/remote-link.png'); background-repeat: no-repeat; opacity: 0.5; @@ -3969,7 +3977,7 @@ aside input[type='text'] { .icon.lock { display: block; width: 17px; height: 25px; margin-top: 1px; - background-size: 100% 100%; + background-size: 17px 25px; background-image: url('images/lock.png'); background-repeat: no-repeat; } @@ -3977,7 +3985,7 @@ aside input[type='text'] { .icon.unlock { display: block; width: 17px; height: 28px; margin-top: -2px; - background-size: 100% 100%; + background-size: 17px 28px; background-image: url('images/unlock.png'); background-repeat: no-repeat; } @@ -3987,7 +3995,7 @@ aside input[type='text'] { /*.attach { background-position: -80px -32px; }*/ .icon.attach { display: block; width: 28px; height: 28px; - background-size: 100% 100%; + background-size: 28px 28px; background-image: url('images/paperclip.png'); background-repeat: no-repeat; } @@ -4000,14 +4008,14 @@ aside input[type='text'] { /*.starred { background-position: -16px -48px; }*/ .icon.starred { display: block; width: 28px; height: 28px; - background-size: 100% 100%; + background-size: 28px 28px; background-image: url('images/star-yellow.png'); background-repeat: no-repeat; } /*.unstarred { background-position: -32px -48px; }*/ .icon.unstarred { display: block; width: 28px; height: 28px; - background-size: 100% 100%; + background-size: 28px 28px; background-image: url('images/star.png'); background-repeat: no-repeat; @@ -4016,7 +4024,7 @@ aside input[type='text'] { /*.tagged { background-position: -48px -48px; }*/ .icon.tagged { display: block; width: 28px; height: 28px; - background-size: 100% 100%; + background-size: 28px 28px; background-image: url('images/tag.png'); background-repeat: no-repeat; opacity: 0.5; @@ -4026,7 +4034,7 @@ aside input[type='text'] { .filer-icon { display: block; width: 24px; height: 24px; - background-size: 100% 100%; + background-size: 24px 24px; background-image: url('images/folder.png'); background-repeat: no-repeat; opacity: 0.5; @@ -4034,7 +4042,7 @@ aside input[type='text'] { .event-icon { display: block; width: 33px; height: 33px; - background-size: 100% 100%; + background-size: 33px 33px; background-repeat: no-repeat; opacity: 0.5; } diff --git a/view/theme/frost-mobile/templates/wall_thread.tpl b/view/theme/frost-mobile/templates/wall_thread.tpl index 1223919fa..3a68b2739 100644 --- a/view/theme/frost-mobile/templates/wall_thread.tpl +++ b/view/theme/frost-mobile/templates/wall_thread.tpl @@ -18,7 +18,7 @@
{{$item.wall}}
{{/if}} - {{**}} {{**}} @@ -38,7 +38,7 @@ {{**}}
{{if $item.lock}}{{**}}{{$item.lock}}{{**}} - {{else}}
{{/if}} + {{else}}
{{/if}}
{{$item.location}}
@@ -71,9 +71,9 @@
{{if $item.vote}} -
+
{{**}} {{if $item.responses}} {{foreach $item.responses as $verb=>$response}} diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 82a89f93d..82b5f165e 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -1385,6 +1385,17 @@ input#dfrn-url { cursor: pointer; } +.wall-item-tools a { + border-radius: 4px; + padding: 2px; + background-position: center; + background-size: initial !important; +} + +.wall-item-tools a.active { + background-color: rgba(59, 101, 164, 0.5); +} + .wall-item-share-buttons { margin-left: 10px; margin-right: 10px; @@ -3886,7 +3897,7 @@ aside input[type='text'] { .event-maybeattend-icon { background-image: url('images/event-maybeattend-16.png'); } .event-dontattend-icon { background-image: url('images/event-dontattend-16.png'); } -.filer-icon:hover { +.event-icon:hover { opacity: 1.0; } diff --git a/view/theme/frost/templates/wall_thread.tpl b/view/theme/frost/templates/wall_thread.tpl index ef18d479c..498bab323 100644 --- a/view/theme/frost/templates/wall_thread.tpl +++ b/view/theme/frost/templates/wall_thread.tpl @@ -18,7 +18,7 @@
{{$item.wall}}
{{/if}} - @@ -66,9 +66,9 @@
{{if $item.vote}} -
+
{{**}} {{if $item.responses}} {{foreach $item.responses as $verb=>$response}} diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 53864c12f..0e5c39439 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1210,6 +1210,9 @@ section { .wall-item-container .wall-item-actions-social a { margin-right: 3em; } +.wall-item-container .wall-item-actions-social a.active { + font-weight: bold; +} .wall-item-container .wall-item-actions-tools { float: right; width: 15%; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index e099a31d6..0532bc1ed 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1210,6 +1210,9 @@ section { .wall-item-container .wall-item-actions-social a { margin-right: 3em; } +.wall-item-container .wall-item-actions-social a.active { + font-weight: bold; +} .wall-item-container .wall-item-actions-tools { float: right; width: 15%; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 631b0233d..a982c6e59 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -1210,6 +1210,9 @@ section { .wall-item-container .wall-item-actions-social a { margin-right: 3em; } +.wall-item-container .wall-item-actions-social a.active { + font-weight: bold; +} .wall-item-container .wall-item-actions-tools { float: right; width: 15%; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 5d25b0fb4..25a524043 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -575,7 +575,9 @@ section { a { margin-right: 3em; } } .wall-item-actions-social { float: left; margin-top: 0.5em; - a { margin-right: 3em; } + a { margin-right: 3em; + .active { font-weight: bold;} + } } .wall-item-actions-tools { float: right; width: 15%; a { float: right; } diff --git a/view/theme/quattro/templates/photo_item.tpl b/view/theme/quattro/templates/photo_item.tpl index 12c43eb0b..6dfacdb78 100644 --- a/view/theme/quattro/templates/photo_item.tpl +++ b/view/theme/quattro/templates/photo_item.tpl @@ -6,7 +6,7 @@ {{$name}}
-
{{$location}}
+
{{$location}}
{{if $title}}

{{$title}}

{{/if}} @@ -30,24 +30,24 @@
{{$name}} {{$ago}}
- +
{{if $star}} {{$star.do}} {{$star.undo}} {{$star.tagger}} {{/if}} - + {{if $vote}} - {{$vote.like.1}} - {{$vote.dislike.1}} + {{$vote.like.1}} + {{$vote.dislike.1}} {{/if}} - + {{if $vote.share}} {{$vote.share.1}} - {{/if}} + {{/if}}
- +
{{if $drop.pagedrop}} @@ -60,7 +60,7 @@ {{/if}}
- +
@@ -73,7 +73,7 @@
{{/if}} - - + + diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl index 8c9cf22e9..512df75ef 100644 --- a/view/theme/quattro/templates/search_item.tpl +++ b/view/theme/quattro/templates/search_item.tpl @@ -1,6 +1,6 @@
{{if $item.star}}{{$item.star.starred}}{{/if}} - {{if $item.lock}}{{$item.lock}}{{/if}} + {{if $item.lock}}{{$item.lock}}{{/if}}
@@ -8,7 +8,7 @@
{{$item.name}} @@ -17,9 +17,9 @@ - +
-
{{$item.location}}
+
{{$item.location}}
{{if $item.title}}

{{$item.title}}

{{/if}} @@ -43,24 +43,24 @@
{{$item.name}} {{$item.ago}}
- +
{{if $item.star}} {{$item.star.do}} {{$item.star.undo}} {{$item.star.tagger}} {{/if}} - + {{if $item.vote}} - {{$item.vote.like.1}} - {{$item.vote.dislike.1}} + {{$item.vote.like.1}} + {{$item.vote.dislike.1}} {{/if}} - + {{if $item.vote.share}} {{$item.vote.share.1}} - {{/if}} + {{/if}}
- +
{{if $item.drop.pagedrop}} @@ -73,7 +73,7 @@ {{/if}}
- +
@@ -86,7 +86,7 @@
{{/if}} - - + + diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl index 247bd16c9..2ec43c0ce 100644 --- a/view/theme/quattro/templates/wall_thread.tpl +++ b/view/theme/quattro/templates/wall_thread.tpl @@ -2,12 +2,12 @@ {{else}} {{if $item.comment_firstcollapsed}}
- {{$item.num_comments}} - {{$item.hide_text}} - {{if $item.thread_level==3}} - + {{if $item.thread_level==3}} - expand / @@ -23,7 +23,7 @@
{{if $item.star}}{{$item.star.starred}}{{/if}} - {{if $item.lock}}{{$item.lock}}{{/if}} + {{if $item.lock}}{{$item.lock}}{{/if}}
@@ -31,7 +31,7 @@
{{$item.name}} @@ -40,16 +40,16 @@ - -
+ +
{{if $item.owner_url}} - {{/if}} -
{{$item.location}}
+ {{/if}} +
{{$item.location}}
{{if $item.title}}

{{$item.title}}

{{/if}} @@ -73,7 +73,7 @@ {{$cat.name}}{{if $cat.removeurl}} (x) {{/if}} {{/foreach}}
-
+
{{if $item.plink}}{{$item.plink.title}}{{/if}} @@ -88,7 +88,7 @@ {{if $item.owner_url}}
{{$item.to}} {{$item.owner_name}} {{$item.vwall}} {{/if}}
- +
{{if $item.star}} {{$item.star.do}} @@ -103,28 +103,28 @@ {{/if}} {{if $item.filer}} {{$item.filer}} - {{/if}} - + {{/if}} + {{if $item.vote}} - {{$item.vote.like.1}} + {{$item.vote.like.1}} {{if $item.vote.dislike}} - {{$item.vote.dislike.1}} + {{$item.vote.dislike.1}} {{/if}} {{if $item.vote.share}} {{$item.vote.share.1}} - {{/if}} + {{/if}} {{/if}} {{if $item.isevent}}
- {{$item.attend.0}} - {{$item.attend.1}} - {{$item.attend.2}} + {{$item.attend.0}} + {{$item.attend.1}} + {{$item.attend.2}}
{{/if}} - +
- +
{{if $item.drop.pagedrop}} @@ -137,7 +137,7 @@ {{/if}}
- +
@@ -148,7 +148,7 @@ {{/foreach}} {{/if}}
- + {{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index e38a7ef6d..e91eccfe1 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1586,6 +1586,10 @@ ul .sidebar-group-li .icon { margin-right: 10px; display: inline; } +.wall-item-like-buttons a.self { + background-color: rgba(52, 101, 164, .5); + border-radius: 6px; +} .wall-item-links-wrapper { width: 30px; diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl index 743612054..134052b9f 100644 --- a/view/theme/smoothly/templates/wall_thread.tpl +++ b/view/theme/smoothly/templates/wall_thread.tpl @@ -1,7 +1,7 @@ {{if $item.comment_firstcollapsed}}
- {{$item.num_comments}} + {{$item.num_comments}} {{$item.hide_text}}
{{$item.wall}}
{{/if}} -
@@ -51,7 +51,7 @@
•
-
+
@@ -66,15 +66,15 @@
{{if $item.has_cats}} -
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} - [{{$remove}}] +
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} + [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
{{/if}} {{if $item.has_folders}} -
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} - [{{$remove}}] +
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} + [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
{{/if}} @@ -85,9 +85,9 @@ {{if $item.vote}} {{/if}} - + {{if $item.star}} {{/if}} @@ -111,7 +111,7 @@ {{if $item.filer}} {{/if}} - +
@@ -132,7 +132,7 @@
-
+
{{$item.like}}
{{$item.dislike}}
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index d53c2f393..67bab16a1 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1583,6 +1583,11 @@ section.minimal { margin-right: 1em; cursor: pointer; } +.wall-item-container .wall-item-actions-social a.active, +.wall-item-container .wall-item-actions-isevent a.active { + color: #36C; +} + .wall-item-container .wall-item-actions-tools { float: right; width: 80px; @@ -1638,7 +1643,7 @@ section.minimal { max-width: calc(100% - 1px); } -.children .wall-item-comment-wrapper textarea, +.children .wall-item-comment-wrapper textarea, .wall-item-container.thread_level_3 .wall-item-comment-wrapper textarea, .wall-item-container.thread_level_4 .wall-item-comment-wrapper textarea, .wall-item-container.thread_level_5 .wall-item-comment-wrapper textarea, diff --git a/view/theme/vier/templates/photo_item.tpl b/view/theme/vier/templates/photo_item.tpl index 84783ae30..bc77eaa9c 100644 --- a/view/theme/vier/templates/photo_item.tpl +++ b/view/theme/vier/templates/photo_item.tpl @@ -8,7 +8,7 @@
- {{$name}} + {{$name}} {{if $plink}}{{$ago}}{{else}} {{$ago}} {{/if}} {{if $lock}}{{$lock}} {{/if}} @@ -36,25 +36,25 @@
-
{{$location}} 
- +
{{$location}} 
+
{{if $star}} {{$star.do}} {{$star.undo}} {{$star.tagger}} {{/if}} - + {{if $vote}} - {{$vote.like.1}} - {{$vote.dislike.1}} + {{$vote.like.1}} + {{$vote.dislike.1}} {{/if}} - + {{if $vote.share}} {{$vote.share.1}} - {{/if}} + {{/if}}
- +
{{if $drop.pagedrop}} @@ -67,12 +67,12 @@ {{/if}}
- +
{{$like}}
-
{{$dislike}}
+
{{$dislike}}
diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl index 73e37e561..27ab78af2 100644 --- a/view/theme/vier/templates/search_item.tpl +++ b/view/theme/vier/templates/search_item.tpl @@ -2,7 +2,7 @@
{{if $item.star}}{{$item.star.starred}}{{/if}} - {{if $item.lock}}{{$item.lock}}{{/if}} + {{if $item.lock}}{{$item.lock}}{{/if}}
@@ -10,7 +10,7 @@
- {{$item.name}} @@ -18,11 +18,11 @@ - +
- {{$item.name}} + {{$item.name}} {{if $item.plink}}{{$item.ago}}{{else}} {{$item.ago}} {{/if}} {{if $item.lock}}{{$item.lock}} {{/if}} @@ -50,25 +50,25 @@
-
{{$item.location}} 
- +
{{$item.location}} 
+
{{if $item.star}} {{$item.star.do}} {{$item.star.undo}} {{$item.star.tagger}} {{/if}} - + {{if $item.vote}} - {{$item.vote.like.1}} - {{$item.vote.dislike.1}} + {{$item.vote.like.1}} + {{$item.vote.dislike.1}} {{/if}} - + {{if $item.vote.share}} {{$item.vote.share.1}} - {{/if}} + {{/if}}
- +
{{if $item.drop.pagedrop}} @@ -81,12 +81,12 @@ {{/if}}
- +
{{$item.like}}
-
{{$item.dislike}}
+
{{$item.dislike}}
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl index 1f6032f4a..23adef340 100644 --- a/view/theme/vier/templates/wall_thread.tpl +++ b/view/theme/vier/templates/wall_thread.tpl @@ -2,12 +2,12 @@ {{if $mode == display}} {{else}} {{if $item.comment_firstcollapsed}} - {{if $item.thread_level<3}} + {{if $item.thread_level<3}}
- {{$item.num_comments}} - {{$item.hide_text}}
{{if $item.owner_url}} - {{/if}} + {{/if}}
{{$item.name}} @@ -81,7 +81,7 @@ {{$cat.name}}{{if $cat.removeurl}} (x) {{/if}} {{/foreach}}
- +
{{if $item.plink}}{{$item.plink.orig_title}}{{/if}} @@ -95,16 +95,16 @@ {{/if}} {{if $item.isevent}} - {{$item.attend.0}} - {{$item.attend.1}} - {{$item.attend.2}} + {{$item.attend.0}} + {{$item.attend.1}} + {{$item.attend.2}} {{/if}} {{if $item.vote}} {{if $item.vote.like}} - {{$item.vote.like.0}} + {{$item.vote.like.0}} {{/if}}{{if $item.vote.dislike}} - {{$item.vote.dislike.0}} + {{$item.vote.dislike.0}} {{/if}} {{if $item.vote.share}} {{$item.vote.share.0}} @@ -144,7 +144,7 @@ {{$item.edpost.1}} {{/if}}
- +
@@ -155,9 +155,9 @@
{{$response.output}}
{{/foreach}} {{/if}} - +
- + {{if $item.threaded}}{{if $item.comment}}