From adc932a5e2fc85fc659fe738e4f1316e039e9f00 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 15 Apr 2012 00:40:21 -0400
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: added js for auto-growing comment-textareas
  diabook: theme-settings: add a wide-option
  Another bunch of executable permission removal
  Removed execution permission: lintian warning in Debian packaging

* master:

From d836be1dc3dfee6f969fab0c03094af8b44dd697 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 15 Apr 2012 02:13:36 -0400
Subject: [PATCH 2/2] fix fpostJS, add and fix some other stuff

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/communityhome.tpl | 2 +-
 view/theme/dispy-dark/jot-header.tpl    | 2 +-
 view/theme/dispy-dark/style.css         | 4 ++--
 view/theme/dispy/communityhome.tpl      | 2 +-
 view/theme/dispy/jot-header.tpl         | 2 +-
 view/theme/dispy/style.css              | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
index edabab611..df8bbad7c 100644
--- a/view/theme/dispy-dark/communityhome.tpl
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -39,6 +39,6 @@
 
 <h3 id="postit-header">'PostIt' to Friendica</h3>
 <div id="postit">
-<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
+<a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
 </div>
 
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 44120da40..5838729cc 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -36,7 +36,7 @@ function initEditor(cb) {
 			entity_encoding : "raw",
 			add_unload_trigger : false,
 			remove_linebreaks : false,
-			force_p_newlines : true,
+			force_p_newlines : false,
 			force_br_newlines : true,
 			forced_root_block : '',
 			convert_urls: false,
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index a87317d9b..80e77bfc8 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -2776,8 +2776,8 @@ div[id$="wrapper"] br {
 }
 #pause {
 	position: fixed;
-	bottom: 5px;
-	right: 5px;
+	bottom: 40px;
+	right: 30px;
 }
 .border, .border:hover {
 	border: 1px solid #babdb6;
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index edabab611..df8bbad7c 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -39,6 +39,6 @@
 
 <h3 id="postit-header">'PostIt' to Friendica</h3>
 <div id="postit">
-<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
+<a href="$fpostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
 </div>
 
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 44120da40..5838729cc 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -36,7 +36,7 @@ function initEditor(cb) {
 			entity_encoding : "raw",
 			add_unload_trigger : false,
 			remove_linebreaks : false,
-			force_p_newlines : true,
+			force_p_newlines : false,
 			force_br_newlines : true,
 			forced_root_block : '',
 			convert_urls: false,
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 47e1d1132..92d27a2c8 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -2777,8 +2777,8 @@ div[id$="wrapper"] br {
 }
 #pause {
 	position: fixed;
-	bottom: 5px;
-	right: 5px;
+	bottom: 40px;
+	right: 30px;
 }
 .border, .border:hover {
 	border: 1px solid #babdb6;