fullstack-cms 0.2.5 → 0.2.6

data/Gemfile

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

data/Gemfile.lock

@@ -20,7 +20,7 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    active_record_schema (0.5.12)
+    active_record_schema (0.5.13)
       rails
     activemodel (3.2.8)
       activesupport (= 3.2.8)
@@ -66,7 +66,7 @@ GEM
       railties (~> 3.0)
       thor (~> 0.14)
     chronic (0.6.7)
-    ckeditor (3.7.2)
+    ckeditor (3.7.3)
       mime-types
       orm_adapter
     cocaine (0.2.1)
@@ -126,7 +126,7 @@ GEM
       remotipart
       resource-presentation-helpers
       squeel
-    fullstack-admin (0.1.40)
+    fullstack-admin (0.1.42)
       bootstrap-datepicker-rails
       bootstrap-helpers
       bootstrap-wysihtml5-rails
@@ -165,10 +165,9 @@ GEM
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.4)
-    kaminari (0.13.0)
+    kaminari (0.14.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
     kaminari-i18n (0.1.3)
       rails
     less (2.2.1)
@@ -262,7 +261,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    squeel (1.0.9)
+    squeel (1.0.11)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
@@ -290,7 +289,7 @@ DEPENDENCIES
   ars-permalink
   awesome_nested_set
   bluecloth
-  fullstack-admin (~> 0.1.40)
+  fullstack-admin (~> 0.1.42)
   has-attached
   jeweler
   rails_i18n_gettext

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/app/controllers/admin/menus_controller.rb

@@ -2,8 +2,14 @@ class Admin::MenusController < Admin::BaseController
   respond_to :html, :js
   
   def index
-    @search = Menu.search(params[:search])
-    @menus = @search.page(params[:page] || 1)
+    @skip_filter = true
+    @menus = Menu.order(:uid)
+    
+    if Fullstack::Cms.localized?
+      @menus = @menus.where(:locale => params[:locale]) 
+      @locale = params[:locale]
+    end
+    
   end
 
   def new

data/app/controllers/admin/pages_controller.rb

@@ -2,7 +2,12 @@ class Admin::PagesController < Admin::BaseController
   respond_to :html, :js
   
   def index
-    @pages = Page.all
+    @pages = Page.order("created_at")
+    if Fullstack::Cms.localized?
+      @pages = @pages.where(:locale => params[:locale]) 
+      @locale = params[:locale]
+    end
+    
     @skip_filter = true
   end
 

data/app/controllers/admin/settings_controller.rb

@@ -4,6 +4,32 @@ class Admin::SettingsController < Admin::BaseController
   def index
     @skip_filter = true
     @settings = Setting.order("key")
+    
+    if Fullstack::Cms.localized?
+      @settings = @settings.where(:locale => params[:locale]) 
+      @locale = params[:locale]
+    end
+
+    @groups = {}
+  
+    @settings.each {|s|
+      @groups[s.group] ||= []
+      @groups[s.group] << s
+    }
+ 
+
+    @groups = @groups.to_a
+  
+    @groups.sort! do |g1, g2|    
+      if g1.first.to_s == "global"
+        -1
+      elsif g2.first.to_s == "global"
+        1
+      else  
+        g1.first.to_s <=> g2.first.to_s
+      end
+    end
+    
   end
 
   def new

data/app/helpers/menus_helper.rb

@@ -1,14 +1,55 @@
 module MenusHelper
+
+  def menu(uid, options = {}, &block)
+    options.reverse_merge({:locale => Fullstack::Cms.localized, :wrap => true})
+    locale = options.delete(:locale)
+    wrap   = options.delete(:wrap)
+    wrapper_options = options.delete(:wrapper_html) || {}
+    link_options = options.delete(:link_html) || {}
+      
+    menu = fetch_menu!(uid, locale)
+     
+    if wrap
+      content_tag :ul, wrapper_options, false do
+        menu_links_for(menu, link_options)
+      end
+    else
+      menu_links_for(menu, link_options)
+    end
+
+  end
+
+  def menu_link(link, options = {})
+    options.reverse_merge({:rel => link.nofollow ? "nofollow" : nil})
+    link_to(link.label, menu_link_url(link), options)
+  end
+  
+  def menu_link_url(link)
+    link.url.present? ? CGI::escape(link.url) : (link.linked ? page_path_for(link.linked) : "#")
+  end
+  
+  
+  # ======================
+  # = Deprecated Methods =
+  # ======================
+  
+  def link_url(link)
+    ActiveSupport::Deprecation.warn("This method is deprecated use 'menu_link_url(link)' instead")
+    menu_link_url(link)
+  end
   
   def find_or_create_menu(uid, locale = nil)
+    ActiveSupport::Deprecation.warn("This method is deprecated use 'menu(uid, :locale => locale_name)' instead")
     if locale
       Menu.find_or_create_by_uid_and_locale(uid, locale.to_s, :name => "#{uid}".gsub("-", "_").humanize)
     else
       Menu.find_or_create_by_uid(uid, :name => "#{uid}".gsub("-", "_").humanize)         
     end
   end
-  
+    
   def nav_items_for(uid,  locale = nil)
+    ActiveSupport::Deprecation.warn("This method is deprecated use 'menu(uid, :locale => locale_name, :wrap => false)' instead")
+
     menu = find_or_create_menu(uid, locale)
     html = ""
 
@@ -24,13 +65,38 @@ module MenusHelper
   end
   
   def render_menu(uid, options = nil, &block)
+    ActiveSupport::Deprecation.warn("This method is deprecated use 'menu(uid, :locale => locale_name)' instead")
     content_tag :ul, nav_items_for(uid, &block), options, false
-  end  
-  
-  
-  def link_url(link)
-    link.url.present? ? CGI::escape(link.url) : (link.linked ? page_path_for(link.linked) : "#")
   end
   
+  # ===================
+  # = Private Methods =
+  # ===================
+    
+  def menu_links_for(menu, link_options = {})
+
+    menu.links.each do |link|
+      unless block_given?
+        html << menu_link(link, link_options)      
+      else
+        html << yield(link)  
+      end
+    end
+    
+  end
   
+  def fetch_menu!(uid, locale)
+
+    query  = Menu.where(:uid => uid.to_s)
+    if locale
+      query = query.where(:locale => locale.to_s)
+    end
+    menu = query.first
+    raise "Menu '#{uid}' not found for locale '#{locale}'" if menu.nil?
+    
+    menu
+
+  end
+    
+    
 end

data/app/helpers/settings_helper.rb

@@ -2,7 +2,7 @@ module SettingsHelper
 
   # eg.
   # setting("blog/per_page", 20, :kind => :integer) 
-  def get_setting(namespaced_key, *args)
+  def setting(namespaced_key, *args)
     namespace_separator = "/"
     
     opts = args.extract_options!
@@ -10,10 +10,11 @@ module SettingsHelper
     namespaced_key = namespaced_key.to_s
     group, key =  namespaced_key.include?(namespace_separator) ? namespaced_key.split(namespace_separator) : [nil, namespaced_key]
     
-    Setting.global("#{key}", :autocreate => (opts[:autocreate].nil? ? true : opts[:autocreate]), :kind => opts[:kind], :default => value, :group => group, :options => opts[:options])
+    s = Setting.global("#{key}", :autocreate => false, :default => value, :group => group, :options => opts[:options], :locale => opts[:locale])
+   
   end
-  
-  alias :setting :get_setting
+    
+  alias :get_setting :setting
   
 end
 

data/app/models/menu.rb

@@ -1,14 +1,15 @@
 class Menu < ActiveRecord::Base
   include Uid
   include Localized if Fullstack::Cms.config.localize
-  
-  field :name, :string
 
   has_many :links, :as => :link_owner, :dependent => :delete_all, :order=>'position ASC'
   accepts_nested_attributes_for :links, :allow_destroy => true
-    
-  validates_presence_of :name
-  validates_presence_of :uid
+  
+  
+  alias_attribute :name, :uid
+  def name
+    I18n.t("fullstack.cms.menus.#{uid}", :default => uid.to_s.humanize)
+  end
   
   timestamps
 end

data/app/models/setting.rb

@@ -1,8 +1,13 @@
 class Setting < ActiveRecord::Base
+  
+  class SettingNotFound < StandardError
+  end
+  
   belongs_to :settable, :polymorphic => true
 
+  include Localized  
   validates_presence_of :key, :kind
-  validates :key, :uniqueness => {:scope => [:settable_id, :settable_type]}
+  validates :key, :uniqueness => {:scope => [:settable_id, :settable_type, :locale]}
 
   field :key
   index :key
@@ -45,16 +50,33 @@ class Setting < ActiveRecord::Base
   # eg. Setting.global("site-name")
 
   def self.global(key, opts = {})
-    autocreate = opts.delete(:autocreate)
-    kind = opts.delete(:kind) || :string
-    default = opts.delete(:default)
-    group = opts.delete(:group) || "global"
-    options = opts.delete(:options)
+    key = key.to_s
+    autocreate  = opts.delete(:autocreate)
+    kind        = opts.delete(:kind) || :string
+    default     = opts.delete(:default)
+    group       = (opts.delete(:group) || "global").to_s
+    options     = opts.delete(:options)
+    locale      = opts.delete(:locale).try(:to_s) 
     
-    s = autocreate ? self.find_or_create_by_key_and_settable_id(key.to_s, nil, :kind => kind, :"#{kind}_value" => default, :group => group, :options => options) : self.find_by_key_and_settable_id(key.to_s, nil)
-    if s
-      s.value || default
+    query = where(:key => key, :group => group, :settable_id => nil)
+    
+    if locale
+      query = query.where(:locale => locale)
     end
+        
+    setting = query.first ||  (  autocreate && create(
+                                    :key => key, 
+                                    :locale => locale, 
+                                    :kind => kind, 
+                                    :"#{kind}_value" => default, 
+                                    :group => group, 
+                                    :options => options
+                                  ) 
+                              )
+    
+    raise SettingNotFound.new("Setting `#{[group, key].join('/')}` not found for locale `#{locale || 'any'}`") if !setting
+    setting.value || default
+    
   end
 
   def self.update_global(key, value)

data/app/views/admin/menus/_collection.html.erb

@@ -0,0 +1,27 @@
+ <% if Fullstack::Cms.localized? %>
+ 
+           <%= nav :class => "nav-pills" do %>
+               
+               <%= content_tag :li, :class => (:active if @locale.blank?) do  %>
+                 <%= link_to t("fullstack.cms.commons", :default => "Commons"), request.path %> 
+               <% end %>
+
+               <% I18n.available_locales.each do |locale| %>
+                  <%= content_tag :li, :class => (:active if @locale == locale.to_s) do  %>
+                   <%= link_to t("locale_names.#{locale}", :default => "#{locale}".humanize), "?locale=#{locale}" %>
+                 <% end %>
+               <% end %>    
+           <% end %>
+ 
+<% end %>
+
+<table class="table table-bordered table-striped">
+  <tr><th><%= t('fullstack.admin.resources.menus', :default => "Menus") %></th><th><%= t('fullstack.admin.actions', :default => "Actions") %></th></tr>
+  <% @menus.each do |content| %>
+    <tr><td>
+      <%= content.name %>
+    </td>
+      <td><%= default_collection_actions_for(content) %></td>
+    </tr>
+  <% end %>
+</table>

data/app/views/admin/pages/_collection.html.erb

@@ -1,17 +1,26 @@
-<%= tabs do |t| %>
-  <% I18n.available_locales.each do |locale| %>
-    <%= t.pane t("locale_names.#{locale}", :default => "#{locale}".humanize) do %>
-  
-  
-      <ul class="nav">
-        <% Page.where(:locale => "#{locale}").roots.each do |root| %>
-        <% Page.each_with_level(root.self_and_descendants) do |page, level| %>
-        <%= nav_item page.name, edit_admin_page_path(page), :icon => (page.root? ? "home" : "file"), :style => "line-height: 36px; padding-left:#{20 * level}px" %>
-        <% end %>
-      <% end %>
-      </ul>
-  
+ <% if Fullstack::Cms.localized? %>
+ 
+           <%= nav :class => "nav-pills" do %>
+               
+               <%= content_tag :li, :class => (:active if @locale.blank?) do  %>
+                 <%= link_to t("fullstack.cms.commons", :default => "Commons"), request.path %> 
+               <% end %>
+
+               <% I18n.available_locales.each do |locale| %>
+                  <%= content_tag :li, :class => (:active if @locale == locale.to_s) do  %>
+                   <%= link_to t("locale_names.#{locale}", :default => "#{locale}".humanize), "?locale=#{locale}" %>
+                 <% end %>
+               <% end %>    
+           <% end %>
+ 
+<% end %>
+
   
-    <% end %>
+<ul class="nav">
+  <% @pages.roots.each do |root| %>
+  <% Page.each_with_level(root.self_and_descendants) do |page, level| %>
+  <%= nav_item page.name, edit_admin_page_path(page), :icon => (page.root? ? "home" : "file"), :style => "line-height: 36px; padding-left:#{20 * level}px" %>
   <% end %>
 <% end %>
+</ul>
+  

data/app/views/admin/settings/_collection.html.erb

@@ -1,39 +1,58 @@
 <% if Setting.any? %>
 
-<% 
+ <% if Fullstack::Cms.localized? %>
+ 
+           <%= nav :class => "nav-pills" do %>
+               
+               <%= content_tag :li, :class => (:active if @locale.blank?) do  %>
+                 <%= link_to t("fullstack.cms.commons", :default => "Commons"), request.path %> 
+               <% end %>
 
-  @groups = {}
-  
-  @settings.each {|s|
-    @groups[s.group] ||= []
-    @groups[s.group] << s
-  }
+               <% I18n.available_locales.each do |locale| %>
+                  <%= content_tag :li, :class => (:active if @locale == locale.to_s) do  %>
+                   <%= link_to t("locale_names.#{locale}", :default => "#{locale}".humanize), "?locale=#{locale}" %>
+                 <% end %>
+               <% end %>    
+           <% end %>
+ 
+<% end %>
  
-  @groups = @groups.to_a
+  <%= tabs :class => "tabs-left" do |t| %>
+
+      <% @groups.each do |g,settings| %>
+        <%= t.pane t(g, :scope => "fullstack.admin.groups", :default => g.to_s.humanize) do %>
+
+
+ <table class="table table-striped table-bordered">
+        <% settings.each do |stg| %>
+         
+              <tr>
+                <th style="width: 20%">
+                  <%= link_to t(stg.key, :scope => "helpers.label", :default => stg.key.to_s.humanize), [:edit, :admin, stg] %>
+                </th>
+                <td style="width: 10%">
+                  <%= locale ? t("locale_names.#{locale}", :default => "#{locale}".humanize) : "-" %>
+                </td>
+                <td>
+                  <% if stg.value %>
+                  <%= truncate stg.options[:markup] ? "#markup" : "#{stg.value}" %>
+                  <% else %>
+                    (<%= t('fullstack.cms.empty', :default => "Empty") %>)
+                  <% end %>
+                </td>
+              </tr>
+
+          <% end %>
+  </table>
+
+
   
-  @groups.sort! do |g1, g2|    
-    if g1.first.to_s == "global"
-      -1
-    elsif g2.first.to_s == "global"
-      1
-    else  
-      g1.first.to_s <=> g2.first.to_s
-    end
-  end
-
-  nil
- %>
-
-<%= tabs do |t| %>
-
-    <% @groups.each do |g,settings| %>
-      <%= t.pane t(g, :scope => "fullstack.admin.groups", :default => g.to_s.humanize) do %>
-      <% settings.each do |stg| %>
-            <p><%= link_to t(stg.key, :scope => "helpers.label", :default => stg.key.to_s.humanize), [:edit, :admin, stg] %></p>
         <% end %>
       <% end %>
-    <% end %>
 
-<% end %>
+  <% end %>
 
 <% end %>
+
+ 
+

data/app/views/admin/settings/_form.html.erb

@@ -6,6 +6,7 @@
   
 
       <%=  f.inputs do %>
+        <%= f.input :locale, :input_html => {:readonly => true} %>
         <%= f.input :key, :input_html => {:readonly => true} %>
         <% if current_resource.kind.to_s == "text" && current_resource.options[:markup] %>
           <%= f.input :"#{current_resource.kind}_value", :label => t('fullstack.admin.value', :default => "Value"), :as => :markup %>

data/config/locales/it.yml

@@ -5,6 +5,8 @@ it:
       link_resource_or_url: "Collega una risorsa o un indirizzo"
       type_the_title_name_of_the_resource_to_link: "Digita il titolo/nome della risorsa da collegare"
       url: "Indirizzo"
+      commons: "Comuni"
+      empty: "Vuoto"
     admin:
       groups:
         global: "Generale"

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-09-03"
+  s.date = "2012-09-04"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
     "app/views/admin/linkables/_fields.html.erb",
     "app/views/admin/linkables/fields.js.coffee",
     "app/views/admin/links/_associated_fields.html.erb",
+    "app/views/admin/menus/_collection.html.erb",
     "app/views/admin/pages/_collection.html.erb",
     "app/views/admin/pages/_form.html.erb",
     "app/views/admin/photos/_photo.html.erb",
@@ -101,9 +102,9 @@ Gem::Specification.new do |s|
     "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/home.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/config/fullstack.rb",
     "lib/generators/fullstack/cms/templates/rails/config/initializers/devise_controller.rb",
     "lib/generators/fullstack/cms/templates/rails/config/initializers/devise_mailer.rb",
-    "lib/generators/fullstack/cms/templates/rails/config/initializers/fullstack.rb",
     "lib/generators/fullstack/cms/templates/rails/config/initializers/sitemap.rb",
     "lib/generators/fullstack/cms/templates/rails/config/schedule.rb",
     "lib/generators/fullstack/cms/templates/rails/config/sitemap.rb.tt",
@@ -132,7 +133,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.40"])
+      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.1.42"])
       s.add_runtime_dependency(%q<ars-permalink>, [">= 0"])
       s.add_runtime_dependency(%q<has-attached>, [">= 0"])
       s.add_runtime_dependency(%q<acts-as-taggable-on>, [">= 0"])
@@ -145,7 +146,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.40"])
+      s.add_dependency(%q<fullstack-admin>, ["~> 0.1.42"])
       s.add_dependency(%q<ars-permalink>, [">= 0"])
       s.add_dependency(%q<has-attached>, [">= 0"])
       s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
@@ -159,7 +160,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fullstack-admin>, ["~> 0.1.40"])
+    s.add_dependency(%q<fullstack-admin>, ["~> 0.1.42"])
     s.add_dependency(%q<ars-permalink>, [">= 0"])
     s.add_dependency(%q<has-attached>, [">= 0"])
     s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])

data/lib/fullstack/cms/configuration.rb

@@ -1,24 +1,91 @@
-require 'ostruct'
-
 module Fullstack
   module Cms
-  
-    def config
-      @config ||= OpenStruct.new
-      @config.resources ||= []
-      @config.linkables ||= []
-      @config.localize = @config.localize.nil? ? true :  @config.localize
-      @config.localize_routes = @config.localize_routes.nil? ? true :  @config.localize_routes
-      @config.default_locale ||= "#{I18n.default_locale}" || "en"
-      @config
+    
+    class Configuration
+      attr_writer :linkables, :localized 
+          
+      def default_locale
+        "#{I18n.default_locale}" || "en"
+      end
+      
+      def localized
+        @localized.nil? ? true : @localized
+      end
+      alias :localize :localized
+      alias :localized? :localized
+
+      
+      def linkables
+        @linkables || []
+      end
+      
+      def resources(&block)
+        Fullstack::Admin.resources(&block)
+      end
+      
+      # config.menu( 'main', :localized => true )
+      #
+      # ...
+      # menu( 'main', :locale => I18n.locale )
+      # menu_items( 'main', :locale => I18n.locale )  
+      #
+      #
+      #
+      def menu(uid, options = {})
+        return nil unless Menu.table_exists?
+        options = options.reverse_merge({:localized => localized?})
+        localized_menu = options.delete(:localized)
+        
+        if localized_menu && localized? # ignores the option if CMS is not localized
+          I18n.available_locales.each do |locale|
+            m = Menu.find_or_create_by_uid_and_locale(uid.to_s, locale.to_s)
+            raise m.errors.full_messages.join("\n") if m.errors.any?
+              
+          end
+        else
+          m = Menu.find_or_create_by_uid(uid.to_s)
+          raise m.errors.full_messages.join("\n") if m.errors.any?
+          
+        end
+      end
+      
+      # config.setting('description', :kind => :text, :localized => true, :group => group)
+      # setting('website/description', :locale => I18n.locale)
+      #
+      def setting(key, options = {})
+        return nil unless Setting.table_exists?
+
+        options = options.reverse_merge({ :localized => localized? }).merge({ :autocreate => true })
+        localized_setting = options.delete(:localized)
+
+        if localized_setting && localized? # ignores the option if CMS is not localized
+          I18n.available_locales.each do |locale|
+            Setting.global(key.to_s, options.merge(:locale => locale.to_s))
+          end
+        else
+          Setting.global(key.to_s, options)
+        end
+
+
+      end
+      
     end
-    module_function :config
+  
+    
+    class << self
+  
+      def config
+        @config ||= ::Fullstack::Cms::Configuration.new
+      end
     
-    def configure
-      yield(config)
-      config
+      def configure
+        yield(config)
+        config
+      end
+      
+      delegate :linkables, :localized, :localized?, :resources, :to => :config
+      
     end
-    module_function :configure
     
   end
 end

data/lib/fullstack/cms/engine.rb

@@ -3,7 +3,9 @@ require 'rails'
 module Fullstack
   module Cms
     class Engine < ::Rails::Engine
-  
+      config.after_initialize do
+        load(Rails.root.join("config", "fullstack.rb").to_s)
+      end
     end
   end
 end

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

@@ -1,3 +1,10 @@
 <footer class="footer">
-  <%= get_setting(:copyright) %>
+  <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>
+
+  </address>
 </footer>

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

@@ -1,5 +1,5 @@
   <script>
-    var _gaq=[['_setAccount','<%= get_setting("google_analytics_code", "UA-xxxxxx-x") %>'],['_trackPageview']];
+    var _gaq=[['_setAccount','<%= setting("google_analytics_code", "UA-xxxxxx-x") %>'],['_trackPageview']];
     (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
     g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
     s.parentNode.insertBefore(g,s)}(document,'script'));

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

@@ -3,9 +3,8 @@
     <%= yield :meta %>
   <% else %>
     <% 
-      site_title       = get_setting(:site_title) || Settings.app.title
-      site_description = get_setting(:site_description) || Settings.app.slogan
-      site_slogan      = get_setting(:site_slogan) || Settings.app.slogan    
+      site_title       = get_setting(:title, Settings.app.title)
+      site_description = get_setting(:description, Settings.app.slogan)
      %>
    
     <% if home? %>

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

@@ -0,0 +1,51 @@
+Fullstack::Cms.configure do |config|
+  
+  # =============
+  # = Resources =
+  # =============
+  
+  config.resources do |admin|
+    admin.group :website do |g|
+      g.resource :pages
+      g.resource :menus
+      g.resource :settings
+    end
+
+    admin.group :contents do |g|
+      g.resource :texts
+      g.resource :prices
+    end
+
+    admin.group :users do |g|
+      g.resource :users
+    end  
+  end
+
+  # =============
+  # = Linkables =
+  # =============
+
+  config.linkables = %w(pages texts)
+  
+  # =========
+  # = Menus =
+  # =========
+  
+  config.menu(:main)
+  
+  # ============
+  # = Settings =
+  # ============
+  
+  config.setting(:google_analytics_code, :localized => false)
+  config.setting(:facebook_app_id, :localized => false)
+  
+  config.setting(:title)
+  config.setting(:slogan)
+  config.setting(:description, :text)
+    
+  config.setting(:address,  :text,  :group => :contacts)
+  config.setting(:phone,    :group => :contacts)
+  config.setting(:email,    :group => :contacts)
+    
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-09-04 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.40
+        version: 0.1.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.42
 - !ruby/object:Gem::Dependency
   name: ars-permalink
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +252,7 @@ files:
 - app/views/admin/linkables/_fields.html.erb
 - app/views/admin/linkables/fields.js.coffee
 - app/views/admin/links/_associated_fields.html.erb
+- app/views/admin/menus/_collection.html.erb
 - app/views/admin/pages/_collection.html.erb
 - app/views/admin/pages/_form.html.erb
 - app/views/admin/photos/_photo.html.erb
@@ -295,9 +296,9 @@ files:
 - 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/home.html.erb
+- lib/generators/fullstack/cms/templates/rails/config/fullstack.rb
 - lib/generators/fullstack/cms/templates/rails/config/initializers/devise_controller.rb
 - lib/generators/fullstack/cms/templates/rails/config/initializers/devise_mailer.rb
-- lib/generators/fullstack/cms/templates/rails/config/initializers/fullstack.rb
 - lib/generators/fullstack/cms/templates/rails/config/initializers/sitemap.rb
 - lib/generators/fullstack/cms/templates/rails/config/schedule.rb
 - lib/generators/fullstack/cms/templates/rails/config/sitemap.rb.tt
@@ -330,7 +331,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 293567694538273846
+      hash: 12527057176936080
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

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

@@ -1,20 +0,0 @@
-Fullstack::Admin.resources do |admin|
-    
-  admin.group :website do |g|
-    g.resource :pages
-    g.resource :menus
-    g.resource :settings
-  end
-
-  admin.group :contents do |g|
-  end
-
-  admin.group :users do |g|
-    g.resource :users
-  end
-    
-end
-
-Fullstack::Cms.configure do |config|
-  config.linkables = %w(pages)
-end