From 59eb3b3351ca38851248aa4b3b072e160dc9555b Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Fri, 18 Apr 2014 12:57:42 +0000
Subject: [PATCH 1/3] Little fix and previous fix on a different place

---
 view/theme/redbasic/css/style.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 39cfcaec3..c43ed5a7e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1386,7 +1386,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 {
@@ -2289,8 +2289,9 @@ 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;
+	z-index: 0;
 }
 
 @media screen and (max-width: 767px) {

From 2ac7fb49b6567f31644da99da5b43fabf09fe067 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Fri, 18 Apr 2014 15:08:16 +0000
Subject: [PATCH 2/3] This should fix the preview allignment permantly.

---
 view/theme/redbasic/css/style.css | 5 ++++-
 view/tpl/jot.tpl                  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c43ed5a7e..74738c537 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2291,7 +2291,10 @@ blockquote {
 
 .btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
     	text-decoration: none;
-	z-index: 0;
+}
+
+.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}}

From 4e0b85267aae6aa8c982b56eb7c17ca2dae17f17 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Fri, 18 Apr 2014 16:34:48 +0100
Subject: [PATCH 3/3] We know why third party zids didn't work now, so don't
 use hacky workarounds anymore.

---
 include/conversation.php  | 5 +----
 view/tpl/page_display.tpl | 2 +-
 2 files changed, 2 insertions(+), 5 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/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>