Merge branch 'pull'

view/theme/diabook/nav.tpl

@@ -1,5 +1,6 @@
 <header>
-	{# $langselector version 0.01#}
+	
+	
 	
 	<div id="site-location">$sitelocation</div>
 	<div id="banner">$banner</div>
@@ -55,13 +56,27 @@
 			</li>		
 		{{ endif }}	
 			
+		{{ if $nav.search}}
+		<li id="search-box">
+			<form method="get" action="$nav.search.0">
+				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+			</form>
+		</li>		
+		{{ endif }}	
+		
 		<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.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="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+
+										<li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+
+
+										<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+										
+										<li><a class="$nav.search.2" href="friendica" title="About" >About</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 }}
@@ -123,6 +138,12 @@
 
 </nav>
 
+<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 7px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="images/bug-x.gif" title="Fehlerreport für das Theme diaBook erstellen"></a></div>
+
+
+<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+
 
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">

view/theme/diabook/style.css

@@ -91,6 +91,8 @@
   background-image: url("../../../view/theme/diabook/icons/notify.png");}
 .icon.messages {
   background-image: url("../../../view/theme/diabook/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/icons/community.png");}
   
 .icon.drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
 .icon.drophide 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
@@ -106,6 +108,7 @@
 .icon.lock		{ background-image: url("../../../view/theme/diabook/icons/lock.png");}
 .icon.unlock		{ background-image: url("../../../view/theme/diabook/icons/unlock.png");}
 .icon.isstar    { background-image: url("../../../view/theme/diabook/icons/isstar.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/icons/language.png");}
 
 
 .camera 	{ background-image: url("../../../view/theme/diabook/icons/camera.png"); 
@@ -170,7 +173,7 @@
 .youtube        { background-position: -130px -40px;}
 
 /*.attach         { background-position: -190px -40px;}*/
-.language       { background-position: -210px -40px;}
+/*.language       { background-position: -210px -40px;}*/
 
 
 .icon.on             { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
@@ -526,7 +529,7 @@ header #banner a:hover {
   color: #ffffff;
   text-decoration: none;
   outline: none;
-  vertical-align: bottom;
+  vertical-align: middle;
 }
 header #banner #logo-img {
   height: 25px;
@@ -610,12 +613,19 @@ nav #logo-text {
     margin-top: 3px;
     margin-right: 15px;
 }
+nav .nav-menu-search {
+  position: relative;
+  
+  margin: 3px 17px;
+  margin-right: 0px;
+  height: 17px;
+}
 
 nav .nav-menu-icon {
   position: relative;
   height: 22px;
   padding: 5px;
-  margin: 0px 12px;
+  margin: 0px 7px;
   -moz-border-radius: 5px 5px 0 0;
   -webkit-border-radius: 5px 5px 0 0;
   border-radius: 5px 5px 0 0;
@@ -1181,6 +1191,7 @@ section {
   color: #999999;
   border: 1px solid #DDD;
   padding: 0.3em;
+  font-size: 14px;
 }
 .wall-item-comment-wrapper .comment-edit-text-full {
   font-size: 14px;
@@ -1329,9 +1340,9 @@ section {
   margin: 0px 2em 20px 0px;
 }
 #profile-jot-form #profile-jot-text {
-  height: 3.0em;
+  height: 2.0em;
   width: 99%;
-  font-size: 10px;
+  font-size: 15px;
   color: #999999;
   border: 1px solid #DDD;
   padding: 0.3em;
@@ -1528,6 +1539,7 @@ section {
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
+	font-size: 10px;
 }
 #profile-jot-perms{
    float: right;