Next pass at bootstrap conversion

Author: carlbennett

src/templates/News/View.phtml

@@ -69,14 +69,14 @@ require('./header.inc.phtml'); ?>
   <section class="red"><p><strong>Warning:</strong> This news post is not yet published. You can view this because you are allowed to create, modify, or delete news posts.</p></section>
 <? } ?>
   <section class="news"><img class="category" alt="<? echo $object->getCategory()->getLabel(); ?>" title="<? echo $object->getCategory()->getLabel(); ?>" src="<? echo Common::relativeUrlToAbsolute("/a/news_categories/" . $object->getCategory()->getFilename()); ?>"/><? echo $object->getContent(true); ?></section>
-  <footer>
+  <div class="card"><div class="card-body">
 <? if ($object->getEditedDateTime() !== null) { ?>
     <span class="float-right"><time datetime="<? echo $object->getCreatedDateTime()->format('c'); ?>"><? echo $object->getCreatedDateTime()->format("l, F j, Y"); ?></time> | Edited: <time datetime="<? echo $object->getEditedDateTime()->format('c'); ?>"><? echo $object->getEditedDateTime()->format("l, F j, Y"); ?></time></span>
 <? } else { ?>
     <span class="float-right"><time datetime="<? echo $object->getCreatedDateTime()->format('c'); ?>"><? echo $object->getCreatedDateTime()->format("l, F j, Y"); ?></time></span>
 <? } ?>
     <span><a href="<? echo $user_url; ?>"><img class="avatar" src="<? echo $user_avatar; ?>"/>&nbsp;<? echo filter_var($user_name, FILTER_SANITIZE_STRING); ?></a></span>
-  </footer>
+  </div></div>
 </div>
 <div class="container mb-3">
 <?

src/templates/header.inc.phtml

@@ -18,15 +18,12 @@ if (!isset($title_suffix)) /* this should be allowed to be empty, however */
 {
   $title_suffix = ' – BNETDocs';
 }
-function _header_active($url, $sr)
+function _header_active(string $url, bool $sr)
 {
   $current_url = parse_url(getenv('REQUEST_URI'), PHP_URL_PATH);
   $match = (substr($current_url, 0, strlen($url)) == $url);
   if (!$match) return '';
-  if ($sr)
-    return ' <span class="sr-only">(current)</span>';
-  else
-    return ' active';
+  if ($sr) return ' <span class="sr-only">(current)</span>'; else return ' active';
 }
 $_header_user = Authentication::$user;
 $_unique_asset = (
@@ -79,12 +76,9 @@ $_header_nav = [
     ['label' => 'Event Logs', 'url' => '/eventlog/index', 'acl' => User::OPTION_ACL_EVENT_LOG_VIEW],
   ]],
 ];
-/*      <a>Account</a>
-      <a href="<?=Common::relativeUrlToAbsolute('/user/changepassword')?>">Change Password</a>
-      <a href="<?=Common::relativeUrlToAbsolute('/user/update')?>">Update Profile</a>*/
 function _header_nav_html($nav)
 {
-  function _line(string $format) { call_user_func_array('printf', func_get_args()) . PHP_EOL; }
+  function _line(string $format) { call_user_func_array('printf', func_get_args()); echo PHP_EOL; }
 
   ob_start();
   _line('<nav class="navbar navbar-expand-lg navbar-dark bg-primary mb-3">');
@@ -157,11 +151,11 @@ function _header_nav_html($nav)
       }
       else if (!$dropdown)
       {
-        if (isset($item['url'])) printf('<li class="nav-item"><a class="nav-link%s" href="%s">%s</a></li>' . PHP_EOL, $class, $item['url'], filter_var($item['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS));
+        if (isset($item['url'])) printf('<li class="nav-item"><a class="nav-link%s" href="%s">%s</a></li>' . PHP_EOL, $class, Common::relativeUrlToAbsolute($item['url']), filter_var($item['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS));
       }
       else if ($dropdown)
       {
-        if (isset($item['url'])) printf('<a class="dropdown-item%s" href="%s">%s</a>' . PHP_EOL, $class, $item['url'], filter_var($item['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS));
+        if (isset($item['url'])) printf('<a class="dropdown-item%s" href="%s">%s</a>' . PHP_EOL, $class, Common::relativeUrlToAbsolute($item['url']), filter_var($item['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS));
       }
 
       if (isset($item['dropdown']))