Merge pull request #261 from plusjade/revert-260-jb-issue-84

Revert "Site.Safe Replacement for Detecting Production Environment"
plusjade · Apr 1, 2015 · bc63f77 · bc63f77
2 parents 7a04f0b + ff3bc1d
commit bc63f77
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 52 deletions.
diff --git a/_includes/JB/analytics b/_includes/JB/analytics
@@ -1,6 +1,4 @@
-{% include JB/is_production %}
-
-{% if is_production and site.JB.analytics.provider and page.JB.analytics != false %}
+{% if site.safe and site.JB.analytics.provider and page.JB.analytics != false %}
 
 {% case site.JB.analytics.provider %}
 {% when "google" %}

diff --git a/_includes/JB/comments-providers/disqus b/_includes/JB/comments-providers/disqus
@@ -1,7 +1,6 @@
 <div id="disqus_thread"></div>
 <script type="text/javascript">
-    {% include JB/is_production %}
-    {% if is_production == false %}var disqus_developer = 1;{% endif %}
+    {% if site.safe == false %}var disqus_developer = 1;{% endif %}
     var disqus_shortname = '{{ site.JB.comments.disqus.short_name }}'; // required: replace example with your forum shortname
     {% if page.wordpress_id %}var disqus_identifier = '{{page.wordpress_id}} {{site.production_url}}/?p={{page.wordpress_id}}';{% endif %}
     /* * * DON'T EDIT BELOW THIS LINE * * */

diff --git a/_includes/JB/is_production b/_includes/JB/is_production
diff --git a/_includes/JB/setup b/_includes/JB/setup
@@ -2,11 +2,10 @@
   <!--
   - Dynamically set liquid variables for working with URLs/paths
   -->
-  {% include JB/is_production %}
   {% if site.JB.setup.provider == "custom" %}
     {% include custom/setup %}
   {% else %}
-    {% if is_production and site.JB.BASE_PATH and site.JB.BASE_PATH != '' %}
+    {% if site.safe and site.JB.BASE_PATH and site.JB.BASE_PATH != '' %}
       {% assign BASE_PATH = site.JB.BASE_PATH %}
       {% assign HOME_PATH = site.JB.BASE_PATH %}
     {% else %}

diff --git a/_includes/JB/sharing b/_includes/JB/sharing
@@ -1,5 +1,4 @@
-{% include JB/is_production %}
-{% if is_production and site.JB.sharing.provider and page.JB.sharing != false %}
+{% if site.safe and site.JB.sharing.provider and page.JB.sharing != false %}
 
 {% case site.JB.sharing.provider %}
 {% when "custom" %}

diff --git a/index.md b/index.md
@@ -43,8 +43,4 @@ Here's a sample "posts list".
 This theme is still unfinished. If you'd like to be added as a contributor, [please fork](http://github.com/plusjade/jekyll-bootstrap)!
 We need to clean up the themes, make theme usage guides with theme-specific markup examples.
 
-{% include JB/is_production %}
-
-## Production Mode?
 
-This site is {% if is_production != true %}not{% endif %} running in production mode. The environment is "{{jb_prod_env}}".