Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed

5 files changed, 49 insertions, 7 deletions

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/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/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 3351b35a1..7fbeed4fe 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -809,6 +809,8 @@ input#dfrn-url {
 }
 .wall-item-wrapper {
 	float: left;
+    margin-right: 5px;
+    width: 80px;
 }
 .wall-item-lock {
 	height: 20px;
@@ -851,7 +853,7 @@ input#dfrn-url {
 }
 .wall-item-content {
 	float: left;
-	width: 450px;
+	/*width: 450px;*/
 	margin-left: 10px;
 	margin-bottom: 20px;
 	padding: 20px;
@@ -905,6 +907,7 @@ input#dfrn-url {
 	margin: 10px 0px 10px 110px;
 }
 
+#profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
 	margin-top: 15px;
 }
@@ -950,6 +953,9 @@ input#dfrn-url {
 	height: 30px;
 }
 
+#profile-jot-plugin-end{
+  clear: both;
+}
 #profile-jot-end {
 	/*clear: both;*/
 	margin-bottom: 30px;
@@ -1456,8 +1462,9 @@ input#dfrn-url {
 	margin-top: 10px;
 }
 a.mail-list-link {
-	display: block;
-	padding: 4px 5px;
+    display: block;
+    font-size: 1.3em;
+    padding: 4px 0;
 }
 
 /*
@@ -1495,8 +1502,8 @@ a.mail-list-link {
 }
 
 .mail-conv-subject {
-	font-size: 1.1em;
-	margin-top: 10px;
+    font-size: 1.4em;
+    margin: 10px 0;
 }
 
 .mail-conv-outside-wrapper-end {
@@ -1882,3 +1889,11 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
+
+.tool-wrapper {
+  float: left;
+  margin-left: 5px;
+}
+.tool-link {
+  cursor: pointer;
+}