mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-21 17:35:17 +00:00
Merge branch 'dev' of /home/macgirvin/roadhouse into dev
This commit is contained in:
commit
d9cae9806b
6 changed files with 15 additions and 8 deletions
|
@ -337,9 +337,9 @@ class ThreadItem {
|
|||
call_hooks('dropdown_extras',$dropdown_extras_arr);
|
||||
$dropdown_extras = $dropdown_extras_arr['dropdown_extras'];
|
||||
|
||||
// Pinned item processing
|
||||
$allowed_type = (in_array($item['item_type'], get_config('system', 'pin_types', [ ITEM_TYPE_POST ])) ? true : false);
|
||||
$pinned_items = ($allowed_type ? get_pconfig($item['uid'], 'pinned', $item['item_type'], []) : []);
|
||||
// Pinned item processing
|
||||
$allowed_type = (in_array($item['item_type'], get_config('system', 'pin_types', [ ITEM_TYPE_POST ])) ? true : false);
|
||||
$pinned_items = ($allowed_type ? get_pconfig($item['uid'], 'pinned', $item['item_type'], []) : []);
|
||||
$pinned = ((! empty($pinned_items) && in_array($item['mid'], $pinned_items)) ? true : false);
|
||||
|
||||
$tmp_item = array(
|
||||
|
@ -430,7 +430,9 @@ class ThreadItem {
|
|||
'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
|
||||
'pinned' => ($pinned ? t('Pinned post') : ''),
|
||||
'pinnable' => (($this->is_toplevel() && local_channel() && $item['owner_xchan'] == $observer['xchan_hash'] && $allowed_type && $item['item_private'] == 0 && $item['item_delayed'] == 0) ? '1' : ''),
|
||||
'pinme' => ($pinned ? t('Unpin this post') : t('Pin this post')),
|
||||
'pinme' => ($pinned ? t('Unpin this post') : t('Pin this post')),
|
||||
'isdraft' => boolval($item['item_unpublished']),
|
||||
'draft_txt' => t('Saved draft'),
|
||||
'bookmark' => (($conv->get_profile_owner() == local_channel() && local_channel() && $has_bookmarks) ? t('Save Bookmarks') : ''),
|
||||
'addtocal' => (($has_event && ! $item['resource_id']) ? t('Add to Calendar') : ''),
|
||||
'drop' => $drop,
|
||||
|
|
2
boot.php
2
boot.php
|
@ -16,7 +16,7 @@ use Zotlabs\Daemon\Run;
|
|||
* @brief This file defines some global constants and includes the central App class.
|
||||
*/
|
||||
|
||||
define ( 'STD_VERSION', '21.03.05' );
|
||||
define ( 'STD_VERSION', '21.03.08' );
|
||||
define ( 'ZOT_REVISION', '6.0' );
|
||||
|
||||
define ( 'DB_UPDATE_VERSION', 1247 );
|
||||
|
|
|
@ -1847,3 +1847,4 @@ dl.bb-dl > dd > li {
|
|||
#channel_role_text {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@
|
|||
</button>
|
||||
{{/if}}
|
||||
{{if $save}}
|
||||
<button class="btn btn-outline-secondary btn-sm" onclick="save_draft_comment({{$id}});return false;" title="{{$save}}">
|
||||
<button class="btn btn-sm {{if $isdraft}} btn-primary{{else}} btn-outline-secondary{{/if}}" onclick="save_draft_comment({{$id}});return false;" title="{{$save}}">
|
||||
<i class="fa fa-floppy-o comment-icon" ></i>
|
||||
</button>
|
||||
{{/if}}
|
||||
|
|
|
@ -38,6 +38,10 @@
|
|||
{{if $item.pinned}}
|
||||
<span class="float-right wall-item-pinned" title="{{$item.pinned}}" id="wall-item-pinned-{{$item.id}}"><i class="fa fa-thumb-tack"> </i></span>
|
||||
{{/if}}
|
||||
{{if $item.isdraft}}
|
||||
<span class="float-right wall-item-draft" title="{{$item.draft_txt}}" id="wall-item-draft-{{$item.id}}"><i class="fa fa-floppy-o"> </i></span>
|
||||
{{/if}}
|
||||
|
||||
<div class="wall-item-info " id="wall-item-info-{{$item.id}}" >
|
||||
<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
|
||||
<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" />
|
||||
|
|
|
@ -217,8 +217,8 @@
|
|||
</button>
|
||||
{{/if}}
|
||||
{{if $save}}
|
||||
<button class="btn btn-outline-secondary btn-sm" onclick="save_draft();return false;" title="{{$save}}">
|
||||
<i class="fa fa-floppy-o jot-icons{{if $is_draft}} btn-success{{/if}}" ></i>
|
||||
<button class="btn btn-sm{{if $is_draft}} btn-primary{{else}} btn-outline-secondary{{/if}}" onclick="save_draft();return false;" title="{{$save}}">
|
||||
<i class="fa fa-floppy-o jot-icons" ></i>
|
||||
</button>
|
||||
{{/if}}
|
||||
{{if $jotnets}}
|
||||
|
|
Loading…
Reference in a new issue