Merge branch 'develop' into phoenix

carlbennett · carlbennett · commit 088251b136d4 · 2018-10-25T13:02:35.000-05:00
diff --git a/etc/config.sample.json b/etc/config.sample.json
@@ -1,7 +1,10 @@
 {
   "bnetdocs": {
-    "battleforthenet": "",
     "btc_donate_address": "",
+    "campaigns": {
+      "battleforthenet": "",
+      "vultr": ""
+    },
     "maintenance": [
       false,
       "BNETDocs has to take a brief moment to do some system maintenance. We'll be back shortly."
diff --git a/src/templates/header.inc.phtml b/src/templates/header.inc.phtml
@@ -18,6 +18,22 @@ if ( isset( Authentication::$user  )) {
   $_header_staff    = null;
 }
 
+$_campaign_battleforthenet = (
+  !empty( Common::$config->bnetdocs->campaigns->battleforthenet ) ?
+  '<script type="text/javascript" src="' .
+  Common::relativeUrlToAbsolute(
+    Common::$config->bnetdocs->campaigns->battleforthenet
+  ) . '" async><![CDATA[]]></script>' . PHP_EOL : ''
+);
+$_campaign_vultr = (
+  !empty( Common::$config->bnetdocs->campaigns->vultr ) ?
+  '<a href="' . Common::relativeUrlToAbsolute(
+    Common::$config->bnetdocs->campaigns->vultr
+  ) . '"><img src="' . Common::relativeUrlToAbsolute(
+    '/a/vultr_badge_ondark.svg'
+  ) . '" style="float:right;margin-right:16px;height:32px;"/></a>'  : ''
+);
+
 ?><!DOCTYPE html>
 <html lang="en-US">
   <head>
@@ -40,9 +56,7 @@ if ( isset( Authentication::$user  )) {
     <link rel="stylesheet" type="text/css" href="<?php echo Common::relativeUrlToAbsolute("/a/font/SourceSansPro-Regular-201508251844.css"); ?>"/>
     <link rel="stylesheet" type="text/css" href="<?php echo Common::relativeUrlToAbsolute("/a/font/SourceCodePro-Regular-201508251844.css"); ?>"/>
     <script type="text/javascript" src="<?php echo Common::relativeUrlToAbsolute("/a/BNETDocs.js"); ?>" async><![CDATA[]]></script>
-<?php if (Common::$config->bnetdocs->battleforthenet) { ?>
-    <script type="text/javascript" src="<?php echo Common::relativeUrlToAbsolute(Common::$config->bnetdocs->battleforthenet); ?>" async><![CDATA[]]></script>
-<?php } ?>
+    <?php echo $_campaign_battleforthenet; ?>
     <link rel="alternate" href="<?php echo Common::relativeUrlToAbsolute("/news.rss"); ?>" type="application/rss+xml" title="BNETDocs News"/>
     <link rel="license" href="<?php echo Common::relativeUrlToAbsolute("/legal"); ?>"/>
     <meta name="keywords" content="battle.net,starcraft,warcraft,diablo,blizzard,logon sequences,packets,information,protocols,reference,programming,coding"/>
@@ -74,7 +88,7 @@ if ( isset( Authentication::$user  )) {
 <?php } ?>
   </head>
   <body>
-    <header class="main-page"><img src="<?php echo Common::relativeUrlToAbsolute("/a/VSZX0bJ.png"); ?>" style="float:left;margin-right:6px;height:32px;"/> BNETDocs<span id="mobile-nav">&#9776;</span></header>
+    <header class="main-page"><img src="<?php echo Common::relativeUrlToAbsolute("/a/VSZX0bJ.png"); ?>" style="float:left;margin-right:6px;height:32px;"/> BNETDocs<span id="mobile-nav">&#9776;</span><?php echo $_campaign_vultr; ?></header>
 <?php if (!(isset($slim_ui) && $slim_ui)) { ?>
     <nav>
       <a>Portal</a>
