Merge branch 'master' of github.com:psychobunny/node-forum

public/src/app.js

@@ -302,6 +302,9 @@ var socket,
 		var	formattingBar = document.querySelector('.formatting-bar'),
 			postContentEl = document.getElementById('post_content');
 		jQuery('#post_window').slideToggle(0);
+
+		if(formattingBar) {
+
 			formattingBar.addEventListener('click', function(e) {
 				if (e.target.nodeName === 'I' || e.target.nodeName === 'SPAN') {
 					var	cursorEnd = postContentEl.value.length,
@@ -360,7 +363,8 @@ var socket,
 					}
 				}
 			}, false);
-	})
+		}
+	});
 
 
 

public/templates/header.tpl

@@ -42,9 +42,7 @@
 	                      <a href="/users">Users</a>
 	                    </li>
 					</ul>
-					<ul class="nav pull-right nodebb-inline-block nodebb-pull-right" id="right-menu">
+					<ul class="nav pull-right nodebb-inline-block" id="right-menu">
-						<!--<li><i class="icon-plus icon-2x" style="color:#999;"></i></li> fail. add this back later -->
-						<!--<li><a href="/users" id="user_label"></a></li>-->
 					</ul>
 				</div>
 			</div>