fullstack-cms 0.2.21 → 0.2.22

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "http://rubygems.org"
 
-gem "fullstack-admin", '~> 0.1.46'
+gem "fullstack-admin", '~> 0.1.47'
 
 gem "ars-permalink"
 gem "has-attached", '~> 0.2.3'

data/Gemfile.lock

@@ -83,7 +83,7 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
-    devise-i18n (0.5.6)
+    devise-i18n (0.5.7)
     devise-i18n-views (0.2.2)
     erubis (2.7.0)
     execjs (1.4.0)
@@ -99,7 +99,7 @@ GEM
       formtastic (~> 2.2)
       formtastic-bootstrap
     friendly_id (4.0.8)
-    fullstack (0.1.25)
+    fullstack (0.1.26)
       active_record_schema
       auto_strip_attributes
       checkin
@@ -111,7 +111,7 @@ GEM
       has_partial
       htmlentities
       jquery-rails
-      kaminari
+      kaminari (= 0.13.0)
       kaminari-i18n
       meta-tags-helpers
       mobile-fu (~> 1.1.0)
@@ -126,7 +126,7 @@ GEM
       remotipart
       resource-presentation-helpers
       squeel
-    fullstack-admin (0.1.46)
+    fullstack-admin (0.1.47)
       bootstrap-datepicker-rails
       bootstrap-helpers
       bootstrap-wysihtml5-rails
@@ -134,7 +134,7 @@ GEM
       ckeditor
       facebox-rails
       formtastic-bootstrap
-      fullstack (~> 0.1.25)
+      fullstack (~> 0.1.26)
       less-rails-bootstrap
       meta_search
       plupload-rails
@@ -165,9 +165,10 @@ GEM
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.4)
-    kaminari (0.14.1)
+    kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     kaminari-i18n (0.1.3)
       rails
     less (2.2.2)
@@ -289,7 +290,7 @@ DEPENDENCIES
   ars-permalink
   awesome_nested_set
   bluecloth
-  fullstack-admin (~> 0.1.46)
+  fullstack-admin (~> 0.1.47)
   has-attached (~> 0.2.3)
   jeweler
   rails_i18n_gettext

data/VERSION

@@ -1 +1 @@
-0.2.21
+0.2.22

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.2.21"
+  s.version = "0.2.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-09-15"
+  s.date = "2012-09-17"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -102,7 +102,18 @@ Gem::Specification.new do |s|
     "lib/generators/fullstack/cms/templates/rails/app/views/site/_map.html.erb",
     "lib/generators/fullstack/cms/templates/rails/app/views/site/_nav.html.erb",
     "lib/generators/fullstack/cms/templates/rails/app/views/site/_share_buttons_big.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/blog.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/contacts.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/dish.html.erb",
     "lib/generators/fullstack/cms/templates/rails/app/views/site/site/home.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/line.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/post.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/product.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/recipe.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/recipes.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/sales_channel.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/text.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/site/site/video.html.erb",
     "lib/generators/fullstack/cms/templates/rails/config/fullstack.rb",
     "lib/generators/fullstack/cms/templates/rails/config/initializers/ckeditor_controller.rb",
     "lib/generators/fullstack/cms/templates/rails/config/initializers/devise_controller.rb",
@@ -135,7 +146,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.1.46"])
+      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.1.47"])
       s.add_runtime_dependency(%q<ars-permalink>, [">= 0"])
       s.add_runtime_dependency(%q<has-attached>, ["~> 0.2.3"])
       s.add_runtime_dependency(%q<acts-as-taggable-on>, [">= 0"])
@@ -148,7 +159,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<fullstack-admin>, ["~> 0.1.46"])
+      s.add_dependency(%q<fullstack-admin>, ["~> 0.1.47"])
       s.add_dependency(%q<ars-permalink>, [">= 0"])
       s.add_dependency(%q<has-attached>, ["~> 0.2.3"])
       s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
@@ -162,7 +173,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fullstack-admin>, ["~> 0.1.46"])
+    s.add_dependency(%q<fullstack-admin>, ["~> 0.1.47"])
     s.add_dependency(%q<ars-permalink>, [">= 0"])
     s.add_dependency(%q<has-attached>, ["~> 0.2.3"])
     s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])

data/lib/generators/fullstack/cms/install_generator.rb

@@ -7,6 +7,7 @@ module Fullstack
       class_option :user, :default => "ror"
       class_option :title, :default => "title"
       class_option :slogan, :default => "slogan"
+      class_option :localize, :type => :boolean, :default => true
       
       def install_fullstack_admin
           generate "fullstack:admin:install  --host='#{host}' --user='#{user}'  --title='#{title}' --slogan='#{slogan}'"
@@ -35,6 +36,7 @@ module Fullstack
       def assets
         append_to_file "config/assets.yml" do
 <<-eos
+
 - site/site.css
 - site/site.js          
 eos
@@ -60,6 +62,20 @@ eos
         '''
       end
       
+      def set_localization
+        if !localize
+          inject_into_file "config/fullstack.rb", :after => "Fullstack::Cms.configure do |config|" do
+%q{
+  
+  config.localized = false
+
+}            
+          end 
+
+
+        end
+      end
+      
       def install_migrations
         generate "migration:from link menu page_part page redirect setting attachment photo text_page_part text_with_title_page_part"
       end
@@ -77,6 +93,10 @@ eos
       def domain
         host
       end
+      
+      def localize
+        options[:localize]
+      end
     
       def user
          options[:user]

data/lib/generators/fullstack/cms/templates/rails/app/controllers/site/site_controller.rb

@@ -2,12 +2,56 @@ class Site::SiteController < ApplicationController
   include Pageable
   rescue_from ActiveRecord::RecordNotFound, :with => :render_404
   authorize :scope => "site", :resourceful => false
+  prepend_before_filter(:set_locale) if Fullstack::Cms.localized?
+    
+  # =========
+  # = Pages =
+  # =========
   
   page :home, "/" do
-    
   end
   
+  # ===========
+  # = Helpers =
+  # ===========
+  
+  helper_method :current_locale
+  
+  protected
+  
+  def current_locale
+    I18n.locale.to_s
+  end
+  
+  # ===================
+  # = Private Methods =
+  # ===================
+  
   private
+  
+  def set_locale
+    I18n.locale = "#{params[:locale]}".to_sym if params[:locale]
+    render_404 if I18n.locale.nil? || !I18n.available_locales.include?(I18n.locale.to_sym)      
+  end
+  
+  def instantiate_resource_by_slug!(resource)
+    res = resource.find_by_slug!(params[:slug])
+    instance_variable_set("@#{resource.name.underscore}", res)
+    @object = res
+    res
+  end
+  
+  alias :resource_by_slug! :instantiate_resource_by_slug!
+  
+  def instantiate_resource_by_slug_and_locale!(resource)
+    res = resource.find_by_slug_and_locale!(params[:slug], current_locale)
+    instance_variable_set("@#{resource.name.underscore}", res)
+    @object = res
+    res
+  end
+
+  alias :resource_by_slug_and_locale! :instantiate_resource_by_slug_and_locale!
+  
   def render_404
     render :file => Rails.root.join("public", "404.html"), :layout => false, :status => :not_found
   end

data/lib/generators/fullstack/cms/templates/rails/app/views/layouts/application.html.erb

@@ -2,24 +2,40 @@
 <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
 <!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
 <!--[if IE 8]>    <html class="no-js lt-ie9" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="it"> <!--<![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="<%= I18n.locale %>"> <!--<![endif]-->
 <%= render :partial => "site/head" %>
-<body>
+<body<%= home_page? ? ' class="home"' : '' %>>
     <!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]-->
     <div id="fb-root">
     </div>
+    
+
+    <%= render :partial => "site/nav" %>
+    
     <header class="container header">
       <%= render :partial => "site/header" %>
     </header>
     <div class="container">
-      <div class="main<%= home? ? ' home' : '' %>" role="main">
+      <div class="main<%= home_page? ? ' home' : '' %>" role="main">
         <%= yield %>
       </div>
       
     </div>
-    <footer class="container footer">
-      <%= render :partial => "site/footer" %>
-    </footer>
+    
+    <% if content_for? :prefooter %>
+    <div class="prefooter-wrapper">
+      <div class="container">
+        <%= yield :prefooter %>
+      </div>
+    </div>
+    <% end %>
+    
+    <div class="footer-wrapper">
+      <div class="container">
+        <%= render :partial => "site/footer" %>
+      </div>
+      
+    </div>
     
     <%= render :partial => "site/javascripts" %>
     <%= render :partial => "site/google_analytics" %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/_footer.html.erb

@@ -1,10 +1,20 @@
 <footer class="footer">
-  <address>
-    <strong><%= setting(:title) %></strong>
-    <p><%= simple_format setting("contacts/address") %></p>
-    <p><%= link_to setting("contacts/email"), "mailto:#{setting("contacts/email")}"%><br/>
-      <%= setting("contacts/phone") %>
-    </p>
+ <%= row do %>
+   <%= span(6) do %>
+      <div class="footer-logo">
+        <%= image_tag "/img/logo-footer.png" %>
+      </div>
+   <% end %>
+   <%= span(6) do %>
+     <address>
+       <strong><%= setting(:title).try(:titleize) %></strong>
+       <p><%= simple_format setting("contacts/address") %></p>
+       <p><%= link_to setting("contacts/email"), "mailto:#{setting("contacts/email")}"%><br/>
+         <%= setting("contacts/phone") %>
+       </p>
 
-  </address>
+     </address>
+     
+   <% end %>
+ <% end %>
 </footer>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/_head.html.erb

@@ -4,16 +4,34 @@
   <% else %>
     <% 
       site_title       = get_setting(:title, Settings.app.title)
+      site_slogan      = get_setting(:slogan, Settings.app.slogan)
       site_description = get_setting(:description, Settings.app.slogan)
      %>
    
-    <% if home? %>
+    <% if home_page? %>
       <%= meta_tags(
           :title => "#{site_title} - #{site_slogan}",
           :description => site_description,
           :og => {:type => "website"}
           ) 
       %>
+    <% elsif @object %>
+       <%= meta_tags(
+         :title => "#{meta_title || title_for(@object)} | #{site_title}",
+         :description => meta_description || description_for(@object),
+         :og => {:image => (meta_image || image_for(@object)), :type => (meta_type || "article")}
+         )
+       %>
+
+      
+    <% elsif current_page %>
+       <%= meta_tags(
+         :title => "#{meta_title || current_page.title} | #{site_title}",
+         :description => (meta_description || current_page.description) ?  (meta_description || current_page.description) : nil,
+         :og => {:image => meta_image, :type => (meta_type || "article")}
+         )
+       %>
+    
     <% elsif meta_title %>
       <%= meta_tags(
         :title => "#{meta_title} | #{site_title}",
@@ -24,7 +42,7 @@
     <% end %>
   <% end %>
 
- 
+ <link rel="shortcut icon" href="/favicon.ico?v=2" />
   <%= stylesheet_link_tag 'site/site' %>
   <%= yield :stylesheets %>
   

data/lib/generators/fullstack/cms/templates/rails/app/views/site/_header.html.erb

@@ -1,15 +1,12 @@
-      <div class="row">
-        <div class="span12">
-          <div id="logo">
-            <h1>
-              <a href="/"><%= get_setting(:site_title, Settings.app.title) %></a>
-            </h1>
-          </div>
-        </div>      
-      </div> 
-      
-      <div class="row">
-        <div class="span12">
-          <%= render :partial => "site/nav" %>
-        </div>
-      </div>
+<div class="row">
+  <div class="span12">
+    
+    <div id="logo">
+      <h1>
+        <a href="/" rel="home" class="clearfix main-logo"><%= image_tag "/img/logo.png", :title => get_setting(:title, Settings.app.title) %></a>
+      </h1>
+    </div>  
+    <div class="tagline"><%= get_setting(:slogan, Settings.app.slogan) %></div>
+   
+  </div>
+</div>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/_javascripts.html.erb

@@ -8,7 +8,7 @@
     var js, fjs = d.getElementsByTagName(s)[0];
     if (d.getElementById(id)) return;
     js = d.createElement(s); js.id = id;
-    js.src = "//connect.facebook.net/it_IT/all.js#xfbml=1&appId=<%= get_setting(:facebook_app_id) %>";
+    js.src = "//connect.facebook.net/it_IT/all.js#xfbml=1&appId=<%= get_setting(:facebook_app_id, :locale => false) %>";
     fjs.parentNode.insertBefore(js, fjs);
   }(document, 'script', 'facebook-jssdk'));</script>
 

data/lib/generators/fullstack/cms/templates/rails/app/views/site/_nav.html.erb

@@ -1,15 +1,17 @@
-<nav>
-   <ul class="nav nav-top nav-pills">
-     <%= nav_items_for("main_menu") %>
-     <% if subject.logged_in? %>
-       <%= dropdown_nav_item _("Account"), :icon => "user" do %>
-          <% if subject.administrator? %>
-          <%= nav_item _("Admin"), "/admin", :icon => "lock" %>
-          <% end %>
-          <%= nav_item _('Logout'), destroy_user_session_path, :method => :delete %>
-       <% end %>
-     <% else %>
-         <%= nav_item _("Accedi"), new_user_session_path, :icon => "user" %>
-     <% end %>
-   </ul>
-</nav>
+<div class="navbar navbar-centered">
+  <div class="navbar-inner">
+    <div class="container">
+
+      <nav class=" main-menu">
+         <ul class="nav nav-top nav-pills">
+           <%= nav_item t("site.home", :default => "Home"), (Fullstack::Cms.localized? ? [:site, :home, I18n.locale] : "/") %>
+           <%= menu("main", :wrap => false) %>
+         </ul>
+      </nav>
+
+    </div>
+  </div>
+</div>
+
+
+ 

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/blog.html.erb

@@ -0,0 +1,51 @@
+<%= row do %>
+  <%= span(12) do %>
+      <section>
+        <h1 class="section-title">
+          <%= current_page.title %>
+        </h1>
+      </section>
+  <% end %>
+<% end %>
+
+
+<%= row do %>
+  
+ <%= span(12) do %>
+   
+   
+ <% if @posts.any? %>
+   <ul class="unstyled index">
+           <% @posts.each do |post| %>
+  
+             <li id="<%= post.slug %>" class="index-item">
+                 <%= index_item(
+                 :title => post.title,
+                 :pubdate => post.created_at,
+                 :excerpt => post.excerpt, 
+                 :link_url => page_path_for(post), 
+                 :link_label => t('continue_reading', :scope => 'site', :default => "Continue Reading"), 
+                 :image => post.image.url) %>
+             </li>
+  
+           <% end %>
+   </ul>
+   <% end %>
+   
+   
+ <% end %>
+  
+  
+  
+  
+  
+<% end %>
+
+<%= row do %>
+<%= span(12) do %>
+    <%= paginate(@posts) %>
+    
+  <% end %>
+<% end %>
+
+

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/contacts.html.erb

@@ -0,0 +1,42 @@
+<%= row do %>
+  <%= span(12) do %>
+  <section>
+    <div class="section-title">
+      <%= t('site.contacts', :default => "Contacts") %>
+    </div>
+  </section>
+  <% end %>
+<% end %>
+
+<%= row do %>
+<%= span(5) do %>
+<% unless params[:success] %>
+
+     <%= semantic_form_for(Contact.new(:locale => I18n.locale), :url => { :controller => "site/site", :action => "contact" }, :builder => FormtasticBootstrap::FormBuilder) do |f| %>
+     
+     <%= f.input :locale, :as => :hidden %>
+         <%= f.inputs do %>
+            <%= f.input :first_name, :input_html => {:class => "span5"} %>
+            <%= f.input :second_name, :input_html => {:class => "span5"} %>
+            <%= f.input :email, :input_html => {:class => "span5"} %>
+            <%= f.input :text, :input_html => {:class => "span5"} %>
+            <%= f.input :agreed_to_privacy %>           
+         <% end %>
+         <div>
+             <input name="commit" type="submit" value="<%= t("send", :scope => :site, :default => "Send") %>" class="contact-submit">
+         </div>
+     
+     <% end %>
+<% else %>
+  <div class="alert">
+    <%= t("contacts.success", :default => "") %>
+  </div>
+<% end %>
+  <% end %>
+  
+  <%= span(7) do %>
+    <%= part("embed", :schema => :text) do |p| %>
+        <%= raw p.text %>
+    <% end %>
+  <% end %>
+<% end %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/dish.html.erb

@@ -0,0 +1,38 @@
+<%= row do %>
+  <%= span(12) do %>
+      <section>
+        <h1 class="section-title">
+          <%= @dish.title %>
+        </h1>
+      </section>
+  <% end %>
+<% end %>
+
+
+<%= row do %>
+  
+ <%= span(12) do %>
+   
+   
+ <% if @dish.recipes.any? %>
+   <ul class="unstyled index">
+           <% @dish.recipes.order(:title).each do |recipe| %>
+  
+             <li id="<%= recipe.slug %>" class="index-item">
+                 <%= index_item(
+                 :title => recipe.title,
+                 :excerpt => recipe.excerpt, 
+                 :link_url => page_path_for(recipe),
+                 :time => recipe.time,
+                 :difficulty => recipe.difficulty,
+                 :link_label => t('continue_reading', :scope => 'site', :default => "Continue Reading"), 
+                 :image => recipe.image.url) %>
+             </li>
+  
+           <% end %>
+   </ul>
+   <% end %>
+   
+   
+ <% end %>
+<% end %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/home.html.erb

@@ -1 +1,133 @@
-<h1 class="page-header">Homepage</h1>
+<section class="section section-home-channels">
+<%= row do %>
+
+  <%= span(4) do %>
+    <%= part("sales_channel_1", :schema => 'channel_frame') do  |part| %>
+    
+    
+              <%= channel_frame :image => part.image.url,
+                :can => part.can.url,
+                :title => part.title,
+                :excerpt => part.excerpt,
+                :link_label => part.link.try(:label),
+                :link_url => menu_link_url(part.link)
+                %>
+    
+    
+    
+    <% end %>
+  <% end %>
+  
+  <%= span(4) do %>  
+    <%= part("sales_channel_2", :schema => 'channel_frame') do  |part| %>
+    
+    
+            <%= channel_frame :image => part.image.url,
+              :can => part.can.url,
+              :title => part.title,
+              :excerpt => part.excerpt,
+              :link_label => part.link.try(:label),
+              :link_url => menu_link_url(part.link)
+              %>
+    
+    <% end %>
+  <% end %>
+
+    <%= span(4) do %>
+      <%= part("sales_channel_3", :schema => 'channel_frame') do  |part| %>
+    
+    
+          <%= channel_frame :image => part.image.url,
+            :can => part.can.url,
+            :title => part.title,
+            :excerpt => part.excerpt,
+            :link_label => part.link.try(:label),
+            :link_url => menu_link_url(part.link)
+            %>
+    
+      <% end %>
+    <% end %>
+
+<% end %>  
+</section>
+
+<section class="section section-home-description">
+<%= row do %>
+
+<%= part("quote", :schema => 'quote') do |part| %>
+  <%= span(2) do %>
+      <%= image_tag part.image.url %>    
+  <% end %>
+  <%= span(10) do %>
+      <%= part.excerpt %> &nbsp; 
+      <%= link_to part.link.try(:label), menu_link_url(part.link), :class => "btn btn-go" %>   
+  <% end %>
+<% end %>
+
+
+
+<% end %>
+</section>
+
+<section class="section section-home-bottom">
+  
+<%= row do %>
+
+<%= span(4) do %>  
+  <%= part("index_box_1", :schema => :index_box) do |part| %>
+  <%= index_box(:images => part.photos.map {|p| p.url(:box)}, 
+    :title => part.title, 
+    :excerpt => part.excerpt, 
+    :link_label => part.link.try(:label), 
+    :link_url =>  menu_link_url(part.link), :video => part.video) %>
+
+  <% end %>
+<% end %>
+
+<%= span(4) do %>  
+  <%= part("index_box_2", :schema => :index_box) do |part| %>
+  <%= index_box(:images => (part.photos || []).map {|p| p.url(:box)}, 
+    :title => part.title, 
+    :excerpt => part.excerpt, 
+    :link_label => part.link.try(:label), 
+    :link_url =>  menu_link_url(part.link), :video => part.video) %>
+
+  <% end %>
+<% end %>
+
+<%= span(4) do %>  
+  <%= part("index_box_3", :schema => :index_box) do |part| %>
+  <%= index_box(:images => (part.photos || []).map {|p| p.url(:box)}, 
+    :title => part.title, 
+    :excerpt => part.excerpt, 
+    :link_label => part.link.try(:label), 
+    :link_url => menu_link_url(part.link), :video => part.video) %>
+
+  <% end %>
+<% end %>
+
+
+
+
+<% end %>
+</section>
+
+
+<% content_for :prefooter do -%>
+  
+<% 
+social_links = (links("social") || []).to(3) 
+%>  
+
+<% if social_links.any? %>
+  <% colspan = (12 / social_links.size) %>
+  <%= row do %>
+    <% social_links.each do |link| %>
+    <%= span(colspan) do %>
+        <%= link_to image_tag(link.icon.url(:i48)), menu_link_url(link), :rel => "tooltip", :title => link.label %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<% end %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/line.html.erb

@@ -0,0 +1,51 @@
+<%= row do %>
+  <%= span(12) do %>
+      <section>
+        <h1 class="section-title">
+          <%= @line.title %>
+        </h1>
+      </section>
+      
+      <% if @line.products.any? %>
+      
+      <section class="clearfix shelf-wrapper" data-offset-top="20">
+        <div class="shelf">
+          <ul class="hl clearfix">
+            <% @line.products.order('position').each do |product| %>
+              <li class="can">
+                <%= link_to "##{product.slug}", :title => product.title, :rel => 'tooltip' do %>
+                  <%= image_tag product.can.url %>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+          
+        </div>
+        
+      </section>
+      
+      <% end %>
+      <section>
+        <div>
+          <%= raw @line.text %>
+        </div>
+      </section>
+  <% end %>
+<% end %>
+
+<% if @line.products.any? %>
+<ul class="unstyled index">
+        <% @line.products.order('position').each do |product| %>
+  
+          <li id="<%= product.slug %>" class="index-item">
+              <%= index_item(
+              :title => product.title,
+              :excerpt => product.excerpt, 
+              :link_url => page_path_for(product), 
+              :link_label => t('continue_reading', :scope => 'site', :default => "Continue Reading"), 
+              :image => product.index_photo.url) %>
+          </li>
+  
+        <% end %>
+</ul>
+<% end %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/post.html.erb

@@ -0,0 +1,20 @@
+<%= row do %>
+<%= span(3) do %>
+<div class="mb1">
+  <%= image_tag @post.image %>
+</div>
+<div class="clearfix">
+  <%= render :partial => "site/share_buttons_big" %>
+</div>
+<% end %>
+ <%= span(9) do %>
+      <h1>
+        <%= @post.title %>
+      </h1>
+    <section>
+      <%= l(@post.created_at, :format => :pubdate) %>
+    </section>
+
+ <%= raw @post.text %>
+ <% end %>
+<% end %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/product.html.erb

@@ -0,0 +1,56 @@
+<%= row do %>
+<%= span(12) do %>
+    <section>
+      <h1 class="section-title">
+        <%= @product.title %>
+      </h1>
+    </section> 
+  <% end %>
+<% end %>
+<%= row do %>
+  <%= span(4) do %>
+    <section>
+    <%= image_tag @product.photo.url %>
+    </section>
+    <h3><%= t(:other_products, :scope => "site", :default => "Other products") %></h3>
+    <ul class="thumbnails">
+      <% (@product.line.products - [@product]).each do |product| %>
+          <li>
+            <%= link_to page_url_for(product), :title => product.title, :rel => 'tooltip', :class => "thumbnail" do %>
+            <%= image_tag product.index_photo.url(:icon), :height => "60", :width => "60" %>
+            <% end %>
+          </li>
+                  
+      <% end %>
+      
+    </ul>
+  <% end %>
+  <%= span(8) do %>
+      <section>
+        <div>
+          <%= raw @product.text %>
+        </div>
+      </section>
+      <section>
+        <h3><%= t(:recipes_with, :scope => "site", :default => "Recipes with") %> <%= @product.title %></h3>
+        <% @product.recipes.in_groups_of(4, false).each do |recipes| %>
+          <section>
+            <%= row do %>
+          
+              <% recipes.each do |recipe| %>
+                  <%= span(4) do %>
+                  <%= link_to page_url_for(recipe), :title => recipe.title, :rel => 'tooltip', :class => "image-link" do %>
+                    <%= image_tag recipe.image.url(:thumb) %>
+                  <% end %>
+                  <% end %>
+              <% end %>
+              
+            <% end %>
+            
+          </section>
+
+        <% end %>
+        
+      </section>
+  <% end %>
+<% end %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/recipe.html.erb

@@ -0,0 +1,37 @@
+<%= row do %>
+  <%= span(12) do %>
+      <section  class="section-title">
+          <%= current_page.title %>
+      
+      </section>
+  <% end %>
+<% end %>
+
+<%= row do %>
+<%= span(3) do %>
+<div class="mb1">
+  <%= image_tag @recipe.image %>
+</div>
+<div class="clearfix">
+  <%= render :partial => "site/share_buttons_big" %>
+</div>
+<% end %>
+ <%= span(9) do %>
+      <h1>
+        <%= @recipe.title %>
+      </h1>
+      <div class="mb1">
+       <ul class="unstyled">
+         <li>
+           <i class="icon icon-time"></i> <%= t("time", :scope => "site", :default => "Time") %>: <%= @recipe.time %> <%= t("site.mins", :default => "mins." ) %>
+        </li>
+        <li>
+          <i class="icon icon-star"></i> <%= t("difficulty", :scope => "site", :default => "Difficulty") %>: <%= @recipe.difficulty %>
+        </li>
+       </ul>
+        
+      </div>
+
+ <%= raw @recipe.text %>
+ <% end %>
+<% end %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/recipes.html.erb

@@ -0,0 +1,36 @@
+<%= row do %>
+  <%= span(12) do %>
+      <section>
+        <div class="section-title">
+          <%= current_page.title %>
+        </div>
+      </section>
+  <% end %>
+<% end %>
+
+
+<% @dishes.in_groups_of(3, false).each do |dishes|  %>
+        <section>
+          <%= row do %>
+
+    <% dishes.each do |dish| %>
+    
+
+            <%= span(4) do %>
+                <%= index_box(:images => [dish.image.url], 
+                    :title => dish.title, 
+                    :excerpt => dish.excerpt, 
+                    :link_label => dish.title, 
+                    :link_url =>  page_path_for(dish)) %>
+            <% end %>
+    
+    <% end %>
+
+          <% end %>
+        </section>
+
+<% end %>
+
+
+
+

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/sales_channel.html.erb

@@ -0,0 +1,41 @@
+<div class="mb1">
+  <%= row do %>
+    <%= span(12) do %>
+        <section>
+          <div class="section-title">
+            <%= @sales_channel.title %>
+          </div>
+        </section>
+        <section>
+          <div>
+            <%= raw @sales_channel.text %>
+          </div>
+        </section>
+    <% end %>
+  <% end %>
+  
+</div>
+
+<% @sales_channel.lines.in_groups_of(3, false).each do |lines|  %>
+        <section>
+          <%= row do %>
+
+    <% lines.each do |line| %>
+    
+
+            <%= span(4) do %>
+                <%= index_box(:images => [line.image.url], 
+                    :title => line.title, 
+                    :excerpt => line.excerpt, 
+                    :link_label => line.label, 
+                    :link_url =>  page_path_for(line)) %>
+            <% end %>
+    
+    <% end %>
+
+          <% end %>
+        </section>
+
+<% end %>
+
+

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/text.html.erb

@@ -0,0 +1,22 @@
+<%= row do %>
+  <%= span(4) do %>
+    <% @text.photos.each do |photo| %>
+    <%= link_to(photo.url, :rel => "facebox", :class => "thumbnail-vertical") do %>
+    <%= image_tag photo.url(:box), :class => :desaturate %>
+    <% end %>
+    <% end %>
+  <% end %>
+  <%= span(8) do %>
+      <section>
+        <div class="section-title">
+          <%= @text.section %>
+        </div>
+      </section>
+      <section>
+        <h1 class='title'><%= @text.title %></h1>
+        <div>
+          <%= raw @text.text %>
+        </div>
+      </section>
+  <% end %>
+<% end %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/site/video.html.erb

@@ -0,0 +1,3 @@
+<div class="video-thumbnail">
+  <iframe src='<%= video_embed(params[:url]) %>' width="600" height="400"></iframe>
+</div>

data/lib/generators/fullstack/cms/templates/rails/config/fullstack.rb

@@ -12,8 +12,6 @@ Fullstack::Cms.configure do |config|
     end
 
     admin.group :contents do |g|
-      g.resource :texts
-      g.resource :prices
     end
 
     admin.group :users do |g|
@@ -25,7 +23,7 @@ Fullstack::Cms.configure do |config|
   # = Linkables =
   # =============
 
-  config.linkables = %w(pages texts)
+  config.linkables = %w(pages)
   
   # =========
   # = Menus =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack-admin
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.46
+        version: 0.1.47
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.46
+        version: 0.1.47
 - !ruby/object:Gem::Dependency
   name: ars-permalink
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +296,18 @@ files:
 - lib/generators/fullstack/cms/templates/rails/app/views/site/_map.html.erb
 - lib/generators/fullstack/cms/templates/rails/app/views/site/_nav.html.erb
 - lib/generators/fullstack/cms/templates/rails/app/views/site/_share_buttons_big.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/blog.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/contacts.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/dish.html.erb
 - lib/generators/fullstack/cms/templates/rails/app/views/site/site/home.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/line.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/post.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/product.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/recipe.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/recipes.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/sales_channel.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/text.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/site/site/video.html.erb
 - lib/generators/fullstack/cms/templates/rails/config/fullstack.rb
 - lib/generators/fullstack/cms/templates/rails/config/initializers/ckeditor_controller.rb
 - lib/generators/fullstack/cms/templates/rails/config/initializers/devise_controller.rb
@@ -333,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1952764940348626948
+      hash: -2772436411612712480
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: