website_builder_engine 0.0.2 → 0.0.3

data/.gitignore

@@ -4,3 +4,4 @@ pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
+spec/dummy/public/*

data/CHANGELOG.textile

@@ -1,5 +1,12 @@
 h1. CHANGELOG
 
+h2. 0.0.3 September 25, 2011
+
+* improve Facebook OpenGraph metadata for templates
+* add Google Analytics script to all templates
+* rework home page template
+* add missing stylesheet for home page
+
 h2. 0.0.2 September 24, 2011
 
 * fix indentation of 'body' tag in layouts and templates

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    website_builder_engine (0.0.2)
+    website_builder_engine (0.0.3)
       RedCloth
       bourbon
       bson_ext

data/app/assets/stylesheets/website_builder_engine/welcome.css.scss

@@ -0,0 +1,87 @@
+// Place all the styles related to the Articles controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+body.welcome {
+  .container {
+    background: #fff;
+    font: 14px/21px Georgia, Times, serif;
+    color: #555;
+    
+    .logo {
+      margin-top:30px;
+      margin-bottom:0px;
+      .sitename{float:left;text-transform: lowercase;}
+      .sitename a{color:#cc0000; text-decoration:none;}
+      .sitename a:hover{color:#cc0000;}
+      .tagline{text-transform: lowercase;}
+      .tagline:before{content:" :";}
+    }
+  
+    article {
+      h1, h2, h3, h4, h5, h6, p {
+        font-family: inherit;
+        color: inherit;
+      }
+      h1 {
+        font-size: 28px;
+        padding-bottom: 5px;
+        line-height: 1em;
+      }
+      h2 {
+        font-size: 20px;
+        line-height: 30px;
+      }
+      h3 {
+        font-size: 16px;
+        line-height: 30px;
+      }
+      blockquote {
+        font-size: inherit;
+        line-height: inherit;
+        margin: 1.5em;
+        padding: 0;
+        border-left: none;
+        p {
+          font-size: inherit;
+          line-height: inherit;
+          color: #666;
+          font-style: italic;
+        }
+      }
+    }
+    
+    aside {
+      section {
+        h1, h2, h3, h4, h5, h6, p {
+          font-family: inherit;
+          color: inherit;
+        }
+        h1 {
+          color: #444;
+          border-bottom: 1px solid #ccc;
+          font-size: 14px;
+          padding-bottom: 5px;
+          line-height: 30px;
+        }
+        ul {
+          font-family: inherit;
+          color: inherit;
+          font-size: inherit;
+          line-height: inherit;
+          margin: 0;
+          padding: 15px;
+          li {
+            a {
+              text-decoration: none;
+              color: #cc0000;
+            }
+            a:hover {
+              background-color: #000;
+            }
+          }
+        }
+      }
+    }
+    
+  }
+}

data/app/controllers/website_builder_engine/articles_controller.rb

@@ -23,6 +23,7 @@ module WebsiteBuilderEngine
       # create (or recreate) the welcome page
       @articles = Article.where(published: true)
       @welcome_sidebar = RedCloth.new(@settings.sidebar).to_html.html_safe if @settings.sidebar
+      @welcome_intro = RedCloth.new(@settings.introduction).to_html.html_safe if @settings.introduction
       welcome_page = render_to_string(:template => "website_builder_engine/welcome/template.html.haml", :layout => false )
       File.open("#{@docroot_path}index.html", 'w') {|f| f.write(welcome_page) }
       respond_to do |format|

data/app/models/article.rb

@@ -4,6 +4,7 @@ class Article
   field :filename, :type => String
   field :description, :type => String
   field :keywords, :type => String
+  field :image_url, :type => String
   field :headline, :type => String
   field :subhead, :type => String
   field :content, :type => String

data/app/models/offerpage.rb

@@ -4,6 +4,7 @@ class Offerpage
   field :filename, :type => String
   field :description, :type => String
   field :keywords, :type => String
+  field :image_url, :type => String
   field :headline, :type => String
   field :subhead, :type => String
   field :content_block1, :type => String

data/app/models/setting.rb

@@ -5,9 +5,13 @@ class Setting
   field :site_tagline, :type => String
   field :site_description, :type => String
   field :site_keywords, :type => String
-  field :twitter_account, :type => String
+  field :site_image_url, :type => String
   field :domain, :type => String
   field :articles_directory, :type => String
   field :offerpages_directory, :type => String
   field :sidebar, :type => String
+  field :introduction, :type => String
+  field :google_analytics_id, :type => String
+  field :twitter_account, :type => String
+  field :facebook_admin_id, :type => String
 end

data/app/views/shared/_google_analytics.html.haml

@@ -0,0 +1,11 @@
+- unless @settings.google_analytics_id.blank?
+  :javascript
+    // Google Analytics Tracking Code
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '#{@settings.google_analytics_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);
+    })();

data/app/views/website_builder_engine/articles/_form.html.haml

@@ -18,6 +18,9 @@
   .field
     = f.label :keywords
     = f.text_field :keywords
+  .field
+    = f.label :image_url
+    = f.text_field :image_url
   .field
     = f.label :headline
     = f.text_field :headline

data/app/views/website_builder_engine/articles/template.html.haml

@@ -6,17 +6,24 @@
     %meta{:name=>'description', :content=>"#{@article.description}"}
     %meta{:name=>'keywords', :content=>"#{@article.keywords}"}
     -# meta tags for the Open Graph protocol for Facebook
-    %meta{:property => "og:title", :content => "#{@article.title}"}
     %meta{:property => "og:type", :content => "article"}
     %meta{:property => "og:url", :content => "#{@permalink}"}
-    %meta{:property => "og:image", :content => ""}
-    %meta{:property => "og:description", :content => "#{@article.description}"}
-    %meta{:property => "og:site_name", :content => "#{@settings.site_name}"}
+    - unless @article.title.blank?
+      %meta{:property => "og:title", :content => "#{@article.title}"}
+    - unless @article.image_url.blank?
+      %meta{:property => "og:image", :content => "#{@article.image_url}"}
+    - unless @article.description.blank?
+      %meta{:property => "og:description", :content => "#{@article.description}"}
+    - unless @settings.site_name.blank?
+      %meta{:property => "og:site_name", :content => "#{@settings.site_name}"}
+    - unless @settings.facebook_admin_id.blank?
+      %meta{:property => "fb:admins", :content => "#{@settings.facebook_admin_id}"}
     = stylesheet_link_tag :application
     = javascript_include_tag :application
     = csrf_meta_tags
     %title
       = @article.title
+    = render 'shared/google_analytics'
   %body.articles
     .container
       .logo.sixteen.columns

data/app/views/website_builder_engine/offerpages/_form.html.haml

@@ -18,6 +18,9 @@
   .field
     = f.label :keywords
     = f.text_area :keywords
+  .field
+    = f.label :image_url
+    = f.text_field :image_url
   .field
     = f.label :headline
     = f.text_area :headline

data/app/views/website_builder_engine/offerpages/template.html.haml

@@ -6,17 +6,24 @@
     %meta{:name=>'description', :content=>"#{@offerpage.description}"}
     %meta{:name=>'keywords', :content=>"#{@offerpage.keywords}"}
     -# meta tags for the Open Graph protocol for Facebook
-    %meta{:property => "og:title", :content => "#{@offerpage.title}"}
     %meta{:property => "og:type", :content => "product"}
     %meta{:property => "og:url", :content => "#{@permalink}"}
-    %meta{:property => "og:image", :content => ""}
-    %meta{:property => "og:description", :content => "#{@offerpage.description}"}
-    %meta{:property => "og:site_name", :content => "#{@settings.site_name}"}
+    - unless @offerpage.title.blank?
+      %meta{:property => "og:title", :content => "#{@offerpage.title}"}
+    - unless @offerpage.image_url.blank?
+      %meta{:property => "og:image", :content => "#{@offerpage.image_url}"}
+    - unless @offerpage.description.blank?
+      %meta{:property => "og:description", :content => "#{@offerpage.description}"}
+    - unless @settings.site_name.blank?
+      %meta{:property => "og:site_name", :content => "#{@settings.site_name}"}
+    - unless @settings.facebook_admin_id.blank?
+      %meta{:property => "fb:admins", :content => "#{@settings.facebook_admin_id}"}
     = stylesheet_link_tag :application
     = javascript_include_tag :application
     = csrf_meta_tags
     %title
       = @offerpage.title
+    = render 'shared/google_analytics'
   %body.offerpages
     .container
       .logo.sixteen.columns

data/app/views/website_builder_engine/settings/_form.html.haml

@@ -22,8 +22,8 @@
     = f.label :site_keywords
     = f.text_field :site_keywords
   .field
-    = f.label :twitter_account
-    = f.text_field :twitter_account
+    = f.label :site_image_url
+    = f.text_field :site_image_url
   .field
     = f.label :domain
     = f.text_field :domain
@@ -36,5 +36,17 @@
   .field
     = f.label :sidebar
     = f.text_area :sidebar
+  .field
+    = f.label :introduction
+    = f.text_area :introduction
+  .field
+    = f.label :google_analytics_id
+    = f.text_field :google_analytics_id
+  .field
+    = f.label :twitter_account
+    = f.text_field :twitter_account
+  .field
+    = f.label :facebook_admin_id
+    = f.text_field :facebook_admin_id
   .actions
     = f.submit 'Save'

data/app/views/website_builder_engine/welcome/template.html.haml

@@ -6,40 +6,45 @@
     %meta{:name=>'description', :content=>"#{@settings.site_description}"}
     %meta{:name=>'keywords', :content=>"#{@settings.site_keywords}"}
     -# meta tags for the Open Graph protocol for Facebook
-    %meta{:property => "og:title", :content => "#{@settings.site_title}"}
-    %meta{:property => "og:type", :content => "article"}
+    %meta{:property => "og:type", :content => "website"}
     %meta{:property => "og:url", :content => "#{@permalink}"}
-    %meta{:property => "og:image", :content => ""}
-    %meta{:property => "og:description", :content => "#{@settings.site_description}"}
-    %meta{:property => "og:site_name", :content => "#{@settings.site_name}"}
+    - unless @settings.site_title.blank?
+      %meta{:property => "og:title", :content => "#{@settings.site_title}"}
+    - unless @settings.site_image_url.blank?
+      %meta{:property => "og:image", :content => "#{@settings.site_image_url}"}
+    - unless @settings.site_description.blank?
+      %meta{:property => "og:description", :content => "#{@settings.site_description}"}
+    - unless @settings.site_name.blank?
+      %meta{:property => "og:site_name", :content => "#{@settings.site_name}"}
+    - unless @settings.facebook_admin_id.blank?
+      %meta{:property => "fb:admins", :content => "#{@settings.facebook_admin_id}"}
     = stylesheet_link_tag :application
     = javascript_include_tag :application
     = csrf_meta_tags
     %title
       = @settings.site_title
+    = render 'shared/google_analytics'
   %body.welcome
     .container
       .logo.sixteen.columns
-        .sitename
+        %h1.sitename
           = link_to @settings.site_name, '/index.html'
         .tagline
           = @settings.site_tagline
       %hr/
       %article.twelve.columns
-        %header
-          %h1
-            = @settings.site_title
         #main{:role => "main"}
-          %ul
-            - if @articles.empty?
-              %li
-                none
-            - else
+          #fb-root
+            %fb:like{:action => "recommend", :send => "true", :show_faces => "false", :width => "450"}
+          - unless @welcome_intro.blank?
+            %h2 Introduction
+            = @welcome_intro
+          - unless @articles.empty?
+            %h2 Articles
+            %ul
               - @articles.each do |article|
                 %li
                   = link_to article.title, "#{@url_path + article.filename}.html"
-        #fb-root
-          %fb:like{:action => "recommend", :send => "true", :show_faces => "false", :width => "450"}
       %aside.four.columns
         %section
           %h1

data/spec/dummy/app/assets/stylesheets/application.css

@@ -2,6 +2,32 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require website_builder_engine/base
+ *= require website_builder_engine/layout
+ *= require website_builder_engine/normalize
+ *= require website_builder_engine/scaffolds
+ *= require website_builder_engine/skeleton
+ *= require_tree .
  *= require_self
- *= require_tree . 
-*/
+*/
+header nav ul {
+  list-style: none;
+  margin: 0 0 2em;
+  padding: 0;
+}
+header nav ul li {
+  display: inline;
+}
+#flash_notice, #flash_alert {
+  padding: 5px 8px;
+  margin: 10px 0;
+}
+#flash_notice {
+  background-color: #CFC;
+  border: solid 1px #6C6;
+}
+#flash_alert {
+  background-color: #FCC;
+  border: solid 1px #C66;
+}
+

data/spec/dummy/app/assets/stylesheets/articles.css.scss

@@ -0,0 +1,87 @@
+// Place all the styles related to the Articles controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+body.articles {
+  .container {
+    background: #fff;
+    font: 14px/21px Georgia, Times, serif;
+    color: #555;
+    
+    .logo {
+      margin-top:30px;
+      margin-bottom:0px;
+      .sitename{float:left;text-transform: lowercase;}
+      .sitename a{color:#cc0000; text-decoration:none;}
+      .sitename a:hover{color:#cc0000;}
+      .tagline{text-transform: lowercase;}
+      .tagline:before{content:" :";}
+    }
+  
+    article {
+      h1, h2, h3, h4, h5, h6, p {
+        font-family: inherit;
+        color: inherit;
+      }
+      h1 {
+        font-size: 28px;
+        padding-bottom: 5px;
+        line-height: 1em;
+      }
+      h2 {
+        font-size: 20px;
+        line-height: 30px;
+      }
+      h3 {
+        font-size: 16px;
+        line-height: 30px;
+      }
+      blockquote {
+        font-size: inherit;
+        line-height: inherit;
+        margin: 1.5em;
+        padding: 0;
+        border-left: none;
+        p {
+          font-size: inherit;
+          line-height: inherit;
+          color: #666;
+          font-style: italic;
+        }
+      }
+    }
+    
+    aside {
+      section {
+        h1, h2, h3, h4, h5, h6, p {
+          font-family: inherit;
+          color: inherit;
+        }
+        h1 {
+          color: #444;
+          border-bottom: 1px solid #ccc;
+          font-size: 14px;
+          padding-bottom: 5px;
+          line-height: 30px;
+        }
+        ul {
+          font-family: inherit;
+          color: inherit;
+          font-size: inherit;
+          line-height: inherit;
+          margin: 0;
+          padding: 15px;
+          li {
+            a {
+              text-decoration: none;
+              color: #cc0000;
+            }
+            a:hover {
+              background-color: #000;
+            }
+          }
+        }
+      }
+    }
+    
+  }
+}