mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 03:35:13 +00:00
continue working on hq
This commit is contained in:
parent
61e019e176
commit
25a63dc413
2 changed files with 20 additions and 20 deletions
|
@ -51,8 +51,8 @@ class Hq extends \Zotlabs\Web\Controller {
|
|||
|
||||
if(! $item_hash) {
|
||||
$r = q("SELECT mid FROM item
|
||||
WHERE uid = %d
|
||||
AND mid = parent_mid
|
||||
WHERE uid = %d $item_normal
|
||||
AND item_unseen = 1
|
||||
ORDER BY created DESC LIMIT 1",
|
||||
intval(local_channel())
|
||||
);
|
||||
|
@ -135,13 +135,11 @@ class Hq extends \Zotlabs\Web\Controller {
|
|||
$o = replace_macros(get_markup_template("hq.tpl"),
|
||||
[
|
||||
'$no_messages' => (($target_item) ? false : true),
|
||||
'$no_messages_label' => t('Welcome to hubzilla!')
|
||||
'$no_messages_label' => [ t('Welcome to Hubzilla!'), t('You have got no unseen activity...') ],
|
||||
'$editor' => status_editor($a,$x)
|
||||
]
|
||||
);
|
||||
|
||||
$o = '<div id="jot-popup">';
|
||||
$o .= status_editor($a,$x);
|
||||
$o .= '</div>';
|
||||
|
||||
}
|
||||
|
||||
if(! $update && ! $load) {
|
||||
|
@ -266,23 +264,20 @@ class Hq extends \Zotlabs\Web\Controller {
|
|||
}
|
||||
|
||||
if($r) {
|
||||
$parents_str = ids_to_querystr($r,'item_id');
|
||||
if($parents_str) {
|
||||
$items = q("SELECT item.*, item.id AS item_id
|
||||
FROM item
|
||||
WHERE parent IN ( %s ) $item_normal ",
|
||||
dbesc($parents_str)
|
||||
);
|
||||
$items = q("SELECT item.*, item.id AS item_id
|
||||
FROM item
|
||||
WHERE parent = '%s' $item_normal ",
|
||||
dbesc($r[0]['item_id'])
|
||||
);
|
||||
|
||||
xchan_query($items,true,(($sys_item) ? local_channel() : 0));
|
||||
$items = fetch_post_tags($items,true);
|
||||
$items = conv_sort($items,'created');
|
||||
}
|
||||
xchan_query($items,true,(($sys_item) ? local_channel() : 0));
|
||||
$items = fetch_post_tags($items,true);
|
||||
$items = conv_sort($items,'created');
|
||||
}
|
||||
else {
|
||||
$items = [];
|
||||
}
|
||||
|
||||
|
||||
$o .= conversation($items, 'hq', $update, 'client');
|
||||
|
||||
if($updateable) {
|
||||
|
|
|
@ -1,9 +1,14 @@
|
|||
{{if $no_messages}}
|
||||
<div class="alert alert-warning alert-dismissible fade show" role="alert">
|
||||
{{$no_messages_label}}
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
<h3>{{$no_messages_label.0}}</h3>
|
||||
<br>
|
||||
{{$no_messages_label.1}}
|
||||
</div>
|
||||
{{/if}}
|
||||
<div id="jot-popup">
|
||||
{{$editor}}
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in a new issue