Fix container margin

carlbennett · carlbennett · commit 942cb5300ed1 · 2021-07-01T20:36:15.000-05:00
diff --git a/src/templates/Comment/Delete.phtml b/src/templates/Comment/Delete.phtml
@@ -26,7 +26,7 @@ if ($c)
 }
 $id = $this->getContext()->id;
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if (is_null($this->getContext()->error)) { ?>
 
   <h2 class="text-danger">Delete Comment</h2>
diff --git a/src/templates/Comment/Edit.phtml b/src/templates/Comment/Edit.phtml
@@ -28,7 +28,7 @@ if ($c)
   $c_user_avatar = $c_user->getAvatarURI(22);
 }
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if (is_null($this->getContext()->error) && !is_null($c)) { ?>
 
   <h2>Edit Comment</h2>
diff --git a/src/templates/Credits.phtml b/src/templates/Credits.phtml
@@ -14,7 +14,7 @@ $top_contributors_by_servers = $this->getContext()->top_contributors_by_servers;
 $users = []; // used for User object lookup cache
 require('./header.inc.phtml');
 ?>
-<div class="container mb-3">
+<div class="container">
   <h2>Contributors</h2>
   <p>We have a total of <strong><?=number_format($total_users)?> users</strong>, of which the following are our top contributors grouped by content.</p>
 
diff --git a/src/templates/Discord.phtml b/src/templates/Discord.phtml
@@ -7,7 +7,7 @@ $description = 'Join our Discord and have a chat with us!';
 $this->opengraph->attach(new Pair('url', '/discord'));
 $this->opengraph->attach(new Pair('type', 'article'));
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h2><?=$title?></h2>
   <p><?=$description?></p>
 <? if (!$this->getContext()->enabled) { ?>
diff --git a/src/templates/Document/Create.phtml b/src/templates/Document/Create.phtml
@@ -21,7 +21,7 @@ $form_content = filter_var($this->getContext()->content, FILTER_SANITIZE_FULL_SP
 $form_markdown = $this->getContext()->markdown;
 $form_title = filter_var($this->getContext()->title, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h1><?=$title?></h1>
   <p><?=$description?></p>
 <?  if ($error !== false) {
diff --git a/src/templates/Document/Delete.phtml b/src/templates/Document/Delete.phtml
@@ -17,7 +17,7 @@ switch ($error)
   default: $message = $error;
 }
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if (is_null($this->getContext()->error)) { ?>
   <h1 class="text-danger">Delete Document</h1>
   <form method="POST" action="?id=<?=filter_var($id, FILTER_SANITIZE_FULL_SPECIAL_CHARS)?>">
diff --git a/src/templates/Document/Edit.phtml b/src/templates/Document/Edit.phtml
@@ -24,7 +24,7 @@ $form_content = filter_var($this->getContext()->content, FILTER_SANITIZE_FULL_SP
 $form_markdown = $this->getContext()->markdown;
 $form_title = filter_var($this->getContext()->title, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h1><?=$title?></h1>
   <p><?=$description?></p>
 <?  if (is_null($error) || $error == 'NOT_FOUND') {
diff --git a/src/templates/Document/Index.phtml b/src/templates/Document/Index.phtml
@@ -21,7 +21,7 @@ $form_order_by = [
   'user-id-desc' => 'User Id (Descending)',
 ];
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h2><?=$title?></h2>
   <p><?=$description?></p>
   <form method="GET" class="m-2" id="order_by_form">
diff --git a/src/templates/Document/View.phtml b/src/templates/Document/View.phtml
@@ -29,7 +29,7 @@ $edit_visible = ($active_user && ($active_user->getOptionsBitmask() & User::OPTI
 $delete_visible = ($active_user && ($active_user->getOptionsBitmask() & User::OPTION_ACL_DOCUMENT_DELETE));
 require_once('./MarkdownBootstrapFix.inc.php');
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if ($object) {
     if ($draft) { ?>
   <div class="alert alert-warning">This document is marked as <strong>draft</strong>. Edit the document to <strong>publish</strong> it.</div>
@@ -43,7 +43,7 @@ require('./header.inc.phtml'); ?>
 <? } ?>
 
   <h1 class="display-4"><a href="<?=$url?>"><?=filter_var($title, FILTER_SANITIZE_FULL_SPECIAL_CHARS)?></a></h1>
-  <?=\BNETDocs\Templates\MarkdownBootstrapFix($object->getContent(true))?>
+  <?=\BNETDocs\Templates\MarkdownBootstrapFix($object->getContent(true), true)?>
 
   <div class="card"><div class="card-body">
     <span class="float-right text-muted">
diff --git a/src/templates/Donate.phtml b/src/templates/Donate.phtml
@@ -16,7 +16,7 @@ if (!empty($user_id))
   $user = new User($user_id);
 }
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h1>Support Us</h1>
   <p>The following are the methods available for supporting us:</p>
   <ul type="circle">
diff --git a/src/templates/EventLog/Index.phtml b/src/templates/EventLog/Index.phtml
@@ -26,7 +26,7 @@ $no_prev = ($page <= 1);
 $no_next = ($page >= $pages);
 
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if (!$this->getContext()->acl_allowed) { ?>
   <div class="alert alert-danger">
     <h1><?=$title?></h1>
diff --git a/src/templates/EventLog/View.phtml b/src/templates/EventLog/View.phtml
@@ -68,7 +68,7 @@ if (stripos($tpl_referer, '/eventlog/view?id=' . $object_id) !== false)
 }
 
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if (!$this->getContext()->acl_allowed) { ?>
   <div class="alert alert-danger">
     <h1><?=$title?></h1>
diff --git a/src/templates/Legal.phtml b/src/templates/Legal.phtml
@@ -9,7 +9,7 @@ $this->opengraph->attach(new Pair('type', 'article'));
 $email_domain = $this->getContext()->email_domain;
 $email_mailbox = $this->getContext()->email_mailbox;
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h1>Disclaimer &amp; Terms of Service</h1>
   <p>
 BNETDocs is a documentation and discussion website for Blizzard Entertainment's
@@ -71,7 +71,7 @@ and/or other countries.
 <? } ?></li>
   </ol>
 </div>
-<div class="container mb-3">
+<div class="container">
   <h1>License Agreement</h1>
   <p>For a plaintext version of the document below, <a href="<?=Common::relativeUrlToAbsolute('/legal.txt')?>">click here</a>.</p>
   <p>Last updated: <time datetime="<?=$this->getContext()->license_version[1]->format('c')?>"><?=$this->getContext()->license_version[1]->format('l, F j, Y')?></time><? if ($this->getContext()->license_version[0]) { ?> (<a href="https://github.com/BNETDocs/bnetdocs-web/commit/<?=$this->getContext()->license_version[0]?>">version</a>)<? } ?></p>
diff --git a/src/templates/News.phtml b/src/templates/News.phtml
@@ -13,7 +13,7 @@ $news_posts = $this->getContext()->news_posts;
 $pagination = $this->getContext()->pagination;
 
 if (is_null($news_posts) || empty($news_posts)) { ?>
-<div class="container mb-3">
+<div class="container">
   <div class="alert alert-danger">
     <h1>No News Found</h1>
     <p class="mb-0">There are no news posts to view at this time.</p>
@@ -39,7 +39,7 @@ if (is_null($news_posts) || empty($news_posts)) { ?>
     $user_id = $news_post->getUserId();
     if (!isset($users[$user_id])) $users[$user_id] = new User($user_id);
     $avatar = $users[$user_id]->getAvatarURI(22); ?>
-<div class="container mb-3">
+<div class="container">
   <div class="row"><div class="col">
     <span class="float-right">
 <?    if ($edit_visible) { ?>
@@ -80,7 +80,7 @@ if ($pagination) {
   $page_prev    = ($page_current > 0               ? $page_current + 0 : false);
   $page_next    = ($page_current + 1 < $page_count ? $page_current + 2 : false);
 ?>
-<div class="container mb-3">
+<div class="container">
   <nav aria-label="User list navigation" class="d-flex justify-content-center">
     <ul class="pagination">
 <?    if ($page_prev) { ?>
diff --git a/src/templates/News/Create.phtml b/src/templates/News/Create.phtml
@@ -22,7 +22,7 @@ $form_title = filter_var($this->getContext()->title, FILTER_SANITIZE_FULL_SPECIA
 $news_post_id = null;
 $news_post_url = null;
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h1><?=$title?></h1>
   <p><?=$description?></p>
 <?  if ($error !== false) {
diff --git a/src/templates/News/Delete.phtml b/src/templates/News/Delete.phtml
@@ -17,7 +17,7 @@ switch ($error)
   default: $message = $error;
 }
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if (is_null($this->getContext()->error)) { ?>
   <h1 class="text-danger">Delete News Post</h1>
   <form method="POST" action="?id=<?=filter_var($id, FILTER_SANITIZE_FULL_SPECIAL_CHARS)?>">
diff --git a/src/templates/News/View.phtml b/src/templates/News/View.phtml
@@ -47,7 +47,7 @@ $delete_visible = ($active_user && ($active_user->getOptionsBitmask()
 
 require_once('./MarkdownBootstrapFix.inc.php');
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if ($object) { ?>
 <? if ($draft) { ?>
   <div class="alert alert-warning">This news post is marked as <strong>draft</strong>. Edit the news post to <strong>publish</strong> it.</div>
@@ -84,7 +84,7 @@ require('./header.inc.phtml'); ?>
     </div></div>
   </div></div>
 </div>
-<div class="container mb-3">
+<div class="container">
 <?
 
 $comment_parent_type = Comment::PARENT_TYPE_NEWS_POST; $comment_parent_id = $object_id;
diff --git a/src/templates/Packet/Index.phtml b/src/templates/Packet/Index.phtml
@@ -19,7 +19,7 @@ $form_order_by = [
   'user-id-desc' => 'User Id (Descending)',
 ];
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h2><?=$title?></h2>
   <p><?=$description?></p>
   <form method="GET" class="m-2" id="filter_form">
diff --git a/src/templates/Packet/View.phtml b/src/templates/Packet/View.phtml
@@ -54,7 +54,7 @@ $delete_visible = ($active_user && ($active_user->getOptionsBitmask()
 
 require_once('./MarkdownBootstrapFix.inc.php');
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if ($object) { ?>
   <a class="btn btn-sm btn-primary float-right mr-1" href="https://twitter.com/share?text=<?=urlencode($packet_id . ' ' . $object->getPacketName())?>&amp;url=<?=urlencode($url)?>" rel="external" data-popup="1"><img src="<?=Common::relativeUrlToAbsolute('/a/social-twitter-24px.png')?>"/></a>
   <a class="btn btn-sm btn-primary float-right mr-1" href="https://facebook.com/sharer/sharer.php?u=<?=urlencode($url)?>" rel="external" data-popup="1"><img src="<?=Common::relativeUrlToAbsolute('/a/social-facebook-24px.png')?>"/></a>
diff --git a/src/templates/PrivacyNotice.phtml b/src/templates/PrivacyNotice.phtml
@@ -15,7 +15,7 @@ $email_mailbox = $this->getContext()->email_mailbox;
 $org = $this->getContext()->organization;
 
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h1><?=$title?></h1>
     <p><?=$org?> is committed to privacy and security for all of its Users. This privacy notice will explain how <?=$org?> uses the personal data collected from you when you use the site.</p>
     <p><h2>Topics:</h2><ul>
diff --git a/src/templates/Servers.phtml b/src/templates/Servers.phtml
@@ -16,7 +16,7 @@ ksort($servers_by_type);
 
 require('./header.inc.phtml');
 ?>
-<div class="container mb-3">
+<div class="container">
   <h1>Server List</h1>
   <div class="row"><div class="col">
     <p>Below is a list of servers that our automated system checks the status of. The status represents if the port is opened or closed, not if the service is functioning correctly.</p>
diff --git a/src/templates/User/ChangePassword.phtml b/src/templates/User/ChangePassword.phtml
@@ -20,7 +20,7 @@ switch ($error)
   default: $message = $error;
 }
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <div class="card mx-auto mb-3" style="width:18rem;">
     <h4 class="card-header text-center"><?=$title?></h4>
     <div class="card-body">
diff --git a/src/templates/User/Index.phtml b/src/templates/User/Index.phtml
@@ -21,7 +21,7 @@ $form_order_by = [
   'registered-desc' => 'Registered (Descending)',
 ];
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <h1><?=$title?></h1>
   <p><?=$description?></p>
   <form method="GET" id="order_by_form">
diff --git a/src/templates/User/Update.phtml b/src/templates/User/Update.phtml
@@ -112,7 +112,7 @@ switch ($this->getContext()->website_error[1] ?? null)
 }
 $avatar = ($this->getContext()->active_user ? $this->getContext()->active_user->getAvatarURI(512) : null);
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
 <? if ($this->getContext()->_responseCode == 401) { ?>
   <h1 class="text-danger"><?=$title?></h1>
   <div class="alert alert-danger">
diff --git a/src/templates/User/View.phtml b/src/templates/User/View.phtml
@@ -59,7 +59,7 @@ if (!empty($biography)) $description = $biography;
 $this->opengraph->attach(new Pair('type', 'profile'));
 $this->opengraph->attach(new Pair('url', $url));
 require('./header.inc.phtml'); ?>
-<div class="container mb-3">
+<div class="container">
   <span class="float-right">
 <?  if ($active_user && $user && $active_user->getId() == $user->getId()) { ?>
     <a class="btn btn-sm btn-secondary" href="<?=Common::relativeUrlToAbsolute('/user/update')?>" title="Update Profile">📝 Update Profile</a>
diff --git a/src/templates/footer.inc.phtml b/src/templates/footer.inc.phtml
@@ -6,7 +6,7 @@ use \CarlBennett\MVC\Libraries\Common;
 ?>
 </main>
 <footer class="footer mt-auto py-3">
-  <div class="container text-center">
+  <div class="container mt-3 text-center">
     <p class="small text-muted"><?php if ( VersionInfo::$version->bnetdocs ) { ?><a href="https://github.com/BNETDocs/bnetdocs-web/tree/<?=VersionInfo::$version->bnetdocs[1]?>" rel="external" title="Contribute to the BNETDocs source code!">BNETDocs <?=VersionInfo::$version->bnetdocs[0]?></a><?php } else { ?>(Development)<?php } ?> &copy; 2003-2021 BNETDocs | <a href="<?=Common::relativeUrlToAbsolute('/legal')?>" title="BNETDocs Legal Page">Legal page</a> | <a href="<?=Common::relativeUrlToAbsolute('/privacy')?>" title="BNETDocs Privacy Notice">Privacy Notice</a></p>
     <p class="small text-muted">
 BNETDocs is a documentation and discussion website for Blizzard Entertainment's

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ if ($c)`
`26`	`26`	`}`
`27`	`27`	`$id = $this->getContext()->id;`
`28`	`28`	`require('./header.inc.phtml'); ?>`
`29`		`-<div class="container mb-3">`
	`29`	`+<div class="container">`
`30`	`30`	`<? if (is_null($this->getContext()->error)) { ?>`
`31`	`31`
`32`	`32`	`<h2 class="text-danger">Delete Comment</h2>`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ if ($c)`
`28`	`28`	`$c_user_avatar = $c_user->getAvatarURI(22);`
`29`	`29`	`}`
`30`	`30`	`require('./header.inc.phtml'); ?>`
`31`		`-<div class="container mb-3">`
	`31`	`+<div class="container">`
`32`	`32`	`<? if (is_null($this->getContext()->error) && !is_null($c)) { ?>`
`33`	`33`
`34`	`34`	`<h2>Edit Comment</h2>`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ switch ($error)`
`17`	`17`	`default: $message = $error;`
`18`	`18`	`}`
`19`	`19`	`require('./header.inc.phtml'); ?>`
`20`		`-<div class="container mb-3">`
	`20`	`+<div class="container">`
`21`	`21`	`<? if (is_null($this->getContext()->error)) { ?>`
`22`	`22`	`<h1 class="text-danger">Delete Document</h1>`
`23`	`23`	`<form method="POST" action="?id=<?=filter_var($id, FILTER_SANITIZE_FULL_SPECIAL_CHARS)?>">`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ if (!empty($user_id))`
`16`	`16`	`$user = new User($user_id);`
`17`	`17`	`}`
`18`	`18`	`require('./header.inc.phtml'); ?>`
`19`		`-<div class="container mb-3">`
	`19`	`+<div class="container">`
`20`	`20`	`<h1>Support Us</h1>`
`21`	`21`	`<p>The following are the methods available for supporting us:</p>`
`22`	`22`	`<ul type="circle">`