harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continue working on hq

Browse Source
This commit is contained in:
Mario Vavti 2018-01-11 10:58:46 +01:00
parent 61e019e176
commit 25a63dc413
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Zotlabs/Module/Hq.php
View File

@ -51,8 +51,8 @@ class Hq extends \Zotlabs\Web\Controller {
if(! $item_hash) { if(! $item_hash) {
$r = q("SELECT mid FROM item $r = q("SELECT mid FROM item
WHERE uid = %d WHERE uid = %d $item_normal
AND mid = parent_mid AND item_unseen = 1
ORDER BY created DESC LIMIT 1", ORDER BY created DESC LIMIT 1",
intval(local_channel()) intval(local_channel())
); );
@ -135,13 +135,11 @@ class Hq extends \Zotlabs\Web\Controller {
$o = replace_macros(get_markup_template("hq.tpl"), $o = replace_macros(get_markup_template("hq.tpl"),
[ [
'$no_messages' => (($target_item) ? false : true), '$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) { if(! $update && ! $load) {
@ -266,18 +264,15 @@ class Hq extends \Zotlabs\Web\Controller {
} }
if($r) { if($r) {
$parents_str = ids_to_querystr($r,'item_id'); $items = q("SELECT item.*, item.id AS item_id
if($parents_str) { FROM item
$items = q("SELECT item.*, item.id AS item_id WHERE parent = '%s' $item_normal ",
FROM item dbesc($r[0]['item_id'])
WHERE parent IN ( %s ) $item_normal ", );
dbesc($parents_str)
);
xchan_query($items,true,(($sys_item) ? local_channel() : 0)); xchan_query($items,true,(($sys_item) ? local_channel() : 0));
$items = fetch_post_tags($items,true); $items = fetch_post_tags($items,true);
$items = conv_sort($items,'created'); $items = conv_sort($items,'created');
}
} }
else { else {
$items = []; $items = [];

7
view/tpl/hq.tpl
View File

@ -1,9 +1,14 @@
{{if $no_messages}} {{if $no_messages}}
<div class="alert alert-warning alert-dismissible fade show" role="alert"> <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"> <button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
<h3>{{$no_messages_label.0}}</h3>
<br>
{{$no_messages_label.1}}
</div> </div>
{{/if}} {{/if}}
<div id="jot-popup">
{{$editor}}
</div>