many small updates

[pharext/pharext.org] / app / views / navbar.phtml

diff --git a/app/views/navbar.phtml b/app/views/navbar.phtml
index ef4cf057ea3fc81108552306b4ecd11255bb40f8..1d14a0bdf37e6d1ff8814a2ceac62af071229540 100644 (file)
--- a/app/views/navbar.phtml
+++ b/app/views/navbar.phtml
@@ -41,7 +41,36 @@
                                        <?php endif; ?>
                                        ><a href="<?=$baseUrl->mod("./github")?>">Github</a>
                                </li>
-                               <?php /*
+                       </ul>
+                       <?php if (isset($session)) : ?>
+                               <?php if (isset($session->github)) : ?>
+                               <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 ?>" 
+                                                        class="img-circle"
+                                                        alt="avatar"
+                                                        width="32"
+                                                        style="margin:-15px 0px">
+                                                       <abbr title="<?= $this->e($session->github->name) ?>">
+                                                               <?= $this->e($session->github->login) ?>
+                                                       </abbr>
+                                                       <span class="caret"></span>
+                                               </a>
+                                               <ul class="dropdown-menu" role="menu">
+                                                       <li>
+                                                               <a href="<?= $baseUrl->mod("./reset") ?>">
+                                                                       Signout
+                                                               </a>
+                                                       </li>
+                                               </ul>
+                                       </li>
+                               </ul>
+                               <?php endif; ?>
+                       <?php endif; ?>
+
+                       <?php /*
+                       <ul>
                                <li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
                                <li><a href="#">Link</a></li>
                                <li class="dropdown">
@@ -75,13 +104,8 @@
                                                <li><a href="#">Separated link</a></li>
                                        </ul>
                                </li>
-                                */ ?>
                        </ul>
+                        */ ?>
                </div><!-- /.navbar-collapse -->
        </div><!-- /.container-fluid -->
-       <a href="https://github.com/m6w6/pharext.org">
-               <img style="position: absolute; top: 0; right: 0; border: 0;" 
-                        src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png">
-       </a>
 </nav>
-