Merge remote-tracking branch 'upstream/2023.03-rc' into remove-media
Michael
commit
453011baa7
|
|
@ -253,6 +253,11 @@ class Page implements ArrayAccess
|
|||
'$touch_icon' => $touch_icon,
|
||||
'$block_public' => intval($config->get('system', 'block_public')),
|
||||
'$stylesheets' => $this->stylesheets,
|
||||
'$likeError' => $l10n->t('Like not successfull'),
|
||||
'$dislikeError' => $l10n->t('Dislike not successfull'),
|
||||
'$announceError' => $l10n->t('Sharing not successfull'),
|
||||
'$srvError' => $l10n->t('Backend error'),
|
||||
'$netError' => $l10n->t('Network error'),
|
||||
]) . $this->page['htmlhead'];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -445,34 +445,28 @@ class System
|
|||
*/
|
||||
public static function getLoadAvg(bool $get_processes = true): array
|
||||
{
|
||||
$load_arr = sys_getloadavg();
|
||||
if (empty($load_arr)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$load = [
|
||||
'average1' => $load_arr[0],
|
||||
'average5' => $load_arr[1],
|
||||
'average15' => $load_arr[2],
|
||||
'runnable' => 0,
|
||||
'scheduled' => 0
|
||||
];
|
||||
|
||||
if ($get_processes && @is_readable('/proc/loadavg')) {
|
||||
$content = @file_get_contents('/proc/loadavg');
|
||||
if (empty($content)) {
|
||||
$content = shell_exec('uptime | sed "s/.*averages*: //" | sed "s/,//g"');
|
||||
if (!empty($content) && preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
|
||||
$load['runnable'] = (float)$matches[4];
|
||||
$load['scheduled'] = (float)$matches[5];
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($content) || !preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
|
||||
$load_arr = sys_getloadavg();
|
||||
if (empty($load_arr)) {
|
||||
return [];
|
||||
}
|
||||
return [
|
||||
'average1' => $load_arr[0],
|
||||
'average5' => $load_arr[1],
|
||||
'average15' => $load_arr[2],
|
||||
'runnable' => 0,
|
||||
'scheduled' => 0
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'average1' => (float)$matches[1],
|
||||
'average5' => (float)$matches[2],
|
||||
'average15' => (float)$matches[3],
|
||||
'runnable' => (float)$matches[4],
|
||||
'scheduled' => (float)$matches[5]
|
||||
];
|
||||
return $load;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -662,16 +662,24 @@ class Worker
|
|||
DBA::close($r);
|
||||
}
|
||||
|
||||
$stamp = (float)microtime(true);
|
||||
$used = 0;
|
||||
$sleep = 0;
|
||||
$data = DBA::p("SHOW PROCESSLIST");
|
||||
while ($row = DBA::fetch($data)) {
|
||||
if ($row['Command'] != 'Sleep') {
|
||||
++$used;
|
||||
} else {
|
||||
++$sleep;
|
||||
}
|
||||
}
|
||||
DBA::close($data);
|
||||
self::$db_duration += (microtime(true) - $stamp);
|
||||
|
||||
// If $max is set we will use the processlist to determine the current number of connections
|
||||
// The processlist only shows entries of the current user
|
||||
if ($max != 0) {
|
||||
$stamp = (float)microtime(true);
|
||||
$r = DBA::p('SHOW PROCESSLIST');
|
||||
self::$db_duration += (microtime(true) - $stamp);
|
||||
$used = DBA::numRows($r);
|
||||
DBA::close($r);
|
||||
|
||||
Logger::info('Connection usage (user values)', ['usage' => $used, 'max' => $max]);
|
||||
Logger::info('Connection usage (user values)', ['working' => $used, 'sleeping' => $sleep, 'max' => $max]);
|
||||
|
||||
$level = ($used / $max) * 100;
|
||||
|
||||
|
|
@ -695,11 +703,11 @@ class Worker
|
|||
if (!DBA::isResult($r)) {
|
||||
return false;
|
||||
}
|
||||
$used = intval($r['Value']);
|
||||
$used = max($used, intval($r['Value'])) - $sleep;
|
||||
if ($used == 0) {
|
||||
return false;
|
||||
}
|
||||
Logger::info('Connection usage (system values)', ['used' => $used, 'max' => $max]);
|
||||
Logger::info('Connection usage (system values)', ['working' => $used, 'sleeping' => $sleep, 'max' => $max]);
|
||||
|
||||
$level = $used / $max * 100;
|
||||
|
||||
|
|
|
|||
|
|
@ -673,7 +673,27 @@ msgid ""
|
|||
"notifications."
|
||||
msgstr ""
|
||||
|
||||
#: src/App/Page.php:320
|
||||
#: src/App/Page.php:256
|
||||
msgid "Like not successfull"
|
||||
msgstr ""
|
||||
|
||||
#: src/App/Page.php:257
|
||||
msgid "Dislike not successfull"
|
||||
msgstr ""
|
||||
|
||||
#: src/App/Page.php:258
|
||||
msgid "Sharing not successfull"
|
||||
msgstr ""
|
||||
|
||||
#: src/App/Page.php:259
|
||||
msgid "Backend error"
|
||||
msgstr ""
|
||||
|
||||
#: src/App/Page.php:260
|
||||
msgid "Network error"
|
||||
msgstr ""
|
||||
|
||||
#: src/App/Page.php:325
|
||||
msgid "toggle mobile"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -764,12 +764,95 @@ function htmlToText(htmlString) {
|
|||
* @param {boolean} un Whether to perform an activity removal instead of creation
|
||||
*/
|
||||
function doActivityItemAction(ident, verb, un) {
|
||||
if (verb.indexOf("attend") === 0) {
|
||||
$(".item-" + ident + " .button-event:not(#" + verb + "-" + ident + ")").removeClass("active");
|
||||
_verb = un ? 'un' + verb : verb;
|
||||
var thumbsClass = '';
|
||||
switch (verb) {
|
||||
case 'like':
|
||||
thumbsClass = 'fa-thumbs-up';
|
||||
break;
|
||||
case 'dislike':
|
||||
thumbsClass = 'fa-thumbs-down';
|
||||
break;
|
||||
case 'announce':
|
||||
thumbsClass = 'fa-retweet';
|
||||
}
|
||||
$("#" + verb + "-" + ident).toggleClass("active");
|
||||
|
||||
doActivityItem(ident, verb, un);
|
||||
if (verb.indexOf('announce') === 0 ) {
|
||||
// Share-Button(s)
|
||||
// remove share-symbol, to replace it by rotator
|
||||
$('button[id^=shareMenuOptions-' + ident.toString() + '] i:first-child').removeClass('fa-share');
|
||||
$('button[id^=announce-' + ident.toString() + '] i:first-child').removeClass('fa-retweet');
|
||||
// avoid multiple rotators on like/share-button if klicked multiple times.
|
||||
if ($('img[id^=waitfor-' + verb + '-' + ident.toString() + ']').length == 0) {
|
||||
// append rotator to the shareMenu-button for small media
|
||||
$('<img>')
|
||||
.attr({id: 'waitfor-' + verb + '-' + ident.toString(), src: 'images/rotator.gif'})
|
||||
.addClass('fa')
|
||||
.appendTo($('button[id^=shareMenuOptions-' + ident.toString() + '] i:first-child' ));
|
||||
}
|
||||
}
|
||||
$('button[id^=' + verb + '-' + ident.toString() + '] i:first-child').removeClass(thumbsClass);
|
||||
// if verb is announce, then one rotator is added above to the shareMedia-dropdown button
|
||||
if ($('button:not(button.dropdown-toggle) img#waitfor-' + verb + '-' + ident.toString()).length == 0) {
|
||||
$('<img>')
|
||||
.attr({id: 'waitfor-' + verb + '-' + ident.toString(), src: 'images/rotator.gif'})
|
||||
.addClass('fa')
|
||||
.appendTo($('button[id^=' + verb + '-' + ident.toString() + '] i:first-child'));
|
||||
}
|
||||
$.post('item/' + ident.toString() + '/activity/' + _verb)
|
||||
.success(function(data){
|
||||
$('img[id^=waitfor-' + verb + '-' + ident.toString() + ']').remove();
|
||||
if (data.status == 'ok') {
|
||||
if (data.verb == 'un' + verb) {
|
||||
// like/dislike buttons
|
||||
$('button[id^=' + verb + '-' + ident.toString() + ']' )
|
||||
.removeClass('active')
|
||||
.attr('onclick', 'doActivityItemAction(' + ident +', "' + verb + '",false )');
|
||||
// link in share-menu
|
||||
$('a[id^=' + verb + '-' + ident.toString() + ']' )
|
||||
.removeClass('active')
|
||||
.attr('href', 'javascript:doActivityItemAction(' + ident +', "' + verb + '",false )');
|
||||
$('a[id^=' + verb + '-' + ident.toString() + '] i:first-child' ).addClass('fa-retweet').removeClass('fa-ban');
|
||||
} else {
|
||||
// like/dislike buttons
|
||||
$('button[id^=' + verb + '-' + ident.toString() + ']' )
|
||||
.addClass('active')
|
||||
.attr('onclick', 'doActivityItemAction(' + ident + ', "' + verb + '", true )');
|
||||
// link in share-menu
|
||||
$('a[id^=' + verb + '-' + ident.toString() + ']' )
|
||||
.addClass('active')
|
||||
.attr('href', 'javascript:doActivityItemAction(' + ident + ', "' + verb + '", true )');
|
||||
$('a[id^=' + verb + '-' + ident.toString() + '] i:first-child' ).removeClass('fa-retweet').addClass('fa-ban');
|
||||
}
|
||||
$('button[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass).show();
|
||||
if (verb.indexOf('announce') === 0 ) {
|
||||
// ShareMenuButton
|
||||
$('button[id^=shareMenuOptions-' + ident.toString() + '] i:first-child').addClass('fa-share');
|
||||
if (data.verb == 'un' + verb) {
|
||||
$('button[id^=shareMenuOptions-' + ident.toString() + ']').removeClass('active');
|
||||
} else {
|
||||
$('button[id^=shareMenuOptions-' + ident.toString() + ']').addClass('active');
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* server-response was not ok. Database-problems or some changes in
|
||||
* data?
|
||||
* reset all buttons
|
||||
*/
|
||||
$('img[id^=waitfor-' + verb + '-' + ident.toString() + ']').remove();
|
||||
$('button[id^=shareMenuOptions-' + ident.toString() + '] i:first-child').addClass('fa-share');
|
||||
$('button[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
|
||||
$('a[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
|
||||
$.jGrowl(aActErr[verb] + '<br>(' + aErrType['srvErr'] + ')', {sticky: false, theme: 'info', life: 5000});
|
||||
}
|
||||
})
|
||||
.error(function(data){
|
||||
// Server could not be reached successfully
|
||||
$('img[id^=waitfor-' + verb + '-' + ident.toString() + ']').remove();
|
||||
$('button[id^=shareMenuOptions-' + ident.toString() + '] i:first-child').addClass('fa-share');
|
||||
$('button[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
|
||||
$('a[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
|
||||
$.jGrowl(aActErr[verb] + '<br>(' + aErrType['netErr'] + ')', {sticky: false, theme: 'info', life: 5000});
|
||||
});
|
||||
}
|
||||
|
||||
// Decodes a hexadecimally encoded binary string
|
||||
|
|
|
|||
|
|
@ -10,4 +10,13 @@ They are loaded into the html <head> so that js functions can use them *}}
|
|||
'blockAuthor' : "{{$blockAuthor|escape:'javascript' nofilter}}",
|
||||
'ignoreAuthor' : "{{$ignoreAuthor|escape:'javascript' nofilter}}",
|
||||
};
|
||||
var aActErr = {
|
||||
'like' : "{{$likeError}}",
|
||||
'dislike' : "{{$dislikeError}}",
|
||||
'announce' : "{{$announceError}}",
|
||||
};
|
||||
var aErrType = {
|
||||
'srvErr' : "{{$srvError}}",
|
||||
'netErr' : "{{$netError}}",
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
<button type="button"
|
||||
class="btn-link button-likes{{if $responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$id}}"
|
||||
title="{{$like_title}}"
|
||||
onclick="doActivityItemAction({{$id}}, 'like'{{if $responses.like.self}}, true{{/if}});"
|
||||
data-toggle="button">
|
||||
onclick="doActivityItemAction({{$id}}, 'like'{{if $responses.like.self}}, true{{/if}});">
|
||||
<i class="fa fa-thumbs-up" aria-hidden="true"></i> {{$like}}
|
||||
</button>
|
||||
{{if !$hide_dislike}}
|
||||
|
|
@ -13,9 +12,8 @@
|
|||
class="btn-link button-likes{{if $responses.dislike.self}} active" aria-pressed="true{{/if}}"
|
||||
id="dislike-{{$id}}"
|
||||
title="{{$dislike_title}}"
|
||||
onclick="doActivityItemAction({{$id}}, 'dislike'{{if $responses.dislike.self}}, true{{/if}});"
|
||||
data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i> {{$dislike}}
|
||||
onclick="doActivityItemAction({{$id}}, 'dislike'{{if $responses.dislike.self}}, true{{/if}});">
|
||||
<i class="fa fa-thumbs-down" aria-hidden="true"></i> {{$dislike}}
|
||||
</button>
|
||||
{{/if}}
|
||||
<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -280,18 +280,18 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
<!-- <hr /> -->
|
||||
<div class="wall-item-actions">
|
||||
{{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
|
||||
<span class="wall-item-actions-left hidden-xs">
|
||||
<span class="wall-item-actions-left hidden-xs">
|
||||
|
||||
{{* Buttons for like and dislike *}}
|
||||
{{if $item.vote}}
|
||||
{{if $item.vote.like}}
|
||||
<button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});" data-toggle="button"><i class="fa fa-thumbs-up" aria-hidden="true"></i> {{$item.vote.like.1}}</button>
|
||||
<button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});" ><i class="fa fa-thumbs-up" aria-hidden="true"></i> {{$item.vote.like.1}}</button>
|
||||
{{/if}}
|
||||
{{if $item.vote.like AND $item.vote.dislike}}
|
||||
<span role="presentation" class="separator"></span>
|
||||
{{/if}}
|
||||
{{if $item.vote.dislike}}
|
||||
<button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i> {{$item.vote.dislike.1}}</button>
|
||||
<button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" ><i class="fa fa-thumbs-down" aria-hidden="true"></i> {{$item.vote.dislike.1}}</button>
|
||||
{{/if}}
|
||||
|
||||
{{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}}
|
||||
|
|
@ -316,7 +316,7 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
{{/if}}
|
||||
{{/if}}
|
||||
{{if $item.vote.announce}}
|
||||
<button type="button" class="btn-link button-announces{{if $item.responses.announce.self}} active" aria-pressed="true{{/if}}" id="announce-{{$item.id}}" title="{{$item.vote.announce.0}}" onclick="doActivityItemAction({{$item.id}}, 'announce'{{if $item.responses.announce.self}}, true{{/if}});" data-toggle="button"><i class="fa fa-retweet" aria-hidden="true"></i> {{$item.vote.announce.1}}</button>
|
||||
<button type="button" class="btn-link button-announces{{if $item.responses.announce.self}} active" aria-pressed="true{{/if}}" id="announce-{{$item.id}}" title="{{$item.vote.announce.0}}" onclick="doActivityItemAction({{$item.id}}, 'announce'{{if $item.responses.announce.self}}, true{{/if}});" ><i class="fa fa-retweet" aria-hidden="true"></i> {{$item.vote.announce.1}}</button>
|
||||
<span role="presentation" class="separator"></span>
|
||||
{{/if}}
|
||||
{{if $item.vote.share}}
|
||||
|
|
@ -325,98 +325,92 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
{{/if}}
|
||||
|
||||
{{* Put additional actions in a dropdown menu *}}
|
||||
{{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || ($item.drop && $item.drop.dropping) || $item.browsershare)}}
|
||||
<span role="presentation" class="separator"></span>
|
||||
<span class="more-links btn-group{{if $item.thread_level > 1}} dropup{{/if}}">
|
||||
<button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i> {{$item.menu}}</button>
|
||||
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenuOptions-{{$item.id}}">
|
||||
{{if $item.edpost}} {{* edit the posting *}}
|
||||
<li role="menuitem">
|
||||
<a href="javascript:editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
<button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i> {{$item.menu}}</button>
|
||||
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenuOptions-{{$item.id}}">
|
||||
{{if $item.edpost}} {{* edit the posting *}}
|
||||
<li role="menuitem">
|
||||
<a href="javascript:editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.tagger}} {{* tag the post *}}
|
||||
<li role="menuitem">
|
||||
<a id="tagger-{{$item.id}}" href="javascript:itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.tagger}} {{* tag the post *}}
|
||||
<li role="menuitem">
|
||||
<a id="tagger-{{$item.id}}" href="javascript:itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.filer}}
|
||||
<li role="menuitem">
|
||||
<a id="filer-{{$item.id}}" href="javascript:itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder" aria-hidden="true"></i> {{$item.filer}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.filer}}
|
||||
<li role="menuitem">
|
||||
<a id="filer-{{$item.id}}" href="javascript:itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder" aria-hidden="true"></i> {{$item.filer}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.pin}}
|
||||
<li role="menuitem">
|
||||
<a id="pin-{{$item.id}}" href="javascript:doPin({{$item.id}});" class="btn-link {{$item.pin.classdo}}" title="{{$item.pin.do}}"><i class="fa fa-circle-o" aria-hidden="true"></i> {{$item.pin.do}}</a>
|
||||
<a id="unpin-{{$item.id}}" href="javascript:doPin({{$item.id}});" class="btn-link {{$item.pin.classundo}}" title="{{$item.pin.undo}}"><i class="fa fa-dot-circle-o" aria-hidden="true"></i> {{$item.pin.undo}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.pin}}
|
||||
<li role="menuitem">
|
||||
<a id="pin-{{$item.id}}" href="javascript:doPin({{$item.id}});" class="btn-link {{$item.pin.classdo}}" title="{{$item.pin.do}}"><i class="fa fa-circle-o" aria-hidden="true"></i> {{$item.pin.do}}</a>
|
||||
<a id="unpin-{{$item.id}}" href="javascript:doPin({{$item.id}});" class="btn-link {{$item.pin.classundo}}" title="{{$item.pin.undo}}"><i class="fa fa-dot-circle-o" aria-hidden="true"></i> {{$item.pin.undo}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.star}}
|
||||
<li role="menuitem">
|
||||
<a id="star-{{$item.id}}" href="javascript:doStar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i> {{$item.star.do}}</a>
|
||||
<a id="unstar-{{$item.id}}" href="javascript:doStar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star" aria-hidden="true"></i> {{$item.star.undo}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.star}}
|
||||
<li role="menuitem">
|
||||
<a id="star-{{$item.id}}" href="javascript:doStar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i> {{$item.star.do}}</a>
|
||||
<a id="unstar-{{$item.id}}" href="javascript:doStar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star" aria-hidden="true"></i> {{$item.star.undo}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.follow_thread}}
|
||||
<li role="menuitem">
|
||||
<a id="follow_thread-{{$item.id}}" href="javascript:{{$item.follow_thread.action}}" class="btn-link" title="{{$item.follow_thread.title}}"><i class="fa fa-plus" aria-hidden="true"></i> {{$item.follow_thread.title}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.follow_thread}}
|
||||
<li role="menuitem">
|
||||
<a id="follow_thread-{{$item.id}}" href="javascript:{{$item.follow_thread.action}}" class="btn-link" title="{{$item.follow_thread.title}}"><i class="fa fa-plus" aria-hidden="true"></i> {{$item.follow_thread.title}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.language}}
|
||||
<li role="menuitem">
|
||||
<a id="language-{{$item.id}}" href="javascript:alert('{{$item.language.1}}');" class="btn-link filer-item language-icon" title="{{$item.language.0}}"><i class="fa fa-language" aria-hidden="true"></i> {{$item.language.0}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.language}}
|
||||
<li role="menuitem">
|
||||
<a id="language-{{$item.id}}" href="javascript:alert('{{$item.language.1}}');" class="btn-link filer-item language-icon" title="{{$item.language.0}}"><i class="fa fa-language" aria-hidden="true"></i> {{$item.language.0}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.browsershare}}
|
||||
<li role="menuitem" class="button-browser-share">
|
||||
<a id="browser-share-{{$item.id}}" href="javascript:navigator.share({url: '{{$item.plink.orig}}'})" class="btn-link button-browser-share" title="{{$item.browsershare.1}}"><i class="fa fa-share-alt" aria-hidden="true"></i> {{$item.browsershare.0}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.browsershare}}
|
||||
<li role="menuitem" class="button-browser-share">
|
||||
<a id="browser-share-{{$item.id}}" href="javascript:navigator.share({url: '{{$item.plink.orig}}'})" class="btn-link button-browser-share" title="{{$item.browsershare.1}}"><i class="fa fa-share-alt" aria-hidden="true"></i> {{$item.browsershare.0}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || ($item.drop && $item.drop.dropping))}}
|
||||
<li role="separator" class="divider"></li>
|
||||
{{/if}}
|
||||
{{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || ($item.drop && $item.drop.dropping))}}
|
||||
<li role="separator" class="divider"></li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.ignore}}
|
||||
<li role="menuitem">
|
||||
<a id="ignore-{{$item.id}}" href="javascript:doIgnoreThread({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{$item.ignore.do}}</a>
|
||||
</li>
|
||||
<li role="menuitem">
|
||||
<a id="unignore-{{$item.id}}" href="javascript:doIgnoreThread({{$item.id}});" class="btn-link {{$item.ignore.classundo}}" title="{{$item.ignore.undo}}"><i class="fa fa-eye" aria-hidden="true"></i> {{$item.ignore.undo}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.ignore}}
|
||||
<li role="menuitem">
|
||||
<a id="ignore-{{$item.id}}" href="javascript:doIgnoreThread({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{$item.ignore.do}}</a>
|
||||
</li>
|
||||
<li role="menuitem">
|
||||
<a id="unignore-{{$item.id}}" href="javascript:doIgnoreThread({{$item.id}});" class="btn-link {{$item.ignore.classundo}}" title="{{$item.ignore.undo}}"><i class="fa fa-eye" aria-hidden="true"></i> {{$item.ignore.undo}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.drop && $item.drop.dropping}}
|
||||
<li role="menuitem">
|
||||
<a class="btn-link navicon delete" href="javascript:dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.drop && $item.drop.dropping}}
|
||||
<li role="menuitem">
|
||||
<a class="btn-link navicon delete" href="javascript:dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.block}}
|
||||
<li role="menuitem">
|
||||
<a class="btn-link navicon block" href="javascript:blockAuthor('item/block/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.block.block}}"><i class="fa fa-ban" aria-hidden="true"></i> {{$item.block.block}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.ignore_author}}
|
||||
<li role="menuitem">
|
||||
<a class="btn-link navicon ignore" href="javascript:ignoreAuthor('item/ignore/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.ignore_author.ignore}}"><i class="fa fa-ban" aria-hidden="true"></i> {{$item.ignore_author.ignore}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
|
||||
</span>
|
||||
{{else}}
|
||||
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
|
||||
{{/if}}
|
||||
|
||||
</span>
|
||||
{{if $item.block}}
|
||||
<li role="menuitem">
|
||||
<a class="btn-link navicon block" href="javascript:blockAuthor('item/block/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.block.block}}"><i class="fa fa-ban" aria-hidden="true"></i> {{$item.block.block}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{if $item.ignore_author}}
|
||||
<li role="menuitem">
|
||||
<a class="btn-link navicon ignore" href="javascript:ignoreAuthor('item/ignore/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.ignore_author.ignore}}"><i class="fa fa-ban" aria-hidden="true"></i> {{$item.ignore_author.ignore}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
<span class="wall-item-actions-right hidden-xs">
|
||||
{{* Event attendance buttons *}}
|
||||
|
|
@ -441,10 +435,10 @@ 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}}
|
||||
<button type="button" class="btn button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});" data-toggle="button"><i class="fa fa-thumbs-up" aria-hidden="true"></i></button>
|
||||
<button type="button" class="btn button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});" ><i class="fa fa-thumbs-up" aria-hidden="true"></i></button>
|
||||
{{/if}}
|
||||
{{if $item.vote.dislike}}
|
||||
<button type="button" class="btn button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i></button>
|
||||
<button type="button" class="btn button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});" ><i class="fa fa-thumbs-down" aria-hidden="true"></i></button>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
|
|
@ -491,7 +485,6 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
{{/if}}
|
||||
|
||||
{{* Put additional actions in a dropdown menu *}}
|
||||
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
|
||||
|
||||
{{* Event attendance buttons *}}
|
||||
{{if $item.isevent}}
|
||||
|
|
@ -569,7 +562,6 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
</li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
|
||||
</div>
|
||||
{{/if}}
|
||||
<span class="pull-right checkbox">
|
||||
|
|
|
|||
Loading…
Reference in New Issue