Merge branch 'develop' into phoenix

carlbennett · carlbennett · commit 0434b7a78c87 · 2018-10-25T18:19:39.000-05:00
diff --git a/etc/config.sample.json b/etc/config.sample.json
@@ -1,5 +1,6 @@
 {
   "bnetdocs": {
+    "asset_versioning": true,
     "btc_donate_address": "",
     "campaigns": {
       "battleforthenet": "",
diff --git a/src/static/a/main-mobile.css b/src/static/a/main-mobile.css
@@ -58,6 +58,11 @@ header.main-page {
   -ms-user-select: none;
   user-select: none;
 }
+header.main-page img#vultr-campaign {
+  float: right;
+  margin-right: 16px;
+  height: 32px;
+}
 header.main-page #mobile-nav {
   cursor: pointer;
   display: block;
diff --git a/src/static/a/main.css b/src/static/a/main.css
@@ -58,6 +58,10 @@ header.main-page {
   -ms-user-select: none;
   user-select: none;
 }
+header.main-page img#vultr-campaign {
+  float: right;
+  height: 32px;
+}
 header.main-page #mobile-nav {
   display: none;
 }
diff --git a/src/templates/header.inc.phtml b/src/templates/header.inc.phtml
@@ -5,6 +5,7 @@ namespace BNETDocs\Templates;
 use \BNETDocs\Libraries\Authentication;
 use \BNETDocs\Libraries\Logger;
 use \BNETDocs\Libraries\User;
+use \BNETDocs\Libraries\VersionInfo;
 
 use \CarlBennett\MVC\Libraries\Common;
 
@@ -18,6 +19,14 @@ if ( isset( Authentication::$user  )) {
   $_header_staff    = null;
 }
 
+if ( Common::$config->bnetdocs->asset_versioning ) {
+  if ( !is_null( VersionInfo::$version->bnetdocs )) {
+    $_unique_css = '?v=' . VersionInfo::$version->bnetdocs[1];
+  } else {
+    $_unique_css = '?v=' . date('YmdHis');
+  }
+}
+
 $_campaign_battleforthenet = (
   !empty( Common::$config->bnetdocs->campaigns->battleforthenet ) ?
   '<script type="text/javascript" src="' .
@@ -29,9 +38,9 @@ $_campaign_vultr = (
   !empty( Common::$config->bnetdocs->campaigns->vultr ) ?
   '<a href="' . Common::relativeUrlToAbsolute(
     Common::$config->bnetdocs->campaigns->vultr
-  ) . '"><img src="' . Common::relativeUrlToAbsolute(
+  ) . '"><img id="vultr-campaign" src="' . Common::relativeUrlToAbsolute(
     '/a/vultr_badge_ondark.svg'
-  ) . '" style="float:right;margin-right:16px;height:32px;"/></a>'  : ''
+  ) . '"/></a>'  : ''
 );
 
 ?><!DOCTYPE html>
@@ -44,13 +53,13 @@ $_campaign_vultr = (
 <?php } ?>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 <?php if (Common::$config->bnetdocs->mobile_site_enabled) { ?>
-    <link rel="stylesheet" href="<?php echo Common::relativeUrlToAbsolute("/a/main.css"); ?>" type="text/css" media="(min-width:1000px)"/>
-    <link rel="stylesheet" href="<?php echo Common::relativeUrlToAbsolute("/a/main-mobile.css"); ?>" type="text/css" media="(max-width:999px)"/>
+    <link rel="stylesheet" href="<?php echo Common::relativeUrlToAbsolute('/a/main.css' . $_unique_css); ?>" type="text/css" media="(min-width:1000px)"/>
+    <link rel="stylesheet" href="<?php echo Common::relativeUrlToAbsolute('/a/main-mobile.css' . $_unique_css); ?>" type="text/css" media="(max-width:999px)"/>
 <?php } else { ?>
-    <link rel="stylesheet" href="<?php echo Common::relativeUrlToAbsolute("/a/main.css"); ?>" type="text/css" media="all"/>
+    <link rel="stylesheet" href="<?php echo Common::relativeUrlToAbsolute('/a/main.css' . $_unique_css); ?>" type="text/css" media="all"/>
 <?php }
       foreach ($this->additional_css as $path) { ?>
-    <link rel="stylesheet" type="text/css" href="<?php echo Common::relativeUrlToAbsolute($path); ?>" media="all"/>
+    <link rel="stylesheet" type="text/css" href="<?php echo Common::relativeUrlToAbsolute($path . $_unique_css); ?>" media="all"/>
 <?php } ?>
     <link rel="icon" href="<?php echo Common::relativeUrlToAbsolute("/a/VSZX0bJ.png"); ?>" type="image/png" sizes="156x174"/>
     <link rel="stylesheet" type="text/css" href="<?php echo Common::relativeUrlToAbsolute("/a/font/SourceSansPro-Regular-201508251844.css"); ?>"/>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"bnetdocs": {`
	`3`	`+ "asset_versioning": true,`
`3`	`4`	`"btc_donate_address": "",`
`4`	`5`	`"campaigns": {`
`5`	`6`	`"battleforthenet": "",`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ header.main-page {`
`58`	`58`	`-ms-user-select: none;`
`59`	`59`	`user-select: none;`
`60`	`60`	`}`
	`61`	`+header.main-page img#vultr-campaign {`
	`62`	`+ float: right;`
	`63`	`+ height: 32px;`
	`64`	`+}`
`61`	`65`	`header.main-page #mobile-nav {`
`62`	`66`	`display: none;`
`63`	`67`	`}`