From a03c3d54805b087181730a84263a14e5a1ca3e96 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Tue, 21 Oct 2014 13:43:14 +0200
Subject: fix nav double dropdown

---
 view/tpl/nav.tpl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index bc9d0ba37..a283b35a8 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -50,12 +50,16 @@
 			{{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
 			{{if !$userinfo}}
 			{{if $nav.loginmenu}}
-				<li class="{{$nav.loginmenu.0.2}}"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a>
-				<ul class="dropdown-menu" role="menu">
+				<li class="{{$nav.loginmenu.0.2}} hidden-xs"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a>
+					<ul class="dropdown-menu" role="menu">
+						{{foreach $nav.loginmenu as $loginmenu}}
+						<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
+						{{/foreach}}
+					</ul>
+				</li>
 				{{foreach $nav.loginmenu as $loginmenu}}
-					<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
+				<li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
 				{{/foreach}}
-				</ul></li>
 			{{/if}}
 			{{/if}}
 
-- 
cgit v1.2.3


From 1fb2de6d55779c853e25d38f5b93133a5414d72a Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Tue, 21 Oct 2014 17:27:13 +0100
Subject: Typo

---
 include/poller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/poller.php b/include/poller.php
index d18cb1ca6..f11618d37 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -25,7 +25,7 @@ function poller_run($argv, $argc){
 	if(! $interval) 
 		$interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
 
-	// Check for a logfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
+	// Check for a lockfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
 	$lockfile = 'store/[data]/poller';
 		if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600))) {
 			logger("poller: Already running");
-- 
cgit v1.2.3