From 947b6073b1920dfcb7de273dd6dae9b1ff3d7458 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 16 Apr 2012 16:05:29 +0200
Subject: [PATCH 1/6] diabook-themes: minor bugfixes

---
 view/theme/diabook-aerith/group_side.tpl |  5 +++++
 view/theme/diabook-aerith/nav.tpl        | 18 +++++++++++-------
 view/theme/diabook-aerith/nets.tpl       |  4 ++--
 view/theme/diabook-blue/group_side.tpl   |  5 +++++
 view/theme/diabook-blue/nav.tpl          | 12 ++++++++----
 view/theme/diabook-blue/nets.tpl         |  4 ++--
 view/theme/diabook-red/group_side.tpl    |  5 +++++
 view/theme/diabook-red/nav.tpl           | 16 ++++++++++------
 view/theme/diabook-red/nets.tpl          |  4 ++--
 view/theme/diabook/group_side.tpl        |  5 +++++
 view/theme/diabook/nav.tpl               |  2 ++
 view/theme/diabook/nets.tpl              |  4 ++--
 12 files changed, 59 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 view/theme/diabook-aerith/group_side.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/group_side.tpl
 mode change 100644 => 100755 view/theme/diabook-red/group_side.tpl

diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl
old mode 100644
new mode 100755
index 642019049..8600402f2
--- a/view/theme/diabook-aerith/group_side.tpl
+++ b/view/theme/diabook-aerith/group_side.tpl
@@ -25,5 +25,10 @@
 			{{ endfor }}
 		</ul>
 	</div>
+	 {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
 </div>	
 
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index 6fab83afc..6559c49ea 100644
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -26,6 +26,7 @@
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
+
 			{{ endif }}
 			
 			{{ if $nav.messages }}
@@ -45,7 +46,7 @@
       {{ if $nav.notifications }}
 			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
 			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			   <span class="icon notify">$nav.notifications.1</span>
+			<span class="icon notify">$nav.notifications.1</span>
 				<span id="notify-update" class="nav-notify"></span></a>
 				<ul id="nav-notifications-menu" class="menu-popup">
 					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
@@ -63,16 +64,18 @@
 		</li>		
 		{{ endif }}	
 		
+		<li  style="width: 1%; height: 1px;float: right;"></li>	
+		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
 
 				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+										
+				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
 										
 										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-
+										
 				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
 
@@ -82,13 +85,13 @@
 			</ul>		
 		</li>
 		
+		
 		{{ if $nav.directory }}
 		<li id="nav-directory-link" class="nav-menu $sel.directory">
 			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 		</li>
 		{{ endif }}
 		
-		
 		{{ if $nav.apps }}
 			<li id="nav-apps-link" class="nav-menu $sel.apps">
 				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
@@ -137,9 +140,10 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-aerith/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-aerith/icons/bluebug.png" title="report bugs for the theme diabook-aerith"/></a></div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
 
 
 
diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl
index 5addf38b1..637b7a04d 100644
--- a/view/theme/diabook-aerith/nets.tpl
+++ b/view/theme/diabook-aerith/nets.tpl
@@ -3,9 +3,9 @@
 	<div id="nets-desc">$desc</div>
 
 	<ul class="nets-ul">
-	<li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+	<li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>
diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
old mode 100644
new mode 100755
index 642019049..8600402f2
--- a/view/theme/diabook-blue/group_side.tpl
+++ b/view/theme/diabook-blue/group_side.tpl
@@ -25,5 +25,10 @@
 			{{ endfor }}
 		</ul>
 	</div>
+	 {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
 </div>	
 
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index fd29d9309..6559c49ea 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -26,6 +26,7 @@
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
+
 			{{ endif }}
 			
 			{{ if $nav.messages }}
@@ -63,16 +64,18 @@
 		</li>		
 		{{ endif }}	
 		
+		<li  style="width: 1%; height: 1px;float: right;"></li>	
+		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
 
 				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+										
+				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
 										
 										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-
+										
 				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
 
@@ -82,13 +85,13 @@
 			</ul>		
 		</li>
 		
+		
 		{{ if $nav.directory }}
 		<li id="nav-directory-link" class="nav-menu $sel.directory">
 			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 		</li>
 		{{ endif }}
 		
-		
 		{{ if $nav.apps }}
 			<li id="nav-apps-link" class="nav-menu $sel.apps">
 				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
@@ -143,6 +146,7 @@
 
 
 
+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
 </ul>
diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl
index 5addf38b1..637b7a04d 100644
--- a/view/theme/diabook-blue/nets.tpl
+++ b/view/theme/diabook-blue/nets.tpl
@@ -3,9 +3,9 @@
 	<div id="nets-desc">$desc</div>
 
 	<ul class="nets-ul">
-	<li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+	<li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>
diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl
old mode 100644
new mode 100755
index 642019049..8600402f2
--- a/view/theme/diabook-red/group_side.tpl
+++ b/view/theme/diabook-red/group_side.tpl
@@ -25,5 +25,10 @@
 			{{ endfor }}
 		</ul>
 	</div>
+	 {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
 </div>	
 
diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl
index dc3fd0cde..6559c49ea 100644
--- a/view/theme/diabook-red/nav.tpl
+++ b/view/theme/diabook-red/nav.tpl
@@ -26,6 +26,7 @@
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
+
 			{{ endif }}
 			
 			{{ if $nav.messages }}
@@ -63,16 +64,18 @@
 		</li>		
 		{{ endif }}	
 		
+		<li  style="width: 1%; height: 1px;float: right;"></li>	
+		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
 
 				{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
-
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+										
+				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
 										
 										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-
+										
 				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
 
@@ -82,13 +85,13 @@
 			</ul>		
 		</li>
 		
+		
 		{{ if $nav.directory }}
 		<li id="nav-directory-link" class="nav-menu $sel.directory">
 			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 		</li>
 		{{ endif }}
 		
-		
 		{{ if $nav.apps }}
 			<li id="nav-apps-link" class="nav-menu $sel.apps">
 				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
@@ -137,9 +140,10 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-red/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-red/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
 
 
 
diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl
index 5addf38b1..637b7a04d 100644
--- a/view/theme/diabook-red/nets.tpl
+++ b/view/theme/diabook-red/nets.tpl
@@ -3,9 +3,9 @@
 	<div id="nets-desc">$desc</div>
 
 	<ul class="nets-ul">
-	<li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+	<li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
index 642019049..1c8ebcd9f 100755
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
@@ -25,5 +25,10 @@
 			{{ endfor }}
 		</ul>
 	</div>
+  {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
 </div>	
 
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 522fb22b4..6559c49ea 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -64,6 +64,8 @@
 		</li>		
 		{{ endif }}	
 		
+		<li  style="width: 1%; height: 1px;float: right;"></li>	
+		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
index 5addf38b1..637b7a04d 100644
--- a/view/theme/diabook/nets.tpl
+++ b/view/theme/diabook/nets.tpl
@@ -3,9 +3,9 @@
 	<div id="nets-desc">$desc</div>
 
 	<ul class="nets-ul">
-	<li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+	<li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>

From b32a7315172937490b5a63095d595a48d837823d Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 16 Apr 2012 17:12:08 +0200
Subject: [PATCH 2/6] diabook-themes: bug-fixes

---
 view/theme/diabook-aerith/comment_item.tpl   | 14 +++++++-------
 view/theme/diabook-aerith/directory_item.tpl |  1 +
 view/theme/diabook-aerith/nets.tpl           | 14 +++++++++-----
 view/theme/diabook-blue/comment_item.tpl     | 14 +++++++-------
 view/theme/diabook-blue/directory_item.tpl   |  1 +
 view/theme/diabook-blue/nets.tpl             | 14 +++++++++-----
 view/theme/diabook-red/comment_item.tpl      | 14 +++++++-------
 view/theme/diabook-red/directory_item.tpl    |  1 +
 view/theme/diabook-red/nets.tpl              | 14 +++++++++-----
 view/theme/diabook/comment_item.tpl          | 14 +++++++-------
 view/theme/diabook/directory_item.tpl        |  1 +
 view/theme/diabook/nets.tpl                  | 14 +++++++++-----
 12 files changed, 68 insertions(+), 48 deletions(-)
 mode change 100644 => 100755 view/theme/diabook-aerith/directory_item.tpl
 mode change 100644 => 100755 view/theme/diabook-blue/directory_item.tpl
 mode change 100644 => 100755 view/theme/diabook-red/directory_item.tpl

diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl
index 47046c371..ee4dfba45 100644
--- a/view/theme/diabook-aerith/comment_item.tpl
+++ b/view/theme/diabook-aerith/comment_item.tpl
@@ -12,13 +12,13 @@
 				</div>
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
 					<option value=""></option>
diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl
old mode 100644
new mode 100755
index db1936e4b..bc2af16c2
--- a/view/theme/diabook-aerith/directory_item.tpl
+++ b/view/theme/diabook-aerith/directory_item.tpl
@@ -7,4 +7,5 @@
 			</a>
 		</div>
 	</div>
+	<div class="contact-name" id="directory-name-$id">$name</div>
 </div>
diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl
index 637b7a04d..68a8e88e9 100644
--- a/view/theme/diabook-aerith/nets.tpl
+++ b/view/theme/diabook-aerith/nets.tpl
@@ -1,11 +1,15 @@
-<div id="nets-sidebar" class="widget">
+<div id="profile_side">
 	<h3>$title</h3>
 	<div id="nets-desc">$desc</div>
-
-	<ul class="nets-ul">
-	<li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
+   
+	<ul class="menu-profile-side">
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>
diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl
index 47046c371..ee4dfba45 100644
--- a/view/theme/diabook-blue/comment_item.tpl
+++ b/view/theme/diabook-blue/comment_item.tpl
@@ -12,13 +12,13 @@
 				</div>
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
 					<option value=""></option>
diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl
old mode 100644
new mode 100755
index db1936e4b..bc2af16c2
--- a/view/theme/diabook-blue/directory_item.tpl
+++ b/view/theme/diabook-blue/directory_item.tpl
@@ -7,4 +7,5 @@
 			</a>
 		</div>
 	</div>
+	<div class="contact-name" id="directory-name-$id">$name</div>
 </div>
diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl
index 637b7a04d..68a8e88e9 100644
--- a/view/theme/diabook-blue/nets.tpl
+++ b/view/theme/diabook-blue/nets.tpl
@@ -1,11 +1,15 @@
-<div id="nets-sidebar" class="widget">
+<div id="profile_side">
 	<h3>$title</h3>
 	<div id="nets-desc">$desc</div>
-
-	<ul class="nets-ul">
-	<li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
+   
+	<ul class="menu-profile-side">
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>
diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl
index 47046c371..ee4dfba45 100644
--- a/view/theme/diabook-red/comment_item.tpl
+++ b/view/theme/diabook-red/comment_item.tpl
@@ -12,13 +12,13 @@
 				</div>
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
 					<option value=""></option>
diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl
old mode 100644
new mode 100755
index db1936e4b..bc2af16c2
--- a/view/theme/diabook-red/directory_item.tpl
+++ b/view/theme/diabook-red/directory_item.tpl
@@ -7,4 +7,5 @@
 			</a>
 		</div>
 	</div>
+	<div class="contact-name" id="directory-name-$id">$name</div>
 </div>
diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl
index 637b7a04d..68a8e88e9 100644
--- a/view/theme/diabook-red/nets.tpl
+++ b/view/theme/diabook-red/nets.tpl
@@ -1,11 +1,15 @@
-<div id="nets-sidebar" class="widget">
+<div id="profile_side">
 	<h3>$title</h3>
 	<div id="nets-desc">$desc</div>
-
-	<ul class="nets-ul">
-	<li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
+   
+	<ul class="menu-profile-side">
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
index 47046c371..ee4dfba45 100644
--- a/view/theme/diabook/comment_item.tpl
+++ b/view/theme/diabook/comment_item.tpl
@@ -12,13 +12,13 @@
 				</div>
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
 					<option value=""></option>
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
index db1936e4b..bc2af16c2 100755
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
@@ -7,4 +7,5 @@
 			</a>
 		</div>
 	</div>
+	<div class="contact-name" id="directory-name-$id">$name</div>
 </div>
diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
index 637b7a04d..68a8e88e9 100644
--- a/view/theme/diabook/nets.tpl
+++ b/view/theme/diabook/nets.tpl
@@ -1,11 +1,15 @@
-<div id="nets-sidebar" class="widget">
+<div id="profile_side">
 	<h3>$title</h3>
 	<div id="nets-desc">$desc</div>
-
-	<ul class="nets-ul">
-	<li class="tool {{ if $sel_all }}selected{{ endif }}"><a style="text-decoration: none;" href="$base" class="nets-link nets-all">$all</a></li>
+   
+	<ul class="menu-profile-side">
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link nets-selected">$net.name</a></li>
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>

From 15dc8f4b212a0554844fcc3104942fe6fc944918 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 16 Apr 2012 18:51:08 +0200
Subject: [PATCH 3/6] diabook-themes: small bug/css-fixes ---> ver. 1.019

---
 view/theme/diabook-aerith/admin_users.tpl   |  88 ++++++++++++++++++++
 view/theme/diabook-aerith/icons/block.png   | Bin 0 -> 335 bytes
 view/theme/diabook-aerith/nets.tpl          |   2 +-
 view/theme/diabook-aerith/style-network.css |   4 +
 view/theme/diabook-aerith/style.css         |   8 +-
 view/theme/diabook-aerith/theme.php         |   4 +-
 view/theme/diabook-blue/admin_users.tpl     |  88 ++++++++++++++++++++
 view/theme/diabook-blue/icons/block.png     | Bin 0 -> 335 bytes
 view/theme/diabook-blue/nets.tpl            |   2 +-
 view/theme/diabook-blue/style-network.css   |   4 +
 view/theme/diabook-blue/style.css           |   8 +-
 view/theme/diabook-blue/theme.php           |   4 +-
 view/theme/diabook-red/admin_users.tpl      |  88 ++++++++++++++++++++
 view/theme/diabook-red/icons/block.png      | Bin 0 -> 335 bytes
 view/theme/diabook-red/nets.tpl             |   2 +-
 view/theme/diabook-red/style-network.css    |   4 +
 view/theme/diabook-red/style.css            |   8 +-
 view/theme/diabook-red/theme.php            |   4 +-
 view/theme/diabook/admin_users.tpl          |  88 ++++++++++++++++++++
 view/theme/diabook/icons/block.png          | Bin 0 -> 335 bytes
 view/theme/diabook/nets.tpl                 |   2 +-
 view/theme/diabook/style-network-wide.css   |   4 +
 view/theme/diabook/style-network.css        |   4 +
 view/theme/diabook/style-wide.css           |   8 +-
 view/theme/diabook/style.css                |  12 ++-
 view/theme/diabook/theme.php                |   4 +-
 26 files changed, 419 insertions(+), 21 deletions(-)
 create mode 100644 view/theme/diabook-aerith/admin_users.tpl
 create mode 100755 view/theme/diabook-aerith/icons/block.png
 create mode 100644 view/theme/diabook-blue/admin_users.tpl
 create mode 100755 view/theme/diabook-blue/icons/block.png
 create mode 100644 view/theme/diabook-red/admin_users.tpl
 create mode 100755 view/theme/diabook-red/icons/block.png
 create mode 100644 view/theme/diabook/admin_users.tpl
 create mode 100755 view/theme/diabook/icons/block.png

diff --git a/view/theme/diabook-aerith/admin_users.tpl b/view/theme/diabook-aerith/admin_users.tpl
new file mode 100644
index 000000000..40f94f5fe
--- /dev/null
+++ b/view/theme/diabook-aerith/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+		
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
diff --git a/view/theme/diabook-aerith/icons/block.png b/view/theme/diabook-aerith/icons/block.png
new file mode 100755
index 0000000000000000000000000000000000000000..a0b1dffe91473daf6cea96e5e159fec01e5aa831
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<76E=$ncwn0c0i%?o-U3d7N?g^
zHsm{Gz~dUfyNq?=xx1%3iyDlkFJ(_iOn&Gz*Rg<kTLIHFt_YbYQEgsVf<#=;b-&G5
zKfGNkf?3=0ej|55>LD)$Cgu-D*#hxDdHLAhG&ZlfXCt!b1m`}+slp3{{|CS8GwS5h
zQ+qJQ^Gegw7jaLH9hj@N)NkwZS!=iQ^;}YUvMMy4{od)LJU1AuKh8~wf5ufYV~gn?
z);_;B?)5C%5w9EO3$5u8%ahr$N$HhYRa2(+lB<i&UOE0^4d;^EGjX2jsrve5Iq%Br
Zn1A#a@NI3$6ajjT!PC{xWt~$(69Cjfd~5&!

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl
index 68a8e88e9..be25ddee1 100644
--- a/view/theme/diabook-aerith/nets.tpl
+++ b/view/theme/diabook-aerith/nets.tpl
@@ -1,5 +1,5 @@
 <div id="profile_side">
-	<h3>$title</h3>
+	<h3 style="margin-left: 2px;">$title</h3>
 	<div id="nets-desc">$desc</div>
    
 	<ul class="menu-profile-side">
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 679d1d77e..82c5a2575 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1064,6 +1064,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index bbd9a5330..be944b0af 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -169,13 +169,17 @@
 			  }
 .edit    {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-			  
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
 			  
 
 
 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index 907865207..df93cbed8 100644
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-aerith
  * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.019)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.018)";
+$diabook_version = "Diabook-aerith (Version: 1.019)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 
diff --git a/view/theme/diabook-blue/admin_users.tpl b/view/theme/diabook-blue/admin_users.tpl
new file mode 100644
index 000000000..40f94f5fe
--- /dev/null
+++ b/view/theme/diabook-blue/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+		
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
diff --git a/view/theme/diabook-blue/icons/block.png b/view/theme/diabook-blue/icons/block.png
new file mode 100755
index 0000000000000000000000000000000000000000..a0b1dffe91473daf6cea96e5e159fec01e5aa831
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<76E=$ncwn0c0i%?o-U3d7N?g^
zHsm{Gz~dUfyNq?=xx1%3iyDlkFJ(_iOn&Gz*Rg<kTLIHFt_YbYQEgsVf<#=;b-&G5
zKfGNkf?3=0ej|55>LD)$Cgu-D*#hxDdHLAhG&ZlfXCt!b1m`}+slp3{{|CS8GwS5h
zQ+qJQ^Gegw7jaLH9hj@N)NkwZS!=iQ^;}YUvMMy4{od)LJU1AuKh8~wf5ufYV~gn?
z);_;B?)5C%5w9EO3$5u8%ahr$N$HhYRa2(+lB<i&UOE0^4d;^EGjX2jsrve5Iq%Br
Zn1A#a@NI3$6ajjT!PC{xWt~$(69Cjfd~5&!

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl
index 68a8e88e9..be25ddee1 100644
--- a/view/theme/diabook-blue/nets.tpl
+++ b/view/theme/diabook-blue/nets.tpl
@@ -1,5 +1,5 @@
 <div id="profile_side">
-	<h3>$title</h3>
+	<h3 style="margin-left: 2px;">$title</h3>
 	<div id="nets-desc">$desc</div>
    
 	<ul class="menu-profile-side">
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 59d4fafe7..d8e569338 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1030,6 +1030,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 5459c65bd..eb43b728e 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -168,13 +168,17 @@
 			  }
 .edit    {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-			  
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
 			  
 
 
 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index eb2d484ba..2257f8df0 100644
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-blue
  * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.019)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.018)";
+$diabook_version = "Diabook-blue (Version: 1.019)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
diff --git a/view/theme/diabook-red/admin_users.tpl b/view/theme/diabook-red/admin_users.tpl
new file mode 100644
index 000000000..40f94f5fe
--- /dev/null
+++ b/view/theme/diabook-red/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+		
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
diff --git a/view/theme/diabook-red/icons/block.png b/view/theme/diabook-red/icons/block.png
new file mode 100755
index 0000000000000000000000000000000000000000..a0b1dffe91473daf6cea96e5e159fec01e5aa831
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<76E=$ncwn0c0i%?o-U3d7N?g^
zHsm{Gz~dUfyNq?=xx1%3iyDlkFJ(_iOn&Gz*Rg<kTLIHFt_YbYQEgsVf<#=;b-&G5
zKfGNkf?3=0ej|55>LD)$Cgu-D*#hxDdHLAhG&ZlfXCt!b1m`}+slp3{{|CS8GwS5h
zQ+qJQ^Gegw7jaLH9hj@N)NkwZS!=iQ^;}YUvMMy4{od)LJU1AuKh8~wf5ufYV~gn?
z);_;B?)5C%5w9EO3$5u8%ahr$N$HhYRa2(+lB<i&UOE0^4d;^EGjX2jsrve5Iq%Br
Zn1A#a@NI3$6ajjT!PC{xWt~$(69Cjfd~5&!

literal 0
HcmV?d00001

diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl
index 68a8e88e9..be25ddee1 100644
--- a/view/theme/diabook-red/nets.tpl
+++ b/view/theme/diabook-red/nets.tpl
@@ -1,5 +1,5 @@
 <div id="profile_side">
-	<h3>$title</h3>
+	<h3 style="margin-left: 2px;">$title</h3>
 	<div id="nets-desc">$desc</div>
    
 	<ul class="menu-profile-side">
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 03357f766..115868711 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1064,6 +1064,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 6ca2370de..122096213 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -168,13 +168,17 @@
 			  }
 .edit    {background-image: url("../../../view/theme/diabook-red/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-			  
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
 			  
 
 
 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 479a0130a..fb2ad21fd 100644
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-red
  * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.019)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.018)";
+$diabook_version = "Diabook-red (Version: 1.019)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
new file mode 100644
index 000000000..40f94f5fe
--- /dev/null
+++ b/view/theme/diabook/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+		
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
diff --git a/view/theme/diabook/icons/block.png b/view/theme/diabook/icons/block.png
new file mode 100755
index 0000000000000000000000000000000000000000..a0b1dffe91473daf6cea96e5e159fec01e5aa831
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<76E=$ncwn0c0i%?o-U3d7N?g^
zHsm{Gz~dUfyNq?=xx1%3iyDlkFJ(_iOn&Gz*Rg<kTLIHFt_YbYQEgsVf<#=;b-&G5
zKfGNkf?3=0ej|55>LD)$Cgu-D*#hxDdHLAhG&ZlfXCt!b1m`}+slp3{{|CS8GwS5h
zQ+qJQ^Gegw7jaLH9hj@N)NkwZS!=iQ^;}YUvMMy4{od)LJU1AuKh8~wf5ufYV~gn?
z);_;B?)5C%5w9EO3$5u8%ahr$N$HhYRa2(+lB<i&UOE0^4d;^EGjX2jsrve5Iq%Br
Zn1A#a@NI3$6ajjT!PC{xWt~$(69Cjfd~5&!

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
index 68a8e88e9..be25ddee1 100644
--- a/view/theme/diabook/nets.tpl
+++ b/view/theme/diabook/nets.tpl
@@ -1,5 +1,5 @@
 <div id="profile_side">
-	<h3>$title</h3>
+	<h3 style="margin-left: 2px;">$title</h3>
 	<div id="nets-desc">$desc</div>
    
 	<ul class="menu-profile-side">
diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css
index 0289419f4..3156a1aa3 100644
--- a/view/theme/diabook/style-network-wide.css
+++ b/view/theme/diabook/style-network-wide.css
@@ -1026,6 +1026,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 2e6a19481..ba45f757e 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1023,6 +1023,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+ -moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index 64f82c487..b6025b532 100644
--- a/view/theme/diabook/style-wide.css
+++ b/view/theme/diabook/style-wide.css
@@ -168,13 +168,17 @@
 			  }
 .edit    {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-			  
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
 			  
 
 
 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index fa945f848..0afb2cac8 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -168,13 +168,19 @@
 			  }
 .edit    {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}
 			  
 			  
 
 
 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
+/*.block 		{ background-position: -90px  0px;}*/
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
@@ -1146,6 +1152,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 173px;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 8c5521eec..490a647f3 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.019)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.018)";
+$diabook_version = "Diabook (Version: 1.019)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages

From f08844a8a58f46d539753831a8ff99995fc3c1ae Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 16 Apr 2012 19:23:11 +0200
Subject: [PATCH 4/6] diabook-themes: bugfix (sry, necessary)

---
 view/theme/diabook-aerith/ch_directory_item.tpl | 10 ++++++++++
 view/theme/diabook-aerith/nav.tpl               |  2 +-
 view/theme/diabook-aerith/theme.php             |  4 ++--
 view/theme/diabook-blue/ch_directory_item.tpl   | 10 ++++++++++
 view/theme/diabook-blue/nav.tpl                 |  2 +-
 view/theme/diabook-blue/theme.php               |  4 ++--
 view/theme/diabook-red/ch_directory_item.tpl    | 10 ++++++++++
 view/theme/diabook-red/nav.tpl                  |  2 +-
 view/theme/diabook-red/theme.php                |  4 ++--
 view/theme/diabook/ch_directory_item.tpl        | 10 ++++++++++
 view/theme/diabook/nav.tpl                      |  2 +-
 view/theme/diabook/theme.php                    |  4 ++--
 12 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100755 view/theme/diabook-aerith/ch_directory_item.tpl
 create mode 100755 view/theme/diabook-blue/ch_directory_item.tpl
 create mode 100755 view/theme/diabook-red/ch_directory_item.tpl
 create mode 100755 view/theme/diabook/ch_directory_item.tpl

diff --git a/view/theme/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook-aerith/ch_directory_item.tpl
new file mode 100755
index 000000000..db1936e4b
--- /dev/null
+++ b/view/theme/diabook-aerith/ch_directory_item.tpl
@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index 6559c49ea..0453ec7ee 100644
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -103,7 +103,7 @@
 			</li>	
 		{{ endif }}		
 		
-      {{ if $nav.settings }}
+      {{ if $nav.home }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
 				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
 				<span id="home-update" class="nav-notify"></span></a>
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index df93cbed8..c798643b5 100644
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -36,7 +36,7 @@ function diabook_aerith_community_info(){
 		0,
 		9
 	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@@ -115,7 +115,7 @@ function diabook_aerith_community_info(){
 				dbesc(t('Profile Photos'))
 				);
 		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
diff --git a/view/theme/diabook-blue/ch_directory_item.tpl b/view/theme/diabook-blue/ch_directory_item.tpl
new file mode 100755
index 000000000..db1936e4b
--- /dev/null
+++ b/view/theme/diabook-blue/ch_directory_item.tpl
@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index 6559c49ea..0453ec7ee 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -103,7 +103,7 @@
 			</li>	
 		{{ endif }}		
 		
-      {{ if $nav.settings }}
+      {{ if $nav.home }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
 				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
 				<span id="home-update" class="nav-notify"></span></a>
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 2257f8df0..9aac48c38 100644
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -35,7 +35,7 @@ function diabook_blue_community_info(){
 		0,
 		9
 	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@@ -114,7 +114,7 @@ function diabook_blue_community_info(){
 				dbesc(t('Profile Photos'))
 				);
 		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
diff --git a/view/theme/diabook-red/ch_directory_item.tpl b/view/theme/diabook-red/ch_directory_item.tpl
new file mode 100755
index 000000000..db1936e4b
--- /dev/null
+++ b/view/theme/diabook-red/ch_directory_item.tpl
@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl
index 6559c49ea..0453ec7ee 100644
--- a/view/theme/diabook-red/nav.tpl
+++ b/view/theme/diabook-red/nav.tpl
@@ -103,7 +103,7 @@
 			</li>	
 		{{ endif }}		
 		
-      {{ if $nav.settings }}
+      {{ if $nav.home }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
 				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
 				<span id="home-update" class="nav-notify"></span></a>
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index fb2ad21fd..1ef65d83e 100644
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -35,7 +35,7 @@ function diabook_red_community_info(){
 		0,
 		9
 	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@@ -114,7 +114,7 @@ function diabook_red_community_info(){
 				dbesc(t('Profile Photos'))
 				);
 		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl
new file mode 100755
index 000000000..db1936e4b
--- /dev/null
+++ b/view/theme/diabook/ch_directory_item.tpl
@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 6559c49ea..0453ec7ee 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -103,7 +103,7 @@
 			</li>	
 		{{ endif }}		
 		
-      {{ if $nav.settings }}
+      {{ if $nav.home }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
 				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
 				<span id="home-update" class="nav-notify"></span></a>
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 490a647f3..0fdcbf701 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -41,7 +41,7 @@ function diabook_community_info(){
 		0,
 		9
 	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@@ -120,7 +120,7 @@ function diabook_community_info(){
 				dbesc(t('Profile Photos'))
 				);
 		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';

From 4e967fc79ffec8219a89a04f4e47fdc6662a7b08 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 16 Apr 2012 22:58:28 -0400
Subject: [PATCH 5/6] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master: (22 commits)
  diabook-themes: bugfix (sry, necessary)
  diabook-themes: small bug/css-fixes ---> ver. 1.019
  diabook-themes: bug-fixes
  diabook-themes: minor bugfixes
  turn on comment edit
  propagate edited comments
  edited comments weren't being relayed
  rev update
  diabook-themes: css-fixes
  open contact edit in same window
  where did this "lang" string come from and why?
  function name typo
  track requested profile error msg
  DBA: Reverting back to original source
  DBA: Nothing really done ..
  DBA: Deactivation of the mysqli-class for testing purposes.
  API: Improved the timeline. Several (disabled) tests with caching of photos.
  html2plain: changed behaviour for the "hr" element.
  API: Tweetdeck is now working
  API: Added Public Timeline
  ...

* master:

From 68e1523496437eae9d33011b4317590de3e32ecb Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 17 Apr 2012 00:26:37 -0400
Subject: [PATCH 6/6] finally fix the ui in the settings. it was fugly....
 other bug fixes too

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/style.css | 1504 +++++++++++++++---------------
 view/theme/dispy/jot-header.tpl |    1 -
 view/theme/dispy/style.css      | 1528 ++++++++++++++++---------------
 3 files changed, 1571 insertions(+), 1462 deletions(-)

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 20f5c5898..9743800bf 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -51,20 +51,23 @@ body, button, input, select, textarea {
     background-color: #2e2f2e;
 }
 select {
-	border: 1px #555 dotted;
-	padding: 3px;
-	margin: 2px;
-	color: #eec;
-	background: #2e2f2e;
+    border: 1px #555 dotted;
+    padding: 3px;
+    margin: 3px;
+    color: #eec;
+    background: #2e2f2e;
 }
 option {
-	padding: 3px;
-	vertical-align: middle;
-	color: #eec;
-	background: #2e2f2e;
+    padding: 3px;
+    color: #eec;
+    background: #2e2f2e;
+}
+option[selected="selected"] {
+	color: #2e2f2e;
+	background: #eec;
 }
 ul, ol {
-	padding: 0;
+    padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
@@ -134,7 +137,7 @@ a:hover img {
 }
 blockquote {
     background: #444;
-	color: #eec;
+    color: #eec;
     text-indent: 5px;
     padding: 5px;
     border: 1px #aaa solid;
@@ -158,36 +161,25 @@ a:hover {
 .fakelink:hover {
     color: #729fcf;
 }
-input[type=submit] {
-    background-color: #eee;
-	color: #2e302e;
-	font-weight: bold;
-    margin-top: 10px;
-    height: 22px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 0;
-}
 .smalltext {
     font-size: 0.7em;
 }
 #panel {
-	position: absolute;
-	font-size: 0.8em;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 1px solid #fff;
-	background-color: #2e302e;
-	color: #eeeeec;
-	padding: 1em;
+    position: absolute;
+    font-size: 0.8em;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 1px solid #fff;
+    background-color: #2e302e;
+    color: #eeeeec;
+    padding: 1em;
 }
 .pager {
-	margin-top: 60px;
-	display: block;
-	clear: both;
-	text-align: center;
+    margin-top: 60px;
+    display: block;
+    clear: both;
+    text-align: center;
 }
 .pager span {
     padding: 4px;
@@ -204,25 +196,25 @@ input[type=submit] {
  */
 /* .tool .action */
 .action {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 .tool {
-	margin: 5px 0;
-	list-style: none;
+    margin: 5px 0;
+    list-style: none;
 }
 #articlemain {
-	width: 100%;
-	height: 100%;
-	margin: 0 auto;
+    width: 100%;
+    height: 100%;
+    margin: 0 auto;
 }
 
 
 /**
- * 	login
+ * login
  */
 #asidemain .field {
-	overflow: hidden;
-	width: 200px;
+    overflow: hidden;
+    width: 200px;
 }
 #login-extra-links {
     overflow: auto !important;
@@ -237,34 +229,34 @@ input[type=submit] {
     float: none !important;
     height: 100% !important;
     position: relative !important;
-	width: 100% !important;
+    width: 100% !important;
 }
 #login_standard .field label {
-	width: 200px !important;
+    width: 200px !important;
 }
 #login_standard input, #login_standard input[type="text"] {
-	margin: 0 0 8px !important;
+    margin: 0 0 8px !important;
     width: 210px !important;
 }
 #login-submit-wrapper {
-	margin: 0 !important;
+    margin: 0 !important;
 }
 #login-submit-button {
     margin-left: 0px !important;
 }
 #asidemain #login_openid {
-	position: relative !important;
-	float: none !important;
-	margin-left: 0px !important;
-	height: auto !important;
-	width: 200px !important;
+    position: relative !important;
+    float: none !important;
+    margin-left: 0px !important;
+    height: auto !important;
+    width: 200px !important;
 }
 #login_openid #id_openid_url {
-	width: 180px !important;
-	overflow: hidden !important;
+    width: 180px !important;
+    overflow: hidden !important;
 }
 #login_openid label {
-	width: 180px !important;
+    width: 180px !important;
 }
 
 
@@ -272,77 +264,77 @@ input[type=submit] {
  * nav
  */
 nav {
-	height: 60px;
-	background-color: #1d1f1d;
-	color: #eeeeec;
-	position: relative;
-	padding: 20px 20px 10px 95px;
+    height: 60px;
+    background-color: #1d1f1d;
+    color: #eeeeec;
+    position: relative;
+    padding: 20px 20px 10px 95px;
 }
 nav a {
-	text-decoration: none;
-	color: #eeeeec;
-	border: 0px;
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
 }
 nav a:hover {
-	text-decoration: none;
-	color: #eeeeec;
+    text-decoration: none;
+    color: #eeeeec;
     border: 0px;
 }
 nav #banner {
-	display: block;
-	position: absolute;
-	left: 51px;
-	top: 25px;
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
 }
 nav #banner #logo-text a {
-	font-size: 40px;
-	font-weight: bold;
-	margin-left: 3px;
+    font-size: 40px;
+    font-weight: bold;
+    margin-left: 3px;
 }
 ul#user-menu-popup {
-	display: none;
-	position: absolute;
-	background-color: #555753;
-	width: 100%;
+    display: none;
+    position: absolute;
+    background-color: #555753;
+    width: 100%;
     padding: 10px 0px;
     margin: 0px;
-	top: 20px;
-	left: 0;
-	-webkit-border-radius: 0 0 5px 5px;
-	-moz-border-radius: 0 0 5px 5px;
-	border-radius: 0 0 5px 5px;
-	box-shadow: 5px 10px 10px 0 #111;
-	z-index: 10000;
+    top: 20px;
+    left: 0;
+    -webkit-border-radius: 0 0 5px 5px;
+    -moz-border-radius: 0 0 5px 5px;
+    border-radius: 0 0 5px 5px;
+    box-shadow: 5px 10px 10px 0 #111;
+    z-index: 10000;
 }
 ul#user-menu-popup li {
-	display: block;
+    display: block;
 }
 ul#user-menu-popup li a {
-	display: block;
-	padding: 5px;
+    display: block;
+    padding: 5px;
 }
 ul#user-menu-popup li a:hover {
-	color: #2e302e;
-	background-color: #eeeeec;
+    color: #2e302e;
+    background-color: #eeeeec;
 }
 ul#user-menu-popup li a.nav-sep {
-	border-top: 1px solid #eeeeec;
+    border-top: 1px solid #eeeeec;
 }
 nav .nav-link {
-	float: right;
-	display: block;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px 5px 5px;
-	text-indent: 50px;
-	background: transparent url(icons.png) 0 0 no-repeat;
+    float: right;
+    display: block;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px 5px 5px;
+    text-indent: 50px;
+    background: transparent url(icons.png) 0 0 no-repeat;
 }
 #nav-apps-link {
-	background-position: 0 -66px;
+    background-position: 0 -66px;
 }
 #nav-apps-link:hover {
-	background-position: -22px -66px;
+    background-position: -22px -66px;
 }
 #nav-community-link {
     background-position: 0 -22px;
@@ -357,16 +349,16 @@ nav .nav-link {
     background-position: -22px -22px;
 }
 #nav-directory-link {
-	background-position: -44px -154px;
+    background-position: -44px -154px;
 }
 #nav-directory-link:hover {
-	background-position: -66px -154px;
+    background-position: -66px -154px;
 }
 #nav-help-link {
-	background-position: 0 -110px;
+    background-position: 0 -110px;
 }
 #nav-help-link:hover {
-	background-position: -22px -110px;
+    background-position: -22px -110px;
 }
 #nav-home-link {
     background-position: -44px -132px;
@@ -375,22 +367,22 @@ nav .nav-link {
     background-position: -66px -132px;
 }
 #nav-intro-link {
-	background-position: 0px -190px;
+    background-position: 0px -190px;
 }
 #nav-intro-link:hover {
-	background-position: -44px -190px;
+    background-position: -44px -190px;
 }
 #nav-login-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-login-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-logout-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-logout-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-messages-link {
     background-position: -44px -88px;
@@ -411,10 +403,10 @@ nav .nav-link {
     background-position: -22px -177px;
 }
 #nav-search-link {
-	background-position: 0 -44px;
+    background-position: 0 -44px;
 }
 #nav-search-link:hover {
-	background-position: -22px -44px;
+    background-position: -22px -44px;
 }
 #profile-link,
 #profile-title, 
@@ -477,18 +469,19 @@ div.jGrowl div.info {
     color: black;
     text-decoration: underline;
 }
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_on.png");
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+    background-image: url("../../../images/icons/22/notify_on.png");
 }
 .show {
     display: block;
 }
 #notifications {
-	height: 20px;
-	width: 170px;
-	position: absolute;
-	top: -19px;
-	left: 7px;
+    height: 20px;
+    width: 170px;
+    position: absolute;
+    top: -19px;
+    left: 7px;
 }
 #nav-floater {
     position: fixed;
@@ -496,132 +489,133 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     right: 1%;
     padding: 5px;
     background: #1d1f1d;
-	color: transparent;
+    color: transparent;
     border-radius: 5px;
     z-index: 100;
-	width: 300px;
-	height: 60px;
+    width: 300px;
+    height: 60px;
 }
 #nav-buttons {
     clear: both;
-	list-style: none;
-	padding: 0px;
-	margin: 0 7px 0 0;
-	height: 25px;
+    list-style: none;
+    padding: 0px;
+    margin: 0 7px 0 0;
+    height: 25px;
 }
 #nav-buttons li {
-	padding: 0;
+    padding: 0;
 }
 .floaterflip {
-	display: block;
+    display: block;
     position: fixed;
     z-index: 110;
     top: 56px;
     right: 19px;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px;
-	background: transparent url(icons.png) -190px -60px no-repeat;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px;
+    background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	display: inline-block;
-	margin: 5px;
-	position: fixed;
-	right: 0px;
-	bottom: 0px;
-	z-index: 100;
-	background: #1d1f1d;
-	border-radius: 5px;
+    display: inline-block;
+    margin: 5px;
+    position: fixed;
+    right: 0px;
+    bottom: 0px;
+    z-index: 100;
+    background: #1d1f1d;
+    border-radius: 5px;
 }
 #search-text {
-	border: 1px #eec solid;
-	background: #2e2f2e;
-	color: #eec;
+    border: 1px #eec solid;
+    background: #2e2f2e;
+    color: #eec;
 }
 .search-box #search-text {
-	margin: 8px;
-	width: 10em;
-	color: #eec;
+    margin: 8px;
+    width: 10em;
+    height: 14px;
+    color: #eec;
 }
 #scrollup {
-	position: fixed;
-	right: 5px;
-	bottom: 40px;
-	z-index: 100;
+    position: fixed;
+    right: 5px;
+    bottom: 40px;
+    z-index: 100;
 }
 #scrollup a:hover {
-	text-decoration: none;
-	border: 0;
+    text-decoration: none;
+    border: 0;
 }
 #user-menu {
-	box-shadow: 5px 0 10px 0 #111;
+    box-shadow: 5px 0 10px 0 #111;
     display: block;	
     width: 75%;
     margin: 3px 0 0 0;
     position: relative;
-	background-color: #555753;
+    background-color: #555753;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
     background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
     clear: both;
-	top: 4px;
-	left: 10px;
-	padding: 2px;
+    top: 4px;
+    left: 10px;
+    padding: 2px;
 }
 #user-menu > a {
-	vertical-align: top;
+    vertical-align: top;
 }
 #user-menu-label {
-   	font-size: 12px;
+    font-size: 12px;
     padding: 3px 20px 9px 5px;
     height: 10px;
 }
 .nav-ajax-update, .nav-ajax-left {
-	width: 30px;
-	height: 19px;
-	background: transparent url(notifications.png) 0 0 no-repeat;
-	color: #222;
-	font-weight: bold;
-	font-size: 0.8em;
-	padding-top: 0.2em;
-	text-align: center;
-	float: left;
-	margin: 0 -1px 0 3px;
-	display: block;
-	visibility: hidden;
+    width: 30px;
+    height: 19px;
+    background: transparent url(notifications.png) 0 0 no-repeat;
+    color: #222;
+    font-weight: bold;
+    font-size: 0.8em;
+    padding-top: 0.2em;
+    text-align: center;
+    float: left;
+    margin: 0 -1px 0 3px;
+    display: block;
+    visibility: hidden;
 }
 .nav-ajax-update.show, .nav-ajax-left.show {
     visibility: visible;
 }
 #net-update {
-	background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 #mail-update {
-	background-position: -30px 0;
+    background-position: -30px 0;
 }
 #notify-update {
-	background-position: -60px 0px;
+    background-position: -60px 0px;
 }
 #home-update {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 #intro-update {
-	background-position: -120px 0px;
+    background-position: -120px 0px;
 }
 #lang-select-icon {
-	cursor: pointer;
-	position: fixed;
-	left: 28px;
-	bottom: 6px;
-	z-index: 10;
+    cursor: pointer;
+    position: fixed;
+    left: 28px;
+    bottom: 6px;
+    z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
-	z-index: 10;
+    z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -683,133 +677,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 
 
-/** sysmsg **/
+/**
+ * sysmsg
+ */
 #sysmsg_info {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border:2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border:2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border: 2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border: 2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display: block;
-	margin: 2px 0px;
-	border-top: 1px solid #ccccce;
+    display: block;
+    margin: 2px 0px;
+    border-top: 1px solid #ccccce;
 }
 
 
 /**
-* aside
-**/
+ * aside
+ */
 #asidemain {
-	float: left;
+    float: left;
     font-size: smaller;
     margin: 20px 0 20px 35px;
     width: 25%;
-	display: inline;
+    display: inline;
 }
 /* for now, disappear these */
 #asideright, #asideleft {
-	display: none;
+    display: none;
 }
 .vcard .fn {
-	font-size: 1.7em;
-	font-weight: bold;
-	border-bottom: 1px solid #729fcf;
-	padding-bottom: 3px;
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px;
 }
 .vcard #profile-photo-wrapper {
-	margin: 20px;
+    margin: 20px;
 }
 /* http://css-tricks.com/snippets/css/css-box-shadow/
- * box-shadow:
- * 1. The horizontal offset of the shadow, positive means
- * the shadow will be on the right of the box, a negative
- * offset will put the shadow on the left of the box.
- * 2. The vertical offset of the shadow, a negative one
- * means the box-shadow will be above the box, a
- * positive one means the shadow will be below the box.
- * 3. The blur radius (optional), if set to 0 the shadow
- * will be sharp, the higher the number, the more blurred
- * it will be.
- * 4. The spread radius (optional), positive values increase
- * the size of the shadow, negative values decrease the size.
- * Default is 0 (the shadow is same size as blur).
- * 5. Colo[u]r
- */
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
 .vcard #profile-photo-wrapper img {
-	box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
 }
 #asidemain h4 {
-	font-size: 1.2em;
+    font-size: 1.2em;
 }
 #asidemain #viewcontacts {
-	text-align: right;
+    text-align: right;
 }
 .aprofile dt {
-	background: #eec;
-	color: #2e2f2e;
-	font-weight: bold;
+    background: #eec;
+    color: #2e2f2e;
+    font-weight: bold;
     box-shadow: 1px 1px 5px 0 #000;
     margin: 15px 0 5px;
     padding-left: 5px;
 }
 #profile-extra-links ul {
-	margin-left: 0px;
+    margin-left: 0px;
     padding-left: 0px;
     list-style: none;
 }
 #dfrn-request-link {
-	background: #3465A4 url(connect.png) no-repeat 95% center;
-	border-radius: 5px 5px 5px 5px;
-	color: #eec;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    background: #3465A4 url(connect.png) no-repeat 95% center;
+    border-radius: 5px 5px 5px 5px;
+    color: #eec;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #wallmessage-link {
-	/*background: #3465A4 url(connect.png) no-repeat 95% center;*/
-	/*border-radius: 5px 5px 5px 5px;*/
-	color: #eee;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+    /*border-radius: 5px 5px 5px 5px;*/
+    color: #eee;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #netsearch-box {
-	margin: 20px 0px 30px;
+    margin: 20px 0px 30px;
     width: 150px;
 }
 #netsearch-box #search-submit {
     margin: 5px 5px 0px 0px;
 }
 .ttright {
-	margin: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 }
 
 
 /**
-* contacts block
-*/
+ * contacts block
+ */
 .contact-block-div {
     width: 50px;
     height: 50px;
@@ -827,20 +823,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * jot
- **/
+ */
 #jot {
-  /*width: 785px;*/
-  margin: 10px 0 20px 0px;
-  width: 100%;
+/*width: 785px;*/
+margin: 10px 0 20px 0px;
+width: 100%;
 }
 #jot #jot-tools {
-  margin: 0px;
-  padding: 0px;
-  height: 35px;
-  overflow: none;
-  width: 100%;
-  /*background-color: #0e232e;*/
-  /*border-bottom: 2px solid #9eabb0;*/
+margin: 0px;
+padding: 0px;
+height: 35px;
+overflow: none;
+width: 100%;
+/*background-color: #0e232e;*/
+/*border-bottom: 2px solid #9eabb0;*/
 }
 #jot #jot-tools span {
     float: left;
@@ -866,67 +862,67 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin-top: 10px;
 }
 #jot #jot-title {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     margin: 0 0 5px;
     height: 20px;
     width: 90%;
     font-weight: bold;
     border-radius: 5px;
-	vertical-align: middle;
+    vertical-align: middle;
 }
 #jot-category {
-	margin: 5px 0;
-	border-radius: 5px;
-	border: 1px #999 solid;
-	color: #aaa;
-	font-size: smaller;
+    margin: 5px 0;
+    border-radius: 5px;
+    border: 1px #999 solid;
+    color: #aaa;
+    font-size: smaller;
 }
 #jot-category:focus {
-	color: #eee;
+    color: #eee;
 }
 #jot #character-counter {
-	width: 6%;
-	float: right;
-	text-align: right;
-	height: 15px;
-	line-height: 20px;
-	padding: 2px 20px 5px 0;
+    width: 6%;
+    float: right;
+    text-align: right;
+    height: 15px;
+    line-height: 20px;
+    padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-	/*border-radius: 10px;*/
-	box-shadow: 5px 0 10px 0 #111;
+    /*border-radius: 10px;*/
+    box-shadow: 5px 0 10px 0 #111;
 }
 #profile-jot-text_tbl {
-	margin-bottom: 10px;
-	/*border-radius: 10px;*/
-	background: #888;
+    margin-bottom: 10px;
+    /*border-radius: 10px;*/
+    background: #888;
 }
 #profile-jot-text_ifr {
-	width:99.900002% !important;
+    width:99.900002% !important;
 }
 #profile-jot-text_toolbargroup {
-	background: #888;
+    background: #888;
 }
 .mceCenter table tr {
-	background: #888;
+    background: #888;
 }
 [id$="jot-text_ifr"] {
-	width: 99.900002% !important;
-	color: #2e2f2e;
-	background: #eec;
+    width: 99.900002% !important;
+    color: #2e2f2e;
+    background: #eec;
 }
 [id$="jot-text_ifr"] .mceContentBody {
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
 }
 .mceFirst tr {
-	background: #888;
+    background: #888;
 }
 .mceFirst td {
-	/*border-radius: 10px 10px 0px 0px;*/
+    /*border-radius: 10px 10px 0px 0px;*/
 }
 .mceLast td {
-	/*border-radius: 0 0 10px 10px;*/
+    /*border-radius: 0 0 10px 10px;*/
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -937,58 +933,58 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #profile-upload-wrapper,
 #profile-video-wrapper {
     float: left;
-	margin: 0 20px 0 0;
+    margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
-	float: right; 
+    float: right; 
 }
 #profile-jot-tools-end,
 #profile-jot-banner-end {
-	clear: both;
+    clear: both;
 }
 #profile-jot-email-wrapper {
-	margin:10px 10% 0;
-	border:1px solid #555753;
-	border-bottom:0;
+    margin:10px 10% 0;
+    border:1px solid #555753;
+    border-bottom:0;
 }
 #profile-jot-email-label {
-	background-color:#555753;
-	color:#ccccce;
-	padding:5px;
+    background-color:#555753;
+    color:#ccccce;
+    padding:5px;
 }
 #profile-jot-email {
-	width:90%;
-	margin:5px;
+    width:90%;
+    margin:5px;
 }
 #profile-jot-networks {
-	margin: 0 10%;
-	border: 1px solid #555753;
-	border-top: 0;
-	border-bottom: 0;
-	padding: 5px;
+    margin: 0 10%;
+    border: 1px solid #555753;
+    border-top: 0;
+    border-bottom: 0;
+    padding: 5px;
 }
 #profile-jot-net {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
     text-decoration: none;
-	float: right;
+    float: right;
 }
 .icon-text-preview {
-	margin: 0 0 -18px 0;
-	display: block;
+    margin: 0 0 -18px 0;
+    display: block;
     width: 20px;
     height: 20px;
     background: url(icons.png) no-repeat -128px -40px;
     border: 0;
     text-decoration: none;
-	float: right;
-	cursor: pointer;
+    float: right;
+    cursor: pointer;
 }
 #profile-jot-perms { 
-	float: right;
+    float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
@@ -1000,103 +996,108 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
-	width: 1px;
-	margin: 10px 0 0 0;
-	float: right;
+    width: 1px;
+    margin: 10px 0 0 0;
+    float: right;
 }
 #profile-jot-submit-wrapper {
-	float: right;
-	width: 100%;
-	list-style: none;
-	margin: 10px 0 0 0;
-	padding: 0;
+    float: right;
+    width: 100%;
+    list-style: none;
+    margin: 10px 0 0 0;
+    padding: 0;
 }
 #profile-jot-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0;
-	margin: 0;
-	float: right;
+    height: auto;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 2px outset #222420;
+    margin: 0;
+    float: right;
+    text-shadow: 1px 1px #111;
+    width: auto;
+}
+#profile-jot-submit:active {
+    box-shadow: 0 0 0 0;
 }
 #jot-perms-icon {
-	height: 22px;
-	width: 20px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	overflow: hidden;
-	border: 0;
+    height: 22px;
+    width: 20px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    overflow: hidden;
+    border: 0;
 }
 #profile-jot-acl-wrapper {
-	margin: 0 10px;
-	border: 1px solid #555753;
-	border-top: 0;
-	display: block !important;
+    margin: 0 10px;
+    border: 1px solid #555753;
+    border-top: 0;
+    display: block !important;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
 #acl-permit-outer-wrapper {
-	width:47%;
-	float:left;
+    width:47%;
+    float:left;
 }
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	width:47%;
-	float:right;
+    width:47%;
+    float:right;
 }
 #acl-permit-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #jot-public {
-	background-color: #555753;
-	color: #ff0000;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ff0000;
+    padding: 5px;
+    float: left;
 }
 #acl-deny-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #acl-permit-text-end,
 #acl-deny-text-end {
-	clear: both;
+    clear: both;
 }
 #jot-title-desc {
-	color: #ccc;
+    color: #ccc;
 }
 #profile-jot-desc {
-	color: #ff2000;
-	margin: 5px 0;
+    color: #ff2000;
+    margin: 5px 0;
 }
 #jot-title-wrapper {
-	margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #jot-title-display {
-	font-weight: bold;
+    font-weight: bold;
 }
 .jothidden {
     display: none;
 }
 #jot-preview-content {
     background-color: #3e3f3e;
-	color: #eec;
+    color: #eec;
     border: 1px #eec solid;
     border-radius: 5px;
     padding: 3px 3px 6px 10px;
 }
 #jot-preview-content .wall-item-outside-wrapper {
-	border: 0;
-	border-radius: 0px;
+    border: 0;
+    border-radius: 0px;
 }
 
 
@@ -1106,13 +1107,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #sectionmain {
     margin: 20px;
     font-size: 0.8em;
-	min-width: 475px;
-	width: 67%;
-	float: left;
-	display: inline;
+    min-width: 475px;
+    width: 67%;
+    float: left;
+    display: inline;
 }
 
-/** tabs **/
+/**
+ * tabs
+ */
 .tabs {
     list-style: none;
     margin: 10px 0;
@@ -1120,12 +1123,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .tabs li {
     display: inline;
-	font-size: smaller;
-	font-weight: bold;
+    font-size: smaller;
+    font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
-	padding: 4px;
+    padding: 4px;
 }
 .tab:hover, .tab.active:hover {
     background: #88a9d2;
@@ -1136,60 +1139,60 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     color: #2e2f2e;
 }
 .tab.active {
-	background: #88a9d2;
+    background: #88a9d2;
     color: #2e2f2e;
 }
 .tab.active a {
-	color: #2e2f2e;
+    color: #2e2f2e;
 }
 .tab a {
-	border: 0;
-	text-decoration: none;
+    border: 0;
+    text-decoration: none;
 }
 
 
 /**
- * 	items
+ * items
  */
 .wall-item-outside-wrapper {
-	border: 1px solid #aaa;
-	border-radius: 5px;
-	box-shadow: 5px 0 10px 0 #111;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    box-shadow: 5px 0 10px 0 #111;
 }
 .wall-item-outside-wrapper.comment {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 .wall-item-outside-wrapper-end {
     clear: both;
 }
 .wall-item-content-wrapper {
     position: relative;
-	padding: 10px;
-	width: auto;
+    padding: 10px;
+    width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
     /*margin-left: 90px;*/
 }
 .shiny {
     background: #2e3436;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .wall-outside-wrapper .shiny {
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .heart {
-	color: red;
+    color: red;
 }
 .wall-item-content {
-	overflow-x: auto;
-	margin: 0px 15px 0px 5px;
+    overflow-x: auto;
+    margin: 0px 15px 0px 5px;
 }
 /* removing it from here, vs. putting it in .wall-item-content
- * might break things for people. we shall see ;) */
+* might break things for people. we shall see ;) */
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
     margin: 15px 0 0 0;
     padding: 0px;
-	/*overflow-x: auto;*/
+    /*overflow-x: auto;*/
 }
 .wall-item-photo-menu {
     display: none;
@@ -1223,7 +1226,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     border-radius: 5px;
 }
 [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-	/*margin: 0 0 5px 0;*/
+    /*margin: 0 0 5px 0;*/
 }
 .wall-item-tools {
     float: right;
@@ -1259,41 +1262,41 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 25px;
 }
 .wall-item-title {
-	font-size: 1.2em;
-	font-weight: bold;
+    font-size: 1.2em;
+    font-weight: bold;
     margin-bottom: 1em;
 }
 .wall-item-body {
-	margin: 20px 20px 10px 0px;
+    margin: 20px 20px 10px 0px;
     text-align: left;
-	overflow-x: auto;
+    overflow-x: auto;
 }
 .wall-item-lock-wrapper {
-	float: right;
+    float: right;
     height: 22px;
     margin: 0 -5px 0 0;
     width: 22px;
-	opacity: 1;
+    opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 5px 0 5px 120px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 5px 0 5px 120px;
 }
 .wall-item-author, .wall-item-actions-author {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 20px 20px 0 110px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
-	display: inline;
-	padding-left: 10px;
+    display: inline;
+    padding-left: 10px;
 }
 .wall-item-wrapper-end {
-	clear:both;
+    clear:both;
 }
 .wall-item-location {
     margin-top: 15px;
@@ -1342,17 +1345,17 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     z-index: 10002;
 }
 .wall-item-photo-menu {
-	min-width: 92px;
-	border: 2px solid #FFFFFF;
-	border-top: 0px;
-	background: #555753;
-	position: absolute;
-	left: -2px; top: 101px;
-	display: none;
-	z-index: 10003;
-	-webkit-border-radius: 0px 5px 5px 5px;
-	-moz-border-radius: 0px 5px 5px 5px;
-	border-radius: 0px 5px 5px 5px;
+    min-width: 92px;
+    border: 2px solid #FFFFFF;
+    border-top: 0px;
+    background: #555753;
+    position: absolute;
+    left: -2px; top: 101px;
+    display: none;
+    z-index: 10003;
+    -webkit-border-radius: 0px 5px 5px 5px;
+    -moz-border-radius: 0px 5px 5px 5px;
+    border-radius: 0px 5px 5px 5px;
 }
 .wall-item-photo-menu ul {
     margin:0px;
@@ -1374,27 +1377,27 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 100%;
 }
 #connect-services-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #connect-services {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 
 
 /**
- * 	comment
+ * comment
  */
 .ccollapse-wrapper {
     font-size: 0.9em;
@@ -1413,7 +1416,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     height: 40px;
 }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px;
+    width: 50px;
     top: 45px;
     background-position: 35px center;
 }
@@ -1439,12 +1442,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
-	width: 20px;
-	height: 20px;
+    width: 20px;
+    height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-	float: left;
-	margin-left: 10px;
+    float: left;
+    margin-left: 10px;
 }
 .my-comment-photo {
     width: 40px;
@@ -1456,32 +1459,32 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 84.5%;
 }
 .comment-edit-text-empty {
-	height: 20px;
-	border: 2px #c8bebe solid;
-	border-radius: 5px;
-	color: #c8bebe;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    height: 20px;
+    border: 2px #c8bebe solid;
+    border-radius: 5px;
+    color: #c8bebe;
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-text-empty:hover {
-	color: #999999;
+    color: #999999;
 }
 .comment-edit-text-full {
-	height: 10em;
+    height: 10em;
     border-radius: 5px;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-submit-wrapper {
-	width: 90%;
-	margin: 5px 5px 10px 50px;
-	text-align: right;
+    width: 90%;
+    margin: 5px 5px 10px 50px;
+    text-align: right;
 }
 .comment-edit-submit {
     height: 22px;
@@ -1496,22 +1499,22 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * item text style
- **/
+ */
 .wall-item-body code {
-	display: block;
-	padding: 0 0 10px 5px;
-	border-color: #ccc;
-	border-style: solid;
-	border-width: 1px 1px 1px 10px;
-	background: #eee;
-	color: #2e2f2e;
-	width: 95%;
+    display: block;
+    padding: 0 0 10px 5px;
+    border-color: #ccc;
+    border-style: solid;
+    border-width: 1px 1px 1px 10px;
+    background: #eee;
+    color: #2e2f2e;
+    width: 95%;
 }
 
 
 /**
  * profile
- **/
+ */
 div[id$="text"] {
     font-weight: bold;
     border-bottom: 1px solid #ccc;
@@ -1530,10 +1533,10 @@ div[id$="wrapper"] br {
 
 /**
  * photos
- **/
+ */
 .photos {
-	height: auto;
-	overflow: auto;
+    height: auto;
+    overflow: auto;
 }
 #photo-top-links {
     margin-bottom: 30px;
@@ -1545,7 +1548,7 @@ div[id$="wrapper"] br {
     -webkit-box-shadow: 3px 3px 10px 0 #000;
     box-shadow: 3px 3px 10px 0 #000;
     background-color: #222;
-	color: #2e2f2e;
+    color: #2e2f2e;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -1581,8 +1584,8 @@ div[id$="wrapper"] br {
     margin: 0 5px;
 }
 #photo-photo {
-	position: relative;
-	float:left;
+    position: relative;
+    float:left;
 }
 #photo-photo-end {
     clear: both;
@@ -1659,10 +1662,10 @@ div[id$="wrapper"] br {
     margin-bottom: 15px;
 }
 #photo-edit-caption {
-	width: 100%;
+    width: 100%;
 }
 #photo-edit-newtag {
-	width: 100%;
+    width: 100%;
 }
 #photo-like-div {
     margin-bottom: 25px;
@@ -1684,15 +1687,15 @@ div[id$="wrapper"] br {
 }
 
 /**
- * 	message
+ * message
  */
 .prvmail-text {
     width: 100%;
 }
 #prvmail-subject {
     width: 100%;
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1716,7 +1719,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
-	font-size: 1.1em;
+    font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
@@ -1724,7 +1727,7 @@ div[id$="wrapper"] br {
     padding-left: 10px;
 }
 .mail-list-sender-name, .mail-list-date {
-	font-style: italic;
+    font-style: italic;
 }
 .mail-list-subject {
     font-size: 1.2em;
@@ -1734,7 +1737,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-outside-wrapper-end {
     clear: both;
-	border-bottom: 1px #eec dotted;
+    border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1764,15 +1767,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	contacts
+ * contacts
  */
 .view-contact-wrapper,
 .contact-entry-wrapper {
     float: left;
     margin: 0 5px 40px 0;
     width: 120px;
-	height: 120px;
-	padding: 3px;
+    height: 120px;
+    padding: 3px;
     position: relative;
 }
 .contact-direction-wrapper {
@@ -1787,7 +1790,7 @@ div[id$="wrapper"] br {
 
 }
 .contact-entry-photo {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 .contact-entry-name {
     width: 120px;
@@ -1795,7 +1798,7 @@ div[id$="wrapper"] br {
     /*overflow: hidden;*/
 }
 .contact-entry-photo {
-	position: relative;
+    position: relative;
 }
 .contact-entry-edit-links .icon {
     border: 1px solid #babdb6;
@@ -1838,7 +1841,7 @@ div[id$="wrapper"] br {
     margin-left:5px;
 }
 #contact-edit-nav-wrapper .icon {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
@@ -1883,7 +1886,7 @@ div[id$="wrapper"] br {
     width: auto;
     border: 2px solid #444;
     background: #2e2f2e;
-	color: #eec;
+    color: #eec;
     position: absolute;
     left: 0px; top: 90px;
     display: none;
@@ -1906,7 +1909,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	register, settings & profile forms
+ * register, settings & profile forms
  */
 .openid {
 
@@ -1923,7 +1926,7 @@ div[id$="wrapper"] br {
     -moz-border-radius: 5px;
     border-radius: 5px;
     padding: 5px;
-	color: #111;
+    color: #111;
 }
 #settings-default-perms {
     margin-bottom: 20px;
@@ -1932,7 +1935,15 @@ div[id$="wrapper"] br {
 #profile-edit-form div {
     clear: both;
 }
-
+.settings-block {
+    
+}
+.settings-block label {
+    clear: left;
+}
+.settings-block input {
+    margin: 10px 5px;
+}
 /*#register-form label,     */
 /*#profile-edit-form label {*/
 /*    width: 300px;         */
@@ -1946,23 +1957,23 @@ div[id$="wrapper"] br {
 /*    margin-bottom: 20px; */
 /*}                        */
 #profile-edit-marital-label span {
-	margin: -4px;
+    margin: -4px;
 }
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	display: none;
+    display: none;
 }
 /*.profile-edit-side-div:hover {
-	display: block;
+    display: block;
 }
 .profile-edit-side-link {
-	margin: 3px 0px 0px 70px;
+    margin: 3px 0px 0px 70px;
 }*/
 #profiles-menu-trigger {
-	margin: 0px 0px 0px 25px;
+    margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
@@ -1971,16 +1982,16 @@ div[id$="wrapper"] br {
 .icon-profile-edit {
     background: url("icons.png") -150px 0px no-repeat;
     border: 0;
-	cursor: pointer;
+    cursor: pointer;
     display: block;
     float: right;
-	width: 20px;
+    width: 20px;
     height: 20px;
     margin: 0 0 -18px;
-	position: absolute;
+    position: absolute;
     text-decoration: none;
-	top: 113px;
-	right: 260px;
+    top: 113px;
+    right: 260px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
@@ -1988,26 +1999,32 @@ div[id$="wrapper"] br {
     list-style: none;
 }
 .marital {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 #register-sitename {
     display: inline;
     font-weight: bold;
 }
 #advanced-expire-popup {
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #id_ssl_policy {
-	width: 374px;
+    width: 374px;
+}
+#theme-preview {
+
+}
+#theme-preview img {
+    margin: 10px 10px 10px 288px;
 }
 
 
 /**
- * 	contacts selector
+ * contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 50px 0 0;
+    margin: -31px 50px 0 0;
     float: right;
 }
 /*.group-delete-icon {
@@ -2130,70 +2147,70 @@ div[id$="wrapper"] br {
 
 /**
  * events
- **/
+ */
 .clear { clear: both; }
 .eventcal {
     float:left;
     font-size:20px;
 }
 .event {
-	background: #2e2f2e;
+    background: #2e2f2e;
 }
 .vevent {
     border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 .vevent .event-start {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 #new-event-link {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .edit-event-link, .plink-event-link {
-	/*float: left;      */
-	/*margin-top: 4px;  */
-	/*margin-right: 4px;*/
-	/*margin-bottom: 15px;*/
+    /*float: left;      */
+    /*margin-top: 4px;  */
+    /*margin-right: 4px;*/
+    /*margin-bottom: 15px;*/
 }
 .event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
+    content: url('../../../images/calendar.png');
+    margin-right: 15px;
 }
 .event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
-	font-size: smaller;
+    margin-left: 10px;
+    width: 330px;
+    font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
-	float: right;
+    float: right;
 }
 .event-list-date {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
+    float: left;
+    margin-left: 32px;
+    margin-right: 32px;
+    margin-top: 64px;
 }
 .event-calendar-end {
-	clear: both;
+    clear: both;
 }
 .calendar {
     font-family: monospace;
 }
 .today {
-	font-weight: bold;
-	color: #FF0000;
+    font-weight: bold;
+    color: #FF0000;
 } 
 #event-start-text, 
 #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-nofinish-checkbox,
 #event-nofinish-text,
@@ -2203,69 +2220,69 @@ div[id$="wrapper"] br {
     float:left;
 }
 #event-datetime-break {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
-	clear: both;
+    clear: both;
 }
 #event-desc-text, 
 #event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-submit {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .body-tag {
-	margin: 10px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 10px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .body-tag:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .filesavetags, .categorytags {
-	margin: 20px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 20px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .filesavetags:hover, .categorytags:hover {
-	margin: 20px 0;
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    margin: 20px 0;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 5px;
+    opacity: 0.1;
+    filter:alpha(opacity=10);
+    float: right;
+    margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
+    opacity: 1;
+    filter:alpha(opacity=100);
 }
 #item-delete-selected {
-	margin-top: 30px;
+    margin-top: 30px;
 }
 /* was tired of having no way of moving it around, so
- * here's a little 'hook' to do so */
+* here's a little 'hook' to do so */
 .delete-checked {
-	position: absolute;
-	left: 35px;
-	margin-top: 20px;
+    position: absolute;
+    left: 35px;
+    margin-top: 20px;
 }
 #item-delete-selected-end {
-	clear: both;
+    clear: both;
 }
 #item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
+    float: left;
+    margin-right: 5px;
 }
 #item-delete-selected-desc:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 .fc-state-highlight {
     background: #eec;
@@ -2274,15 +2291,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	directory
+ * directory
  */
 .directory-item {
     float: left;
-	/*margin: 50px 50px 0px 0px;*/
-	margin: 0 5px 4px 0;
-	padding: 3px;
-	width: 180px;
-	height: 250px;
+    /*margin: 50px 50px 0px 0px;*/
+    margin: 0 5px 4px 0;
+    padding: 3px;
+    width: 180px;
+    height: 250px;
     position: relative;
 }
 
@@ -2295,12 +2312,12 @@ div[id$="wrapper"] br {
 }
 .group-selected, .nets-selected, .fileas-selected {
     padding: 3px;
-	color: #2e2f2e;
+    color: #2e2f2e;
     background: #88a9d2;
     font-weight: bold;
 }
 .group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-	color: #2e2f2e;
+    color: #2e2f2e;
 }
 .groupsideedit {
     margin-right: 10px;
@@ -2331,7 +2348,7 @@ div[id$="wrapper"] br {
     text-align: center;
 }
 #peoplefind-sidebar form {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #sidebar-new-group:hover {
     /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
@@ -2346,14 +2363,14 @@ div[id$="wrapper"] br {
 #side-peoplefind-url {
     background-color: #2e2f2e;
     color: #eec;
-	border: 1px 999 solid;
-	margin-right: 3px;
-	width: 75%;
+    border: 1px 999 solid;
+    margin-right: 3px;
+    width: 75%;
 }
 #side-peoplefind-url:hover, #side-peoplefind-url:focus {
     background-color: #efefef;
     color: #222;
-	border: 1px 333 solid;
+    border: 1px 333 solid;
 }
 .nets-ul {
     list-style-type: none;
@@ -2379,7 +2396,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * ADMIN
+ * admin
  */
 #pending-update {
     float:right;
@@ -2395,10 +2412,10 @@ div[id$="wrapper"] br {
     list-style-position: inside;
 }
 #adminpage {
-	color: #eec;
-	background: #2e2f2e;
-	margin: 5px;
-	padding: 10px;
+    color: #eec;
+    background: #2e2f2e;
+    margin: 5px;
+    padding: 10px;
 }
 #adminpage dl {
     clear:left;
@@ -2412,14 +2429,14 @@ div[id$="wrapper"] br {
     font-weight: bold;
 }
 #adminpage dd {
-	margin-left: 250px;
+    margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
-	clear:left;
+    clear:left;
 }
 #adminpage #pluginslist {
     margin: 0;
@@ -2434,8 +2451,8 @@ div[id$="wrapper"] br {
     clear: left;
 }
 #adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
+    float:left;
+    margin-right: 1em;
 }
 #adminpage table {
     width: 100%;
@@ -2452,46 +2469,67 @@ div[id$="wrapper"] br {
     width: 16px; height: 16px;
 }
 #adminpage table tr:hover {
-	color: #2e2f2e;
+    color: #2e2f2e;
     background-color: #eec;
 }
 #adminpage .selectall {
     text-align: right;
 }
 #adminpage #users a {
-	color: #eec;
-	text-decoration: underline;
+    color: #eec;
+    text-decoration: underline;
 }
 #users .name {
-	color: #eec;
+    color: #eec;
 }
 
 
 /**
- * Form fields
+ * form fields
  */
 .field {
-	/*margin-bottom: 10px;*/
-	/*padding-bottom: 10px;*/
-	overflow: auto;
+    /*margin-bottom: 10px;*/
+    /*padding-bottom: 10px;*/
+    overflow: auto;
     width: 100%;
 }
 .field label, label {
-    float: left;
-    width: 275px;
-	display: block;
-	font-size: 1.077em;
-	margin: 0 10px 0.5em 0;
-	border: 1px #2e2f2e solid;
-	padding: 5px;
-	background: #eec;
-	vertical-align: middle;
-	color: #111;
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #2e2f2e solid;
+    padding: 5px;
+    background: #eec;
+    color: #111;
 }
-.field input, input[type="text"] {
-	width: 250px;
-	height: 25px;
-	border: 1px #999 solid;
+input,
+input[type="text"],
+input[type="password"],
+input[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid;
+}
+input[type="checkbox"], input[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
+}
+input[type="submit"], input[type="button"] {
+    background-color: #eee;
+    border: 2px outset #aaa;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #2e302e;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #000;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+}
+input[type="submit"]:active, input[type="button"]:active {
+    box-shadow: 0 0 0 0;
 }
 .field textarea {
     width: 80%;
@@ -2514,12 +2552,12 @@ div[id$="wrapper"] br {
     text-decoration: none;
 }
 .field .onoff .on {
-	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
     color: #111;
     text-align: left;
 }
 .field .onoff .off {
-	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
     color: #333;
     text-align: right;
 }
@@ -2532,34 +2570,34 @@ div[id$="wrapper"] br {
 
 
 /*
- * UPDATE
+ * update
  */
 .popup { 	
-	width: 100%;
+    width: 100%;
     height: 100%;
-	top: 0px;
+    top: 0px;
     left: 0px;
-	position: absolute;
-	display: none;
+    position: absolute;
+    display: none;
 }
 .popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%;
+    background-color: rgba(0,0,0,128);
+    opacity: 0.5;
+    width: 100%;
     height: 100%;
-	position: absolute;
-	top:0px;
+    position: absolute;
+    top:0px;
     left:0px;
 }
 .popup .panel {
-	top: 25%;
+    top: 25%;
     left: 25%;
     width: 50%;
     height: 50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF;
 }
 #panel {
     z-index: 100;
@@ -2608,32 +2646,32 @@ div[id$="wrapper"] br {
  * OAuth
  */
 .oauthapp {
-	height: auto;
+    height: auto;
     overflow: auto;
-	border-bottom: 2px solid #cccccc;
-	padding-bottom: 1em;
-	margin-bottom: 1em;	
+    border-bottom: 2px solid #cccccc;
+    padding-bottom: 1em;
+    margin-bottom: 1em;	
 }
 .oauthapp img {
-	float: left;
-	width: 48px; height: 48px;
-	margin: 10px;
+    float: left;
+    width: 48px; height: 48px;
+    margin: 10px;
 }
 .oauthapp img.noicon {
-	background-image: url("../../../images/icons/48/plugin.png");
-	background-position: center center;
-	background-repeat: no-repeat;
+    background-image: url("../../../images/icons/48/plugin.png");
+    background-position: center center;
+    background-repeat: no-repeat;
 }
 .oauthapp a {
-	float: left;
+    float: left;
 }
 
 
 /**
- * ICONS
+ * icons
  */
 .iconspacer {
-	display: block;
+    display: block;
     width: 16px;
     height: 16px;
 }
@@ -2644,7 +2682,7 @@ div[id$="wrapper"] br {
     background: url(icons.png) no-repeat;
     border: 0;
     text-decoration: none;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .icon:hover {
     border: 0;
@@ -2653,15 +2691,15 @@ div[id$="wrapper"] br {
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;
-	margin: 0 2px;
+    margin: 0 2px;
 }
 .icon.s22.delete {
-	display: block;
-	background-position: -110px 0;
+    display: block;
+    background-position: -110px 0;
 }
 .icon.s22.text {
-	padding: 10px 0px 0px 25px;
-	width: 200px;
+    padding: 10px 0px 0px 25px;
+    width: 200px;
 }
 .icon.text {
     text-indent: 0px;
@@ -2677,118 +2715,118 @@ div[id$="wrapper"] br {
     margin: 0px 5px;    
 }
 .article {
-	background-position: -50px 0;
+    background-position: -50px 0;
 }
 .audio {
-	background-position: -70px 0;
+    background-position: -70px 0;
 }
 .block {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 .drop, .delete {
-	background-position: -110px 0;
+    background-position: -110px 0;
 }
 .drophide {
-	background-position: -130px 0;
+    background-position: -130px 0;
 }
 .edit {
-	background-position: -150px 0;
+    background-position: -150px 0;
 }
 .camera {
-	background-position: -170px 0;
+    background-position: -170px 0;
 }
 .dislike {
-	background-position: -190px 0;
+    background-position: -190px 0;
 }
 .file-as {
-	background-position: -230px -60px;
+    background-position: -230px -60px;
 }
 .like {
-	background-position: -211px 0;
+    background-position: -211px 0;
 }
 .link {
-	background-position: -230px 0;
+    background-position: -230px 0;
 }
 .globe, .location {
-	background-position: -50px -20px;
+    background-position: -50px -20px;
 }
 .noglobe, .nolocation {
-	background-position: -70px -20px;
+    background-position: -70px -20px;
 }
 .no {
-	background-position: -90px -20px;
+    background-position: -90px -20px;
 }
 .pause {
-	background-position: -110px -20px;
+    background-position: -110px -20px;
 }
 .play {
-	background-position: -130px -20px;
+    background-position: -130px -20px;
 }
 .pencil {
-	background-position: -151px -18px;
+    background-position: -151px -18px;
 }
 .small-pencil {
-	background-position: -170px -20px;
+    background-position: -170px -20px;
 }
 .recycle {
-	background-position: -190px -20px;
+    background-position: -190px -20px;
 }
 .remote-link {
-	background-position: -210px -20px;
+    background-position: -210px -20px;
 }
 .share {
-	background-position: -230px -20px;
+    background-position: -230px -20px;
 }
 .tools {
-	background-position: -50px -40px;
+    background-position: -50px -40px;
 }
 .lock {
-	background-position: -70px -40px;
+    background-position: -70px -40px;
 }
 .unlock {
-	background-position: -88px -40px;
+    background-position: -88px -40px;
 }
 .video {
-	background-position: -110px -40px;
+    background-position: -110px -40px;
 }
 .attach {
-	background-position: -190px -40px;
+    background-position: -190px -40px;
 }
 .language {
-	background-position: -210px -40px;
+    background-position: -210px -40px;
 }
 .starred {
-	background-position: -130px -60px;
+    background-position: -130px -60px;
 }
 .unstarred {
-	background-position: -150px -60px;
+    background-position: -150px -60px;
 }
 .tagged {
-	background-position: -170px -60px;
+    background-position: -170px -60px;
 }
 .on {
-	background-position: -50px  -60px;
+    background-position: -50px  -60px;
 }
 .off {
-	background-position: -70px  -60px;
+    background-position: -70px  -60px;
 }
 .prev {
-	background-position: -90px  -60px;
+    background-position: -90px  -60px;
 }
 .next {
-	background-position: -110px  -60px;
+    background-position: -110px  -60px;
 }
 .icon.dim {
-	opacity: 0.3;
-	filter: alpha(opacity=30);
+    opacity: 0.3;
+    filter: alpha(opacity=30);
 }
 #pause {
-	position: fixed;
-	bottom: 40px;
-	right: 30px;
+    position: fixed;
+    bottom: 40px;
+    right: 30px;
 }
 .border, .border:hover {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;	
@@ -2817,7 +2855,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	footer
+ * footer
  */
 .cc-license {
     margin-top: 100px;
@@ -2825,7 +2863,7 @@ div[id$="wrapper"] br {
 }
 footer {
     display: block;
-	/*margin: 50px 20%;*/
+    /*margin: 50px 20%;*/
     clear: both;
 }
 #profile-jot-text {
@@ -2837,24 +2875,26 @@ footer {
 }
 
 
-/** acl **/
+/**
+ * acl
+ */
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #acl-wrapper {
     width: 660px;
-	margin: 0 auto;
+    margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
-	margin: 6px;
-	color: #111;
+    margin: 6px;
+    color: #111;
 }
 #acl-showall {
     float: left;
@@ -2867,7 +2907,7 @@ footer {
     -moz-border-radius: 5px;
     border-radius: 5px;
     color: #999;
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #acl-showall.selected {
     color: #000;
@@ -2883,7 +2923,7 @@ footer {
 /*#acl-list-content {
 }*/
 .acl-list-item {
-	border: 1px solid #eec;
+    border: 1px solid #eec;
     display: block;
     float: left;
     height: 110px;
@@ -2907,29 +2947,29 @@ footer {
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
-	clear: both;
+    clear: both;
     font-size: 10px;
     display: block;
     width: 55px;
     height: 20px;
     color: #2e2f2e;
     margin: 5px auto 0;
-	padding: 0 3px;
-	text-align: center;
-	vertical-align: middle;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle;
 }
 #acl-wrapper a:hover {
     text-decoration: none;
     color: #2e2f2e;
-	border: 0;
+    border: 0;
 }
 .acl-button-show {
     background-image: url('../../../images/show_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-hide {
     background-image: url('../../../images/hide_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-show.selected {
     color: #2e2f2e;
@@ -2952,25 +2992,25 @@ footer {
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 175px;
+    max-height: 175px;
     max-width: 42%;
-	background-color: #555753;
-	color: #fff;
-	overflow: auto;
-	z-index: 100000;
-	border: 1px solid #cccccc;
+    background-color: #555753;
+    color: #fff;
+    overflow: auto;
+    z-index: 100000;
+    border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color: #555753;
+    background-color: #555753;
     padding: 4px;
-	clear: left;
+    clear: left;
 }
 .acpopupitem img {
-	float: left;
-	margin-right: 4px;
+    float: left;
+    margin-right: 4px;
 }
 .acpopupitem.selected {
-	color: #2e302e;
+    color: #2e302e;
     background-color: #eeeeec;
 }
 .qcomment-wrapper {
@@ -2978,12 +3018,12 @@ footer {
     margin: 5px 5px 5px 81%;
 }
 .qcomment {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
+    opacity: 1.0;
+    filter:alpha(opacity=100);
 }
 #network-star-link {
     margin-top: 10px;
@@ -2996,32 +3036,38 @@ footer {
     display: inline-block;
 }
 #fileas-sidebar {
-	
+    
 }
 .fileas-ul {
-	padding: 0;
+    padding: 0;
 }
 
 
 
 /*
- * ADDONS THEMING
+ * addons theming
  */
 
 #sidebar-page-list {
-	
+    
 }
 #sidebar-page-list ul {
-	padding: 0;
-	margin: 5px 0;
+    padding: 0;
+    margin: 5px 0;
 }
 #sidebar-page-list li {
-	list-style: none;
+    list-style: none;
+}
+#jappix_mini {
+    margin-left: 130px;
+    position: fixed;
+    bottom: 0;
+    right: 175px !important; /* override the jappix css */
+    z-index: 999;
 }
-
 
 @media handheld {
-	body {
-		font-size: 15pt;
-	}
+    body {
+        font-size: 15pt;
+    }
 }
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 5838729cc..c55ac503a 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -346,4 +346,3 @@ function enableOnUser(){
 	}
 
 </script>
-
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 9d10d2409..bc2677b4a 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -9,11 +9,22 @@
 /* from html5boilerplate */
 
 /* these are to tell browsers they should be displayed a certain way */
-article, aside, details, figcaption, figure, footer,
-header, hgroup, nav, section {
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
     display: block;
 }
-audio, canvas, video, time {
+audio,
+canvas,
+video,
+time {
     display: inline-block;
     *display: inline;
     *zoom: 1;
@@ -46,31 +57,41 @@ body {
     font-size: 16px;
     line-height: 1.1em;
 }
-body, button, input, select, textarea {
+body,
+button,
+input,
+select,
+textarea {
     font-family: sans-serif;
     color: #222;
-    background-color: #efefef;
+    background-color: #e8e8e8;
 }
 select {
-	border: 1px #555 dotted;
-	padding: 3px;
-	margin: 2px;
-	color: #222;
-	background: #efefef;
+    border: 1px #555 dotted;
+    padding: 3px;
+    margin: 3px;
+    color: #222;
+    background: #e8e8e8;
 }
 option {
-	padding: 3px;
-	vertical-align: middle;
-	color: #222;
-	background: #efefef;
+    padding: 3px;
+    color: #222;
+    background: #e8e8e8;
+}
+option[selected="selected"] {
+	background: #cca;
 }
 ul, ol {
-	padding: 0;
+    padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
     outline: 0;
 }
+[disabled="disabled"] {
+    background: #ddd;
+    color: #333;
+}
 
 /* remember to highlight inserts somehow! */
 ins {
@@ -135,7 +156,7 @@ a:hover img {
 }
 blockquote {
     background: #eee;
-	color: #111;
+    color: #111;
     text-indent: 5px;
     padding: 5px;
     border: 1px #aaa solid;
@@ -159,36 +180,25 @@ a:hover {
 .fakelink:hover {
     color: #729fcf;
 }
-input[type=submit] {
-    background-color: #555753;
-	color: #eeeeec;
-	font-weight: bold;
-    margin-top: 10px;
-    height: 22px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 0;
-}
 .smalltext {
     font-size: 0.7em;
 }
 #panel {
-	position: absolute;
-	font-size: 0.8em;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 1px solid #fff;
-	background-color: #2e3436;
-	color: #eeeeec;
-	padding: 1em;
+    position: absolute;
+    font-size: 0.8em;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 1px solid #fff;
+    background-color: #2e3436;
+    color: #eeeeec;
+    padding: 1em;
 }
 .pager {
-	margin-top: 60px;
-	display: block;
-	clear: both;
-	text-align: center;
+    margin-top: 60px;
+    display: block;
+    clear: both;
+    text-align: center;
 }
 .pager span {
     padding: 4px;
@@ -205,25 +215,25 @@ input[type=submit] {
  */
 /* .tool .action */
 .action {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 .tool {
-	margin: 5px 0;
-	list-style: none;
+    margin: 5px 0;
+    list-style: none;
 }
 #articlemain {
-	width: 100%;
-	height: 100%;
-	margin: 0 auto;
+    width: 100%;
+    height: 100%;
+    margin: 0 auto;
 }
 
 
 /**
- * 	login
+ * login
  */
 #asidemain .field {
-	overflow: hidden;
-	width: 200px;
+    overflow: hidden;
+    width: 200px;
 }
 #login-extra-links {
     overflow: auto !important;
@@ -238,34 +248,34 @@ input[type=submit] {
     float: none !important;
     height: 100% !important;
     position: relative !important;
-	width: 100% !important;
+    width: 100% !important;
 }
 #login_standard .field label {
-	width: 200px !important;
+    width: 200px !important;
 }
 #login_standard input, #login_standard input[type="text"] {
-	margin: 0 0 8px !important;
+    margin: 0 0 8px !important;
     width: 210px !important;
 }
 #login-submit-wrapper {
-	margin: 0 !important;
+    margin: 0 !important;
 }
 #login-submit-button {
     margin-left: 0px !important;
 }
 #asidemain #login_openid {
-	position: relative !important;
-	float: none !important;
-	margin-left: 0px !important;
-	height: auto !important;
-	width: 200px !important;
+    position: relative !important;
+    float: none !important;
+    margin-left: 0px !important;
+    height: auto !important;
+    width: 200px !important;
 }
 #login_openid #id_openid_url {
-	width: 180px !important;
-	overflow: hidden !important;
+    width: 180px !important;
+    overflow: hidden !important;
 }
 #login_openid label {
-	width: 180px !important;
+    width: 180px !important;
 }
 
 
@@ -273,77 +283,77 @@ input[type=submit] {
  * nav
  */
 nav {
-	height: 60px;
-	background-color: #2e3436;
-	color: #eeeeec;
-	position: relative;
-	padding: 20px 20px 10px 95px;
+    height: 60px;
+    background-color: #2e3436;
+    color: #eeeeec;
+    position: relative;
+    padding: 20px 20px 10px 95px;
 }
 nav a {
-	text-decoration: none;
-	color: #eeeeec;
-	border: 0px;
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
 }
 nav a:hover {
-	text-decoration: none;
-	color: #eeeeec;
+    text-decoration: none;
+    color: #eeeeec;
     border: 0px;
 }
 nav #banner {
-	display: block;
-	position: absolute;
-	left: 51px;
-	top: 25px;
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
 }
 nav #banner #logo-text a {
-	font-size: 40px;
-	font-weight: bold;
-	margin-left: 3px;
+    font-size: 40px;
+    font-weight: bold;
+    margin-left: 3px;
 }
 ul#user-menu-popup {
-	display: none;
-	position: absolute;
-	background-color: #555753;
-	width: 100%;
+    display: none;
+    position: absolute;
+    background-color: #555753;
+    width: 100%;
     padding: 10px 0px;
     margin: 0px;
-	top: 20px;
-	left: 0;
-	-webkit-border-radius: 0 0 5px 5px;
-	-moz-border-radius: 0 0 5px 5px;
-	border-radius: 0 0 5px 5px;
-	box-shadow: 5px 10px 10px 0 #111;
-	z-index: 10000;
+    top: 20px;
+    left: 0;
+    -webkit-border-radius: 0 0 5px 5px;
+    -moz-border-radius: 0 0 5px 5px;
+    border-radius: 0 0 5px 5px;
+    box-shadow: 5px 10px 10px 0 #111;
+    z-index: 10000;
 }
 ul#user-menu-popup li {
-	display: block;
+    display: block;
 }
 ul#user-menu-popup li a {
-	display: block;
-	padding: 5px;
+    display: block;
+    padding: 5px;
 }
 ul#user-menu-popup li a:hover {
-	color: #2e3436;
-	background-color: #eeeeec;
+    color: #2e3436;
+    background-color: #eeeeec;
 }
 ul#user-menu-popup li a.nav-sep {
-	border-top: 1px solid #eeeeec;
+    border-top: 1px solid #eeeeec;
 }
 nav .nav-link {
-	float: right;
-	display: block;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px 5px 5px;
-	text-indent: 50px;
-	background: transparent url(icons.png) 0 0 no-repeat;
+    float: right;
+    display: block;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px 5px 5px;
+    text-indent: 50px;
+    background: transparent url(icons.png) 0 0 no-repeat;
 }
 #nav-apps-link {
-	background-position: 0 -66px;
+    background-position: 0 -66px;
 }
 #nav-apps-link:hover {
-	background-position: -22px -66px;
+    background-position: -22px -66px;
 }
 #nav-community-link {
     background-position: 0 -22px;
@@ -358,16 +368,16 @@ nav .nav-link {
     background-position: -22px -22px;
 }
 #nav-directory-link {
-	background-position: -44px -154px;
+    background-position: -44px -154px;
 }
 #nav-directory-link:hover {
-	background-position: -66px -154px;
+    background-position: -66px -154px;
 }
 #nav-help-link {
-	background-position: 0 -110px;
+    background-position: 0 -110px;
 }
 #nav-help-link:hover {
-	background-position: -22px -110px;
+    background-position: -22px -110px;
 }
 #nav-home-link {
     background-position: -44px -132px;
@@ -376,22 +386,22 @@ nav .nav-link {
     background-position: -66px -132px;
 }
 #nav-intro-link {
-	background-position: 0px -190px;
+    background-position: 0px -190px;
 }
 #nav-intro-link:hover {
-	background-position: -44px -190px;
+    background-position: -44px -190px;
 }
 #nav-login-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-login-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-logout-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-logout-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-messages-link {
     background-position: -44px -88px;
@@ -412,10 +422,10 @@ nav .nav-link {
     background-position: -22px -177px;
 }
 #nav-search-link {
-	background-position: 0 -44px;
+    background-position: 0 -44px;
 }
 #nav-search-link:hover {
-	background-position: -22px -44px;
+    background-position: -22px -44px;
 }
 #profile-link,
 #profile-title, 
@@ -478,18 +488,19 @@ div.jGrowl div.info {
     color: black;
     text-decoration: underline;
 }
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_on.png");
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+    background-image: url("../../../images/icons/22/notify_on.png");
 }
 .show {
     display: block;
 }
 #notifications {
-	height: 20px;
-	width: 170px;
-	position: absolute;
-	top: -19px;
-	left: 7px;
+    height: 20px;
+    width: 170px;
+    position: absolute;
+    top: -19px;
+    left: 7px;
 }
 #nav-floater {
     position: fixed;
@@ -497,132 +508,133 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     right: 1%;
     padding: 5px;
     background: #2e3436;
-	color: transparent;
+    color: transparent;
     border-radius: 5px;
     z-index: 100;
-	width: 300px;
-	height: 60px;
+    width: 300px;
+    height: 60px;
 }
 #nav-buttons {
     clear: both;
-	list-style: none;
-	padding: 0px;
-	margin: 0 7px 0 0;
-	height: 25px;
+    list-style: none;
+    padding: 0px;
+    margin: 0 7px 0 0;
+    height: 25px;
 }
 #nav-buttons li {
-	padding: 0;
+    padding: 0;
 }
 .floaterflip {
-	display: block;
+    display: block;
     position: fixed;
     z-index: 110;
     top: 56px;
     right: 19px;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px;
-	background: transparent url(icons.png) -190px -60px no-repeat;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px;
+    background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	display: inline-block;
-	margin: 5px;
-	position: fixed;
-	right: 0px;
-	bottom: 0px;
-	z-index: 100;
-	background: #1d1f1d;
-	border-radius: 5px;
+    display: inline-block;
+    margin: 5px;
+    position: fixed;
+    right: 0px;
+    bottom: 0px;
+    z-index: 100;
+    background: #1d1f1d;
+    border-radius: 5px;
 }
 #search-text {
-	border: 1px #eec solid;
-	background: #2e3436;
-	color: #eec;
+    border: 1px #eec solid;
+    background: #2e3436;
+    color: #eec;
 }
 .search-box #search-text {
-	margin: 8px;
-	width: 10em;
-	color: #eec;
+    margin: 8px;
+    width: 10em;
+    height: 14px;
+    color: #eec;
 }
 #scrollup {
-	position: fixed;
-	right: 5px;
-	bottom: 40px;
-	z-index: 100;
+    position: fixed;
+    right: 5px;
+    bottom: 40px;
+    z-index: 100;
 }
 #scrollup a:hover {
-	text-decoration: none;
-	border: 0;
+    text-decoration: none;
+    border: 0;
 }
 #user-menu {
-	box-shadow: 5px 0 10px 0 #111;
+    box-shadow: 5px 0 10px 0 #111;
     display: block;	
     width: 75%;
     margin: 3px 0 0 0;
     position: relative;
-	background-color: #555753;
+    background-color: #555753;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
     background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
     clear: both;
-	top: 4px;
-	left: 10px;
-	padding: 2px;
+    top: 4px;
+    left: 10px;
+    padding: 2px;
 }
 #user-menu > a {
-	vertical-align: top;
+    vertical-align: top;
 }
 #user-menu-label {
-   	font-size: 12px;
+    font-size: 12px;
     padding: 3px 20px 9px 5px;
     height: 10px;
 }
 .nav-ajax-update, .nav-ajax-left {
-	width: 30px;
-	height: 19px;
-	background: transparent url(notifications.png) 0 0 no-repeat;
-	color: #222;
-	font-weight: bold;
-	font-size: 0.8em;
-	padding-top: 0.2em;
-	text-align: center;
-	float: left;
-	margin: 0 -1px 0 3px;
-	display: block;
-	visibility: hidden;
+    width: 30px;
+    height: 19px;
+    background: transparent url(notifications.png) 0 0 no-repeat;
+    color: #222;
+    font-weight: bold;
+    font-size: 0.8em;
+    padding-top: 0.2em;
+    text-align: center;
+    float: left;
+    margin: 0 -1px 0 3px;
+    display: block;
+    visibility: hidden;
 }
 .nav-ajax-update.show, .nav-ajax-left.show {
     visibility: visible;
 }
 #net-update {
-	background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 #mail-update {
-	background-position: -30px 0;
+    background-position: -30px 0;
 }
 #notify-update {
-	background-position: -60px 0px;
+    background-position: -60px 0px;
 }
 #home-update {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 #intro-update {
-	background-position: -120px 0px;
+    background-position: -120px 0px;
 }
 #lang-select-icon {
-	cursor: pointer;
-	position: fixed;
-	left: 28px;
-	bottom: 6px;
-	z-index: 10;
+    cursor: pointer;
+    position: fixed;
+    left: 28px;
+    bottom: 6px;
+    z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
-	z-index: 10;
+    z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -684,133 +696,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 
 
-/** sysmsg **/
+/**
+ * sysmsg
+ */
 #sysmsg_info {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border:2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border:2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border: 2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border: 2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display: block;
-	margin: 2px 0px;
-	border-top: 1px solid #ccccce;
+    display: block;
+    margin: 2px 0px;
+    border-top: 1px solid #ccccce;
 }
 
 
 /**
-* aside
-**/
+ * aside
+ */
 #asidemain {
-	float: left;
+    float: left;
     font-size: smaller;
     margin: 20px 0 20px 35px;
     width: 25%;
-	display: inline;
+    display: inline;
 }
 /* for now, disappear these */
 #asideright, #asideleft {
-	display: none;
+    display: none;
 }
 .vcard .fn {
-	font-size: 1.7em;
-	font-weight: bold;
-	border-bottom: 1px solid #729fcf;
-	padding-bottom: 3px;
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px;
 }
 .vcard #profile-photo-wrapper {
-	margin: 20px;
+    margin: 20px;
 }
 /* http://css-tricks.com/snippets/css/css-box-shadow/
- * box-shadow:
- * 1. The horizontal offset of the shadow, positive means
- * the shadow will be on the right of the box, a negative
- * offset will put the shadow on the left of the box.
- * 2. The vertical offset of the shadow, a negative one
- * means the box-shadow will be above the box, a
- * positive one means the shadow will be below the box.
- * 3. The blur radius (optional), if set to 0 the shadow
- * will be sharp, the higher the number, the more blurred
- * it will be.
- * 4. The spread radius (optional), positive values increase
- * the size of the shadow, negative values decrease the size.
- * Default is 0 (the shadow is same size as blur).
- * 5. Colo[u]r
- */
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
 .vcard #profile-photo-wrapper img {
-	box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
 }
 #asidemain h4 {
-	font-size: 1.2em;
+    font-size: 1.2em;
 }
 #asidemain #viewcontacts {
-	text-align: right;
+    text-align: right;
 }
 .aprofile dt {
-	background: transparent;
-	color: #666666;
-	font-weight: bold;
+    background: transparent;
+    color: #666666;
+    font-weight: bold;
     box-shadow: 1px 1px 5px 0 #000;
     margin: 15px 0 5px;
     padding-left: 5px;
 }
 #profile-extra-links ul {
-	margin-left: 0px;
+    margin-left: 0px;
     padding-left: 0px;
     list-style: none;
 }
 #dfrn-request-link {
-	background: #3465A4 url(connect.png) no-repeat 95% center;
-	border-radius: 5px 5px 5px 5px;
-	color: #fff;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    background: #3465A4 url(connect.png) no-repeat 95% center;
+    border-radius: 5px 5px 5px 5px;
+    color: #fff;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #wallmessage-link {
-	/*background: #3465A4 url(connect.png) no-repeat 95% center;*/
-	/*border-radius: 5px 5px 5px 5px;*/
-	color: #eee;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+    /*border-radius: 5px 5px 5px 5px;*/
+    color: #eee;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #netsearch-box {
-	margin: 20px 0px 30px;
+    margin: 20px 0px 30px;
     width: 150px;
 }
 #netsearch-box #search-submit {
     margin: 5px 5px 0px 0px;
 }
 .ttright {
-	margin: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 }
 
 
 /**
-* contacts block
-*/
+ * contacts block
+ */
 .contact-block-div {
     width: 50px;
     height: 50px;
@@ -828,20 +842,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * jot
- **/
+ */
 #jot {
-  /*width: 785px;*/
-  margin: 10px 0 20px 0px;
-  width: 100%;
+/*width: 785px;*/
+margin: 10px 0 20px 0px;
+width: 100%;
 }
 #jot #jot-tools {
-  margin: 0px;
-  padding: 0px;
-  height: 35px;
-  overflow: none;
-  width: 100%;
-  /*background-color: #0e232e;*/
-  /*border-bottom: 2px solid #9eabb0;*/
+margin: 0px;
+padding: 0px;
+height: 35px;
+overflow: none;
+width: 100%;
+/*background-color: #0e232e;*/
+/*border-bottom: 2px solid #9eabb0;*/
 }
 #jot #jot-tools span {
     float: left;
@@ -867,67 +881,67 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin-top: 10px;
 }
 #jot #jot-title {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     margin: 0 0 5px;
     height: 20px;
     width: 90%;
     font-weight: bold;
     border-radius: 5px;
-	vertical-align: middle;
+    vertical-align: middle;
 }
 #jot-category {
-	margin: 5px 0;
-	border-radius: 5px;
-	border: 1px #ccc solid;
-	color: #666;
-	font-size: small;
+    margin: 5px 0;
+    border-radius: 5px;
+    border: 1px #ccc solid;
+    color: #666;
+    font-size: smaller;
 }
 #jot-category:focus {
-	color: #111;
+    color: #111;
 }
 #jot #character-counter {
-	width: 6%;
-	float: right;
-	text-align: right;
-	height: 15px;
-	line-height: 20px;
-	padding: 2px 20px 5px 0;
+    width: 6%;
+    float: right;
+    text-align: right;
+    height: 15px;
+    line-height: 20px;
+    padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-	/*border-radius: 10px;*/
-	box-shadow: 5px 0 10px 0 #111;
+    /*border-radius: 10px;*/
+    box-shadow: 5px 0 10px 0 #111;
 }
 #profile-jot-text_tbl {
-	margin-bottom: 10px;
-	/*border-radius: 10px;*/
-	background: #888;
+    margin-bottom: 10px;
+    /*border-radius: 10px;*/
+    background: #888;
 }
 #profile-jot-text_ifr {
-	width:99.900002% !important;
+    width:99.900002% !important;
 }
 #profile-jot-text_toolbargroup {
-	background: #888;
+    background: #888;
 }
 .mceCenter table tr {
-	background: #888;
+    background: #888;
 }
 [id$="jot-text_ifr"] {
-	width: 99.900002% !important;
-	color: #2e2f2e;
-	background: #eec;
+    width: 99.900002% !important;
+    color: #2e2f2e;
+    background: #eec;
 }
 [id$="jot-text_ifr"] .mceContentBody {
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
 }
 .mceFirst tr {
-	background: #888;
+    background: #888;
 }
 .mceFirst td {
-	/*border-radius: 10px 10px 0px 0px;*/
+    /*border-radius: 10px 10px 0px 0px;*/
 }
 .mceLast td {
-	/*border-radius: 0 0 10px 10px;*/
+    /*border-radius: 0 0 10px 10px;*/
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -938,58 +952,58 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #profile-upload-wrapper,
 #profile-video-wrapper {
     float: left;
-	margin: 0 20px 0 0;
+    margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
-	float: right; 
+    float: right; 
 }
 #profile-jot-tools-end,
 #profile-jot-banner-end {
-	clear: both;
+    clear: both;
 }
 #profile-jot-email-wrapper {
-	margin:10px 10% 0;
-	border:1px solid #555753;
-	border-bottom:0;
+    margin:10px 10% 0;
+    border:1px solid #555753;
+    border-bottom:0;
 }
 #profile-jot-email-label {
-	background-color:#555753;
-	color:#ccccce;
-	padding:5px;
+    background-color:#555753;
+    color:#ccccce;
+    padding:5px;
 }
 #profile-jot-email {
-	width:90%;
-	margin:5px;
+    width:90%;
+    margin:5px;
 }
 #profile-jot-networks {
-	margin: 0 10%;
-	border: 1px solid #555753;
-	border-top: 0;
-	border-bottom: 0;
-	padding: 5px;
+    margin: 0 10%;
+    border: 1px solid #555753;
+    border-top: 0;
+    border-bottom: 0;
+    padding: 5px;
 }
 #profile-jot-net {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
     text-decoration: none;
-	float: right;
+    float: right;
 }
 .icon-text-preview {
-	margin: 0 0 -18px 0;
-	display: block;
+    margin: 0 0 -18px 0;
+    display: block;
     width: 20px;
     height: 20px;
     background: url(icons.png) no-repeat -128px -40px;
     border: 0;
     text-decoration: none;
-	float: right;
-	cursor: pointer;
+    float: right;
+    cursor: pointer;
 }
 #profile-jot-perms { 
-	float: right;
+    float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
@@ -1001,103 +1015,108 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
-	width: 1px;
-	margin: 10px 0 0 0;
-	float: right;
+    width: 1px;
+    margin: 10px 0 0 0;
+    float: right;
 }
 #profile-jot-submit-wrapper {
-	float: right;
-	width: 100%;
-	list-style: none;
-	margin: 10px 0 0 0;
-	padding: 0;
+    float: right;
+    width: 100%;
+    list-style: none;
+    margin: 10px 0 0 0;
+    padding: 0;
 }
 #profile-jot-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0;
-	margin: 0;
-	float: right;
+    height: auto;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 2px outset #222420;
+    margin: 0;
+    float: right;
+    text-shadow: 1px 1px #111;
+    width: auto;
+}
+#profile-jot-submit:active {
+    box-shadow: 0 0 0 0;
 }
 #jot-perms-icon {
-	height: 22px;
-	width: 20px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	overflow: hidden;
-	border: 0;
+    height: 22px;
+    width: 20px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    overflow: hidden;
+    border: 0;
 }
 #profile-jot-acl-wrapper {
-	margin: 0 10px;
-	border: 1px solid #555753;
-	border-top: 0;
-	display: block !important;
+    margin: 0 10px;
+    border: 1px solid #555753;
+    border-top: 0;
+    display: block !important;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
 #acl-permit-outer-wrapper {
-	width:47%;
-	float:left;
+    width:47%;
+    float:left;
 }
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	width:47%;
-	float:right;
+    width:47%;
+    float:right;
 }
 #acl-permit-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #jot-public {
-	background-color: #555753;
-	color: #ff0000;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ff0000;
+    padding: 5px;
+    float: left;
 }
 #acl-deny-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #acl-permit-text-end,
 #acl-deny-text-end {
-	clear: both;
+    clear: both;
 }
 #jot-title-desc {
-	color: #ccc;
+    color: #ccc;
 }
 #profile-jot-desc {
-	color: #a00;
-	margin: 5px 0;
+    color: #a00;
+    margin: 5px 0;
 }
 #jot-title-wrapper {
-	margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #jot-title-display {
-	font-weight: bold;
+    font-weight: bold;
 }
 .jothidden {
     display: none;
 }
 #jot-preview-content {
     background-color: #ffffe0;
-	color: #111;
+    color: #111;
     border: 1px #aa0 solid;
     border-radius: 5px;
     padding: 3px 3px 6px 10px;
 }
 #jot-preview-content .wall-item-outside-wrapper {
-	border: 0;
-	border-radius: 0px;
+    border: 0;
+    border-radius: 0px;
 }
 
 
@@ -1107,13 +1126,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #sectionmain {
     margin: 20px;
     font-size: 0.8em;
-	min-width: 475px;
-	width: 67%;
-	float: left;
-	display: inline;
+    min-width: 475px;
+    width: 67%;
+    float: left;
+    display: inline;
 }
 
-/** tabs **/
+/**
+ * tabs
+ */
 .tabs {
     list-style: none;
     margin: 10px 0;
@@ -1121,12 +1142,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .tabs li {
     display: inline;
-	font-size: smaller;
-	font-weight: bold;
+    font-size: smaller;
+    font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
-	padding: 4px;
+    padding: 4px;
 }
 .tab:hover, .tab.active:hover {
     background: #729fcf;
@@ -1137,60 +1158,60 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     color: #eeeeec;
 }
 .tab.active {
-	background: #729fcf;
+    background: #729fcf;
     color: #eeeeec;
 }
 .tab.active a {
-	color: #729fcf;
+    color: #729fcf;
 }
 .tab a {
-	border: 0;
-	text-decoration: none;
+    border: 0;
+    text-decoration: none;
 }
 
 
 /**
- * 	items
+ * items
  */
 .wall-item-outside-wrapper {
-	border: 1px solid #aaa;
-	border-radius: 5px;
-	box-shadow: 5px 0 10px 0 #999;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    box-shadow: 5px 0 10px 0 #888;
 }
 .wall-item-outside-wrapper.comment {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 .wall-item-outside-wrapper-end {
     clear: both;
 }
 .wall-item-content-wrapper {
     position: relative;
-	padding: 10px;
-	width: auto;
+    padding: 10px;
+    width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
     /*margin-left: 90px;*/
 }
 .shiny {
     background: #efefdf;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .wall-outside-wrapper .shiny {
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .heart {
-	color: red;
+    color: red;
 }
 .wall-item-content {
-	overflow-x: auto;
-	margin: 0px 15px 0px 5px;
+    overflow-x: auto;
+    margin: 0px 15px 0px 5px;
 }
 /* removing it from here, vs. putting it in .wall-item-content
- * might break things for people. we shall see ;) */
+* might break things for people. we shall see ;) */
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
     margin: 15px 0 0 0;
     padding: 0px;
-	/*overflow-x: auto;*/
+    /*overflow-x: auto;*/
 }
 .wall-item-photo-menu {
     display: none;
@@ -1224,7 +1245,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     border-radius: 5px;
 }
 [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-	/*margin: 0 0 5px 0;*/
+    /*margin: 0 0 5px 0;*/
 }
 .wall-item-tools {
     float: right;
@@ -1260,41 +1281,41 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 25px;
 }
 .wall-item-title {
-	font-size: 1.2em;
-	font-weight: bold;
+    font-size: 1.2em;
+    font-weight: bold;
     margin-bottom: 1em;
 }
 .wall-item-body {
-	margin: 20px 20px 10px 0px;
+    margin: 20px 20px 10px 0px;
     text-align: left;
-	overflow-x: auto;
+    overflow-x: auto;
 }
 .wall-item-lock-wrapper {
-	float: right;
+    float: right;
     height: 22px;
     margin: 0 -5px 0 0;
     width: 22px;
-	opacity: 1;
+    opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 5px 0 5px 120px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 5px 0 5px 120px;
 }
 .wall-item-author, .wall-item-actions-author {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 20px 20px 0 110px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
-	display: inline;
-	padding-left: 10px;
+    display: inline;
+    padding-left: 10px;
 }
 .wall-item-wrapper-end {
-	clear:both;
+    clear:both;
 }
 .wall-item-location {
     margin-top: 15px;
@@ -1343,17 +1364,17 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     z-index: 10002;
 }
 .wall-item-photo-menu {
-	min-width: 92px;
-	border: 2px solid #FFFFFF;
-	border-top: 0px;
-	background: #555753;
-	position: absolute;
-	left: -2px; top: 101px;
-	display: none;
-	z-index: 10003;
-	-webkit-border-radius: 0px 5px 5px 5px;
-	-moz-border-radius: 0px 5px 5px 5px;
-	border-radius: 0px 5px 5px 5px;
+    min-width: 92px;
+    border: 2px solid #FFFFFF;
+    border-top: 0px;
+    background: #555753;
+    position: absolute;
+    left: -2px; top: 101px;
+    display: none;
+    z-index: 10003;
+    -webkit-border-radius: 0px 5px 5px 5px;
+    -moz-border-radius: 0px 5px 5px 5px;
+    border-radius: 0px 5px 5px 5px;
 }
 .wall-item-photo-menu ul {
     margin:0px;
@@ -1375,27 +1396,27 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 100%;
 }
 #connect-services-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #connect-services {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 
 
 /**
- * 	comment
+ * comment
  */
 .ccollapse-wrapper {
     font-size: 0.9em;
@@ -1414,7 +1435,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     height: 40px;
 }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px;
+    width: 50px;
     top: 45px;
     background-position: 35px center;
 }
@@ -1440,12 +1461,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
-	width: 20px;
-	height: 20px;
+    width: 20px;
+    height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-	float: left;
-	margin-left: 10px;
+    float: left;
+    margin-left: 10px;
 }
 .my-comment-photo {
     width: 40px;
@@ -1457,32 +1478,32 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 84.5%;
 }
 .comment-edit-text-empty {
-	height: 20px;
-	border: 2px #babdd6 solid;
-	border-radius: 5px;
-	color: #babdb6;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    height: 20px;
+    border: 2px #babdd6 solid;
+    border-radius: 5px;
+    color: #babdb6;
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-text-empty:hover {
-	color: #999999;
+    color: #999999;
 }
 .comment-edit-text-full {
-	height: 10em;
+    height: 10em;
     border-radius: 5px;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-submit-wrapper {
-	width: 90%;
-	margin: 5px 5px 10px 50px;
-	text-align: right;
+    width: 90%;
+    margin: 5px 5px 10px 50px;
+    text-align: right;
 }
 .comment-edit-submit {
     height: 22px;
@@ -1497,22 +1518,22 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * item text style
- **/
+ */
 .wall-item-body code {
-	display: block;
-	padding: 0 0 10px 5px;
-	border-color: #ccc;
-	border-style: solid;
-	border-width: 1px 1px 1px 10px;
-	background: #eee;
-	color: #444;
-	width: 95%;
+    display: block;
+    padding: 0 0 10px 5px;
+    border-color: #ccc;
+    border-style: solid;
+    border-width: 1px 1px 1px 10px;
+    background: #eee;
+    color: #444;
+    width: 95%;
 }
 
 
 /**
  * profile
- **/
+ */
 div[id$="text"] {
     font-weight: bold;
     border-bottom: 1px solid #ccc;
@@ -1531,10 +1552,10 @@ div[id$="wrapper"] br {
 
 /**
  * photos
- **/
+ */
 .photos {
-	height: auto;
-	overflow: auto;
+    height: auto;
+    overflow: auto;
 }
 #photo-top-links {
     margin-bottom: 30px;
@@ -1546,7 +1567,7 @@ div[id$="wrapper"] br {
     -webkit-box-shadow: 3px 3px 10px 0 #000;
     box-shadow: 3px 3px 10px 0 #000;
     background-color: #eee;
-	color: #111;
+    color: #111;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -1582,8 +1603,8 @@ div[id$="wrapper"] br {
     margin: 0 5px;
 }
 #photo-photo {
-	position: relative;
-	float:left;
+    position: relative;
+    float:left;
 }
 #photo-photo-end {
     clear: both;
@@ -1660,10 +1681,10 @@ div[id$="wrapper"] br {
     margin-bottom: 15px;
 }
 #photo-edit-caption {
-	width: 100%;
+    width: 100%;
 }
 #photo-edit-newtag {
-	width: 100%;
+    width: 100%;
 }
 #photo-like-div {
     margin-bottom: 25px;
@@ -1685,15 +1706,15 @@ div[id$="wrapper"] br {
 }
 
 /**
- * 	message
+ * message
  */
 .prvmail-text {
     width: 100%;
 }
 #prvmail-subject {
     width: 100%;
-	color: #eec;
-	background: #444;
+    color: #eec;
+    background: #444;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1717,7 +1738,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
-	font-size: 1.1em;
+    font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
@@ -1725,7 +1746,7 @@ div[id$="wrapper"] br {
     padding-left: 10px;
 }
 .mail-list-sender-name, .mail-list-date {
-	font-style: italic;
+    font-style: italic;
 }
 .mail-list-subject {
     font-size: 1.2em;
@@ -1735,7 +1756,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-outside-wrapper-end {
     clear: both;
-	border-bottom: 1px #eec dotted;
+    border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1765,15 +1786,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	contacts
+ * contacts
  */
 .view-contact-wrapper,
 .contact-entry-wrapper {
     float: left;
     margin: 0 5px 40px 0;
     width: 120px;
-	height: 120px;
-	padding: 3px;
+    height: 120px;
+    padding: 3px;
     position: relative;
 }
 .contact-direction-wrapper {
@@ -1788,7 +1809,7 @@ div[id$="wrapper"] br {
 
 }
 .contact-entry-photo {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 .contact-entry-name {
     width: 120px;
@@ -1796,7 +1817,7 @@ div[id$="wrapper"] br {
     /*overflow: hidden;*/
 }
 .contact-entry-photo {
-	position: relative;
+    position: relative;
 }
 .contact-entry-edit-links .icon {
     border: 1px solid #babdb6;
@@ -1839,7 +1860,7 @@ div[id$="wrapper"] br {
     margin-left:5px;
 }
 #contact-edit-nav-wrapper .icon {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
@@ -1884,7 +1905,7 @@ div[id$="wrapper"] br {
     width: auto;
     border: 2px solid #444;
     background: #eee;
-	color: #111;
+    color: #111;
     position: absolute;
     left: 0px; top: 90px;
     display: none;
@@ -1907,7 +1928,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	register, settings & profile forms
+ * register, settings & profile forms
  */
 .openid {
 
@@ -1924,7 +1945,7 @@ div[id$="wrapper"] br {
     -moz-border-radius: 5px;
     border-radius: 5px;
     padding: 5px;
-	color: #111;
+    color: #111;
 }
 #settings-default-perms {
     margin-bottom: 20px;
@@ -1933,7 +1954,15 @@ div[id$="wrapper"] br {
 #profile-edit-form div {
     clear: both;
 }
-
+.settings-block {
+    
+}
+.settings-block label {
+    clear: left;
+}
+.settings-block input {
+    margin: 10px 5px;
+}
 /*#register-form label,     */
 /*#profile-edit-form label {*/
 /*    width: 300px;         */
@@ -1947,23 +1976,23 @@ div[id$="wrapper"] br {
 /*    margin-bottom: 20px; */
 /*}                        */
 #profile-edit-marital-label span {
-	margin: -4px;
+    margin: -4px;
 }
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	display: none;
+    display: none;
 }
 /*.profile-edit-side-div:hover {
-	display: block;
+    display: block;
 }
 .profile-edit-side-link {
-	margin: 3px 0px 0px 70px;
+    margin: 3px 0px 0px 70px;
 }*/
 #profiles-menu-trigger {
-	margin: 0px 0px 0px 25px;
+    margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
@@ -1972,16 +2001,16 @@ div[id$="wrapper"] br {
 .icon-profile-edit {
     background: url("icons.png") -150px 0px no-repeat;
     border: 0;
-	cursor: pointer;
+    cursor: pointer;
     display: block;
     float: right;
-	width: 20px;
+    width: 20px;
     height: 20px;
     margin: 0 0 -18px;
-	position: absolute;
+    position: absolute;
     text-decoration: none;
-	top: 113px;
-	right: 260px;
+    top: 113px;
+    right: 260px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
@@ -1989,26 +2018,32 @@ div[id$="wrapper"] br {
     list-style: none;
 }
 .marital {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 #register-sitename {
     display: inline;
     font-weight: bold;
 }
 #advanced-expire-popup {
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #id_ssl_policy {
-	width: 374px;
+    width: 374px;
+}
+#theme-preview {
+
+}
+#theme-preview img {
+    margin: 10px 10px 10px 288px;
 }
 
 
 /**
- * 	contacts selector
+ * contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 50px 0 0;
+    margin: -31px 50px 0 0;
     float: right;
 }
 /*.group-delete-icon {
@@ -2131,70 +2166,70 @@ div[id$="wrapper"] br {
 
 /**
  * events
- **/
+ */
 .clear { clear: both; }
 .eventcal {
     float:left;
     font-size:20px;
 }
 .event {
-	background: #2e2f2e;
+    background: #2e2f2e;
 }
 .vevent {
     border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 .vevent .event-start {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 #new-event-link {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .edit-event-link, .plink-event-link {
-	/*float: left;      */
-	/*margin-top: 4px;  */
-	/*margin-right: 4px;*/
-	/*margin-bottom: 15px;*/
+    /*float: left;      */
+    /*margin-top: 4px;  */
+    /*margin-right: 4px;*/
+    /*margin-bottom: 15px;*/
 }
 .event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
+    content: url('../../../images/calendar.png');
+    margin-right: 15px;
 }
 .event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
-	font-size: smaller;
+    margin-left: 10px;
+    width: 330px;
+    font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
-	float: right;
+    float: right;
 }
 .event-list-date {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
+    float: left;
+    margin-left: 32px;
+    margin-right: 32px;
+    margin-top: 64px;
 }
 .event-calendar-end {
-	clear: both;
+    clear: both;
 }
 .calendar {
     font-family: monospace;
 }
 .today {
-	font-weight: bold;
-	color: #FF0000;
+    font-weight: bold;
+    color: #FF0000;
 } 
 #event-start-text, 
 #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-nofinish-checkbox,
 #event-nofinish-text,
@@ -2204,69 +2239,69 @@ div[id$="wrapper"] br {
     float:left;
 }
 #event-datetime-break {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
-	clear: both;
+    clear: both;
 }
 #event-desc-text, 
 #event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-submit {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .body-tag {
-	margin: 10px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 10px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .body-tag:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .filesavetags, .categorytags {
-	margin: 20px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 20px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .filesavetags:hover, .categorytags:hover {
-	margin: 20px 0;
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    margin: 20px 0;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 5px;
+    opacity: 0.1;
+    filter:alpha(opacity=10);
+    float: right;
+    margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
+    opacity: 1;
+    filter:alpha(opacity=100);
 }
 #item-delete-selected {
-	margin-top: 30px;
+    margin-top: 30px;
 }
 /* was tired of having no way of moving it around, so
- * here's a little 'hook' to do so */
+* here's a little 'hook' to do so */
 .delete-checked {
-	position: absolute;
-	left: 35px;
-	margin-top: 20px;
+    position: absolute;
+    left: 35px;
+    margin-top: 20px;
 }
 #item-delete-selected-end {
-	clear: both;
+    clear: both;
 }
 #item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
+    float: left;
+    margin-right: 5px;
 }
 #item-delete-selected-desc:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 .fc-state-highlight {
     background: #eec;
@@ -2275,15 +2310,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	directory
+ * directory
  */
 .directory-item {
     float: left;
-	/*margin: 50px 50px 0px 0px;*/
-	margin: 0 5px 4px 0;
-	padding: 3px;
-	width: 180px;
-	height: 250px;
+    /*margin: 50px 50px 0px 0px;*/
+    margin: 0 5px 4px 0;
+    padding: 3px;
+    width: 180px;
+    height: 250px;
     position: relative;
 }
 
@@ -2296,12 +2331,12 @@ div[id$="wrapper"] br {
 }
 .group-selected, .nets-selected, .fileas-selected {
     padding: 3px;
-	color: #111;
+    color: #111;
     background: #f8f8f8;
     font-weight: bold;
 }
 .group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-	color: #111;
+    color: #111;
 }
 .groupsideedit {
     margin-right: 10px;
@@ -2332,7 +2367,7 @@ div[id$="wrapper"] br {
     text-align: center;
 }
 #peoplefind-sidebar form {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #sidebar-new-group:hover {
     /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
@@ -2347,14 +2382,14 @@ div[id$="wrapper"] br {
 #side-peoplefind-url {
     background-color: #e5e0cf;
     color: #666;
-	border: 1px 666 solid;
-	margin-right: 3px;
-	width: 75%;
+    border: 1px 666 solid;
+    margin-right: 3px;
+    width: 75%;
 }
 #side-peoplefind-url:hover, #side-peoplefind-url:focus {
     background-color: #efefef;
     color: #222;
-	border: 1px 333 solid;
+    border: 1px 333 solid;
 }
 .nets-ul {
     list-style-type: none;
@@ -2380,7 +2415,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * ADMIN
+ * admin
  */
 #pending-update {
     float:right;
@@ -2396,10 +2431,10 @@ div[id$="wrapper"] br {
     list-style-position: inside;
 }
 #adminpage {
-	color: #111;
-	background: transparent;
-	margin: 5px;
-	padding: 10px;
+    color: #111;
+    background: transparent;
+    margin: 5px;
+    padding: 10px;
 }
 #adminpage dl {
     clear:left;
@@ -2413,14 +2448,14 @@ div[id$="wrapper"] br {
     font-weight: bold;
 }
 #adminpage dd {
-	margin-left: 250px;
+    margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
-	clear:left;
+    clear:left;
 }
 #adminpage #pluginslist {
     margin: 0;
@@ -2435,8 +2470,8 @@ div[id$="wrapper"] br {
     clear: left;
 }
 #adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
+    float:left;
+    margin-right: 1em;
 }
 #adminpage table {
     width: 100%;
@@ -2461,38 +2496,59 @@ div[id$="wrapper"] br {
 }
 #adminpage #users a {
 /*	color: #;*/
-	text-decoration: underline;
+    text-decoration: underline;
 }
 #users .name {
-	color: #eec;
+    color: #eec;
 }
 
 
 /**
- * Form fields
+ * form fields
  */
 .field {
-	/*margin-bottom: 10px;*/
-	/*padding-bottom: 10px;*/
-	overflow: auto;
+    /*margin-bottom: 10px;*/
+    /*padding-bottom: 10px;*/
+    overflow: auto;
     width: 100%;
 }
 .field label, label {
-    float: left;
-    width: 275px;
-	display: block;
-	font-size: 1.077em;
-	margin: 0 10px 0.5em 0;
-	border: 1px #999 solid;
-	padding: 5px;
-	background: #ccc;
-	vertical-align: middle;
-	color: #111;
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #999 solid;
+    padding: 5px;
+    background: #ccc;
+    color: #111;
 }
-.field input, input[type="text"] {
-	width: 250px;
-	height: 25px;
-	border: 1px #999 solid;
+input,
+input[type="text"],
+input[type="password"],
+input[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid;
+}
+input[type="checkbox"], input[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
+}
+input[type="submit"], input[type="button"] {
+    background-color: #555753;
+    border: 2px outset #444;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #eeeeec;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #111;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+}
+input[type="submit"]:active, input[type="button"]:active {
+    box-shadow: 0 0 0 0;
 }
 .field textarea {
     width: 80%;
@@ -2515,12 +2571,12 @@ div[id$="wrapper"] br {
     text-decoration: none;
 }
 .field .onoff .on {
-	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
     color: #111;
     text-align: left;
 }
 .field .onoff .off {
-	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
     color: #333;
     text-align: right;
 }
@@ -2533,34 +2589,34 @@ div[id$="wrapper"] br {
 
 
 /*
- * UPDATE
+ * update
  */
 .popup { 	
-	width: 100%;
+    width: 100%;
     height: 100%;
-	top: 0px;
+    top: 0px;
     left: 0px;
-	position: absolute;
-	display: none;
+    position: absolute;
+    display: none;
 }
 .popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%;
+    background-color: rgba(0,0,0,128);
+    opacity: 0.5;
+    width: 100%;
     height: 100%;
-	position: absolute;
-	top:0px;
+    position: absolute;
+    top:0px;
     left:0px;
 }
 .popup .panel {
-	top: 25%;
+    top: 25%;
     left: 25%;
     width: 50%;
     height: 50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF;
 }
 #panel {
     z-index: 100;
@@ -2609,32 +2665,32 @@ div[id$="wrapper"] br {
  * OAuth
  */
 .oauthapp {
-	height: auto;
+    height: auto;
     overflow: auto;
-	border-bottom: 2px solid #cccccc;
-	padding-bottom: 1em;
-	margin-bottom: 1em;	
+    border-bottom: 2px solid #cccccc;
+    padding-bottom: 1em;
+    margin-bottom: 1em;	
 }
 .oauthapp img {
-	float: left;
-	width: 48px; height: 48px;
-	margin: 10px;
+    float: left;
+    width: 48px; height: 48px;
+    margin: 10px;
 }
 .oauthapp img.noicon {
-	background-image: url("../../../images/icons/48/plugin.png");
-	background-position: center center;
-	background-repeat: no-repeat;
+    background-image: url("../../../images/icons/48/plugin.png");
+    background-position: center center;
+    background-repeat: no-repeat;
 }
 .oauthapp a {
-	float: left;
+    float: left;
 }
 
 
 /**
- * ICONS
+ * icons
  */
 .iconspacer {
-	display: block;
+    display: block;
     width: 16px;
     height: 16px;
 }
@@ -2645,7 +2701,7 @@ div[id$="wrapper"] br {
     background: url(icons.png) no-repeat;
     border: 0;
     text-decoration: none;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .icon:hover {
     border: 0;
@@ -2654,15 +2710,15 @@ div[id$="wrapper"] br {
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;
-	margin: 0 2px;
+    margin: 0 2px;
 }
 .icon.s22.delete {
-	display: block;
-	background-position: -110px 0;
+    display: block;
+    background-position: -110px 0;
 }
 .icon.s22.text {
-	padding: 10px 0px 0px 25px;
-	width: 200px;
+    padding: 10px 0px 0px 25px;
+    width: 200px;
 }
 .icon.text {
     text-indent: 0px;
@@ -2678,118 +2734,118 @@ div[id$="wrapper"] br {
     margin: 0px 5px;    
 }
 .article {
-	background-position: -50px 0;
+    background-position: -50px 0;
 }
 .audio {
-	background-position: -70px 0;
+    background-position: -70px 0;
 }
 .block {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 .drop, .delete {
-	background-position: -110px 0;
+    background-position: -110px 0;
 }
 .drophide {
-	background-position: -130px 0;
+    background-position: -130px 0;
 }
 .edit {
-	background-position: -150px 0;
+    background-position: -150px 0;
 }
 .camera {
-	background-position: -170px 0;
+    background-position: -170px 0;
 }
 .dislike {
-	background-position: -190px 0;
+    background-position: -190px 0;
 }
 .file-as {
-	background-position: -230px -60px;
+    background-position: -230px -60px;
 }
 .like {
-	background-position: -211px 0;
+    background-position: -211px 0;
 }
 .link {
-	background-position: -230px 0;
+    background-position: -230px 0;
 }
 .globe, .location {
-	background-position: -50px -20px;
+    background-position: -50px -20px;
 }
 .noglobe, .nolocation {
-	background-position: -70px -20px;
+    background-position: -70px -20px;
 }
 .no {
-	background-position: -90px -20px;
+    background-position: -90px -20px;
 }
 .pause {
-	background-position: -110px -20px;
+    background-position: -110px -20px;
 }
 .play {
-	background-position: -130px -20px;
+    background-position: -130px -20px;
 }
 .pencil {
-	background-position: -151px -18px;
+    background-position: -151px -18px;
 }
 .small-pencil {
-	background-position: -170px -20px;
+    background-position: -170px -20px;
 }
 .recycle {
-	background-position: -190px -20px;
+    background-position: -190px -20px;
 }
 .remote-link {
-	background-position: -210px -20px;
+    background-position: -210px -20px;
 }
 .share {
-	background-position: -230px -20px;
+    background-position: -230px -20px;
 }
 .tools {
-	background-position: -50px -40px;
+    background-position: -50px -40px;
 }
 .lock {
-	background-position: -70px -40px;
+    background-position: -70px -40px;
 }
 .unlock {
-	background-position: -88px -40px;
+    background-position: -88px -40px;
 }
 .video {
-	background-position: -110px -40px;
+    background-position: -110px -40px;
 }
 .attach {
-	background-position: -190px -40px;
+    background-position: -190px -40px;
 }
 .language {
-	background-position: -210px -40px;
+    background-position: -210px -40px;
 }
 .starred {
-	background-position: -130px -60px;
+    background-position: -130px -60px;
 }
 .unstarred {
-	background-position: -150px -60px;
+    background-position: -150px -60px;
 }
 .tagged {
-	background-position: -170px -60px;
+    background-position: -170px -60px;
 }
 .on {
-	background-position: -50px  -60px;
+    background-position: -50px  -60px;
 }
 .off {
-	background-position: -70px  -60px;
+    background-position: -70px  -60px;
 }
 .prev {
-	background-position: -90px  -60px;
+    background-position: -90px  -60px;
 }
 .next {
-	background-position: -110px  -60px;
+    background-position: -110px  -60px;
 }
 .icon.dim {
-	opacity: 0.3;
-	filter: alpha(opacity=30);
+    opacity: 0.3;
+    filter: alpha(opacity=30);
 }
 #pause {
-	position: fixed;
-	bottom: 40px;
-	right: 30px;
+    position: fixed;
+    bottom: 40px;
+    right: 30px;
 }
 .border, .border:hover {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;	
@@ -2818,7 +2874,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	footer
+ * footer
  */
 .cc-license {
     margin-top: 100px;
@@ -2826,7 +2882,7 @@ div[id$="wrapper"] br {
 }
 footer {
     display: block;
-	/*margin: 50px 20%;*/
+    /*margin: 50px 20%;*/
     clear: both;
 }
 #profile-jot-text {
@@ -2838,24 +2894,26 @@ footer {
 }
 
 
-/** acl **/
+/**
+ * acl
+ */
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
-	background: #eec;
-	color: #2e2f2e;
+    background: #eec;
+    color: #2e2f2e;
 }
 #acl-wrapper {
     width: 660px;
-	margin: 0 auto;
+    margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
-	margin: 6px;
-	color: #111;
+    margin: 6px;
+    color: #111;
 }
 #acl-showall {
     float: left;
@@ -2868,7 +2926,7 @@ footer {
     -moz-border-radius: 5px;
     border-radius: 5px;
     color: #999;
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #acl-showall.selected {
     color: #000;
@@ -2884,7 +2942,7 @@ footer {
 /*#acl-list-content {
 }*/
 .acl-list-item {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     display: block;
     float: left;
     height: 110px;
@@ -2908,29 +2966,29 @@ footer {
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
-	clear: both;
+    clear: both;
     font-size: 10px;
     display: block;
     width: 55px;
     height: 20px;
     color: #999;
     margin: 5px auto 0;
-	padding: 0 3px;
-	text-align: center;
-	vertical-align: middle;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle;
 }
 #acl-wrapper a:hover {
     text-decoration: none;
     color: #000;
-	border: 0;
+    border: 0;
 }
 .acl-button-show {
     background-image: url('../../../images/show_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-hide {
     background-image: url('../../../images/hide_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-show.selected {
     color: #000;
@@ -2953,25 +3011,25 @@ footer {
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 175px;
+    max-height: 175px;
     max-width: 42%;
-	background-color: #555753;
-	color: #fff;
-	overflow: auto;
-	z-index: 100000;
-	border: 1px solid #cccccc;
+    background-color: #555753;
+    color: #fff;
+    overflow: auto;
+    z-index: 100000;
+    border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color: #555753;
+    background-color: #555753;
     padding: 4px;
-	clear: left;
+    clear: left;
 }
 .acpopupitem img {
-	float: left;
-	margin-right: 4px;
+    float: left;
+    margin-right: 4px;
 }
 .acpopupitem.selected {
-	color: #2e3436;
+    color: #2e3436;
     background-color: #eeeeec;
 }
 .qcomment-wrapper {
@@ -2979,12 +3037,12 @@ footer {
     margin: 5px 5px 5px 81%;
 }
 .qcomment {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
+    opacity: 1.0;
+    filter:alpha(opacity=100);
 }
 #network-star-link {
     margin-top: 10px;
@@ -2997,32 +3055,38 @@ footer {
     display: inline-block;
 }
 #fileas-sidebar {
-	
+    
 }
 .fileas-ul {
-	padding: 0;
+    padding: 0;
 }
 
 
 
 /*
- * ADDONS THEMING
+ * addons theming
  */
 
 #sidebar-page-list {
-	
+    
 }
 #sidebar-page-list ul {
-	padding: 0;
-	margin: 5px 0;
+    padding: 0;
+    margin: 5px 0;
 }
 #sidebar-page-list li {
-	list-style: none;
+    list-style: none;
+}
+#jappix_mini {
+    margin-left: 130px;
+    position: fixed;
+    bottom: 0;
+    right: 175px !important; /* override the jappix css */
+    z-index: 999;
 }
-
 
 @media handheld {
-	body {
-		font-size: 15pt;
-	}
+    body {
+        font-size: 15pt;
+    }
 }