From ea782d46b2e2fd24ca3e9823af7469431e4e9ed8 Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kjohnson@gnulnx.net>
Date: Tue, 11 Nov 2014 14:19:15 +0000
Subject: [PATCH] Move timeline link from Events to Header

---
 web/skins/bootstrap/views/events.php | 1 -
 web/skins/bootstrap/views/header.php | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/bootstrap/views/events.php b/web/skins/bootstrap/views/events.php
index 0406300af..9d67ada19 100644
--- a/web/skins/bootstrap/views/events.php
+++ b/web/skins/bootstrap/views/events.php
@@ -164,7 +164,6 @@ if ( $pagination )
         <p id="controls">
           <a id="refreshLink" href="#" onclick="location.reload(true);"><?= $SLANG['Refresh'] ?></a>
           <a id="filterLink" href="#" onclick="createPopup( '?view=filter&amp;page=<?= $page ?><?= $filterQuery ?>', 'zmFilter', 'filter' );"><?= $SLANG['ShowFilterWindow'] ?></a>
-          <a id="timelineLink" href="#" onclick="createPopup( '?view=timeline<?= $filterQuery ?>', 'zmTimeline', 'timeline' );"><?= $SLANG['ShowTimeline'] ?></a>
         </p>
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
diff --git a/web/skins/bootstrap/views/header.php b/web/skins/bootstrap/views/header.php
index 71c082889..48bb895d4 100644
--- a/web/skins/bootstrap/views/header.php
+++ b/web/skins/bootstrap/views/header.php
@@ -17,6 +17,7 @@
 				<ul class="nav navbar-nav pull-right">
 					<li><a href="?view=console"><?= $SLANG['Console']; ?></a></li>
 					<li><a href="?view=events"><?= $SLANG['Events']; ?></a></li>
+					<li><a href="?view=timeline"><?= $SLANG['Timeline']; ?></a></li>
       		<li><a href="?view=options"><?= $SLANG['Options'] ?></a></li>
 					<?php if ( logToDatabase() > Logger::NOLOG ) { ?>
 						<li><a href="?view=log"><span class="<?= logState(); ?>"><?= $SLANG['Log'] ?></span></a></li>