The rest of the front end for the new notifications - now only missing "mark all seen" for some types, ajax loader for a couple of types, and perhaps a birthday cake icon if any birthdays today, a bit of css cleanup of duplicated or obsolete stuff

author: friendica <info@friendica.com> 2013-01-08 11:59:29 -0800
committer: friendica <info@friendica.com> 2013-01-08 11:59:29 -0800
commit: a96d3ac66f50615ffc0ba764fdeba14cdae00c86 (patch)
tree: 3d10d634839c9d5628d4df8abe1e1881d9211a93
parent: 3b213c5fc76d7392f1fd825b9db4fb4dfb8b9940 (diff)
download: volse-hubzilla-a96d3ac66f50615ffc0ba764fdeba14cdae00c86.tar.gz
volse-hubzilla-a96d3ac66f50615ffc0ba764fdeba14cdae00c86.tar.bz2
volse-hubzilla-a96d3ac66f50615ffc0ba764fdeba14cdae00c86.zip
7 files changed, 143 insertions, 207 deletions
diff --git a/include/nav.php b/include/nav.php
index aa98192c8..644264a92 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -143,7 +143,7 @@ EOT;
 		$nav['intros']['all']=array('intro', t('See all channel introductions'), "", "");
 
 
-		$nav['notifications'] = array('notifications',	t('Notifications'), "", t('Notifications'));
+		$nav['notifications'] = array('notifications/system',	t('Notifications'), "", t('Notifications'));
 		$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
 		$nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '','');
 
diff --git a/mod/ping.php b/mod/ping.php
index dd6153963..3c3cef325 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -95,7 +95,7 @@ function ping_init(&$a) {
 
 		$channel = $a->get_channel();
 		$t = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan 
-			where channel_id = %d and ( mail_flags & %d ) and not (mail_flags & %d ) 
+			where channel_id = %d and not ( mail_flags & %d ) and not (mail_flags & %d ) 
 			and from_xchan != '%s' order by created desc limit 0,50",
 			intval(local_user()),
 			intval(MAIL_SEEN),
@@ -146,7 +146,7 @@ function ping_init(&$a) {
 			}
 		}			
 		logger('ping: ' . print_r($result,true));
-		echo json_encode(array( argv(1) => $result));
+		echo json_encode(array('notify' => $result));
 		killme();
 
 	}
diff --git a/view/css/default.css b/view/css/default.css
index 8583d6589..19eeb9a68 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -6,12 +6,11 @@ nav {
 
 aside {
 	display: block;
-	width: 200px;
+	width: 210px;
 	position: absolute;
 	top: 48px;
 	left: 0;
 	margin-left: 10px;
-/*	float: left; */
 }
 
 
diff --git a/view/css/mod_register.css b/view/css/mod_register.css
index 581dee1a0..aca6ee002 100644
--- a/view/css/mod_register.css
+++ b/view/css/mod_register.css
@@ -1,12 +1,12 @@
 
 h2 {
-	margin-left: 15%;
-	margin-top: 15%;
+	margin-left: 5%;
+	margin-top: 5%;
 }
 
 #register-form {
 	font-size: 1.4em;	
-	margin-left: 15%;
+	margin-left: 10%;
 	margin-top: 5%;
 }
 
diff --git a/view/php/full.php b/view/php/full.php
index c4d62d5cd..d8643d5a1 100644
--- a/view/php/full.php
+++ b/view/php/full.php
@@ -1,14 +1,14 @@
-<!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>
-	<section><?php if(x($page,'content')) echo $page['content']; ?>
-		<div id="page-footer"></div>
+<!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>
+	<nav><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+	<section><?php if(x($page,'content')) echo $page['content']; ?>
+		<div id="page-footer"></div>
 	</section>
-</body>
-</html>
-
+</body>
+</html>
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b855a045a..5f551c66e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -9,8 +9,6 @@ body {
 	font-family: helvetica,arial,freesans,clean,sans-serif;
 	font-size: 12px;
 	background-color: #ffffff;
-/*	background-image: url(../img/head.jpg); */
-	background-repeat: repeat-x;
 	color: #000000;
 	margin: 0px;
 }
@@ -19,13 +17,8 @@ abbr {
 	border-bottom: none;
 }
 
-/*Should we be doing this here, or should we be changing default.css? */
-
 aside {
-/*box-shadow: 3px 3px 3px #ccc;*/
 border: none;
-/*border-radius: 0px 0px 20px 0px;*/
-width: 210px;
 color: #d00;
 }
 
@@ -36,9 +29,8 @@ color: #d00;
   display: block;
   overflow: hidden;
   text-indent: -9999px;
-/*  min-width: 22px;
-  height: 22px; */
 }
+
 .icon.text {
   text-indent: 0px;
 }
@@ -104,8 +96,8 @@ color: #d00;
   padding: 1px;
 }
 
-a, a:visited, a:link { color: #dd0000; text-decoration: none; }
-a:hover { color: #dd0000; text-decoration: underline; }
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { color: #dd0000; text-decoration: none; }
+a:hover, .fakelink:hover { color: #dd0000; text-decoration: underline; }
 
 input {
 	border: 1px solid #666666;
@@ -117,8 +109,6 @@ input {
 img { border :0px; }
 
 
-
-
 code {
 	font-family: Courier, monospace;
 	display: block;
@@ -137,7 +127,7 @@ blockquote {
 	padding: 0.4em;
 }
 
-.icollapse-wrapper, .ccollapse-wrapper {
+.ccollapse-wrapper {
 	border: 1px solid #CCC;
 	padding: 5px;
 }
@@ -164,11 +154,19 @@ blockquote {
 
 
 /* nav */
+
 nav {
 	display: block;
-/*	margin: 0px 10%; */
 	border-bottom: 1px solid #d00;
 }
+
+#langselector {
+	position: fixed; 
+	top: 3px; 
+	left: 5px; 
+	z-index:9999;
+}
+
 nav #site-location {
 	color: #888a85;
 	font-size: 0.8em;
@@ -204,6 +202,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
 header #site-location {
   display: none;
 }
+
 header #banner {
   overflow: hidden;
   text-align: center;
@@ -232,16 +231,12 @@ header #banner #logo-text {
   font-size: 22px;
 }
 
-
-
-
 .nav-commlink {
     display: block;
     height: 15px;
 	margin-top: 67px;
 	margin-right: 2px;
-	//padding: 6px 10px;
-       padding: 6px 3px;
+	padding: 6px 3px;
 	float: left;
 	bottom: 140px;
 	border: 1px solid #babdb6;
@@ -251,6 +246,7 @@ header #banner #logo-text {
 	-moz-border-radius: 5px 5px 0px 0px;
 	border-radius: 5px 5px 0px 0px;	
 }
+
 nav .nav-link {
 	float: right;
 	margin: 0.2em 0em;
@@ -266,6 +262,7 @@ nav .nav-link {
 	padding-top: 6px;
 	padding-bottom: 8px;
 }
+
 .nav-ajax-left {
 	font-size: 0.8em;
 	float: left;
@@ -277,50 +274,25 @@ nav #nav-link-wrapper .nav-link {
 	border-right: 1px solid #babdb6;
 }
 
-
-
-#dfrn-request-link {
-	display: block;
-	color: #FFFFFF;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	padding: 5px;
-	font-weight: bold;
-	background: #3465a4 url('../img/friendika-16.png') no-repeat 95% center;
-}
-#wallmessage-link {
-	display: block;
-	color: #FFFFFF;
-	-webkit-border-radius: 5px ;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	padding: 5px;
-	font-weight: bold;
-	background-color: #3465a4;
-}
-
 .tabs {
 	height: 22px;
-/*	background-image: url(../img/head.jpg);
-	background-repeat: repeat-x;	
-	background-position: 0px -20px; */
 	border-bottom: 1px solid #aaaaaa;
 	padding:0px;
 	margin-right: 10px;
 }
+
 .tabs li { margin: 0px; list-style: none; }
 .tab {
 	display:block;
 	float:left;
 	padding: 0.4em;
-	//margin-right: 1em;
 	margin-right: 3px ;
 }
+
 .tab.active {
-	font-weight: bold;
-	
+	font-weight: bold;	
 }
+
 ul.tabs {
 	margin-top: 0px;
 	margin-bottom: 0px;
@@ -329,6 +301,7 @@ ul.tabs {
 }
 
 /* footer */
+
 footer {
 	text-align: right;
 	padding-bottom: 1em;
@@ -354,7 +327,7 @@ div.wall-item-content-wrapper.shiny {
 }
 
 .preview {
-	background: #FFFFC8;
+	background: lightyellow;
 }
 
 #theme-preview {
@@ -392,16 +365,14 @@ div.wall-item-content-wrapper.shiny {
 	margin-bottom: 5px;
 	font-weight: bold;
 	border: solid 1px #ccc;
-/*	box-shadow: 5px 5px 5px #666 inset; */
 	border-radius: 5px;
 }
 
-#jot-title::-webkit-input-placeholder{font-weight: normal;}
-#jot-category::-webkit-input-placeholder{font-weight: normal;}
-#jot-title:-moz-placeholder{font-weight: normal;}
-#jot-category:-moz-placeholder{font-weight: normal;}
+#jot-title::-webkit-input-placeholder{font-weight: bold;}
+#jot-category::-webkit-input-placeholder{font-weight: bold;}
+#jot-title:-moz-placeholder{font-weight: bold;}
+#jot-category:-moz-placeholder{font-weight: bold;}
 		
-	
 #jot-title:hover,
 #jot-title:focus,
 #jot-category:hover,
@@ -412,11 +383,7 @@ div.wall-item-content-wrapper.shiny {
 .jothidden { display:none; }
 
 
-.fakelink, .fakelink:visited, .fakelink:link {
-	color: #335577;
-	text-decoration: none;
-	cursor: pointer;
-}
+
 .fakebutton {
 	margin-top: 15px;
 	margin-bottom: 15px;
@@ -449,58 +416,14 @@ div.wall-item-content-wrapper.shiny {
 	font-weight: bold;
 }
 
-.fakelink:hover {
-	color: #5588aa;
-	text-decoration: underline;
-	cursor: pointer;
-}
 .smalltext {
 	font-size: 0.7em;
 }
+
 #sysmsg {
-	/*width: 600px;*/
 	margin-bottom: 10px;
 }
 
-#register-fill-ext {
-	margin-bottom: 25px;
-}
-
-#label-register-name, #label-register-nickname, #label-register-openid {
-	float: left;
-	width: 350px;
-	margin-top: 10px;
-}
-
-#register-name, #register-nickname {
-	float: left;
-	margin-top: 10px;
-	width: 150px;
-}
-
-#register-openid {
-	float: left;
-	margin-top: 10px;
-	width: 130px;
-}
-
-#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
-	clear: both;
-}
-
-#register-nickname-desc {
-	margin-top: 30px;
-	width: 650px;
-}
-#register-sitename {
-	float: left;
-	margin-top: 10px;
-}
-
-#register-submit-button {
-	margin-top: 10px;
-}
-
 #main-login {
 	margin-left: 100px;
 	margin-top: 50px;
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 1b4247280..ed395175a 100644
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -4,59 +4,77 @@
 </header>
 <nav>
 	<ul>
-		{{ if $nav.lock }}
-			<li id="nav-rmagic-link" class="nav-menu-icon" >
-				<a class="icon $nav.lock.2" href="$nav.lock.0" title="$nav.lock.3" >$nav.lock.1</a>
-			</li>
-		{{ endif }}
+	{{ if $nav.lock }}
+		<li id="nav-rmagic-link" class="nav-menu-icon" >
+			<a class="icon $nav.lock.2" href="$nav.lock.0" title="$nav.lock.3" >$nav.lock.1</a>
+		</li>
+	{{ endif }}
 
 		
-		{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu $sel.network">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="icon network">$nav.network.1</span></a>
-				<span id="net-update" class="nav-notify fakelink" onclick="notify_popup('network'); return false;" ></span>
+	{{ if $nav.network }}
+		<li id="nav-network-link" class="nav-menu $sel.network">
+			<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="icon network">$nav.network.1</span></a>
+			<span id="net-update" class="nav-notify" rel="#nav-network-menu"></span>
+			<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
+				<li id="nav-network-see-all"><a href="$nav.network.all.0">$nav.network.all.1</a></li>
+				<li id="nav-network-mark-all"><a href="#" onclick="/*fixme*/ return false;">$nav.network.mark.1</a></li>
+				<li class="empty">$emptynotifications</li>
+			</ul>
 			</li>
-		{{ endif }}
+	{{ endif }}
 
-		{{ 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" ><span class="icon home">$nav.home.1</span></a>
-				<span id="home-update" class="nav-notify fakelink" onclick="notify_popup('home'); return false;" ></span>
-			</li>
-		{{ endif }}
+	{{ 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" ><span class="icon home">$nav.home.1</span></a>
+			<span id="home-update" class="nav-notify" rel="#nav-home-menu"></span>
+			<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
+				<li id="nav-home-see-all"><a href="$nav.home.all.0">$nav.home.all.1</a></li>
+				<li id="nav-home-mark-all"><a href="#" onclick="/*fixme*/ return false;">$nav.home.mark.1</a></li>
+				<li class="empty">$emptynotifications</li>
+			</ul>
+		</li>
+	{{ endif }}
 
-		{{ if $nav.messages }}
-			<li id="nav-mail-link" class="nav-menu $sel.messages">
-				<a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" ><span class="icon mail">$nav.messages.1</span></a>
-				<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
-				<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
-					<li id="nav-messages-see-all"><a href="$nav.messages.all.0">$nav.messages.all.1</a></li>
-					<li id="nav-messages-mark-all"><a href="#">$nav.messages.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>
-		{{ endif }}
+	{{ if $nav.messages }}
+		<li id="nav-mail-link" class="nav-menu $sel.messages">
+			<a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" ><span class="icon mail">$nav.messages.1</span></a>
+			<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
+			<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
+				<li id="nav-messages-see-all"><a href="$nav.messages.all.0">$nav.messages.all.1</a></li>
+				<li id="nav-messages-mark-all"><a href="#">$nav.messages.mark.1</a></li>
+				<li class="empty">$emptynotifications</li>
+			</ul>
+		</li>
+	{{ endif }}
 
-		{{ if $nav.all_events }}
-			<li id="nav-all-events-link" class="nav-menu $sel.all_events">
-				<a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="icon events">$nav.all_events.1</span></a>
-				<span id="all-events-update" class="nav-notify fakelink" onclick="notify_popup('all_events'); return false;" ></span>
-			</li>
-		{{ endif }}
+	{{ if $nav.all_events }}
+		<li id="nav-all-events-link" class="nav-menu $sel.all_events">
+			<a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="icon events">$nav.all_events.1</span></a>
+			<span id="all-events-update" class="nav-notify" rel="#nav-events-menu"></span>
+			<ul id="nav-events-menu" class="menu-popup notify-menus" rel="events">
+				<li id="nav-events-see-all"><a href="$nav.events.all.0">$nav.events.all.1</a></li>
+				<li id="nav-events-mark-all"><a href="#" onclick="/*fixme*/ return false;">$nav.events.mark.1</a></li>
+				<li class="empty">$emptynotifications</li>
+			</ul>
+		</li>
+	{{ endif }}
 
-		{{ if $nav.intros }}
-			<li id="nav-intros-link" class="nav-menu $sel.intros">
-				<a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="icon introductions">$nav.intros.1</span></a>
-				<span id="intro-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
+	{{ if $nav.intros }}
+		<li id="nav-intros-link" class="nav-menu $sel.intros">
+			<a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="icon introductions">$nav.intros.1</span></a>
+			<span id="intro-update" class="nav-notify" rel="#nav-intros-menu"></span>
+			<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
+				<li id="nav-intros-see-all"><a href="$nav.intros.all.0">$nav.intros.all.1</a></li>
+				<li id="nav-intros-mark-all"><a href="#" onclick="/*fixme*/ return false;">$nav.intros.mark.1</a></li>
+				<li class="empty">$emptynotifications</li>
+			</ul>
+		</li>
+	{{ endif }}
 		
-
 	{{ if $nav.notifications }}
-
 		<li id="nav-notify-linkmenu" class="nav-menu fakelink">
-			<a  rel="#nav-notify-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
-			<span id="notify-update" class="nav-notify"></span>
+			<a href="$nav.notifications.0" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
+			<span id="notify-update" class="nav-notify" rel="#nav-notify-menu"></span>
 			<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
 				<li id="nav-notify-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
 				<li id="nav-notify-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
@@ -75,58 +93,54 @@
 			</ul>		
 		</li>
 	{{ endif }}
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				{{ if $localuser }}
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-				{{ 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.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
 
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
+	{{ if $userinfo }}
+		<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+		{{ if $localuser }}
+			<ul id="nav-user-menu" class="menu-popup">
+				{{ for $nav.usermenu as $usermenu }}
+					<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+				{{ endfor }}
+				{{ 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.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}	
+				{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.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 }}
 
-				</ul>
-				{{ endif }}
-			</li>
+			</ul>
 		{{ endif }}
-		{{ if $nav.login }}<li id="nav-login-link" class="nav-menu $nav.login.2"><a href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
-
-		{{ if $nav.help }} 
+		</li>
+	{{ endif }}
+	
+	{{ if $nav.login }}<li id="nav-login-link" class="nav-menu $nav.login.2"><a href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
+	{{ 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 }}
+	{{ 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>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</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>
+			<ul id="nav-apps-menu" class="menu-popup">
+			{{ for $apps as $ap }}
+				<li>$ap</li>
+				{{ endfor }}
+			</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>
+			<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>
+	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
 </ul>
 
-<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>
+<div id="langselector" >$langselector</div>
 <div id="panel" style="display: none;"></div>
author	friendica <info@friendica.com>	2013-01-08 11:59:29 -0800
committer	friendica <info@friendica.com>	2013-01-08 11:59:29 -0800
commit	a96d3ac66f50615ffc0ba764fdeba14cdae00c86 (patch)
tree	3d10d634839c9d5628d4df8abe1e1881d9211a93
parent	3b213c5fc76d7392f1fd825b9db4fb4dfb8b9940 (diff)
download	volse-hubzilla-a96d3ac66f50615ffc0ba764fdeba14cdae00c86.tar.gz volse-hubzilla-a96d3ac66f50615ffc0ba764fdeba14cdae00c86.tar.bz2 volse-hubzilla-a96d3ac66f50615ffc0ba764fdeba14cdae00c86.zip