Merge branch 'fabrixxm-master'

diff --git a/view/de/jot.tpl b/view/de/jot.tpl
index d86d8f847027a1784b4ebc21e322497bdf9f9a28..545bbdadd2d553e0c691ed05b5dfd26b2773ed30 100644 (file)
--- a/view/de/jot.tpl
+++ b/view/de/jot.tpl
@@ -13,10 +13,6 @@
                <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>
 
@@ -37,6 +33,12 @@
        <div id="profile-nolocation-wrapper" style="display: none;" >
                <img id="profile-nolocation" src="images/noglobe.gif" alt="Browser Standort leeren" title="Browser Standort leeren" onclick="jotClearLocation();" />
        </div> 
+
+       <div id="profile-jot-plugin-wrapper" >
+       $jotplugins
+       </div>
+
+
        <div id="profile-rotator-wrapper" style="display: $visitor;" >
                <img id="profile-rotator" src="images/rotator.gif" alt="Bitte warten" title="Bitte warten" style="display: none;" />
        </div> 

diff --git a/view/en/jot.tpl b/view/en/jot.tpl
index d2a1014e720c28da47fff40a7b14a4c561fca262..5f99357780d23a92a81caefded93bc45d6a86e18 100644 (file)
--- a/view/en/jot.tpl
+++ b/view/en/jot.tpl
@@ -15,10 +15,6 @@
 
                <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" />
@@ -37,6 +33,10 @@
        <div id="profile-nolocation-wrapper" style="display: none;" >
                <img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
        </div> 
+       <div id="profile-jot-plugin-wrapper">
+       $jotplugins
+       </div>
+
        <div id="profile-rotator-wrapper" style="display: $visitor;" >
                <img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
        </div> 

diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl
index 7c49d771da9c6b0bd92c9b9293a09a4d556adc2a..720cb0d1bcad02117a76f968db6ef9bd97fb9d00 100644 (file)
--- a/view/fr/jot.tpl
+++ b/view/fr/jot.tpl
@@ -15,10 +15,6 @@
 
                <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" >
@@ -38,6 +34,11 @@
        <div id="profile-nolocation-wrapper" style="display: none;" >
                <img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
        </div> 
+
+       <div id="profile-jot-plugin-wrapper" >
+       $jotplugins
+       </div>
+
        <div id="profile-rotator-wrapper" style="display: $visitor;" >
                <img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
        </div> 

diff --git a/view/it/jot.tpl b/view/it/jot.tpl
index 7153c341c702e2850851740eb0f96d508511a89a..eae3ecba8b26b3bf68a2d316009ca5b04e9d51c1 100644 (file)
--- a/view/it/jot.tpl
+++ b/view/it/jot.tpl
@@ -15,10 +15,6 @@
 
                <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" />
@@ -37,6 +33,11 @@
        <div id="profile-nolocation-wrapper" style="display: none;" >
                <img id="profile-nolocation" src="images/noglobe.gif" alt="Cancella la tua posizione data dal browser" title="Cancella la tua posizione data dal browser" onclick="jotClearLocation();" />
        </div> 
+
+       <div id="profile-jot-plugin-wrapper" >
+       $jotplugins
+       </div>
+
        <div id="profile-rotator-wrapper" style="display: $visitor;" >
                <img id="profile-rotator" src="images/rotator.gif" alt="Attendi" title="Attendi" style="display: none;" />
        </div> 

diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index ae45a42449cbf5d4e6c6884525ce938ea51cbd5a..a60ea9db6d12317da0b28bda1c783b81c5824392 100644 (file)
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -2010,7 +2010,7 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 5px;
+  margin-left: 20px;
 }
 .tool-link {
   cursor: pointer;

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index d6a1744a6bbd6ae3ad6df223f9f10259c095290b..d27a894b76291e0e704b5b0847e27fd5ef878111 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1900,8 +1900,9 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 5px;
+  margin-left: 20px;
 }
+
 .tool-link {
   cursor: pointer;
 }