diff --git a/nur_src/v/nb.php b/nur_src/v/nb.php index d0d714a..76c2520 100644 --- a/nur_src/v/nb.php +++ b/nur_src/v/nb.php @@ -32,6 +32,7 @@ class nb { } static final function menu($text, ?array $links=null, ?array $options=null): array { + $links = array_filter($links, function($link) { return $link !== null; }); $item = ["item" => "menu", "links" => $links, "value" => $text]; if ($options !== null) $item = array_merge($item, $options); return $item; diff --git a/nur_src/v/vp/NavigablePage.php b/nur_src/v/vp/NavigablePage.php index 64fc944..23212c3 100644 --- a/nur_src/v/vp/NavigablePage.php +++ b/nur_src/v/vp/NavigablePage.php @@ -1,6 +1,7 @@ getProjdir(); + $versionfile = "$projdir/VERSION.txt"; + if (file_exists($versionfile)) { + $name = $app->getName(); + $version = file_get_contents($versionfile); + return nb::text([ + "style" => "margin: 0 15px", + "$name v$version" + ]); + } + return null; + } + protected function getAuthzNbtext(IAuthzUser $user): array { $username = $user->getUsername(); $role = $user->getRole(); @@ -95,6 +111,7 @@ class NavigablePage extends AInitAuthzPage implements INavigablePage { $user = authz::get(); navbar::nav(["align" => "right"], [ nb::menu(icon::user($user->getShortName()), [ + $this->getAppVersionNbtext(), $this->getAuthzNbtext($user), $this->getLogoutNblink(), ]),