From 1ff69605be20d8a7ca721a2a881b15e71d87fa46 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Sun, 1 Dec 2013 10:55:39 +0100
Subject: some jot tools structuring and styling

---
 view/theme/redbasic/css/style.css  | 54 +++++++++++++++++++-----
 view/theme/redbasic/js/redbasic.js | 10 ++++-
 view/tpl/jot.tpl                   | 86 +++++++++++++++++++-------------------
 3 files changed, 96 insertions(+), 54 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index eaa3140c9..3aa9bc346 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -351,7 +351,12 @@ footer {
 }
 
 #jot-perms-icon {
-	float: left;
+	display: block;
+	color: #fff;
+	padding: 8px;
+	text-align: center;
+	text-decoration: none;
+	text-shadow: 1px 1px #111;
 }
 
 #jot-title, #jot-category, #jot-pagetitle {
@@ -1177,10 +1182,14 @@ footer {
 	float: left;
 	margin-left: 15px;
 }
-#jot-preview-link {
-	float: left;
-	margin-left: 45px;
-	margin-top: 0px !important;
+
+#jot-preview-link .icon-eye-open {
+	display:block;
+	color: #fff;
+	padding-top: 8px;
+	text-align: center;
+	text-decoration: none;
+	text-shadow: 1px 1px #111;
 }
 
 #profile-nolocation-wrapper {
@@ -1192,13 +1201,27 @@ footer {
 	margin-left: 15px;
 }
 
-#profile-jot-perms {
+#profile-jot-perms,
+#jot-preview-link {
+	height: 28px;
+	width: 28px;
 	float: right;
-	background-color: $toolicon_colour;
+	background: linear-gradient(top, $toolicon_colour 0%, #707070);
+	background: -webkit-linear-gradient(top, $toolicon_colour 0%, #707070);
+	background: -moz-linear-gradient(top, $toolicon_colour 0%, #707070);
+	background: -o-linear-gradient(top, $toolicon_colour 0%, #707070);
+	background: -ms-linear-gradient(top, $toolicon_colour 0%, #707070);
 	border: 1px solid #666;
 	border-right: none;
-	border-radius: $radiuspx 0px 0px $radiuspx;
-	padding: 6px;
+}
+
+#profile-jot-perms:hover,
+#jot-preview-link:hover {
+	background: linear-gradient(top, #707070 0%, $toolicon_colour);
+	background: -webkit-linear-gradient(top, #707070 0%, $toolicon_colour);
+	background: -moz-linear-gradient(top, #707070 0%, $toolicon_colour);
+	background: -o-linear-gradient(top, #707070 0%, $toolicon_colour);
+	background: -ms-linear-gradient(top, #707070 0%, $toolicon_colour);
 }
 
 #profile-jot-perms-end {
@@ -1525,6 +1548,18 @@ tr.mceLast {
     box-shadow: 4px 4px 3px 0 #444444;
 }
 
+.jot-tools-right :last-child {
+	border-radius: $radiuspx 0px 0px $radiuspx;
+}
+
+.jot-tools-right :first-child {
+	border-radius: 0px $radiuspx $radiuspx 0px;
+}
+
+.jot-tools-right :only-child {
+	border-radius: $radiuspx;
+}
+
 #profile-jot-submit {
 	height: 30px;
 	width: 70px;
@@ -1535,7 +1570,6 @@ tr.mceLast {
 	background: -ms-linear-gradient(top, #0080ff 0%, #0080aa);
 	color: #fff;
 	font-weight: bold;
-	border-radius: 0px $radiuspx $radiuspx 0px;
 	float: right;
 	text-shadow: 1px 1px #111;
 	cursor: pointer;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index e40a94fcc..eb50c188e 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -18,6 +18,14 @@ function cmtBbClose(comment, id) {
 
 $(document).ready(function() {
 
+document.jotpermsunlock = 'icon-unlock';
+document.jotpermslock = 'icon-lock';
+
+if($('#jot-perms-icon').hasClass('lock'))
+	$('#jot-perms-icon').addClass('icon-lock');
+if($('#jot-perms-icon').hasClass('unlock'))
+	$('#jot-perms-icon').addClass('icon-unlock');
+
 $('.group-edit-icon').hover(
 	function() {
 		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
@@ -68,4 +76,4 @@ $(document).ready(function(){
 		}
 	};
 	setInterval(function () {checkNotify();}, 10 * 1000);
-});
\ No newline at end of file
+});
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 666fae9cd..d260165ab 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -29,51 +29,51 @@
 		<div id="profile-jot-text-loading"></div>
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-
-	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-image-upload-div" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<i id="profile-link" class="icon-link jot-icons" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></i>
-	</div> 
-	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
-		<i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-		<i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i>
-	</div> 
-	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
-		<i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i>
+	<div class="jot-tools-left">
+		<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+			<div id="wall-image-upload-div" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></div>
+		</div>
+		<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+			<div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div>
+		</div>
+		<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+			<i id="profile-link" class="icon-link jot-icons" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></i>
+		</div>
+		<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+			<i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i>
+		</div>
+			<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+			<i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i>
+		</div>
+		<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+			<i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i>
+		</div>
+		<div id="profile-nolocation-wrapper" style="display: none;" >
+			<i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i>
+		</div>
+		<div id="profile-expire-wrapper" style="display: {{$feature_expire}};" >
+			<i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i>
+		</div>
+		<div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
+			<i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i>
+		</div>
+		<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+			<div id="profile-rotator"></div>
+		</div>
 	</div>
-	<div id="profile-expire-wrapper" style="display: {{$feature_expire}};" >
-		<i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i>
-	</div> 
-	<div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
-		<i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i>
-	</div> 
-
-
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<div id="profile-rotator"></div>
-	</div>  
-
-	{{if $showacl}}
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	<div class="jot-tools-right">
+		<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+		{{if $preview}}
+		<div onclick="preview_post();" id="jot-preview-link" class="fakelink">
+			<i id="jot-preview-icon "class="icon-eye-open" title="{{$preview}}"></i>
+		</div>
+		{{/if}}
+		{{if $showacl}}
+		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+			<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="{{$lockstate}}" title="{{$permset}}" ></a>{{$bang}}
+		</div>
+		{{/if}}
 	</div>
-	{{/if}}
-
-	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}}
-
-
 	<div id="profile-jot-perms-end"></div>
 
 
-- 
cgit v1.2.3


From 6a1dfbb218a1e2a48010803906e78bf3b7a16965 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Sun, 1 Dec 2013 15:51:14 +0100
Subject: only show user-photo if not local user

---
 view/tpl/nav.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index f27afed09..c78f15aa8 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -6,7 +6,7 @@
 	<ul>
 
 	{{if $userinfo}}
-	      <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="nav-dropdown-indicator">&#x25BC;</span></a>
+	      <li id="nav-user-linkmenu" class="nav-menu-icon">{{if $localuser}}<a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}">{{/if}}<img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">{{if $localuser}}<span class="nav-dropdown-indicator">&#x25BC;</span></a>{{/if}}
 		{{if $localuser}}
 			<ul id="nav-user-menu" class="menu-popup">
 				{{foreach $nav.usermenu as $usermenu}}
-- 
cgit v1.2.3


From 51cad9cafef228090cc1641a425ba272b1a3b470 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Sun, 1 Dec 2013 16:52:32 +0100
Subject: update spin.js to latest version

---
 js/spin.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/js/spin.js b/js/spin.js
index c66c607a7..af1c55f06 100644
--- a/js/spin.js
+++ b/js/spin.js
@@ -1,4 +1,4 @@
-//fgnass.github.com/spin.js#v1.3
+//fgnass.github.com/spin.js#v1.3.2
 
 /**
  * Copyright (c) 2011-2013 Felix Gnass
@@ -89,12 +89,12 @@
       , pp
       , i
 
-    if(s[prop] !== undefined) return prop
     prop = prop.charAt(0).toUpperCase() + prop.slice(1)
     for(i=0; i<prefixes.length; i++) {
       pp = prefixes[i]+prop
       if(s[pp] !== undefined) return pp
     }
+    if(s[prop] !== undefined) return prop
   }
 
   /**
@@ -130,6 +130,13 @@
     return o
   }
 
+  /**
+   * Returns the line color from the given string or array.
+   */
+  function getColor(color, idx) {
+    return typeof color == 'string' ? color : color[idx % color.length]
+  }
+
   // Built-in defaults
 
   var defaults = {
@@ -259,8 +266,7 @@
         })
 
         if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}))
-
-        ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)')))
+        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
       }
       return el
     },
@@ -314,7 +320,7 @@
                 top: -o.width>>1,
                 filter: filter
               }),
-              vml('fill', {color: o.color, opacity: o.opacity}),
+              vml('fill', {color: getColor(o.color, i), opacity: o.opacity}),
               vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
             )
           )
-- 
cgit v1.2.3


From 0e7e5fa53d1f235984716fecd6810542468bc8c3 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Mon, 2 Dec 2013 12:26:07 +0100
Subject: Revert "some jot tools structuring and styling"

This reverts commit 1ff69605be20d8a7ca721a2a881b15e71d87fa46.
---
 view/theme/redbasic/css/style.css  | 54 +++++-------------------
 view/theme/redbasic/js/redbasic.js | 10 +----
 view/tpl/jot.tpl                   | 86 +++++++++++++++++++-------------------
 3 files changed, 54 insertions(+), 96 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 16ec7a34f..cd0842683 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -351,12 +351,7 @@ footer {
 }
 
 #jot-perms-icon {
-	display: block;
-	color: #fff;
-	padding: 8px;
-	text-align: center;
-	text-decoration: none;
-	text-shadow: 1px 1px #111;
+	float: left;
 }
 
 #jot-title, #jot-category, #jot-pagetitle {
@@ -1033,14 +1028,10 @@ footer {
 	float: left;
 	margin-left: 15px;
 }
-
-#jot-preview-link .icon-eye-open {
-	display:block;
-	color: #fff;
-	padding-top: 8px;
-	text-align: center;
-	text-decoration: none;
-	text-shadow: 1px 1px #111;
+#jot-preview-link {
+	float: left;
+	margin-left: 45px;
+	margin-top: 0px !important;
 }
 
 #profile-nolocation-wrapper {
@@ -1052,27 +1043,13 @@ footer {
 	margin-left: 15px;
 }
 
-#profile-jot-perms,
-#jot-preview-link {
-	height: 28px;
-	width: 28px;
+#profile-jot-perms {
 	float: right;
-	background: linear-gradient(top, $toolicon_colour 0%, #707070);
-	background: -webkit-linear-gradient(top, $toolicon_colour 0%, #707070);
-	background: -moz-linear-gradient(top, $toolicon_colour 0%, #707070);
-	background: -o-linear-gradient(top, $toolicon_colour 0%, #707070);
-	background: -ms-linear-gradient(top, $toolicon_colour 0%, #707070);
+	background-color: $toolicon_colour;
 	border: 1px solid #666;
 	border-right: none;
-}
-
-#profile-jot-perms:hover,
-#jot-preview-link:hover {
-	background: linear-gradient(top, #707070 0%, $toolicon_colour);
-	background: -webkit-linear-gradient(top, #707070 0%, $toolicon_colour);
-	background: -moz-linear-gradient(top, #707070 0%, $toolicon_colour);
-	background: -o-linear-gradient(top, #707070 0%, $toolicon_colour);
-	background: -ms-linear-gradient(top, #707070 0%, $toolicon_colour);
+	border-radius: $radiuspx 0px 0px $radiuspx;
+	padding: 6px;
 }
 
 #profile-jot-perms-end {
@@ -1399,18 +1376,6 @@ tr.mceLast {
     box-shadow: 4px 4px 3px 0 #444444;
 }
 
-.jot-tools-right :last-child {
-	border-radius: $radiuspx 0px 0px $radiuspx;
-}
-
-.jot-tools-right :first-child {
-	border-radius: 0px $radiuspx $radiuspx 0px;
-}
-
-.jot-tools-right :only-child {
-	border-radius: $radiuspx;
-}
-
 #profile-jot-submit {
 	height: 30px;
 	width: 70px;
@@ -1421,6 +1386,7 @@ tr.mceLast {
 	background: -ms-linear-gradient(top, #0080ff 0%, #0080aa);
 	color: #fff;
 	font-weight: bold;
+	border-radius: 0px $radiuspx $radiuspx 0px;
 	float: right;
 	text-shadow: 1px 1px #111;
 	cursor: pointer;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index eb50c188e..e40a94fcc 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -18,14 +18,6 @@ function cmtBbClose(comment, id) {
 
 $(document).ready(function() {
 
-document.jotpermsunlock = 'icon-unlock';
-document.jotpermslock = 'icon-lock';
-
-if($('#jot-perms-icon').hasClass('lock'))
-	$('#jot-perms-icon').addClass('icon-lock');
-if($('#jot-perms-icon').hasClass('unlock'))
-	$('#jot-perms-icon').addClass('icon-unlock');
-
 $('.group-edit-icon').hover(
 	function() {
 		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
@@ -76,4 +68,4 @@ $(document).ready(function(){
 		}
 	};
 	setInterval(function () {checkNotify();}, 10 * 1000);
-});
+});
\ No newline at end of file
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index d260165ab..666fae9cd 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -29,51 +29,51 @@
 		<div id="profile-jot-text-loading"></div>
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
-	<div class="jot-tools-left">
-		<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-			<div id="wall-image-upload-div" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></div>
-		</div>
-		<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-			<div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div>
-		</div>
-		<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-			<i id="profile-link" class="icon-link jot-icons" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></i>
-		</div>
-		<div id="profile-video-wrapper" style="display: {{$visitor}};" >
-			<i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i>
-		</div>
-			<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-			<i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i>
-		</div>
-		<div id="profile-location-wrapper" style="display: {{$visitor}};" >
-			<i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i>
-		</div>
-		<div id="profile-nolocation-wrapper" style="display: none;" >
-			<i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i>
-		</div>
-		<div id="profile-expire-wrapper" style="display: {{$feature_expire}};" >
-			<i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i>
-		</div>
-		<div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
-			<i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i>
-		</div>
-		<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-			<div id="profile-rotator"></div>
-		</div>
+	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<i id="profile-link" class="icon-link jot-icons" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></i>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i>
 	</div>
-	<div class="jot-tools-right">
-		<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-		{{if $preview}}
-		<div onclick="preview_post();" id="jot-preview-link" class="fakelink">
-			<i id="jot-preview-icon "class="icon-eye-open" title="{{$preview}}"></i>
-		</div>
-		{{/if}}
-		{{if $showacl}}
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-			<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="{{$lockstate}}" title="{{$permset}}" ></a>{{$bang}}
-		</div>
-		{{/if}}
+	<div id="profile-expire-wrapper" style="display: {{$feature_expire}};" >
+		<i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i>
+	</div> 
+	<div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
+		<i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i>
+	</div> 
+
+
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<div id="profile-rotator"></div>
+	</div>  
+
+	{{if $showacl}}
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
 	</div>
+	{{/if}}
+
+	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}}
+
+
 	<div id="profile-jot-perms-end"></div>
 
 
-- 
cgit v1.2.3


From ba895d6668b2f3b99121d9115201022f6fbc8728 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Mon, 2 Dec 2013 12:26:46 +0100
Subject: Revert "only show user-photo if not local user"

This reverts commit 6a1dfbb218a1e2a48010803906e78bf3b7a16965.
---
 view/tpl/nav.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index c78f15aa8..f27afed09 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -6,7 +6,7 @@
 	<ul>
 
 	{{if $userinfo}}
-	      <li id="nav-user-linkmenu" class="nav-menu-icon">{{if $localuser}}<a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}">{{/if}}<img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">{{if $localuser}}<span class="nav-dropdown-indicator">&#x25BC;</span></a>{{/if}}
+	      <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="nav-dropdown-indicator">&#x25BC;</span></a>
 		{{if $localuser}}
 			<ul id="nav-user-menu" class="menu-popup">
 				{{foreach $nav.usermenu as $usermenu}}
-- 
cgit v1.2.3


From d525d1c26f2b67579ff5911dc81958c4fa1e9c6f Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Mon, 2 Dec 2013 12:27:12 +0100
Subject: Revert "update spin.js to latest version"

This reverts commit 51cad9cafef228090cc1641a425ba272b1a3b470.
---
 js/spin.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/js/spin.js b/js/spin.js
index af1c55f06..c66c607a7 100644
--- a/js/spin.js
+++ b/js/spin.js
@@ -1,4 +1,4 @@
-//fgnass.github.com/spin.js#v1.3.2
+//fgnass.github.com/spin.js#v1.3
 
 /**
  * Copyright (c) 2011-2013 Felix Gnass
@@ -89,12 +89,12 @@
       , pp
       , i
 
+    if(s[prop] !== undefined) return prop
     prop = prop.charAt(0).toUpperCase() + prop.slice(1)
     for(i=0; i<prefixes.length; i++) {
       pp = prefixes[i]+prop
       if(s[pp] !== undefined) return pp
     }
-    if(s[prop] !== undefined) return prop
   }
 
   /**
@@ -130,13 +130,6 @@
     return o
   }
 
-  /**
-   * Returns the line color from the given string or array.
-   */
-  function getColor(color, idx) {
-    return typeof color == 'string' ? color : color[idx % color.length]
-  }
-
   // Built-in defaults
 
   var defaults = {
@@ -266,7 +259,8 @@
         })
 
         if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}))
-        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
+
+        ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)')))
       }
       return el
     },
@@ -320,7 +314,7 @@
                 top: -o.width>>1,
                 filter: filter
               }),
-              vml('fill', {color: getColor(o.color, i), opacity: o.opacity}),
+              vml('fill', {color: o.color, opacity: o.opacity}),
               vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
             )
           )
-- 
cgit v1.2.3


From 27e0f4e06123f3a3a9c6c064e21aec813585933a Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Tue, 3 Dec 2013 23:08:57 +0100
Subject: split out mod_message and a typo

---
 view/css/mod_message.css          | 102 ++++++++++++++++++++++++++++++++++++++
 view/theme/redbasic/css/style.css | 101 +++----------------------------------
 view/tpl/mail_list.tpl            |   2 +-
 3 files changed, 109 insertions(+), 96 deletions(-)
 create mode 100644 view/css/mod_message.css

diff --git a/view/css/mod_message.css b/view/css/mod_message.css
new file mode 100644
index 000000000..c65747477
--- /dev/null
+++ b/view/css/mod_message.css
@@ -0,0 +1,102 @@
+/* message */
+
+#mail-list-wrapper {
+	border-top: 1px solid #ccc;
+	padding: 5px 5px 5px 5px;
+}
+
+span.mail-list {
+	float: left;
+	width: 20%;
+}
+
+img.mail-list-sender-photo {
+	height: 24px;
+	width: 24px;
+	float: left;
+	margin-right: 30px;
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+}
+
+.mail-list-remove {
+	width: 5% !important;
+}
+
+/* message/new */
+
+#prvmail-to-label,
+#prvmail-subject-label,
+#prvmail-expires-label,
+#prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: left;
+	margin-top: 10px;
+	margin-right: 30px;
+}
+
+#prvmail-upload-wrapper,
+#prvmail-attach-wrapper,
+#prvmail-link-wrapper,
+#prvmail-expire-wrapper,
+#prvmail-encrypt-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+	cursor: pointer;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+/* message/id */
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+.mail-conv-recall-wrapper {
+	float: right;
+	margin-right: 10px;
+	margin-top: 15px;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-break {
+	clear: both;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 33e89d3f2..51654aeaa 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1590,34 +1590,7 @@ tr.mceLast {
 	margin-left: 200px;
 }
 
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-expires-label, #prvmail-message-label {
-	margin-bottom: 10px;
-	margin-top: 20px;
-}
-
-#prvmail-submit {
-	float: left;
-	margin-top: 10px;
-	margin-right: 30px;
-}
-#prvmail-upload-wrapper,
-#prvmail-attach-wrapper,
-#prvmail-link-wrapper,
-#prvmail-expire-wrapper,
-#prvmail-encrypt-wrapper,
-#prvmail-rotator-wrapper {
-	float: left;
-	margin-top: 10px;
-	margin-right: 10px;
-	width: 24px;
-	cursor: pointer;
-}
-
-#prvmail-end {
-	clear: both;
-}
-
+/* might be obsolete
 .mail-list-sender,
 .mail-list-detail {
 	float: left;
@@ -1637,8 +1610,6 @@ a.mail-list-link {
     padding: 4px 0;
 }
 
-
-
 .mail-list-outside-wrapper-end {
 	clear: both;
 }
@@ -1656,48 +1627,10 @@ a.mail-list-link {
 .mail-list-delete-icon {
 	border: none;
 }
+*/
 
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-conv-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-.mail-conv-recall-wrapper {
-	float: right;
-	margin-right: 10px;
-	margin-top: 15px;
-}
-
-.mail-conv-break {
-	clear: both;
-}
-
-.mail-conv-delete-icon {
-	border: none;
-}
 
+/* might be obsolete
 .message-links ul {
 	list-style-type: none;
 	padding: 0px;
@@ -1714,6 +1647,7 @@ a.mail-list-link {
 .message-links-end {
 	clear: both;
 }
+*/
 
 #sidebar-group-list ul {
 	list-style-type: none;
@@ -1818,7 +1752,6 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
-
 .group-delete-wrapper {
 	float: right;
 	margin-right: 50px;
@@ -3129,34 +3062,12 @@ ul.menu-popup {
 .reshared-content { margin-left: 30px; }
 .shared_header img { margin-right: 10px; }
 
-
-#mail-list-wrapper {
-border-top: 1px solid #ccc;
-padding: 5px 5px 5px 5px;
-}
-
-span.mail-list {
-float: left;
-width: 20%;
-}
-
-.mail-list-remove {
-width: 5% !important;
-}
-
+/* might be obsolete
 span.mail-delete {
 float: left;
 width: 30px;
 }
-
-img.mail-list-sender-photo {
-height: 24px;
-width: 24px;
-float: left;
-margin-right: 30px;
--moz-border-radius: $radiuspx;
-border-radius: $radiuspx;
-}
+*/
 
 .tag1 {
     font-size : 1.0em !important;
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 24966ad1d..8566ca368 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
-	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
 	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<div class="clear">&nbsp;</div>
-- 
cgit v1.2.3


From 6d4a265ab27ab16c4cd6404876c91cb3ca0d5265 Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Tue, 3 Dec 2013 23:26:21 +0100
Subject: this should remain in style.css

---
 view/css/mod_message.css          | 2 --
 view/theme/redbasic/css/style.css | 7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/view/css/mod_message.css b/view/css/mod_message.css
index c65747477..c278f4d53 100644
--- a/view/css/mod_message.css
+++ b/view/css/mod_message.css
@@ -15,8 +15,6 @@ img.mail-list-sender-photo {
 	width: 24px;
 	float: left;
 	margin-right: 30px;
-	-moz-border-radius: $radiuspx;
-	border-radius: $radiuspx;
 }
 
 .mail-list-remove {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 51654aeaa..8251db4a2 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3237,3 +3237,10 @@ text-decoration: none;
 	color: $toolicon_colour;
 	margin-right: 10px;
 }
+
+/* message */
+
+img.mail-list-sender-photo {
+	-moz-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+}
-- 
cgit v1.2.3


From a03a198bc1dfd352484f270d0bcd9647b1b33f1c Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Tue, 3 Dec 2013 23:35:31 +0100
Subject: should fix typos the right way...

---
 view/tpl/mail_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 8566ca368..c96827996 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
-	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
 	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<div class="clear">&nbsp;</div>
-- 
cgit v1.2.3