From 15d310e4c3dbc7fade7553ff4de6baf616e261b3 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 7 Mar 2012 12:35:04 -0500
Subject: [PATCH 2/2] fix jot.tpl buttons. fix up subsequent styling breakage

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/jot.tpl   | 65 +++++++++++++++++++++++--------------
 view/theme/dispy/style.css | 66 ++++++++++++++++++++------------------
 2 files changed, 75 insertions(+), 56 deletions(-)

diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index e34a218031..94c31da23b 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -15,41 +15,58 @@
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
 		</textarea>
 
-		<div id="jot-tools" class="jothidden" style="display:none">
-			<span class="icon border camera"><a href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></span>
-			<span class="icon border attach"><a href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></span>
-			<span class="icon border link"><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a></span>
-			<span class="icon border video"><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo"></a></span>
-			<span class="icon border audio"><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a></span>
-			<span class="icon border globe"><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a></span>
-			<span class="icon border noglobe"><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a></span>
-			$jotplugins
-			<ul id="profile-jot-submit-wrapper">
-				<li id="profile-jot-perms" class="profile-jot-perms">
-					<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
-				</li>
-				<li><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
-				<li>
-					<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
-				</li>
-			</ul>
-			<span id="profile-rotator" class="loading" style="display: none">
-				<img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
+
+<div id="jot-tools" class="jothidden" style="display:none">
+	<div id="profile-jot-submit-wrapper" class="jothidden">
+
+		<div id="profile-upload-wrapper" style="display: $visitor;">
+			<div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
 		</div>
+		<div id="profile-attach-wrapper" style="display: $visitor;">
+			<div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
+		</div>
+		<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
+			<a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
+		</div>
+		<div id="profile-video-wrapper" style="display: $visitor;">
+			<a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
+		</div>
+		<div id="profile-audio-wrapper" style="display: $visitor;">
+			<a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
+		</div>
+		<div id="profile-location-wrapper" style="display: $visitor;">
+			<a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
+		</div>
+		<div id="profile-nolocation-wrapper" style="display: none;">
+			<a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
+		</div>
+
+		<div id="profile-jot-plugin-wrapper">
+		$jotplugins
+		</div>
+
+	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
+	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+	<div id="profile-jot-perms" class="profile-jot-perms">
+		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
 	</div>
+	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
+	</div>
+
+	</div> <!-- /#profile-jot-submit-wrapper -->
+</div> <!-- /#jot-tools -->
 	
 	<div id="jot-preview-content" style="display:none;"></div>
-
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
 			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<hr style="clear:both" />
+			<div id="profile-jot-email-label">$emailcc</div>
+			<input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
 			<div id="profile-jot-email-end"></div>
 			$jotnets
 		</div>
 	</div>
 
 </form>
-
 {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 558290c2fc..472fd875c7 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -143,7 +143,10 @@ a:hover {
 }
 .required {
     display: inline;
-    color: #ff0000;
+    color: #ff0;
+    font-size: 16px;
+    font-weight: bold;
+    margin: 3px;
 }
 .fakelink, .lockview {
     color: #3465a4;
@@ -613,7 +616,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 aside {
     position: absolute;
     right: 15px;
-    width: 230px;
+    width: 245px;
+	padding-top: 15px;
     font-size: smaller;
 }
 .vcard .fn {
@@ -687,7 +691,7 @@ aside #viewcontacts {
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
-  height: 40px;
+  height: 35px;
   overflow: none;
   width: 100%;
   /*background-color: #0e232e;*/
@@ -757,23 +761,21 @@ aside #viewcontacts {
     margin-top: 10px;
 }
 #jot #jot-title {
-	border: 1px solid #aaa;
+	border: 1px solid #ccc;
     margin: 0 0 5px;
     height: 20px;
     width: 90%;
     font-weight: bold;
     border-radius: 5px;
 	vertical-align: middle;
-	padding: 5px 1px;
 }
 #jot #character-counter {
-  width: 40px;
-  float: right;
-  text-align: right;
-  height: 20px;
-  line-height: 20px;
-  padding: 5px;
-  margin: 0 0 5px;
+	width: 6%;
+	float: right;
+	text-align: right;
+	height: 15px;
+	line-height: 20px;
+	padding: 2px 20px 5px 0;
 }
 #profile-jot-text_tbl {
 	margin-bottom: 10px;
@@ -782,15 +784,15 @@ aside #viewcontacts {
 	width:99.900002% !important;
 }
 #profile-attach-wrapper,
-#profile-audio,
+#profile-audio-wrapper,
 #profile-link-wrapper,
-#profile-location,
-#profile-nolocation,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
 #profile-title-wrapper,
 #profile-upload-wrapper,
-#profile-video {
+#profile-video-wrapper {
     float: left;
-    margin-left: 10px;
+	margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
 	float: right; 
@@ -821,9 +823,10 @@ aside #viewcontacts {
 	padding: 5px;
 }
 #jot-preview-link {
-    margin: 0 0 0 25px;
+    margin: 0 0 0 10px;
     border: 0;
     text-decoration: none;
+	float: right;
 }
 .icon-text-preview {
 	margin: 0 0 -18px 0;
@@ -833,9 +836,10 @@ aside #viewcontacts {
     background: url(icons.png) no-repeat -128px -40px;
     border: 0;
     text-decoration: none;
+	float: right;
 }
 #profile-jot-perms { 
-	/*float: right;*/
+	float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
@@ -846,17 +850,18 @@ aside #viewcontacts {
     border: 0px;
     margin: 0 -4px 0 10px;
 }
+#profile-jot-plugin-wrapper {
+	width: 1px;
+	margin: 10px 0 0 0;
+	float: right;
+}
 #profile-jot-submit-wrapper {
 	float: right;
-	width: 30%;
+	width: 100%;
 	list-style: none;
 	margin: 10px 0 0 0;
 	padding: 0;
 }
-#profile-jot-submit-wrapper li {
-	display: inline-block;
-	vertical-align: middle;
-}
 #profile-jot-submit {
 	height: 22px;
 	background-color: #555753;
@@ -866,6 +871,7 @@ aside #viewcontacts {
 	border-radius: 0 5px 5px 0;
 	border: 0;
 	margin: 0;
+	float: right;
 }
 #jot-perms-icons {
 	background-color: #555753;
@@ -951,7 +957,7 @@ aside #viewcontacts {
 section {
     margin: 20px 6% 0 4%;
     font-size: 0.8em;
-    padding-right: 220px;
+    padding-right: 230px;
 	min-width: 475px;
 }
 
@@ -1726,11 +1732,10 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-    margin-top: 0px;
+    margin: 5px 2px 0 0;
 }
 .profile-edit-side-link {
     float: right;
-    margin: 0px 20px -18px 0;
 }
 .profile-listing {
     float: left;
@@ -2119,8 +2124,6 @@ div[id$="wrapper"] br {
 }
 .field textarea {
     width: 80%;
-}
-.field textarea {
     height: 100px;
 }
 .field_help {
@@ -2152,7 +2155,6 @@ div[id$="wrapper"] br {
 .hidden {
     display:none !important;
 }
-
 .field.radio .field_help {
     margin-left: 0;
 }
@@ -2280,12 +2282,12 @@ div[id$="wrapper"] br {
 .icon.drophide, .icon.delete {
     float: left;
 }
-.icon.s22 {
+/*.icon.s22 {
 	display: block;
 	background: url(icons.png) no-repeat;
 	width: 22px;
 	height: 22px;
-}
+}*/
 .icon.s22.delete {
 	display: block;
 	background-position: -110px 0;