fullstack-cms 0.2.13 → 0.2.14

data/Gemfile

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

data/Gemfile.lock

@@ -62,7 +62,7 @@ GEM
       railties (>= 3.0)
     builder (3.0.0)
     checkin (0.5.1)
-    chosen-rails (0.9.8.2)
+    chosen-rails (0.9.8.3)
       railties (~> 3.0)
       thor (~> 0.14)
     chronic (0.6.7)
@@ -95,9 +95,9 @@ GEM
       rails (~> 3.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    formtastic-bootstrap (1.1.1)
-      formtastic
-      rails (~> 3.1)
+    formtastic-bootstrap (2.0.0)
+      formtastic (~> 2.2)
+      formtastic-bootstrap
     friendly_id (4.0.8)
     fullstack (0.1.25)
       active_record_schema
@@ -126,7 +126,7 @@ GEM
       remotipart
       resource-presentation-helpers
       squeel
-    fullstack-admin (0.1.42)
+    fullstack-admin (0.1.43)
       bootstrap-datepicker-rails
       bootstrap-helpers
       bootstrap-wysihtml5-rails
@@ -161,7 +161,7 @@ GEM
       rake
       rdoc
     journey (1.0.4)
-    jquery-rails (2.1.1)
+    jquery-rails (2.1.2)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.4)
@@ -170,12 +170,12 @@ GEM
       activesupport (>= 3.0.0)
     kaminari-i18n (0.1.3)
       rails
-    less (2.2.1)
+    less (2.2.2)
       commonjs (~> 0.2.6)
     less-rails (2.2.3)
       actionpack (>= 3.1)
       less (~> 2.2.0)
-    less-rails-bootstrap (2.1.0)
+    less-rails-bootstrap (2.1.1)
       less-rails (~> 2.2.0)
     libv8 (3.3.10.4)
     mail (2.4.4)
@@ -226,7 +226,7 @@ GEM
       activesupport (= 3.2.8)
       bundler (~> 1.0)
       railties (= 3.2.8)
-    rails-i18n (0.6.5)
+    rails-i18n (0.6.6)
       i18n (~> 0.5)
     rails-slow-assets-workaround (0.1.1)
       rails
@@ -289,7 +289,7 @@ DEPENDENCIES
   ars-permalink
   awesome_nested_set
   bluecloth
-  fullstack-admin (~> 0.1.42)
+  fullstack-admin (~> 0.1.43)
   has-attached
   jeweler
   rails_i18n_gettext

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/app/helpers/menus_helper.rb

@@ -25,6 +25,7 @@ module MenusHelper
   end
   
   def menu_link_url(link)
+    return "#" unless link
     link.url.present? ? CGI::escape(link.url) : (link.linked ? page_path_for(link.linked) : "#")
   end
   

data/app/helpers/pages_helper.rb

@@ -7,10 +7,11 @@ module PagesHelper
   def part(name, opts = {}, &block)
     if @current_page
       schema = opts.delete(:schema) || PagePart
-
-      klass = schema.is_a?(Class)  ? schema : "#{schema.to_s.camelize}PagePart".constantize  
-      p = klass.find_or_create_by_name_and_page_id("#{name}", @current_page)
       
+      klass = schema.is_a?(Class)  ? schema : "#{schema.to_s.camelize}PagePart".constantize  
+      p = klass.where(:name => "#{name}", :page_id => @current_page.id).first
+      p ||= klass.create!(:name => "#{name}", :page_id =>  @current_page.id)
+            
       if block_given?
         capture do
           block.call(p)

data/app/models/link.rb

@@ -1,10 +1,10 @@
 class Link < ActiveRecord::Base
   validates_presence_of :label
 
-  field :label, :string, :translatable => true
-  field :description, :text, :translatable => true
+  field :label, :string
   include Positionable
-  
+ 
+  field :description, :text 
   has_attached :image
   has_attached :icon
   

data/app/models/page.rb

@@ -59,6 +59,10 @@ class Page < ActiveRecord::Base
     }
     params
   end
+  
+  def to_label
+    "#{name} - #{locale}"
+  end
 
   has_many :page_parts
   accepts_nested_attributes_for :page_parts, :allow_destroy => true

data/app/models/page_part.rb

@@ -3,4 +3,6 @@ class PagePart < ActiveRecord::Base
   field :name
   belongs_to :page
   index [:name, :page_id], :unique => true
+  timestamps
+  default_scope order("created_at ASC")
 end

data/app/models/pageable.rb

@@ -154,14 +154,23 @@ module Pageable
        end
          
        @pages ||= ActiveSupport::HashWithIndifferentAccess.new
-       @pages[name] = _page
+       
+       if locale
+         @pages["#{name}@#{locale}"] = _page         
+       else
+         @pages[name] = _page
+       end
 
    end
        
  end
 
  def load_current_page
-   @current_page.reload if @current_page = self.class.pages[action_name]
+   if Fullstack::Cms.config.localize 
+     @current_page.reload if @current_page = self.class.pages["#{action_name}@#{I18n.locale}"]
+   else
+     @current_page.reload if @current_page = self.class.pages[action_name]
+   end
  end
     
 end

data/app/models/photo.rb

@@ -14,12 +14,16 @@ class Photo < ActiveRecord::Base
   belongs_to :photographable, :polymorphic => :true
   delegate :url, :file_name, :to => :image
   
-  field :caption, :text, :translatable => true
+  field :caption, :text
   
   def owner
     photographable.owner if photographable && photographable.respond_to?(:owner)
   end
-
+    
   timestamps
 
+  def to_label
+    image_file_name
+  end
+
 end

data/app/models/setting.rb

@@ -15,12 +15,12 @@ class Setting < ActiveRecord::Base
   field :kind
   field :group
     
-  field :integer_value, :integer, :translatable => true
-  field :float_value, :float, :translatable => true
-  field :text_value, :text, :translatable => true
-  field :string_value, :string, :translatable => true
-  field :datetime_value, :datetime, :translatable => true
-  field :date_value, :date, :translatable => true
+  field :integer_value, :integer
+  field :float_value, :float
+  field :text_value, :text
+  field :string_value, :string
+  field :datetime_value, :datetime
+  field :date_value, :date
   has_attached :file_value
   
   

data/app/models/text.rb

@@ -1,6 +1,6 @@
 class Text < ActiveRecord::Base
   include Content
-  field :text, :text, :markup => true, :translatable => true
+  field :text, :text, :markup => true
   has_many :attachments, :as => :attachable
   accepts_nested_attributes_for :attachments
 end

data/app/models/text_page_part.rb

@@ -1,3 +1,3 @@
 class TextPagePart < PagePart
-  field :text, :text, :markup => true, :translatable => true
+  field :text, :text, :markup => true
 end

data/app/models/text_with_title_page_part.rb

@@ -1,4 +1,4 @@
 class TextWithTitlePagePart < PagePart
-  field :title, :string, :translatable => true
-  field :text, :text, :markup => true, :translatable => true
+  field :title, :string
+  field :text, :text, :markup => true
 end

data/app/views/admin/links/_associated_fields.html.erb

@@ -9,72 +9,4 @@
 <% end %>
 
 <hr/>
-
-<%= f.inputs :class => "linked-fields" do %>
-    <% 
-    linkables_collection = [[t('fullstack.cms.url', :default => "Url"), ""]] + Linkable.linkable_class_names.map do |klass_name|
-      [t("fullstack.admin.resources.#{klass_name.underscore}", :default => klass_name), klass_name]
-    end  
-    %>
-    <%= f.input :linked_type, :as => :radio, :collection => linkables_collection, :input_html => {:class => "linked-type-field"}, 
-    :label => t('fullstack.cms.link_resource_or_url', :default => "Link resource or url")    
-     %>
-    <div class="linked-id-field-placeholder" id="linked_id_field_placeholder_<%= @linked_id_field_placeholder_uid = 1 + (@linked_id_field_placeholder_uid || 0)
- %>" data-current-id="<%= f.object.linked_id %>" data-current-type="<%= f.object.linked_type %>">
-    </div>
-    <%= f.input :url, :label => false, :input_html => {:style => ("display: none" if f.object.persisted?), :class => "linked-url-field"}  %>
-<% end %>
-
-
-<% unless @link_associated_fields_js_included %>
-<% @link_associated_fields_js_included = true %>
-
-  <% content_for :javascripts do -%>
-
-
-  <%= javascript_tag do %>
-     <%= coffee_script do %>
-
-       $(document).ready ->
-       
-         update_linked_fields = (linked_fields) ->           
-           linked_type_field            = linked_fields.find(".linked-type-field")
-           checked_linked_type_field    = linked_fields.find(".linked-type-field:checked")
-           linked_id_field_placeholder  = linked_fields.find(".linked-id-field-placeholder")
-           linked_url_field             = linked_fields.find(".linked-url-field")
-           
-           linked_type                  = checked_linked_type_field.val()
-           
-           target_id                    = linked_id_field_placeholder.attr("id")
-           linked_id_field_name         = linked_type_field.attr("name").replace(/linked_type\]$/, "linked_id]")
-
-  
-           if linked_type
-             $.get '<%= fields_admin_linkables_path %>',
-               type:          linked_type
-               target:        target_id
-               field_name:    linked_id_field_name
-               current_type:  linked_id_field_placeholder.data("current-type")
-               current_id:    linked_id_field_placeholder.data("current-id")
-             linked_url_field.hide()
-           
-           else
-             linked_id_field_placeholder.empty()
-             linked_url_field.show()
-             
-         $(".linked-fields").each ->
-           linked_fields = $(@)
-           update_linked_fields(linked_fields)
-
-         $(".linked-type-field").live "change", ->
-           update_linked_fields($(@).closest(".linked-fields"))
-         
-
-      <% end %>
-  <% end %>
-  <% end -%>
-  
-<% end %>
-
-
-
+<%= render :partial => "linked_fields", :locals => {:f => f} %>

data/app/views/admin/links/_linked_fields.html.erb

@@ -0,0 +1,65 @@
+<%= f.inputs :class => "linked-fields" do %>
+    <% 
+    linkables_collection = [[t('fullstack.cms.url', :default => "Url"), ""]] + Linkable.linkable_class_names.map do |klass_name|
+      [t("fullstack.admin.resources.#{klass_name.underscore}", :default => klass_name), klass_name]
+    end  
+    %>
+    <%= f.input :linked_type, :as => :radio, :collection => linkables_collection, :input_html => {:class => "linked-type-field"}, 
+    :label => t('fullstack.cms.link_resource_or_url', :default => "Link resource or url")    
+     %>
+    <div class="linked-id-field-placeholder" id="linked_id_field_placeholder_<%= @linked_id_field_placeholder_uid = 1 + (@linked_id_field_placeholder_uid || 0)
+ %>" data-current-id="<%= f.object.linked_id %>" data-current-type="<%= f.object.linked_type %>">
+    </div>
+    <%= f.input :url, :label => false, :input_html => {:style => ("display: none" if f.object.persisted?), :class => "linked-url-field"}  %>
+<% end %>
+
+
+<% unless @link_associated_fields_js_included %>
+<% @link_associated_fields_js_included = true %>
+
+  <% content_for :javascripts do -%>
+
+
+  <%= javascript_tag do %>
+     <%= coffee_script do %>
+
+       $(document).ready ->
+       
+         update_linked_fields = (linked_fields) ->           
+           linked_type_field            = linked_fields.find(".linked-type-field")
+           checked_linked_type_field    = linked_fields.find(".linked-type-field:checked")
+           linked_id_field_placeholder  = linked_fields.find(".linked-id-field-placeholder")
+           linked_url_field             = linked_fields.find(".linked-url-field")
+           
+           linked_type                  = checked_linked_type_field.val()
+           
+           target_id                    = linked_id_field_placeholder.attr("id")
+           linked_id_field_name         = linked_type_field.attr("name").replace(/linked_type\]$/, "linked_id]")
+
+  
+           if linked_type
+             $.get '<%= fields_admin_linkables_path %>',
+               type:          linked_type
+               target:        target_id
+               field_name:    linked_id_field_name
+               current_type:  linked_id_field_placeholder.data("current-type")
+               current_id:    linked_id_field_placeholder.data("current-id")
+             linked_url_field.hide()
+           
+           else
+             linked_id_field_placeholder.empty()
+             linked_url_field.show()
+             
+         $(".linked-fields").each ->
+           linked_fields = $(@)
+           update_linked_fields(linked_fields)
+
+         $(".linked-type-field").live "change", ->
+           update_linked_fields($(@).closest(".linked-fields"))
+         
+
+      <% end %>
+  <% end %>
+  <% end -%>
+  
+<% end %>

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

@@ -33,7 +33,7 @@
     <% current_resource.page_parts.each do |p| %>
         <%= t.pane t(p.name, :scope => 'fullstack.cms.parts', :default => p.name.try(:humanize)) do  %>
         <%= f.admin_fields_for :page_parts, p do |f| %>
-          <%= f.resource_inputs :except => [:page_id, :name] %>
+        <%= f.resource_inputs :except => [:page, :name] %>
           <% end %>
         <% end %>
     <% end %>

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.2.13"
+  s.version = "0.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-09-05"
+  s.date = "2012-09-09"
   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/links/_linked_fields.html.erb",
     "app/views/admin/menus/_collection.html.erb",
     "app/views/admin/pages/_collection.html.erb",
     "app/views/admin/pages/_form.html.erb",
@@ -133,7 +134,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.42"])
+      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.1.43"])
       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"])
@@ -146,7 +147,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.42"])
+      s.add_dependency(%q<fullstack-admin>, ["~> 0.1.43"])
       s.add_dependency(%q<ars-permalink>, [">= 0"])
       s.add_dependency(%q<has-attached>, [">= 0"])
       s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
@@ -160,7 +161,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fullstack-admin>, ["~> 0.1.42"])
+    s.add_dependency(%q<fullstack-admin>, ["~> 0.1.43"])
     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/generators/fullstack/cms/templates/rails/lib/support/content.rb

@@ -8,8 +8,8 @@ module Content
     alias :keywords :tags
     permalink :title, :history => true
   
-    field :title, :translatable => true
-    field :excerpt, :as => :text, :translatable => true
+    field :title
+    field :excerpt, :as => :text
     alias_attribute :description, :excerpt    
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-09 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.42
+        version: 0.1.43
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.42
+        version: 0.1.43
 - !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/links/_linked_fields.html.erb
 - app/views/admin/menus/_collection.html.erb
 - app/views/admin/pages/_collection.html.erb
 - app/views/admin/pages/_form.html.erb
@@ -331,7 +332,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2010351401597044343
+      hash: -3299776057597534333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: