From bcf8a571f96f1f93ee3d2f8c6a6da7f9d6bd5da8 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 28 Mar 2012 05:52:28 -0400
Subject: [PATCH] add some icons for the newbie stuff (diabook but 24px not
 32); fixes for dispy (broken last push)

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/communityhome.tpl |  41 ++++++++++++-
 view/theme/dispy-dark/default.php       |  20 +++++++
 view/theme/dispy-dark/nav.tpl           |  14 ++---
 view/theme/dispy-dark/style.css         |  62 +++++++++++++++-----
 view/theme/dispy-dark/theme.php         |  11 +++-
 view/theme/dispy-dark/wall_item.tpl     |  73 ++++++++++++------------
 view/theme/dispy/communityhome.tpl      |  41 ++++++++++++-
 view/theme/dispy/default.php            |  20 +++++++
 view/theme/dispy/icons/StatusNet.png    | Bin 0 -> 1048 bytes
 view/theme/dispy/icons/email.png        | Bin 0 -> 853 bytes
 view/theme/dispy/icons/facebook.png     | Bin 0 -> 1097 bytes
 view/theme/dispy/icons/livejournal.png  | Bin 0 -> 1571 bytes
 view/theme/dispy/icons/posterous.png    | Bin 0 -> 1223 bytes
 view/theme/dispy/icons/tumblr.png       | Bin 0 -> 843 bytes
 view/theme/dispy/icons/twitter.png      | Bin 0 -> 967 bytes
 view/theme/dispy/icons/wordpress.png    | Bin 0 -> 1346 bytes
 view/theme/dispy/nav.tpl                |  14 ++---
 view/theme/dispy/style.css              |  64 ++++++++++++++++-----
 view/theme/dispy/theme.php              |  18 +++---
 view/theme/dispy/wall_item.tpl          |  73 ++++++++++++------------
 20 files changed, 321 insertions(+), 130 deletions(-)
 create mode 100644 view/theme/dispy-dark/default.php
 create mode 100644 view/theme/dispy/default.php
 create mode 100644 view/theme/dispy/icons/StatusNet.png
 create mode 100644 view/theme/dispy/icons/email.png
 create mode 100644 view/theme/dispy/icons/facebook.png
 create mode 100644 view/theme/dispy/icons/livejournal.png
 create mode 100644 view/theme/dispy/icons/posterous.png
 create mode 100644 view/theme/dispy/icons/tumblr.png
 create mode 100644 view/theme/dispy/icons/twitter.png
 create mode 100644 view/theme/dispy/icons/wordpress.png

diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
index dfc0467f79..2876f936ee 100644
--- a/view/theme/dispy-dark/communityhome.tpl
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -2,8 +2,43 @@
 <div>$page</div>
 {{ endif }}
 
-<h3>PostIt to Friendica</h3>
-<div style="padding-left: 8px;">
-<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span>
+{{ if $lastusers_title }}
+<h3 id="extra-help-header">Help or '@NewHere'?</h3>
+<div id="extra-help">
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
+	title="Friendica Support" target="_blank">Friendica Support</a><br />
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
+	title="Let's talk" target="_blank">Let's talk</a><br />
+<a href="http://newzot.hydra.uberspace.de/profile/newzot"
+	title="Local Friendica" target="_blank">Local Friendica</a><br />
+<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
 </div>
 {{ endif }}
+
+{{ if $lastusers_title }}
+<h3 id="connect-services-header">Connectable Services</h3>
+<div id="connect-services">
+<a href="$url/facebook"><img alt="Facebook"
+	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
+<a href="$url/settings/connectors"><img
+	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
+<a href="$url/settings/connectors"><img
+	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
+<a href="$url/settings/connectors"><img
+	alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
+<a href="$url/settings/connectors"><img
+	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
+<a href="$url/settings/connectors"><img
+	alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
+<a href="$url/settings/connectors"><img
+	alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
+<a href="$url/settings/connectors"><img
+	alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
+</div>
+{{ endif }}
+
+<h3 id="postit-header">PostIt to Friendica</h3>
+<div id="postit">
+<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
+</div>
+
diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php
new file mode 100644
index 0000000000..e74ec1a4f9
--- /dev/null
+++ b/view/theme/dispy-dark/default.php
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+	<?php if(x($page,'nav')) echo $page['nav']; ?>
+	<aside>
+		<?php if(x($page,'aside')) echo $page['aside']; ?>
+		<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
+	</aside>
+	<section><?php if(x($page,'content')) echo $page['content']; ?>
+		<div id="page-footer"></div>
+	</section>
+	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+</body>
+</html>
+
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index 589d683521..e38b2bbe2f 100644
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -45,13 +45,7 @@ works -->
     {{ endif }}
 	</div>
 
-	<div class="search-box">
-		<form method="get" action="$nav.search.0">
-			<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
-		</form>
-	</div>
-
-    <div id="user-menu">
+	<div id="user-menu">
         <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
         <ul id="user-menu-popup"
             onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
@@ -125,6 +119,12 @@ works -->
 $langselector
 </div>
 
+<div class="search-box">
+	<form method="get" action="$nav.search.0">
+		<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+	</form>
+</div>
+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
 </ul>
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 8be441c8b1..3616489992 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -251,7 +251,7 @@ input[type=submit] {
  * nav
  */
 nav {
-	height: 85px;
+	height: 60px;
 	display: block;
 	background-color: #1d1f1d;
 	color: #eeeeec;
@@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	width: 170px;
 	position: absolute;
 	top: -19px;
-	left: 15px;
+	left: 7px;
 }
 #nav-floater {
     position: fixed;
@@ -480,13 +480,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	color: transparent;
     border-radius: 5px;
     z-index: 100;
-	width: 28%;
-	height: 80px;
+	width: 300px;
+	height: 60px;
 }
 #nav-buttons {
     clear: both;
 	list-style: none;
 	padding: 0px;
+	margin: 0 7px 0 0;
 	height: 25px;
 }
 #nav-buttons li {
@@ -506,18 +507,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .search-box {
 	display: inline-block;
-	height: 20px;
-	margin: 0;
-	position: relative;
-	left: 7px;
-	top: 5px;
-	/*width: 210px;*/
+	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;
 }
+.search-box #search-text {
+	margin: 8px;
+	width: 10em;
+	color: #eec;
+}
 nav #user-menu {
     display: block;	
     width: 75%;
@@ -529,8 +536,8 @@ nav #user-menu {
     border-radius: 5px;
     background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
     clear: both;
-	top: 12px;
-	left: 7px;
+	top: 4px;
+	left: 10px;
 }
 nav #user-menu-label {
    	font-size: 12px;
@@ -641,6 +648,7 @@ nav #user-menu-label {
     background: #ddd;
 }
 
+
 /** sysmsg **/
 #sysmsg_info {
 	position: fixed;
@@ -752,6 +760,7 @@ aside #viewcontacts {
 	margin: 0px 0px 0px 0px;
 }
 
+
 /**
 * contacts block
 */
@@ -1018,7 +1027,7 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 8% 0 4%;
+    margin: 20px 9% 0 4%;
     font-size: 0.8em;
     padding-right: 230px;
 	min-width: 475px;
@@ -1057,6 +1066,7 @@ section {
 	text-decoration: none;
 }
 
+
 /**
  * 	items
  */
@@ -1129,7 +1139,7 @@ section {
     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;
@@ -1150,6 +1160,12 @@ section {
     -ms-transition: all 1s ease-in-out;
     transition: all 1s ease-in-out;
 }
+.wall-item-subtools1 {
+	list-style: none;
+}
+.wall-item-subtools2 {
+	list-style: none;
+}
 .wall-item-title {
 	font-size: 1.2em;
 	font-weight: bold;
@@ -1260,6 +1276,24 @@ section {
     overflow: auto;
     width: 100%;
 }
+#connect-services-header {
+
+}
+#connect-services {
+	margin: 5px 0 0 0;
+}
+#extra-help-header {
+
+}
+#extra-help {
+	margin: 5px 0 0 0;
+}
+#postit-header {
+
+}
+#postit {
+	margin: 5px 0 0 0;
+}
 
 
 /**
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 4c938997bc..84cbc05cd8 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -91,11 +91,13 @@ $(document).ready(function() {
             $('.floaterflip').css({
                 backgroundPosition: '-210px -60px' 
             });
+			$('.search-box').slideDown('fast');
         } else {
             $('#nav-floater').slideDown('fast');
             $('.floaterflip').css({
                 backgroundPosition: '-190px -60px'
             });
+			$('.search-box').slideUp('fast');
         }
     };
 	// our trigger for the toolbar button
@@ -151,6 +153,13 @@ function dispydark_community_info() {
 	$aside['$url'] = $url;
 
     $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['aside'] = replace_macros($tpl, $aside);
+	$a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
+// use our 'default.php' instead of the system-wide one
+$a->page['template'] = "theme/dispy-dark/default";
+
+// aside on profile page
+if ($a->argv[0] === "profile") {
+	dispydark_community_info();
+}
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index c9ac20c894..4b973bf93e 100644
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -15,44 +15,45 @@
 			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
 		</div>
-		<div class="wall-item-lock-wrapper">
-			{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-			{{ else }}<div class="wall-item-lock"></div>{{ endif }}
-		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}
-			
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ if $item.vote.share }}
-					<a href="#" id="share-$item.id"
-					class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-
-			{{ if $item.filer }}
-				<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}
-
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<ul class="wall-item-subtools1">
+				<li class="wall-item-lock-wrapper">
+					{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+					{{ else }}<div class="wall-item-lock"></div>{{ endif }}
+				</li>
+				{{ if $item.star }}
+				<li>
+					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+				</li>
+				{{ endif }}
+				{{ if $item.vote }}
+				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+					<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+					{{ if $item.vote.share }}
+						<a href="#" id="share-$item.id"
+							class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+				</li>
+				{{ endif }}
+			</ul>
+			<ul class="wall-item-subtools2">
+				{{ if $item.filer }}
+				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
+				{{ endif }}
+				{{ if $item.plink }}
+				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
+				{{ endif }}
+				{{ if $item.edpost }}
+				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
+				{{ endif }}
+				<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id">
+				{{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }}
+				{{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }}
+				</li>
+			</ul>
 			<div class="wall-item-delete-end"></div>
-		
 		</div>
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index dfc0467f79..2876f936ee 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -2,8 +2,43 @@
 <div>$page</div>
 {{ endif }}
 
-<h3>PostIt to Friendica</h3>
-<div style="padding-left: 8px;">
-<span><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span>
+{{ if $lastusers_title }}
+<h3 id="extra-help-header">Help or '@NewHere'?</h3>
+<div id="extra-help">
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
+	title="Friendica Support" target="_blank">Friendica Support</a><br />
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
+	title="Let's talk" target="_blank">Let's talk</a><br />
+<a href="http://newzot.hydra.uberspace.de/profile/newzot"
+	title="Local Friendica" target="_blank">Local Friendica</a><br />
+<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
 </div>
 {{ endif }}
+
+{{ if $lastusers_title }}
+<h3 id="connect-services-header">Connectable Services</h3>
+<div id="connect-services">
+<a href="$url/facebook"><img alt="Facebook"
+	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
+<a href="$url/settings/connectors"><img
+	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
+<a href="$url/settings/connectors"><img
+	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
+<a href="$url/settings/connectors"><img
+	alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
+<a href="$url/settings/connectors"><img
+	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
+<a href="$url/settings/connectors"><img
+	alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
+<a href="$url/settings/connectors"><img
+	alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
+<a href="$url/settings/connectors"><img
+	alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
+</div>
+{{ endif }}
+
+<h3 id="postit-header">PostIt to Friendica</h3>
+<div id="postit">
+<a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
+</div>
+
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php
new file mode 100644
index 0000000000..e74ec1a4f9
--- /dev/null
+++ b/view/theme/dispy/default.php
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+</head>
+<body>
+	<?php if(x($page,'nav')) echo $page['nav']; ?>
+	<aside>
+		<?php if(x($page,'aside')) echo $page['aside']; ?>
+		<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
+	</aside>
+	<section><?php if(x($page,'content')) echo $page['content']; ?>
+		<div id="page-footer"></div>
+	</section>
+	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+</body>
+</html>
+
diff --git a/view/theme/dispy/icons/StatusNet.png b/view/theme/dispy/icons/StatusNet.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b5f9a677d324eef9da61e99d6cd2547d818b6bd
GIT binary patch
literal 1048
zcmV+z1n2vSP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;wK*0RREA=E!aU000SaNLh0L01FZT01FZU(%pXi00007bV*G`2iyZ3
z2qrI*TMNbj00WpwL_t(Y$E}u4NE~Mv$A8bvJF{P|Sv4O@V8K#?5)ex+DaoY}gi2|^
zLm>vq!Fy10%B@F*(1euULux987V(fv5<#J@R9Zqvtk6hHOdIl1kw#f}XJ_80hn=17
z8V!{Czyrg~^Z9@O@AHgIrc&*`$Td&ooPc2;L?NuIP6w)ECNJ{&A=e#l5y7o}{9htK
z1ZGQh<W&^8GM&p+4mpnRu)kt~SJnn51wN`8)spYgvw|ubSBOYW-`<I)z&8q5RY{y1
z<628pE>k#tn%2HP(p_By>+5Vie$4vZ9FDb!=b@@izHuy3z*s;<&>i@zwV1<)dGE#z
z3MWqBW->U&BuUH9o^k)e1vZzKaMS5s&(5kMUuUzL7eTez#B_FY^7d_7dwTZ9Ig0pk
zXo!t__uhm^giTdsI-Av&7|%LPL8-+1cka-2=1i@95mshr`Rn0BT8l;A9ULTg@E`zN
zYilf=I)!d*uoLDjRZOIcZGguH0foWArr=)<4Dfn!5fcQc=karQH|G`>NVm1oQY><0
zc$l@TS8+YBnXalhHh!pUISlC@9ZlN&VRDkqyLah`BHCS-Hf!P0Bj(1&kht@AMn@@E
ztJsD(^}-#iN}~oqp|>}w<oBC5DWua#d}yeWPp4U%no4Zij~$~NbAM+%V*wkpsD44B
zN+oelXEKEG`-J<}k~?sqi7j;-jcw`$Igu)%DxtN6)?$G_78eue<KyE5)hb~WB{o%S
zaq{`Z=Fix^F-{o6^e;ql1+MFI|N8aBx##?O`X(muj~=C5sbC$4C=6MD`jqw6RRDgv
zas^{df_o!W&Koa`p|rBXcM}uwlu-IEUE-sqB|drbgrU_{K3-nt<mJmO-?{}rwopKJ
zU|)|bU--Uecidtt!lp3{Oij^y_H4qIz2wD%2h8;Mlk)v0nw9|fL)ZP(jR#qxsz?~}
z%j_(FzkG?`)<(9Y1K0D2s#RXBtnl0XJg)DP>*%1Rvy)$EW~e-W4h>_cDuP_|Jk9J;
zS*S``m8i89$>qTJ(P|a8x6x7w$>qovi}a6-kaZlszjzV9;j(Q5@>!hVZHp$VQ!sAb
zsnZY$tfd@97$EO?$*7PxfzkLt_E>#Mz}*&-3uHt{8IusA(YH3PYYBE+2Z`Z-*u{<Z
zYC((@2`u=!&nr_vECf!Z`i)gZ_gUk?_pSSZ$h^Q2f#Wf(`|;aS4dKfW#{U61dpx*Q
SRHEhp0000<MNUMnLSTZDmGA-p

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/icons/email.png b/view/theme/dispy/icons/email.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9d64cb9319b9be7d6ee33e97b6d43f88ede6576
GIT binary patch
literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;wK*0RREA=E!aU000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyZ3
z2r3Ee<H0uo00PxXL_t(Y$Gw%$PWwg>$3HV(+liBq3&DVdltVy52t^=q;F72KwU5w4
zAB|R(cm<w<BO*W`e*_38V8_|*A#s3mX-nFXM&3Q_jJ|(nEa&IvaS#M&s@h?NVXeK$
zvg~IQ1i@LS)9IAUW#^oeRTLKy_xk$UxwyDEGpgDN!_Xy3A}a(SQ4~2<?HK1A&N)%l
zRWgKgPMmX?#RU;rbpwF^p}~S8{sW5mMA51nSZm)ASZguHEMa{&RF&CmHb-EsWjdYW
zoWt`xJkR^bXhekBY(}2vWLd^wFhEtAPN$eW&*^r%42MI)Fr-u}5k(PeYirbMHLBI>
z7vTy+q-o0I<0H?{&m>90WHKR5Q^GK0b8BnP3_!J7r9d*BP8p3x^m;ws-rlg*(r7e@
z<Cr*(an8~0cDcE^VLToaMG>V^31bXV6j86&@jMUT7*rLbs&lT4!SlR#?u;SJGTQAn
z<MEjL`+F`gFA)(MjRt#rdkh8xhQlFI6rrliED)+HMnn)1JY%rd&IPiThwE$F?KV*q
zQ7)HRUtj;ieWg+%NfOdDrCzV&7De^LOsR-q7dG`g4?hSP4TrQ^E#f%F_kDsO!1w)6
z83X}g7;<=cNWb4-I#EOrRop@=U8uJd@9F7@QmMrL{ywUT@B0{ImfzxB+-tQOCnqNi
z27@In#T<ypTx4r40_1tlI7v7?Jzd)NuMYZX%_258H<?T(^m;wwIQ}%r3NV|^5D`YB
z5xcv)1VKQdO_3i(EQBl)pxJEV`#wpMPz*1C7M&g*9w?W~Y;SLW^84S(f|`Sa172QU
zu-0O&eMc}JkFnNre0=<^<yNUwXti2gUtg2w`TM#~)0Cs5Bfhh`i#J<aTTCVsuCA_@
z6xp4f9V(T|7xDgWG@DH}Ha2k1Sp)ph@ArSKs(8UdmSq6H8|U0FcXxNQ+uPfpfK~kz
ftcd*Pocr}pUI2JSr|$Z`00000NkvXXu0mjf0z!F4

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/icons/facebook.png b/view/theme/dispy/icons/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff5129f94703ce783d3a80bd2616e36fdf48ac20
GIT binary patch
literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;wK*0RREA=E!aU000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyZ3
z2qy==^^$!600YTML_t(Y$9<JMh+S0_hQEEzKKI@kW+X8W^Ux?(5+tOMD5#ZDQW%28
zFolSXh#9c85v(i}QUvQXij7Q@$|5Kz3JOsX3niHGF$u=#OdKXRnVGxyUcbe8kBPfF
z`?3DD{(n7=dus08-5Vi0w;4DoDFXol17RS6ge1U_gk;qlA<BDDX^IdsV9`=M?KdXb
zxnoa1ekvsqV`*4oR-h7QC78*OskxJA_SAbso@H5{x%rD<e}Uha*vYL)VtILmDul)W
zm7qu!P#u7fSqHeZLp3AVzkeSRb6z5wOafrEOEuMY?}USr4FXpJI#;tzjY<wj3;`hX
z!bq{CUReQZfz<yl<!-<Ky!tb<!^HH+V-ha&XzCEj5|Z$k2q9r6oa@rHCKsrydnuXA
za@MYV&zUz~;EBf`CC_v6Jmb>RG7E2iMoI}Gyvc|$Ags)NH&SXqkXp?F)>nSz!?Uk)
z^vGelYsWn^NJfeg1YTx@NkYl$JmKm@qF%ylCtH)mYxBoAdgL&YaLzRj2E_o$h^dlD
zGGdHnwKSDLr#jRtStPb5f#;ul5&-8MAq38U`V)g9=laS`vdocE0>GO@3<0H7S7}pf
zJ&9=LLBi*G6ZPe#E4=mICrk};oP)wUVv0zH$5O+fs=Ov@SM@{<?p(&T-+yFf<!@qq
zv6W?5aP7D6m>v!&hEwc&;1R4&vLsS0b5KjubV5fWfQ_v!J~;C-4?lR2`}XW;96WUB
z06$zfL*a8SEiLo<JD)Q>Dyk$aky6C0(`afNtY%d9LuAkHog6%{w^uoNo^$B_eE_Vj
z-$a&>as+tlwzt&cHXYn=e@n*f>`V`Qdlk*j%wlF$z?DQ+&y{Tq)MgzJqhZb~Z=Pp!
z68PxsOYGe>gL97Y_!g%Y-e+nwAcV+pkT)^<a=50_3ELQm{(O?SzPir%_7*9%k}hAp
z&L4lRGaCA4Y^y4JUr)?7T5U(}u&bx7_3oXk%h)>Ml#V<Yu9-QFN%P3nd#O2hegEZ|
zwfE&4S4otN@p!FMIoqc8HmwAV#~VEslDKti9i^g2OEUauG~)QPCx~If|E;e7+nbT$
zXw>YB!H{Q;pI}gA&6zI>E_{3*Z-^Ksgb?UdTLtRw;6TJ`Qg*3^7|C4L6|MRolw7m&
z;J?w<f2_9F-5u4ui@xR&i#JwR=Xc(_tCyrZ8PvGmi|MIBb2BqDi}xPy^XBb8H&ziW
zdb4=?+lya;W3FU!mrQq}j>%ZqxXfr&;2hi>Z}R0gzmR85fF@XsAuRk0iYf<svhRcH
P00000NkvXXu0mjff^+%P

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/icons/livejournal.png b/view/theme/dispy/icons/livejournal.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ba5f7f7d827e59424d64737e1c6d9c138303470
GIT binary patch
literal 1571
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
V_U*7lOuzsD002ovPDHLkV1mFV?IQpH

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/icons/posterous.png b/view/theme/dispy/icons/posterous.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0ae6face9fa03401ecba64aa26a2a35bc947ceb
GIT binary patch
literal 1223
zcmV;&1UUPNP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;wK*0RREA=E!aU000SaNLh0L01FZT01FZU(%pXi00007bV*G`2iyZ3
z2q!EONozd-00c)#L_t(Y$90y$t5sDL#(!&{^L#2+>U(HpBtkamJ%mUsvWyfe6m8HT
zA)-GZnlx)rL`{nVXAPo)W=8O8P&o)BFp)|tvqUEeiaxJCEuZ(Ev-kQM?0wF=79O~l
zbIxY(wbu82>s!Z8AN^pH#FtP#Xog_`Ab}Ym`b#Xm>+V(7&A`e&Nkaa+1@_i*&8@rl
z{+ZQl*MW_l)}L&*xgUSFTlPq13zsj=T)uF2t_IDlUb7Z&E@C)l)>j}zFzc&vsXuP~
z=>LZgteKi({`{Gl+Hivge1v)!443kuKK9%rC?p7Gj9)I5cLFtlTa6NULf%kWl{0W*
zT`tQfAx22TCTgfc&Nd}z6T*>1us{Ihp3|r!rbrH;mY@Xq61#H3^5wk$)&X|xe1zF8
z5Ae<BhdFlS1b5uIiifw&vg_IHn7WKpVY~n)2YDADB5#UBI<5^Ya&6%{^YaTFc<*D@
z-LsxO&+le99CG;3_xyVN4_<lgMJDR1oGSu`D`7rDYD)l*1SOK3%EFRPlTlTHACI2k
znZ3K%`q(U_213Q-J09ZQcRu9nx$oG$?+HS;&%h**V{(GLrGv>l;%S7Z5vB;<VnAJ2
zY<+Yyeq$aDuc4a@)M<eiUfRR)pH4Geya8&F=e>9Xil9UtNM*6XFho|1drOev?rhw&
z0pfLn5{?rT5Mp`_BoB;+i>z3_q_O;;6RhP4yaly+NnS#br7LH8`YuSLtQNr4Viu@L
zR8_!ZgJ}{<f(Xn@1sNVksmVBwH)hH`aQV_8m+X$q`$|*WG90!9B1&zsjI!BdQ4tZ;
zV2VhF<XQiPv|w=Y!hD7?MS=yo8b`xLmQ7BwY$9aNdbdzPBoXj2nQDX)2_&Q@lVva%
z{LR@@=Ll6I`H(=1O(ecO^c$Ntt!Kq#Kt4h~%&>MOdn7=H$cV^WRQPbu0b-17+rE{9
zU;M(cAI?y%tXaHqlg~am!p|qpv2*7vRcNrTpVVfXPy`Y+9wD`O91*MngiE;}+(0n3
zx@P~&`}p*uuQ)jOCuT4`eHX94{VHoF{z6UD3&gCz?74zWG7(dor6ns)A<R=YHXpL_
z?(4kq=6?QJOoU*pTour@Q)t*0PRR1^lWS2Qz}x)70>KRT>?up*K`^?C-?+-EP-RrF
zBvc$WbXoU?9RSBj)R0Zi6f^mj7Xty@QTcT;l|paXoiWO@o2v67ZwP8jA9w`MGIe=x
zcn*X{Jhl62?%M#wc>)3VcB!ENinL_~q;8J-cmR1;4P^T@LlQVVx#c>f2E_<w+4IMT
zq;l2>9LKsIDn!>(lw5{HAQdYwv(*fZu4ZKv8&A?wmZfu5?t@ujVFElLwW>)sPhJ@e
zW~Zh$1Eb!otfXlL?rsuR{~f|()pSqBB!j_aNH<T`fp*{E{OP&Dg=I5XFmBy@%V&vh
lGwl1%n6c@M+LLDf+`mRd?yiu<PLlut002ovPDHLkV1in4FMt35

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/icons/tumblr.png b/view/theme/dispy/icons/tumblr.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d5fcd045bdead95ae39431dc1f38b53fd6bb863
GIT binary patch
literal 843
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAF%}28J29*~C-V}>-Vopu;wtBq
z0z|SVUO-a8B0$k9SlKpI#UWb7F;>+nP7R2h6VzQ2)m;<SJu)?%<1}28HQiIRJkqp1
zGjzN&b$zq-{c;Tg@(cp<4Fd~}f{ToTi;Y4`jNPM*fn;c@2?&*$gq4|sP`Oz+5LK8(
z08yoRM1?t!jI6eZuC??}wT!N|im9=Rsk4r2u!(Q7jjOj!Y_>~kwGT?MPj0hMX>&;F
za7=D?Ozm(??Q~4*a!TuTPVaKf>~%};aLej-%j);Y?)8ky^2+J;%A4q0IK{tka$xDq
z;L_<K<uf8{=EXHGPH0-1)Vd<AYfW0$+VqYU89nQ>`ZnZF+?+poTk(W-rIR<-&)C>7
zXGhb#oh|*dx+l-+U$$q`$^%mttX{Z$&C<;WSFGE*V%OQ#8+WYTyld^2T^qLV-L!N6
zmfZ)p>^;7H@8KQ$j_lljWdG4KM~)spdgjuxbJvcay>jCG)zfFspFMl_JP_P?bP)({
zJ-U4P^0jN%Zr;3k_wL<$51%{$f`^ZR;Q90CuU@@+`}Xa-51-zD{QU9b$1h*LeE<Ia
z=g*(NfB*jb_wWDz|E0RNYk(rMB*-tA!Qt7BG!Q4r+uensgH_f8$l)yTh%9Dc;1&j9
zMuu5)K#738#M9T6{SLDXhlb$Uoz{<mde}W(978nD=U$5TW^$Bi`?yi{g+oGMTgTQZ
zB@2``scu&Bj=r{F#ex?eBCbcJ^2)v>iP|J+UQ2&x|JkqDbpPtg%4cZ_63K0D4TjsQ
z78SaD?+><OGv=H8f79$&GnN!gm~c(sUzn@amfLJy{e9imLwPYC^K1X_IV#F!?S1HI
z`0~$>Ed1CeAG)^Z!n8O;%{6B^bze$OKJ=;Q!PQx3XFabppCPi$N5e#lHF%-G#7|$V
z>=u0xVA~#5dYG$qqkv6_R=;9vyWkG}>Gs>)#fu|Ej<r8L_x<nfzn|50xP+ZI1n6)^
zh^VnACOn<I`_Li*Zm-(F+uL^UGW@~(yHvyH`zr~Zgl`#VKIJd^Z&$CQp4hx`fxZne
Plo&i+{an^LB{Ts5a5jNW

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/icons/twitter.png b/view/theme/dispy/icons/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a068451e5313288739b0a2c7e921e289c0168b5
GIT binary patch
literal 967
zcmV;&133JNP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;wK*0RREA=E!aU000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyZ3
z2q-L-(RcCy00T!!L_t(Y$E}vlZd+9pg}-y|xrsxP=Ep(Bkfs%p0jXlZpTvYWKw=a{
zV!(h|c@LhUBc32bo`Dgn#E&dml_nLDpsI>!oaEZR_nf^L+#APE+$w|Ip?$p9T6=%{
z_`2_ZdAK(3{e55u@LbPhz~0F0UYPU#{<rVn*_HDoT~GDQ;hk*vheuBdNIN4r9v=^w
zuJ7=f#{p)BbaizHbeCEn?F4}@Oc&fcs&d31y&hFr(S5JW%6c2gt}IfR5cpugFo`(f
z&}WVZPY(Gp-NLoz+3Fqg&Br<6jU~8Zl3@}C1PKNvs&P2T1wGa{X>XFrI9Oa`|KtVl
zE`XXduYbhAgama0GolH`Q*b!%QH%&-7$t!+MrQf<-Z$pXza5%22@pjRr5JmYz>*;~
z0!r*39Psbs)5~53H(D9pPd>wv#xg|`LIe{G%%~=;nIKuh6!C}>_^GuGc6rEh5Jm-G
zKYGa9-4C$l%)ks21kuc3f)L>wG$Yo;F3G@WGdn(Nt?|1VZ(-v)19ON*U}z#vw8%_Y
zipWaT2$)_+3~Y5)7^d2_ni@KzXk?ly5Ckb1O7#pJ(4KS5hiv9jebmm`TFn`njY&*r
z6bUFLG|^vk9;JxI5(msV@l|J@?VC$8DLSf*<CvP#^$F*Fod86Vs3sODm`Ew1szMIT
ziDyHPifRhQ$rKkc%~fL`fJR`FqGkp$A}35nRXNQ2nVVdbGyS=5&YcTP3?Tsv%S+fv
zf%A?E@mueZqr)e-DUw8%1=_bZSzO<k5(o`30U+AhqSYcwV!N}-&wm}^v$~guVT0%Y
z9bZb|l$bmCl`lTO%Sxw%%n**;CKA|%76G{2(`_&C=ZjN(<7SXA&cyU|?gsnM`h3{w
zG`I3Om30D%>cWzG=eT=&o#*|6{;)#u%4;r~SYB;YCSgtGIBt>Z1W}hSnT6#RUw(R<
zr+>fXpO*vr!;;*4f_LMQ3Rr37Y`(Km?|~*3Qw^q3P|fgH#f0}6H@Di{*>dE7Ii~*I
z98luuH;Z+aGfIR8Q*$yO&Ap-tVq~H}a|6yr+|+M{a{{nnxV=TIcHi^?yQWtP4=h@w
p!0iP|_ln|_{F+}|3fPnQ?tfM55kKXOL)QQR002ovPDHLkV1nQ~x1#_6

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/icons/wordpress.png b/view/theme/dispy/icons/wordpress.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a4e36d458d25b375c877ff77b0e832fed8355ee
GIT binary patch
literal 1346
zcmV-I1-<%-P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;wK*0RREA=E!aU000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyZ3
z2q_03cE9rg00hEGL_t(Y$F-JCOjK7C$A9;|H=pr?p~HtLi3|xfVk&_IDnUYo)QVM!
z36ipDT-t@pMu`j9)LrAwx-hbFMMPH^ivgohSH@_Z`jOFEorHh`0|sZ_d-LwSUBDY5
z%BuG4-pf7z|2^k_KCWnQYm0?Kp^HL@UclhXn9^F0IF5753Wh=#e>!=x&np!0JnxI3
zTb5;5fk5Bzl`B{Rdh_`_$z*av2O$JPh;{$8)@ZFa^r^3}M?kNowKnqk{AUkqt#MtK
zd@hIMI2guC29;6-gF&LvD8W$Z6LNr6OvBPzQz#TZA@Dqpd@e^KktjMSr9f+hX%Y^H
zF%5&4uU-)jg$Ra1>o9ywOKXkmI7lgrH_=+Nn9b7F)x{sTZt?BDeH`oQp)4K;A(+o(
zn4FyC&*^D8ySlhDImza&TQN=ZW8{vrLZFnwaou80wbm?UvmEW|;m+hFzg@V%wr$(i
zMORr_N&TKZ{Mg^mujkLxbNo0rMn~DSWlJ%Qj_ab7!q8gdtVSTE#Bm%t4jdqvOfon$
zL?jYHN=YV@!F641+a{CA0Py0)3l`?*xpwUu2Rb|P3WaqzTI&@8cQpbjC5c3Wd-v{<
zPNzA2`ZPDLU&nD>1_uY}>+7Sxzn{yOFH<NKNT<`}aycTA2on<%)YQ}<rDQE;kw8j`
zVHjww*%Xc9*fv#FRrH=XK{OI!U|@i<c$~7bGP=9F2?PRkbaW7nL<k0h)YjJGNr`Ei
zNGU%hP)Z?$Aot+|znnQktfYjuZ{PCp;X?qbs;Ve2FUPiRrl+ToQWB5H>Fn%eetw>#
z$Bt2O-C`N9Bk(*ArPNAzKxt_y-yb@JQi_{5Zx+S<?%+W@&*Ry%XXJ7@gb?hguBM{A
zoL#$iQSiJXmgjjN2@0#?D5dbfn_F6lMx#7^`jn-mB>+;X6ibVXq|<5My?Y11-0Upf
zhYusA1g(n~_4~l^>((a#n3<WOq@;w}+FAg{#>Q}6mvlN!Z*MP-<1jWhhEj@DDn(OM
z6PZk=*l51c00wKCt57HaFflPfFc_q<v5`<H#QppCNhXsdYHIl5$Pp~dVtRU-rKKgb
z)|8f(a{Kme4AWdc6@<X>r-)y>hH3KP!2@PyW@u_`#Ih_F78V#EAE#~qexlJRU)R;~
z{{4G~hlgosXkdAHnW?EM48y>-?Ui%^V(t9*^Z(-ca~c~P85$bmt9YCp+qbj4yv#qZ
zUsF+0K{y=do4tF9Mk3t3dzZSpI?kOtM?*scsZ<KRs)KLq2z>R&$H!@HZDru>S@yTL
zqm-h(y`4xTf)Ik1mKMU{FxA!7{C?>Y&CShBO-<oAP7$X_;14*z#kJNLhQY|l2sMcW
zSFc`0E5)YGo0*%NV|I2H+qQ9Rn>TOXuyf~5Mn^|+S9`$6DejTB)>d6pTT3>ZMF@e`
z8X*Lp=OKh(_wL=qVlfu8S!~BCE}yb^oLoN7qeqXBQW6LRioRNFVzC&1zkG@1i{W>&
zUs3+pc>MVBhTF?93@ppSG|ggK{Ih=XSO}pE(=;{$F-`Nc8*44tXUR<ygisb*j|79k
zzRJo<<Qj4Qi<yQ&AP@kpM=UAjslT2);s1EHNGX5*7nm9Zon9GHUH||907*qoM6N<$
Ef}AsUmH+?%

literal 0
HcmV?d00001

diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index 589d683521..e38b2bbe2f 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -45,13 +45,7 @@ works -->
     {{ endif }}
 	</div>
 
-	<div class="search-box">
-		<form method="get" action="$nav.search.0">
-			<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
-		</form>
-	</div>
-
-    <div id="user-menu">
+	<div id="user-menu">
         <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
         <ul id="user-menu-popup"
             onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
@@ -125,6 +119,12 @@ works -->
 $langselector
 </div>
 
+<div class="search-box">
+	<form method="get" action="$nav.search.0">
+		<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+	</form>
+</div>
+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
 </ul>
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 74a7809a1f..c2c7467671 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -251,7 +251,7 @@ input[type=submit] {
  * nav
  */
 nav {
-	height: 85px;
+	height: 60px;
 	display: block;
 	background-color: #2e3436;
 	color: #eeeeec;
@@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	width: 170px;
 	position: absolute;
 	top: -19px;
-	left: 15px;
+	left: 7px;
 }
 #nav-floater {
     position: fixed;
@@ -480,13 +480,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	color: transparent;
     border-radius: 5px;
     z-index: 100;
-	width: 28%;
-	height: 80px;
+	width: 300px;
+	height: 60px;
 }
 #nav-buttons {
     clear: both;
 	list-style: none;
 	padding: 0px;
+	margin: 0 7px 0 0;
 	height: 25px;
 }
 #nav-buttons li {
@@ -506,18 +507,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .search-box {
 	display: inline-block;
-	height: 20px;
-	margin: 0;
-	position: relative;
-	left: 7px;
-	top: 5px;
-	/*width: 210px;*/
+	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;
 }
+.search-box #search-text {
+	margin: 8px;
+	width: 10em;
+	color: #eec;
+}
 nav #user-menu {
     display: block;	
     width: 75%;
@@ -529,8 +536,8 @@ nav #user-menu {
     border-radius: 5px;
     background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
     clear: both;
-	top: 12px;
-	left: 7px;
+	top: 4px;
+	left: 10px;
 }
 nav #user-menu-label {
    	font-size: 12px;
@@ -641,6 +648,7 @@ nav #user-menu-label {
     background: #ddd;
 }
 
+
 /** sysmsg **/
 #sysmsg_info {
 	position: fixed;
@@ -752,6 +760,7 @@ aside #viewcontacts {
 	margin: 0px 0px 0px 0px;
 }
 
+
 /**
 * contacts block
 */
@@ -1018,7 +1027,7 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 8% 0 4%;
+    margin: 20px 9% 0 4%;
     font-size: 0.8em;
     padding-right: 230px;
 	min-width: 475px;
@@ -1057,6 +1066,7 @@ section {
 	text-decoration: none;
 }
 
+
 /**
  * 	items
  */
@@ -1129,7 +1139,7 @@ section {
     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;
@@ -1150,6 +1160,12 @@ section {
     -ms-transition: all 1s ease-in-out;
     transition: all 1s ease-in-out;
 }
+.wall-item-subtools1 {
+	list-style: none;
+}
+.wall-item-subtools2 {
+	list-style: none;
+}
 .wall-item-title {
 	font-size: 1.2em;
 	font-weight: bold;
@@ -1260,6 +1276,24 @@ section {
     overflow: auto;
     width: 100%;
 }
+#connect-services-header {
+
+}
+#connect-services {
+	margin: 5px 0 0 0;
+}
+#extra-help-header {
+
+}
+#extra-help {
+	margin: 5px 0 0 0;
+}
+#postit-header {
+
+}
+#postit {
+	margin: 5px 0 0 0;
+}
 
 
 /**
@@ -2328,7 +2362,7 @@ div[id$="wrapper"] br {
 .field {
 	/*margin-bottom: 10px;*/
 	/*padding-bottom: 10px;*/
-	/*overflow: auto;*/
+	overflow: auto;
     width: 100%;
 }
 .field label, label {
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index db8cf5ccdf..d451a6b931 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -132,11 +132,13 @@ function dispy_community_info() {
 
 	$fostitJS = "javascript: (function() {
 		the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/fpostit/fpostit.php?url=' +
-		encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
-		encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
-		document.getSelection() : document.selection.createRange().text));
+		encodeURIComponent(window.location.href) + '&title='
+			+ encodeURIComponent(document.title) + '&text='
+			+ encodeURIComponent('' + (window.getSelection
+			? window.getSelection() : document.getSelection
+			? document.getSelection() : document.selection.createRange().text));
 		a_funct = function() {
-			if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
+			if ( !window.open(the_url, 'fpostit', 'location=yes, links=no, scrollbars=no, toolbar=no, width=600, height=300') ) {
 				location.href = the_url;
 			}
 			if (/Firefox/.test(navigator.userAgent)) {
@@ -144,18 +146,18 @@ function dispy_community_info() {
 			} else {
 				a_funct();
 			}
-		})();" ;
+		})();";
 
 	$aside['$fostitJS'] = $fostitJS;
 	$url = $a->get_baseurl($ssl_state);
 	$aside['$url'] = $url;
 
     $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['aside'] = replace_macros($tpl, $aside);
+	$a->page['aside'] .= replace_macros($tpl, $aside);
 }
 
-//right_aside at profile pages
+//aside at profile pages
 if ($a->argv[0] === "profile") {
-	// COMMUNITY
 	dispy_community_info();
 }
+
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index c9ac20c894..4b973bf93e 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -15,44 +15,45 @@
 			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
 		</div>
-		<div class="wall-item-lock-wrapper">
-			{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-			{{ else }}<div class="wall-item-lock"></div>{{ endif }}
-		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			{{ endif }}
-			
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ if $item.vote.share }}
-					<a href="#" id="share-$item.id"
-					class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-
-			{{ if $item.filer }}
-				<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}
-
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-		
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+			<ul class="wall-item-subtools1">
+				<li class="wall-item-lock-wrapper">
+					{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+					{{ else }}<div class="wall-item-lock"></div>{{ endif }}
+				</li>
+				{{ if $item.star }}
+				<li>
+					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+				</li>
+				{{ endif }}
+				{{ if $item.vote }}
+				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+					<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+					{{ if $item.vote.share }}
+						<a href="#" id="share-$item.id"
+							class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+				</li>
+				{{ endif }}
+			</ul>
+			<ul class="wall-item-subtools2">
+				{{ if $item.filer }}
+				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
+				{{ endif }}
+				{{ if $item.plink }}
+				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
+				{{ endif }}
+				{{ if $item.edpost }}
+				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
+				{{ endif }}
+				<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id">
+				{{ if $item.drop.dropping }}<div><a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>{{ endif }}
+				{{ if $item.drop.dropping }}<div><input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /></div>{{ endif }}
+				</li>
+			</ul>
 			<div class="wall-item-delete-end"></div>
-		
 		</div>
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-- 
2.39.5