diff options
| -rw-r--r-- | include/conversation.php | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 10 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/page_display.tpl | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/include/conversation.php b/include/conversation.php index 541da1d9b..2d72f3489 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -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), diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c1bf257e1..1846c023b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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) { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c4fdba0f5..2fd24d5ff 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -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}} diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index 9b6b182c8..d8175bdd2 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -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> |