caboodle 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/caboodle/app/views/layout.haml

@@ -75,6 +75,12 @@
           %header#page_title
             %h1
               = @title
+        = before_social
+        %section#social
+          = above_social
+          = social
+          = below_social
+        = after_social 
         = before_content
         %section#content
           = above_content

data/lib/caboodle/helpers.rb

@@ -9,6 +9,15 @@ module Sinatra
       #Caboodle::Kit.credit
     end
     
+    def title
+      if request.path_info == "/"
+        "#{Caboodle::Site.title} | #{Caboodle::Site.description}"
+      else
+        t = Caboodle::Site.title
+        t = "#{@title} | #{t}" if @title
+      end
+    end
+    
   end
   helpers CaboodleHelpers
 end

data/lib/caboodle/kits/analytics/analytics.rb

@@ -1,14 +1,19 @@
 module Caboodle
   class Analytics < Caboodle::Kit
     add_to_layout "after_body" => "<script type=\"text/javascript\">
-    	var gaJsHost = ((\"https:\" == document.location.protocol) ? \"https://ssl.\" : \"http://www.\");
-    	document.write(unescape(\"%3Cscript src='\" + gaJsHost + \"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E\"));
-    </script>
-    <script type=\"text/javascript\">
-    	try {
-    	var pageTracker = _gat._getTracker(\"#{Caboodle::Site.analytics_id}\");
-    	pageTracker._trackPageview();
-    	} catch(err) {}
+
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', '#{Caboodle::Site.analytics_id}']);
+      _gaq.push(['_setDomainName', 'none']);
+      _gaq.push(['_setAllowLinker', true]);
+      _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>"
     required [:analytics_id]
   end

data/lib/caboodle/kits/disqus/disqus.rb

@@ -0,0 +1,11 @@
+module Caboodle
+  class Disqus < Caboodle::Kit
+        
+    menu "Chat", "/chat" do
+      @title = "Chat"
+      haml :disqus
+    end
+    
+    required [:disqus]
+  end
+end

data/lib/caboodle/kits/disqus/views/disqus.haml

@@ -0,0 +1,13 @@
+- if ENV["RACK_ENV"] == "development"
+  :javascript
+    var disqus_developer = true;
+    
+#disqus.page
+  - if Caboodle::Site.disqus
+    #disqus_thread
+    %script{:src => "http://disqus.com/forums/#{Caboodle::Site.disqus}/embed.js", :type => "text/javascript"}
+    %noscript
+      %a{:href => "http://#{Caboodle::Site.disqus}.disqus.com/?url=ref"} View the discussion thread.
+    %a.dsq-brlink{:href => "http://disqus.com"}
+      Discussion powered by
+      %span.logo-disqus Disqus

data/lib/caboodle/kits/posterous/posterous.rb

@@ -132,7 +132,7 @@ module Caboodle
 
   class Posterous < Caboodle::Kit
   
-    get "/page/:page_number" do |page_number|
+    get "/blog/:page_number" do |page_number|
       @posts = Post.page(page_number) rescue nil
       not_found if @posts.class == Array && @posts.blank?
       haml :posts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caboodle
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - steflewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-15 00:00:00 +01:00
+date: 2010-08-16 00:00:00 +01:00
 default_executable: caboodle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -277,6 +277,8 @@ files:
 - lib/caboodle/helpers.rb
 - lib/caboodle/kit.rb
 - lib/caboodle/kits/analytics/analytics.rb
+- lib/caboodle/kits/disqus/disqus.rb
+- lib/caboodle/kits/disqus/views/disqus.haml
 - lib/caboodle/kits/flickr/flickr.rb
 - lib/caboodle/kits/flickr/public/galleria.noconflict.min.js
 - lib/caboodle/kits/flickr/views/photography.haml