From 0ebce75c7d53d209e47f4549105d27bbf1b5052a Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 1 Mar 2016 13:09:04 +0100
Subject: css fixes to make jot look better with background colors or images

---
 view/tpl/jot.tpl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 32a08a9b3..4f1ecfef2 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,3 +1,10 @@
+{{$mimeselect}}
+{{$layoutselect}}
+{{if $id_select}}
+<div class="channel-id-select-div">
+	<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
+</div>
+{{/if}}
 <div id="profile-jot-wrapper">
 	<form id="profile-jot-form" action="{{$action}}" method="post">
 		{{if $parent}}
@@ -17,13 +24,7 @@
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
 		{{if $showacl}}{{$acl}}{{/if}}
-		{{$mimeselect}}
-		{{$layoutselect}}
-		{{if $id_select}}
-		<div class="channel-id-select-div">
-			<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
-		</div>
-		{{/if}}
+
 		{{if $webpage}}
 		<div id="jot-pagetitle-wrap" class="jothidden">
 			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
-- 
cgit v1.2.3


From 141f3e21b222b0eb5eae4580367c24825a963f5b Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 1 Mar 2016 13:40:19 +0100
Subject: move preview content outside of editor space

---
 view/tpl/jot.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 4f1ecfef2..631f55d83 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -160,10 +160,11 @@
 		</div>
 		<div id="profile-jot-text-loading"></div>
 		<div id="profile-jot-end" class="clear"></div>
-		<div id="jot-preview-content" style="display:none;"></div>
 	</form>
 </div>
 
+<div id="jot-preview-content" style="display:none;"></div>
+
 <!-- Modal for item expiry-->
 <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
   <div class="modal-dialog">
-- 
cgit v1.2.3