Merge branch 'friendika-master'

10 files changed, 65 insertions, 13 deletions

diff --git a/view/de/contact_edit.tpl b/view/de/contact_edit.tpl
index 8455db30c..fcd3f2d66 100644
--- a/view/de/contact_edit.tpl
+++ b/view/de/contact_edit.tpl
@@ -23,6 +23,10 @@
 			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
 		</div>
 		<div id="contact-edit-nav-end"></div>
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
 		<div id="contact-edit-poll-wrapper">
 			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
 			<div id="contact-edit-poll-text">$updpub</div>
@@ -35,8 +39,6 @@ $insecure
 $blocked
 $ignored
 
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
 
 <div id="contact-edit-info-wrapper">
 <h4>Kontaktinformation / Notizen</h4>
diff --git a/view/de/jot.tpl b/view/de/jot.tpl
index 1411b8a7f..f42f37156 100644
--- a/view/de/jot.tpl
+++ b/view/de/jot.tpl
@@ -13,6 +13,11 @@
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 
+<div id="profile-jot-plugin-wrapper" >
+	$jotplugins
+</div>
+<div id="profile-jot-plugin-end"></div>
+
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
 <div id="profile-jot-submit-wrapper" >
diff --git a/view/en/contact_edit.tpl b/view/en/contact_edit.tpl
index 79a7651c1..ea546b784 100644
--- a/view/en/contact_edit.tpl
+++ b/view/en/contact_edit.tpl
@@ -23,6 +23,10 @@
 			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
 		</div>
 		<div id="contact-edit-nav-end"></div>
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
 		<div id="contact-edit-poll-wrapper">
 			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
 			<div id="contact-edit-poll-text">$updpub</div>
@@ -35,9 +39,6 @@ $insecure
 $blocked
 $ignored
 
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
 <div id="contact-edit-info-wrapper">
 <h4>Contact Information / Notes</h4>
 <textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
diff --git a/view/en/jot.tpl b/view/en/jot.tpl
index 6590cace8..de88fb84f 100644
--- a/view/en/jot.tpl
+++ b/view/en/jot.tpl
@@ -15,6 +15,11 @@
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
+<div id="profile-jot-plugin-wrapper" >
+  $jotplugins
+</div>
+<div id="profile-jot-plugin-end"></div>
+
 <div id="profile-jot-submit-wrapper" >
 <input type="submit" id="profile-jot-submit" name="submit" value="Share" />
 	<div id="profile-upload-wrapper" style="display: $visitor;" >
diff --git a/view/fr/contact_edit.tpl b/view/fr/contact_edit.tpl
index 79a7651c1..c7d2d5975 100644
--- a/view/fr/contact_edit.tpl
+++ b/view/fr/contact_edit.tpl
@@ -23,6 +23,11 @@
 			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
 		</div>
 		<div id="contact-edit-nav-end"></div>
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
+
 		<div id="contact-edit-poll-wrapper">
 			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
 			<div id="contact-edit-poll-text">$updpub</div>
@@ -35,8 +40,6 @@ $insecure
 $blocked
 $ignored
 
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
 
 <div id="contact-edit-info-wrapper">
 <h4>Contact Information / Notes</h4>
diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl
index 6590cace8..9a5c58153 100644
--- a/view/fr/jot.tpl
+++ b/view/fr/jot.tpl
@@ -15,6 +15,12 @@
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
+<div id="profile-jot-plugin-wrapper" >
+  $jotplugins
+</div>
+<div id="profile-jot-plugin-end"></div>
+
+
 <div id="profile-jot-submit-wrapper" >
 <input type="submit" id="profile-jot-submit" name="submit" value="Share" />
 	<div id="profile-upload-wrapper" style="display: $visitor;" >
diff --git a/view/it/contact_edit.tpl b/view/it/contact_edit.tpl
index 4432f496a..d4217ba8c 100644
--- a/view/it/contact_edit.tpl
+++ b/view/it/contact_edit.tpl
@@ -23,6 +23,10 @@
 			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
 		</div>
 		<div id="contact-edit-nav-end"></div>
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
 		<div id="contact-edit-poll-wrapper">
 			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
 			<div id="contact-edit-poll-text">$updpub</div>
@@ -35,8 +39,6 @@ $insecure
 $blocked
 $ignored
 
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
 
 <div id="contact-edit-info-wrapper">
 <h4>Informazioni di contatto / Note</h4>
diff --git a/view/it/jot.tpl b/view/it/jot.tpl
index 5aaf9b923..b0c90ddf5 100644
--- a/view/it/jot.tpl
+++ b/view/it/jot.tpl
@@ -15,6 +15,11 @@
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
+<div id="profile-jot-plugin-wrapper" >
+  $jotplugins
+</div>
+<div id="profile-jot-plugin-end"></div>
+
 <div id="profile-jot-submit-wrapper" >
 <input type="submit" id="profile-jot-submit" name="submit" value="Condividi" />
 	<div id="profile-upload-wrapper" style="display: $visitor;" >
@@ -40,6 +45,8 @@
 	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
 </div>
 
+
+
 <div id="profile-jot-end"></div>
 </form>
 </div>
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index fcc9c94a8..6e643d4fe 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -1034,7 +1034,7 @@ input#dfrn-url {
 	margin-left: 110px;
 	margin-top: 10px;
 }
-
+#profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
 	margin-top: 15px;
 }
@@ -1078,7 +1078,9 @@ input#dfrn-url {
 #profile-jot-perms-end {
 	clear: both;
 }
-
+#profile-jot-plugin-end {
+  clear:both;
+}
 #profile-jot-end {
 	clear: both;
 	margin-bottom: 30px;
@@ -2000,3 +2002,10 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
+.tool-wrapper {
+  float: left;
+  margin-left: 5px;
+}
+.tool-link {
+  cursor: pointer;
+}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 1a415db45..1f713f28d 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -810,7 +810,7 @@ input#dfrn-url {
 .wall-item-wrapper {
 	float: left;
     margin-right: 5px;
-    width: 80px;
+    width: 150px;
 }
 .wall-item-lock {
 	height: 20px;
@@ -853,7 +853,7 @@ input#dfrn-url {
 }
 .wall-item-content {
 	float: left;
-	width: 450px;
+	/*width: 450px;*/
 	margin-left: 10px;
 	margin-bottom: 20px;
 	padding: 20px;
@@ -907,6 +907,7 @@ input#dfrn-url {
 	margin: 10px 0px 10px 110px;
 }
 
+#profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
 	margin-top: 15px;
 }
@@ -952,6 +953,9 @@ input#dfrn-url {
 	height: 30px;
 }
 
+#profile-jot-plugin-end{
+  clear: both;
+}
 #profile-jot-end {
 	/*clear: both;*/
 	margin-bottom: 30px;
@@ -1885,3 +1889,11 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
+
+.tool-wrapper {
+  float: left;
+  margin-left: 5px;
+}
+.tool-link {
+  cursor: pointer;
+}