Resource endpoint changes for CDN and domains

carlbennett · carlbennett · commit 35c8253c4f30 · 2016-04-09T22:37:15.000Z
- Updated dev.bnetdocs.org to bnetdocs.org for some assets
- Added missing assets to version control
- Changed URLs to use BNETDocs CDN (all /a/* urls)
diff --git a/static/a/BNETDocs.js b/static/a/BNETDocs.js
@@ -1,7 +1,7 @@
 /**
  * BNETDocs: Phoenix
  * Copyright (C) 2003-2016 BNETDocs CC-BY-NC-SA 4.0
- * <https://dev.bnetdocs.org/legal>
+ * <https://bnetdocs.org/legal>
  *
  * The site should **ALWAYS** work if JavaScript is disabled. This script is
  * intended to be an addon to enhance the experience, not a required feature.
diff --git a/static/a/font/SourceCodePro-Regular-201508251844.css b/static/a/font/SourceCodePro-Regular-201508251844.css
@@ -0,0 +1,8 @@
+/* latin */
+@font-face {
+  font-family: 'Source Code Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('//static.carlbennett.me/font/SourceCodePro-Regular-201508251844.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
diff --git a/static/a/font/SourceCodePro-Regular-201508251844.ttf b/static/a/font/SourceCodePro-Regular-201508251844.ttf
diff --git a/static/a/font/SourceSansPro-Regular-201504292348.css b/static/a/font/SourceSansPro-Regular-201504292348.css
@@ -0,0 +1,6 @@
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('//static.carlbennett.me/font/SourceSansPro-Regular-201504292348.ttf') format('truetype');
+}
diff --git a/static/a/font/SourceSansPro-Regular-201504292348.ttf b/static/a/font/SourceSansPro-Regular-201504292348.ttf
diff --git a/static/a/font/SourceSansPro-Regular-201508251844.css b/static/a/font/SourceSansPro-Regular-201508251844.css
@@ -0,0 +1,8 @@
+/* latin */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('//static.carlbennett.me/font/SourceSansPro-Regular-201508251844.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
diff --git a/static/a/font/SourceSansPro-Regular-201508251844.ttf b/static/a/font/SourceSansPro-Regular-201508251844.ttf
diff --git a/static/a/font/SourceSerifPro-Regular-201508251844.css b/static/a/font/SourceSerifPro-Regular-201508251844.css
@@ -0,0 +1,8 @@
+/* latin */
+@font-face {
+  font-family: 'Source Serif Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Serif Pro'), local('SourceSerifPro-Regular'), url('//static.carlbennett.me/font/SourceSerifPro-Regular-201508251844.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
diff --git a/static/a/font/SourceSerifPro-Regular-201508251844.ttf b/static/a/font/SourceSerifPro-Regular-201508251844.ttf
diff --git a/static/a/forms.css b/static/a/forms.css
@@ -43,7 +43,7 @@ form textarea:focus {
 }
 form input[disabled],
 form textarea[disabled] {
-  background-image: url("https://static.carlbennett.me/img/unable-20px.png");
+  background-image: url("/a/unable-20px.png");
   background-position: left top;
   background-repeat: repeat;
 }
diff --git a/static/a/main.css b/static/a/main.css
@@ -3,7 +3,7 @@
  */
 
 body {
-  background: #272727 url("https://static.carlbennett.me/img/main_bg.png") repeat fixed center;
+  background: #272727 url("/a/main_bg.png") repeat fixed center;
   color: #ddd;
   font: 11pt source sans pro, verdana, arial, sans-serif;
   margin: 48px 0px;
@@ -90,7 +90,7 @@ body > nav > a[href]:hover {
   text-decoration: none;
 }
 body > nav > a#nav-current {
-  background-image: url("https://dev.bnetdocs.org/a/nav_arrow.png");
+  background-image: url("/a/nav_arrow.png");
   background-position: left center;
   background-repeat: no-repeat;
 }
@@ -301,7 +301,7 @@ ol.lower-latin {
   list-style-type: lower-latin;
 }
 blockquote {
-  background-image: url("https://dev.bnetdocs.org/a/quote-symbol.png");
+  background-image: url("/a/quote-symbol.png");
   background-position: 0px -12px;
   background-repeat: no-repeat;
   margin: 0px;
diff --git a/templates/email/User/Register.plain.phtml b/templates/email/User/Register.plain.phtml
@@ -4,7 +4,7 @@ Welcome to BNETDocs!
 Your account requires activation before being able to use this service. Click
 or copy and paste the link below into your browser to activate your account.
 
-https://dev.bnetdocs.org/user/activate?t=<?php echo rawurlencode($this->getContext()->token); ?>
+https://bnetdocs.org/user/activate?t=<?php echo rawurlencode($this->getContext()->token); ?>
 
 Note: This link will only be available for 24 hours after registering. If you
 wait until it expires, you will need to complete a password reset.
diff --git a/templates/email/User/Register.rich.phtml b/templates/email/User/Register.rich.phtml
@@ -1,6 +1,6 @@
 <?php require("./email/header.rich.inc.phtml"); ?>
 <p style="font-family:sans-serif;font-weight:bold;">Welcome to BNETDocs!</p>
 <p style="font-family:sans-serif;">Your account requires activation before being able to use this service. Click or copy and paste the link below into your browser to activate your account.</p>
-<p style="font-family:sans-serif;"><a href="https://dev.bnetdocs.org/user/activate?t=<?php echo rawurlencode($this->getContext()->token); ?>" rel="external">https://dev.bnetdocs.org/user/activate?t=<?php echo rawurlencode($this->getContext()->token); ?></a></p>
+<p style="font-family:sans-serif;"><a href="https://bnetdocs.org/user/activate?t=<?php echo rawurlencode($this->getContext()->token); ?>" rel="external">https://bnetdocs.org/user/activate?t=<?php echo rawurlencode($this->getContext()->token); ?></a></p>
 <p style="font-family:sans-serif;"><strong>Note:</strong> This link will only be available for 24 hours after registering. If you wait until it expires, you will need to complete a password reset.</p>
 <?php require("./email/footer.rich.inc.phtml"); ?>
diff --git a/templates/email/footer.plain.inc.phtml b/templates/email/footer.plain.inc.phtml
@@ -3,7 +3,7 @@
 
 BNETDocs: Phoenix
 
-Copyright © 2003-2015 BNETDocs CC-BY-NC-SA 4.0 <https://dev.bnetdocs.org/legal>
+Copyright © 2003-2015 BNETDocs CC-BY-NC-SA 4.0 <https://bnetdocs.org/legal>
 
 BNETDocs is in no way affiliated with or endorsed by Blizzard Entertainment™ or
 its brands, and is not intended to compete with or undermine Blizzard
diff --git a/templates/email/footer.rich.inc.phtml b/templates/email/footer.rich.inc.phtml
@@ -1,5 +1,5 @@
 <p>--</p>
 <p style="font-family:sans-serif;">BNETDocs: Phoenix</p>
-<p style="font-family:sans-serif;">Copyright &copy; 2003-2015 BNETDocs <a href="https://dev.bnetdocs.org/legal" rel="external">CC-BY-NC-SA 4.0</a></p>
+<p style="font-family:sans-serif;">Copyright &copy; 2003-2015 BNETDocs <a href="https://bnetdocs.org/legal" rel="external">CC-BY-NC-SA 4.0</a></p>
 <p style="font-family:sans-serif;">BNETDocs is in no way affiliated with or endorsed by Blizzard Entertainment&trade; or its brands, and is not intended to compete with or undermine Blizzard Entertainment&trade; or Battle.net&trade;. Persons using this software understand that the information provided within is collected knowledge from years of observations and may be inaccurate. All aforementioned trademarks are the property of their respective owners.</p>
 </body></html>
diff --git a/templates/header.inc.phtml b/templates/header.inc.phtml
@@ -28,8 +28,8 @@ if (isset($this->getContext()->user_session)) {
     <link rel="stylesheet" type="text/css" href="<?php echo Common::relativeUrlToAbsolute($path); ?>" media="all"/>
 <?php } ?>
     <link rel="icon" href="<?php echo Common::relativeUrlToAbsolute("/favicon.png"); ?>" type="image/png" sizes="48x48"/>
-    <link rel="stylesheet" type="text/css" href="<?php echo Common::relativeUrlToAbsolute("//static.carlbennett.me/font/SourceSansPro-Regular-201508251844.css"); ?>"/>
-    <link rel="stylesheet" type="text/css" href="<?php echo Common::relativeUrlToAbsolute("//static.carlbennett.me/font/SourceCodePro-Regular-201508251844.css"); ?>"/>
+    <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"); ?>"><![CDATA[]]></script>
     <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"); ?>"/>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`* BNETDocs: Phoenix`
`3`	`3`	`* Copyright (C) 2003-2016 BNETDocs CC-BY-NC-SA 4.0`
`4`		`- * <https://dev.bnetdocs.org/legal>`
	`4`	`+ * <https://bnetdocs.org/legal>`
`5`	`5`	`*`
`6`	`6`	`* The site should ALWAYS work if JavaScript is disabled. This script is`
`7`	`7`	`* intended to be an addon to enhance the experience, not a required feature.`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ form textarea:focus {`
`43`	`43`	`}`
`44`	`44`	`form input[disabled],`
`45`	`45`	`form textarea[disabled] {`
`46`		`- background-image: url("https://static.carlbennett.me/img/unable-20px.png");`
	`46`	`+ background-image: url("/a/unable-20px.png");`
`47`	`47`	`background-position: left top;`
`48`	`48`	`background-repeat: repeat;`
`49`	`49`	`}`