mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 09:15:19 +00:00
Merge https://github.com/friendica/red into pending_merge
This commit is contained in:
commit
b886647429
4 changed files with 10 additions and 9 deletions
|
@ -1303,11 +1303,9 @@ function render_location_default($item) {
|
|||
|
||||
|
||||
function prepare_page($item) {
|
||||
|
||||
$a = get_app();
|
||||
$naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0);
|
||||
$observer = $a->get_observer();
|
||||
$zid = ($observer['xchan_addr']);
|
||||
//240 chars is the longest we can have before we start hitting problems with suhosin sites
|
||||
$preview = substr(urlencode($item['body']), 0, 240);
|
||||
$link = z_root() . '/' . $a->cmd;
|
||||
|
@ -1318,8 +1316,7 @@ function prepare_page($item) {
|
|||
}
|
||||
return replace_macros(get_markup_template('page_display.tpl'),array(
|
||||
'$author' => (($naked) ? '' : $item['author']['xchan_name']),
|
||||
'$auth_url' => (($naked) ? '' : $item['author']['xchan_url']),
|
||||
'$zid' => $zid,
|
||||
'$auth_url' => (($naked) ? '' : zid($item['author']['xchan_url'])),
|
||||
'$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')),
|
||||
'$title' => smilies(bbcode($item['title'])),
|
||||
'$body' => prepare_body($item,true),
|
||||
|
|
|
@ -1389,7 +1389,7 @@ brain is weird like that */
|
|||
border:1px solid $acpopup_bordercolour;
|
||||
}
|
||||
.acpopupitem {
|
||||
background-color:$acpopup_bgcolour; padding: 4px;
|
||||
background-color:$acpopup_bgcolour;
|
||||
clear:left;
|
||||
}
|
||||
.acpopupitem.taggable {
|
||||
|
@ -2292,8 +2292,12 @@ blockquote {
|
|||
text-decoration: $input_decohover;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
z-index: 10;
|
||||
.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.btn-preview, .btn-preview:hover, .btn-preview:focus, .btn-preview:active {
|
||||
margin-right: 1px;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 767px) {
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
</button>
|
||||
{{/if}}
|
||||
{{if $preview}}
|
||||
<button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
|
||||
<button class="btn btn-default btn-sm btn-preview" onclick="preview_post();return false;" title="{{$preview}}">
|
||||
<i class="icon-eye-open jot-icons" ></i>
|
||||
</button>
|
||||
{{/if}}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<div class="generic-content-wrapper" id="page-content-wrapper" >
|
||||
<h3 class="page-title">{{$title}}</h3>
|
||||
<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}{{if $zid}}?zid={{$zid}}{{/if}}">{{$author}}</a></div>
|
||||
<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
|
||||
<div class="page-date">{{$date}}</div>
|
||||
<div class="page-body">{{$body}}</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue