X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=app%2Fviews%2Fnavbar.phtml;h=0b0a5986168ffd2404575465bd05bec5cb9e7669;hb=9e35d9e1f6adb610b17e940616cd1dc4ec8aa0d7;hp=1d14a0bdf37e6d1ff8814a2ceac62af071229540;hpb=4c462ab66e6c65c15df7bd5fe6d2673884c639a0;p=pharext%2Fpharext.org

diff --git a/app/views/navbar.phtml b/app/views/navbar.phtml
index 1d14a0b..0b0a598 100644
--- a/app/views/navbar.phtml
+++ b/app/views/navbar.phtml
@@ -9,7 +9,7 @@
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand" href="<?=$baseUrl->mod("./")?>">PHARext</a>
+			<a class="navbar-brand" href="<?=$baseUrl->mod(":./")?>">PHARext</a>
 		</div>
 
 		<!-- Collect the nav links, forms, and other content for toggling -->
@@ -22,24 +22,25 @@
 						data-toggle="dropdown"
 						role="button"
 						aria-expand="false"
-						href="<?=$baseUrl->mod("./pages/Home")?>">
+						href="<?=$baseUrl->mod(":./pages/Home")?>">
 						About
 						<span class="caret"></span>
 					</a>
 					<ul class="dropdown-menu" role="menu">
 						<?php foreach ($pages as $page) : ?>
-						<li><a href="<?= $baseUrl->mod("./pages/". rawurlencode($page)) ?>"><?= $this->e($page) ?></a></li>
+						<li><a href="<?= $baseUrl->mod(":./pages/". rawurlencode($page)) ?>">
+							<?= $this->e($page) ?></a></li>
 						<?php endforeach; ?>
 					</ul>
 				</li>
 				<?php else : ?>
-				<li><a href="<?=$baseUrl->mod("./pages/Home")?>">About</a></li>
+				<li><a href="<?=$baseUrl->mod(":./pages/Home")?>">About</a></li>
 				<?php endif; ?>
 				<li
 					<?php if ($location == "github") : ?>
 					class="active"
 					<?php endif; ?>
-					><a href="<?=$baseUrl->mod("./github")?>">Github</a>
+					><a href="<?=$baseUrl->mod(":./github")?>">Github</a>
 				</li>
 			</ul>
 			<?php if (isset($session)) : ?>
@@ -47,19 +48,19 @@
 				<ul class="nav navbar-nav navbar-right">
 					<li class="dropdown">
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-							<img src="<?= $session->github->avatar_url ?>" 
+							<img src="<?= $session->github->owner["avatar_url"] ?>" 
 							 class="img-circle"
 							 alt="avatar"
 							 width="32"
 							 style="margin:-15px 0px">
-							<abbr title="<?= $this->e($session->github->name) ?>">
-								<?= $this->e($session->github->login) ?>
+							<abbr title="<?= $this->e($session->github->owner["name"]) ?>">
+								<?= $this->e($session->github->owner["login"]) ?>
 							</abbr>
 							<span class="caret"></span>
 						</a>
 						<ul class="dropdown-menu" role="menu">
 							<li>
-								<a href="<?= $baseUrl->mod("./reset") ?>">
+								<a href="<?= $baseUrl->mod(":./reset") ?>">
 									Signout
 								</a>
 							</li>