From ceeb4db6e304c26ebe56311743eb9baca69f7066 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 24 Oct 2012 19:13:29 -0700
Subject: Give the UI a little love after all the backend mods

---
 view/php/theme_init.php               |  1 +
 view/theme/duepuntozero/css/style.css | 35 +++++++++++++++++++++++++++++++----
 view/tpl/nav.tpl                      | 23 ++++++++++++++---------
 3 files changed, 46 insertions(+), 13 deletions(-)

(limited to 'view')

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index cadc9e9c8..4703022ec 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -17,6 +17,7 @@ head_add_js('js/fk.autocomplete.js');
 head_add_js('library/fancybox/jquery.fancybox-1.3.4.pack.js');
 head_add_js('library/jquery.timeago.js');
 head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js');
+head_add_js('library/jquery_ac/friendica.complete.js');
 head_add_js('library/tiptip/jquery.tipTip.minified.js');
 head_add_js('library/jgrowl/jquery.jgrowl_minimized.js');
 head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js');
diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css
index 5c41e0b4b..ee13bbeb6 100644
--- a/view/theme/duepuntozero/css/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -243,7 +243,16 @@ nav #nav-link-wrapper .nav-link {
 footer {
 	text-align: right;
 	padding-bottom: 1em;
-	padding-right: 3em;
+	padding-right: 3em; 
+}
+
+#powered-by {
+	position: fixed;
+	bottom: 1px;
+	left: 15px;
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+
 }
 
 .birthday-today, .event-today {
@@ -2366,6 +2375,24 @@ aside input[type='text'] {
 	margin-bottom: 25px;
 }
 
+#nav-searchbar {
+	float: right;
+	margin-top: 3px;
+}
+
+#nav-search-text:hover {
+	background-color: #FFFFFF;
+}
+
+#nav-search-text {
+	border-radius: 14px;
+	background-color: #AAAAAA;
+}
+
+#nav-user-linkmenu img {
+	border-radius: 3px;
+}
+
 .location-label, .gender-label, .marital-label, .homepage-label {
 	float: left;
 	text-align: right;
@@ -3362,7 +3389,7 @@ nav .nav-menu {
   border-bottom: 3px solid #888888;
 }
 nav .nav-menu.selected {
-  border-bottom: 3px solid #FF8888;
+  border-bottom: 4px solid #000000;
 }
 nav .nav-notify {
   display: none;
@@ -3520,8 +3547,8 @@ ul.menu-popup {
 	padding: 0px;
 	list-style: none;
 	z-index: 100000;
-	top: 90px;
-	left: 400px;
+/*	top: 90px; */
+/*	left: 400px; */
 }
 #nav-notifications-menu {
 	width: 320px;
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index bd0fc2f5a..d36988281 100644
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -54,29 +54,23 @@
 
 		<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.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
 				{{ 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.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.1</a></li>{{ endif }}				
 
-				{{ if $nav.settings }}<li><a class="$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 }}
 
 				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
 				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
 			</ul>		
 		</li>
-		
+
 		{{ if $nav.help }} 
 		<li id="nav-help-link" class="nav-menu $sel.help">
 			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
 		</li>
 		{{ endif }}
 
-		<li id="nav-search-link" class="nav-menu $sel.search">
-			<a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-		</li>
-		<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>
-		
 		{{ 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>
@@ -87,8 +81,19 @@
 				</ul>
 			</li>
 		{{ endif }}
+
+		<li id="nav-searchbar">		
+		<form method="get" action="search">
+		<input id="nav-search-text" type="text" value="" placeholder="$nav.search.1" name="search" title="$nav.search.3" onclick="this.submit();" />
+		</form>
+		</li>
+
+
+
+
 	</ul>
 
+
 </nav>
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-- 
cgit v1.2.3