From 065e6edbed1ee5a33ef1916bbf620f5a745c4160 Mon Sep 17 00:00:00 2001
From: Jade Dominguez <plusjade@gmail.com>
Date: Tue, 24 Jan 2012 03:26:18 -0800
Subject: 'Provider' is more correct than 'engine'

---
 _includes/JB/analytics                        |  8 ++++----
 _includes/JB/analytics-engines/getclicky      | 12 ------------
 _includes/JB/analytics-engines/google         | 11 -----------
 _includes/JB/analytics-providers/getclicky    | 12 ++++++++++++
 _includes/JB/analytics-providers/google       | 11 +++++++++++
 _includes/JB/categories_list                  |  2 +-
 _includes/JB/comments                         | 12 ++++++------
 _includes/JB/comments-engines/disqus          | 13 -------------
 _includes/JB/comments-engines/facebook        |  1 -
 _includes/JB/comments-engines/intensedebate   |  6 ------
 _includes/JB/comments-engines/livefyre        |  6 ------
 _includes/JB/comments-providers/disqus        | 13 +++++++++++++
 _includes/JB/comments-providers/facebook      |  1 +
 _includes/JB/comments-providers/intensedebate |  6 ++++++
 _includes/JB/comments-providers/livefyre      |  6 ++++++
 _includes/JB/liquid_raw                       |  2 +-
 _includes/JB/pages_list                       |  2 +-
 _includes/JB/posts_collate                    |  2 +-
 _includes/JB/setup                            |  2 +-
 _includes/JB/sharing                          |  4 ++--
 _includes/JB/tags_list                        |  2 +-
 21 files changed, 67 insertions(+), 67 deletions(-)
 delete mode 100644 _includes/JB/analytics-engines/getclicky
 delete mode 100644 _includes/JB/analytics-engines/google
 create mode 100644 _includes/JB/analytics-providers/getclicky
 create mode 100644 _includes/JB/analytics-providers/google
 delete mode 100644 _includes/JB/comments-engines/disqus
 delete mode 100644 _includes/JB/comments-engines/facebook
 delete mode 100644 _includes/JB/comments-engines/intensedebate
 delete mode 100644 _includes/JB/comments-engines/livefyre
 create mode 100644 _includes/JB/comments-providers/disqus
 create mode 100644 _includes/JB/comments-providers/facebook
 create mode 100644 _includes/JB/comments-providers/intensedebate
 create mode 100644 _includes/JB/comments-providers/livefyre

(limited to '_includes')

diff --git a/_includes/JB/analytics b/_includes/JB/analytics
index 6dd2406..9280e8d 100644
--- a/_includes/JB/analytics
+++ b/_includes/JB/analytics
@@ -1,10 +1,10 @@
-{% if site.safe and site.JB.analytics.engine and page.JB.analytics != false %}
+{% if site.safe and site.JB.analytics.provider and page.JB.analytics != false %}
 
-{% case site.JB.analytics.engine %}
+{% case site.JB.analytics.provider %}
 {% when "google" %}
-  {% include JB/analytics-engines/google %}
+  {% include JB/analytics-providers/google %}
 {% when "getclicky" %}
-  {% include JB/analytics-engines/getclicky %}
+  {% include JB/analytics-providers/getclicky %}
 {% when "custom" %}
   {% include custom/analytics %}
 {% endcase %}
diff --git a/_includes/JB/analytics-engines/getclicky b/_includes/JB/analytics-engines/getclicky
deleted file mode 100644
index a9a5fd9..0000000
--- a/_includes/JB/analytics-engines/getclicky
+++ /dev/null
@@ -1,12 +0,0 @@
-<script type="text/javascript">
-var clicky_site_ids = clicky_site_ids || [];
-clicky_site_ids.push({{ site.JB.analytics.getclicky.site_id }});
-(function() {
-  var s = document.createElement('script');
-  s.type = 'text/javascript';
-  s.async = true;
-  s.src = '//static.getclicky.com/js';
-  ( document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0] ).appendChild( s );
-})();
-</script>
-<noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/66527741ns.gif" /></p></noscript>
\ No newline at end of file
diff --git a/_includes/JB/analytics-engines/google b/_includes/JB/analytics-engines/google
deleted file mode 100644
index 9014866..0000000
--- a/_includes/JB/analytics-engines/google
+++ /dev/null
@@ -1,11 +0,0 @@
-<script type="text/javascript">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '{{ site.JB.analytics.google.tracking_id }}']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-</script>
\ No newline at end of file
diff --git a/_includes/JB/analytics-providers/getclicky b/_includes/JB/analytics-providers/getclicky
new file mode 100644
index 0000000..a9a5fd9
--- /dev/null
+++ b/_includes/JB/analytics-providers/getclicky
@@ -0,0 +1,12 @@
+<script type="text/javascript">
+var clicky_site_ids = clicky_site_ids || [];
+clicky_site_ids.push({{ site.JB.analytics.getclicky.site_id }});
+(function() {
+  var s = document.createElement('script');
+  s.type = 'text/javascript';
+  s.async = true;
+  s.src = '//static.getclicky.com/js';
+  ( document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0] ).appendChild( s );
+})();
+</script>
+<noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/66527741ns.gif" /></p></noscript>
\ No newline at end of file
diff --git a/_includes/JB/analytics-providers/google b/_includes/JB/analytics-providers/google
new file mode 100644
index 0000000..9014866
--- /dev/null
+++ b/_includes/JB/analytics-providers/google
@@ -0,0 +1,11 @@
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', '{{ site.JB.analytics.google.tracking_id }}']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
\ No newline at end of file
diff --git a/_includes/JB/categories_list b/_includes/JB/categories_list
index 1f7e45b..83be2e2 100644
--- a/_includes/JB/categories_list
+++ b/_includes/JB/categories_list
@@ -17,7 +17,7 @@ Usage:
   This helper can be seen in use at: ../_layouts/default.html
 -->{% endcomment %}
 
-{% if site.JB.categories_list.engine == "custom" %}
+{% if site.JB.categories_list.provider == "custom" %}
   {% include custom/categories_list %}
 {% else %}
   {% if categories_list.first[0] == null %}
diff --git a/_includes/JB/comments b/_includes/JB/comments
index 81cddea..58fdff6 100644
--- a/_includes/JB/comments
+++ b/_includes/JB/comments
@@ -1,14 +1,14 @@
-{% if site.JB.comments.engine and page.JB.comments != false %}
+{% if site.JB.comments.provider and page.JB.comments != false %}
 
-{% case site.JB.comments.engine %}
+{% case site.JB.comments.provider %}
 {% when "disqus" %}
-  {% include JB/comments-engines/disqus %}
+  {% include JB/comments-providers/disqus %}
 {% when "livefyre" %}
-  {% include JB/comments-engines/livefyre %}
+  {% include JB/comments-providers/livefyre %}
 {% when "intensedebate" %}
-  {% include JB/comments-engines/intensedebate %}
+  {% include JB/comments-providers/intensedebate %}
 {% when "facebook" %}
-  {% include JB/comments-engines/facebook %}
+  {% include JB/comments-providers/facebook %}
 {% when "custom" %}
   {% include custom/comments %}
 {% endcase %}
diff --git a/_includes/JB/comments-engines/disqus b/_includes/JB/comments-engines/disqus
deleted file mode 100644
index f6dd3a9..0000000
--- a/_includes/JB/comments-engines/disqus
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="disqus_thread"></div>
-<script type="text/javascript">
-    {% 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
-    /* * * DON'T EDIT BELOW THIS LINE * * */
-    (function() {
-        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
-        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-    })();
-</script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
diff --git a/_includes/JB/comments-engines/facebook b/_includes/JB/comments-engines/facebook
deleted file mode 100644
index f8c7d21..0000000
--- a/_includes/JB/comments-engines/facebook
+++ /dev/null
@@ -1 +0,0 @@
-<h3>Facebook comments TODO!</h3>
\ No newline at end of file
diff --git a/_includes/JB/comments-engines/intensedebate b/_includes/JB/comments-engines/intensedebate
deleted file mode 100644
index ab0c3c9..0000000
--- a/_includes/JB/comments-engines/intensedebate
+++ /dev/null
@@ -1,6 +0,0 @@
-<script>
-var idcomments_acct = '{{ site.JB.comments.intensedebate.account }}';
-var idcomments_post_id;
-var idcomments_post_url;
-</script>
-<script type="text/javascript" src="http://www.intensedebate.com/js/genericLinkWrapperV2.js"></script>
diff --git a/_includes/JB/comments-engines/livefyre b/_includes/JB/comments-engines/livefyre
deleted file mode 100644
index 704b803..0000000
--- a/_includes/JB/comments-engines/livefyre
+++ /dev/null
@@ -1,6 +0,0 @@
-<script type='text/javascript' src='http://zor.livefyre.com/wjs/v1.0/javascripts/livefyre_init.js'></script>
-<script type='text/javascript'>
-    var fyre = LF({
-        site_id: {{ site.JB.comments.livefyre.site_id }}
-    });
-</script>
\ No newline at end of file
diff --git a/_includes/JB/comments-providers/disqus b/_includes/JB/comments-providers/disqus
new file mode 100644
index 0000000..f6dd3a9
--- /dev/null
+++ b/_includes/JB/comments-providers/disqus
@@ -0,0 +1,13 @@
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+    {% 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
+    /* * * DON'T EDIT BELOW THIS LINE * * */
+    (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+</script>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
diff --git a/_includes/JB/comments-providers/facebook b/_includes/JB/comments-providers/facebook
new file mode 100644
index 0000000..f8c7d21
--- /dev/null
+++ b/_includes/JB/comments-providers/facebook
@@ -0,0 +1 @@
+<h3>Facebook comments TODO!</h3>
\ No newline at end of file
diff --git a/_includes/JB/comments-providers/intensedebate b/_includes/JB/comments-providers/intensedebate
new file mode 100644
index 0000000..ab0c3c9
--- /dev/null
+++ b/_includes/JB/comments-providers/intensedebate
@@ -0,0 +1,6 @@
+<script>
+var idcomments_acct = '{{ site.JB.comments.intensedebate.account }}';
+var idcomments_post_id;
+var idcomments_post_url;
+</script>
+<script type="text/javascript" src="http://www.intensedebate.com/js/genericLinkWrapperV2.js"></script>
diff --git a/_includes/JB/comments-providers/livefyre b/_includes/JB/comments-providers/livefyre
new file mode 100644
index 0000000..704b803
--- /dev/null
+++ b/_includes/JB/comments-providers/livefyre
@@ -0,0 +1,6 @@
+<script type='text/javascript' src='http://zor.livefyre.com/wjs/v1.0/javascripts/livefyre_init.js'></script>
+<script type='text/javascript'>
+    var fyre = LF({
+        site_id: {{ site.JB.comments.livefyre.site_id }}
+    });
+</script>
\ No newline at end of file
diff --git a/_includes/JB/liquid_raw b/_includes/JB/liquid_raw
index 869e9a1..a5c1783 100644
--- a/_includes/JB/liquid_raw
+++ b/_includes/JB/liquid_raw
@@ -24,7 +24,7 @@ Usage:
   As seen here, you must use "|." and ".|" as opening and closing brackets.
 -->{% endcomment%}
 
-{% if site.JB.liquid_raw.engine == "custom" %}
+{% if site.JB.liquid_raw.provider == "custom" %}
   {% include custom/liquid_raw %}
 {% else %}
   <pre><code>{{text | replace:"|.", "&#123;" | replace:".|", "&#125;" | replace:">", "&gt;" | replace:"<", "&lt;" }}</code></pre>
diff --git a/_includes/JB/pages_list b/_includes/JB/pages_list
index 07cb058..1afc3f3 100644
--- a/_includes/JB/pages_list
+++ b/_includes/JB/pages_list
@@ -20,7 +20,7 @@ Usage:
   This helper can be seen in use at: ../_layouts/default.html
 -->{% endcomment %}
 
-{% if site.JB.pages_list.engine == "custom" %}
+{% if site.JB.pages_list.provider == "custom" %}
   {% include custom/pages_list %}
 {% else %}
   {% for node in pages_list %}
diff --git a/_includes/JB/posts_collate b/_includes/JB/posts_collate
index 588c6fe..f612ade 100644
--- a/_includes/JB/posts_collate
+++ b/_includes/JB/posts_collate
@@ -17,7 +17,7 @@ Usage:
         
 -->{% endcomment %}
 
-{% if site.JB.posts_collate.engine == "custom" %}
+{% if site.JB.posts_collate.provider == "custom" %}
   {% include custom/posts_collate %}
 {% else %}
   {% for post in posts_collate  %}
diff --git a/_includes/JB/setup b/_includes/JB/setup
index ce7ce7d..e6d8b88 100644
--- a/_includes/JB/setup
+++ b/_includes/JB/setup
@@ -2,7 +2,7 @@
   <!--
   - Dynamically set liquid variables for working with URLs/paths
   -->
-  {% if site.JB.setup.engine == "custom" %}
+  {% if site.JB.setup.provider == "custom" %}
     {% include custom/setup %}
   {% else %}
     {% if site.safe and site.JB.BASE_PATH %}
diff --git a/_includes/JB/sharing b/_includes/JB/sharing
index 8850b23..f5b1151 100644
--- a/_includes/JB/sharing
+++ b/_includes/JB/sharing
@@ -1,6 +1,6 @@
-{% if site.safe and site.JB.sharing.engine and page.JB.sharing != false %}
+{% if site.safe and site.JB.sharing.provider and page.JB.sharing != false %}
 
-{% case site.JB.sharing.engine %}
+{% case site.JB.sharing.provider %}
 {% when "custom" %}
   {% include custom/sharing %}
 {% endcase %}
diff --git a/_includes/JB/tags_list b/_includes/JB/tags_list
index 9a93d90..8eb62a7 100644
--- a/_includes/JB/tags_list
+++ b/_includes/JB/tags_list
@@ -17,7 +17,7 @@ Usage:
   This helper can be seen in use at: ../_layouts/default.html
 -->{% endcomment %}
 
-{% if site.JB.tags_list.engine == "custom" %}
+{% if site.JB.tags_list.provider == "custom" %}
   {% include custom/tags_list %}
 {% else %}
   {% if tags_list.first[0] == null %}
-- 
cgit v1.2.3