From e5fc0819b42c1b4413aa9b4a8474a226fbe14d02 Mon Sep 17 00:00:00 2001
From: bdharrington7 <BDHarrington7@gmail.com>
Date: Fri, 10 Jan 2014 20:21:56 -0800
Subject: [PATCH 01/10] excluding .DS_Store

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2c56455eb6..e743a14466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ Vagrantfile
 .vagrant
 provision.sh
 *.komodoproject
-
+.DS_Store
 feeds/recent.rss
 
 # winston?

From 99dc989c3915dee9f69834a8f083405a5b1414c4 Mon Sep 17 00:00:00 2001
From: bdharrington7 <BDHarrington7@gmail.com>
Date: Fri, 10 Jan 2014 20:21:56 -0800
Subject: [PATCH 02/10] excluding .DS_Store

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2c56455eb6..e743a14466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ Vagrantfile
 .vagrant
 provision.sh
 *.komodoproject
-
+.DS_Store
 feeds/recent.rss
 
 # winston?

From cfda0a93c444da67cb55c924c8085619be11074e Mon Sep 17 00:00:00 2001
From: bdharrington7 <BDHarrington7@gmail.com>
Date: Sun, 12 Jan 2014 13:12:13 -0800
Subject: [PATCH 03/10] Fix: login / register collapses on click, Search
 unavailable if not allowed

---
 public/templates/header.tpl | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 65aefa9cee..e6c08644d4 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -66,9 +66,11 @@
 					<li class="{adminDisplay}">
 						<a href="{relative_path}/admin"><i class="fa fa-cogs" title="[[global:header.admin]]"></i></a>
 					</li>
+					<!-- IF allowGuestSearching -->
 					<li class="visible-xs">
 						<a href="{relative_path}/search">[[global:header.search]]</a>
 					</li>
+					<!-- ENDIF allowGuestSearching -->
 					<!-- BEGIN navigation -->
 					<li class="{navigation.class}">
 						<a href="{relative_path}{navigation.route}" title="{navigation.title}">
@@ -123,14 +125,19 @@
 
 				</ul>
 
-				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
-					<!-- IF allowRegistration -->
-					<li>
-						<a href="{relative_path}/register">[[global:register]]</a>
-					</li>
-					<!-- ENDIF allowRegistration -->
-					<li>
-						<a href="{relative_path}/login">[[global:login]]</a>
+				<ul id="logged-out-menu" class="nav navbar-nav navbar-right hide">
+					<li class="visible-xs">
+					 	<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a>
+						<ul class="dropdown-menu" aria-labelledby="loggedout_dropdown">
+							<!-- IF allowRegistration -->
+							<li>
+								<a href="{relative_path}/register">[[global:register]]</a>
+							</li>
+							<!-- ENDIF allowRegistration -->
+							<li>
+								<a href="{relative_path}/login">[[global:login]]</a>
+							</li>
+						</ul>
 					</li>
 				</ul>
 

From 3ccc11d53c3abd752fa4afdb9c4ff98bbd5b59f5 Mon Sep 17 00:00:00 2001
From: bdharrington7 <BDHarrington7@gmail.com>
Date: Sun, 12 Jan 2014 13:36:15 -0800
Subject: [PATCH 04/10] fixed bug that hid the login menu option

---
 public/templates/header.tpl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index e6c08644d4..f620603a49 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -125,9 +125,17 @@
 
 				</ul>
 
-				<ul id="logged-out-menu" class="nav navbar-nav navbar-right hide">
+				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
+					<!-- IF allowRegistration -->
+					<li class="visible-lg visible-md visible-sm">
+						<a href="{relative_path}/register">[[global:register]]</a>
+					</li>
+					<!-- ENDIF allowRegistration -->
+					<li class="visible-lg visible-md visible-sm">
+						<a href="{relative_path}/login">[[global:login]]</a>
+					</li>
 					<li class="visible-xs">
-					 	<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a>
+						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a>
 						<ul class="dropdown-menu" aria-labelledby="loggedout_dropdown">
 							<!-- IF allowRegistration -->
 							<li>

From d60151a6cccb42b688205936ab967ad3fa05731a Mon Sep 17 00:00:00 2001
From: bdharrington7 <BDHarrington7@gmail.com>
Date: Fri, 10 Jan 2014 20:21:56 -0800
Subject: [PATCH 05/10] excluding .DS_Store

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2c56455eb6..e743a14466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ Vagrantfile
 .vagrant
 provision.sh
 *.komodoproject
-
+.DS_Store
 feeds/recent.rss
 
 # winston?

From a88544474018f48d36060aa178c6137eefe5d24a Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Sun, 12 Jan 2014 15:37:33 -0500
Subject: [PATCH 06/10] fixes toggle_mod_tools undefined error

---
 public/src/forum/topic.js | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 2fd9001fab..8c9d335f96 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -897,23 +897,6 @@ define(['composer'], function(composer) {
 			}
 		}
 
-		function toggle_mod_tools(pid, state) {
-			var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')),
-				editEl = postEl.find('.edit'),
-				deleteEl = postEl.find('.delete');
-
-			if (state) {
-				editEl.removeClass('none');
-				deleteEl.removeClass('none');
-			} else {
-				editEl.addClass('none');
-				deleteEl.addClass('none');
-			}
-		}
-
-
-
-
 		Topic.postCount = templates.get('postcount');
 
 		window.onscroll = updateHeader;
@@ -1084,6 +1067,20 @@ define(['composer'], function(composer) {
 		});
 	}
 
+	function toggle_mod_tools(pid, state) {
+		var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')),
+			editEl = postEl.find('.edit'),
+			deleteEl = postEl.find('.delete');
+
+		if (state) {
+			editEl.removeClass('none');
+			deleteEl.removeClass('none');
+		} else {
+			editEl.addClass('none');
+			deleteEl.addClass('none');
+		}
+	}
+
 	function updatePostCount() {
 		socket.emit('api:topics.postcount', templates.get('topic_id'), function(err, postcount) {
 			if(!err) {

From 5febb3dc23abc64b0b0e612e81ab0b91cff7b582 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Sun, 12 Jan 2014 15:52:44 -0500
Subject: [PATCH 07/10] clicking the pagination block no longer sends page to
 top

---
 public/src/forum/topic.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 8c9d335f96..17f80def3f 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -905,9 +905,14 @@ define(['composer'], function(composer) {
 
 	function updateHeader() {
 		if (pagination == null) {
+			$('.pagination-block a').on('click', function() {
+				return false;
+			});
+
 			jQuery('.pagination-block i:first').on('click', function() {
 				app.scrollToTop();
 			});
+
 			jQuery('.pagination-block i:last').on('click', function() {
 				app.scrollToBottom();
 			});

From 0ad1f1576b30e86c1dfe20c3bc87bd89eef1112e Mon Sep 17 00:00:00 2001
From: bdharrington7 <BDHarrington7@gmail.com>
Date: Sun, 12 Jan 2014 13:12:13 -0800
Subject: [PATCH 08/10] Fix: login / register collapses on click, Search
 unavailable if not allowed

---
 public/templates/header.tpl | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 65aefa9cee..e6c08644d4 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -66,9 +66,11 @@
 					<li class="{adminDisplay}">
 						<a href="{relative_path}/admin"><i class="fa fa-cogs" title="[[global:header.admin]]"></i></a>
 					</li>
+					<!-- IF allowGuestSearching -->
 					<li class="visible-xs">
 						<a href="{relative_path}/search">[[global:header.search]]</a>
 					</li>
+					<!-- ENDIF allowGuestSearching -->
 					<!-- BEGIN navigation -->
 					<li class="{navigation.class}">
 						<a href="{relative_path}{navigation.route}" title="{navigation.title}">
@@ -123,14 +125,19 @@
 
 				</ul>
 
-				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
-					<!-- IF allowRegistration -->
-					<li>
-						<a href="{relative_path}/register">[[global:register]]</a>
-					</li>
-					<!-- ENDIF allowRegistration -->
-					<li>
-						<a href="{relative_path}/login">[[global:login]]</a>
+				<ul id="logged-out-menu" class="nav navbar-nav navbar-right hide">
+					<li class="visible-xs">
+					 	<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a>
+						<ul class="dropdown-menu" aria-labelledby="loggedout_dropdown">
+							<!-- IF allowRegistration -->
+							<li>
+								<a href="{relative_path}/register">[[global:register]]</a>
+							</li>
+							<!-- ENDIF allowRegistration -->
+							<li>
+								<a href="{relative_path}/login">[[global:login]]</a>
+							</li>
+						</ul>
 					</li>
 				</ul>
 

From 2b63b2c52a2d95a5997b30ad2aa3be76bde1f1b2 Mon Sep 17 00:00:00 2001
From: bdharrington7 <BDHarrington7@gmail.com>
Date: Sun, 12 Jan 2014 13:36:15 -0800
Subject: [PATCH 09/10] fixed bug that hid the login menu option

---
 public/templates/header.tpl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index e6c08644d4..f620603a49 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -125,9 +125,17 @@
 
 				</ul>
 
-				<ul id="logged-out-menu" class="nav navbar-nav navbar-right hide">
+				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
+					<!-- IF allowRegistration -->
+					<li class="visible-lg visible-md visible-sm">
+						<a href="{relative_path}/register">[[global:register]]</a>
+					</li>
+					<!-- ENDIF allowRegistration -->
+					<li class="visible-lg visible-md visible-sm">
+						<a href="{relative_path}/login">[[global:login]]</a>
+					</li>
 					<li class="visible-xs">
-					 	<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a>
+						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a>
 						<ul class="dropdown-menu" aria-labelledby="loggedout_dropdown">
 							<!-- IF allowRegistration -->
 							<li>

From bf96903d6e75b193eb6cc3661d0f1b46053410ca Mon Sep 17 00:00:00 2001
From: bdharrington7 <BDHarrington7@gmail.com>
Date: Sun, 12 Jan 2014 15:10:10 -0800
Subject: [PATCH 10/10] removed submenu for login / register in guest menu
 options

---
 public/src/app.js           |  2 +-
 public/templates/header.tpl | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/public/src/app.js b/public/src/app.js
index bfe1a4d81c..c04df7da9a 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -508,7 +508,7 @@ var socket,
 
 		}
 
-		$('#main-nav a,#user-control-list a,#logged-out-menu .dropdown-menu a').off('click').on('click', function() {
+		$('#main-nav a,#user-control-list a,#logged-out-menu li a').off('click').on('click', function() {
 			if($('.navbar .navbar-collapse').hasClass('in'))
 				$('.navbar-header button').click();
 		});
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index f620603a49..bf2057d638 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -127,26 +127,13 @@
 
 				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
 					<!-- IF allowRegistration -->
-					<li class="visible-lg visible-md visible-sm">
+					<li>
 						<a href="{relative_path}/register">[[global:register]]</a>
 					</li>
 					<!-- ENDIF allowRegistration -->
-					<li class="visible-lg visible-md visible-sm">
+					<li>
 						<a href="{relative_path}/login">[[global:login]]</a>
 					</li>
-					<li class="visible-xs">
-						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a>
-						<ul class="dropdown-menu" aria-labelledby="loggedout_dropdown">
-							<!-- IF allowRegistration -->
-							<li>
-								<a href="{relative_path}/register">[[global:register]]</a>
-							</li>
-							<!-- ENDIF allowRegistration -->
-							<li>
-								<a href="{relative_path}/login">[[global:login]]</a>
-							</li>
-						</ul>
-					</li>
 				</ul>
 
 				<ul id="logged-conditional-menu" class="nav navbar-nav navbar-right">