fullstack-cms 0.3.29 → 0.3.30

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "http://rubygems.org"
 
-gem "fullstack-admin", '~> 0.2.13'
+gem "fullstack-admin", '~> 0.2.15'
 
 gem "ars-permalink"
 gem "acts-as-taggable-on"

data/Gemfile.lock

@@ -48,9 +48,9 @@ GEM
       uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
     bluecloth (2.2.0)
-    bootstrap-datepicker-rails (0.6.35)
+    bootstrap-datepicker-rails (0.6.36)
       railties (>= 3.0)
-    bootstrap-helpers (0.1.8)
+    bootstrap-helpers (0.1.9)
       rails
     builder (3.0.4)
     checkin (0.5.1)
@@ -73,7 +73,7 @@ GEM
     coffeebeans (1.0.1)
       actionpack (>= 3.0.0)
       coffee-script
-    devise (2.2.0)
+    devise (2.2.1)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
@@ -121,9 +121,9 @@ GEM
       remotipart
       resource-presentation-helpers
       squeel
-    fullstack-admin (0.2.13)
+    fullstack-admin (0.2.15)
       bootstrap-datepicker-rails
-      bootstrap-helpers (~> 0.1.7)
+      bootstrap-helpers (~> 0.1.9)
       chosen-rails
       ckeditor
       facebox-rails
@@ -143,7 +143,7 @@ GEM
       rails
     hike (1.2.1)
     htmlentities (4.3.1)
-    httparty (0.9.0)
+    httparty (0.10.0)
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.1)
@@ -179,8 +179,8 @@ GEM
       rack-mobile-detect
       rails
     multi_json (1.5.0)
-    multi_xml (0.5.1)
-    net-ssh (2.6.2)
+    multi_xml (0.5.2)
+    net-ssh (2.6.3)
     nokogiri (1.5.6)
     orm_adapter (0.4.0)
     paperclip (3.4.0)
@@ -241,7 +241,7 @@ GEM
       rails
     rinku (1.2.2)
     sass (3.2.5)
-    sass-rails (3.2.5)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
@@ -276,7 +276,7 @@ DEPENDENCIES
   ars-permalink
   awesome_nested_set
   bluecloth
-  fullstack-admin (~> 0.2.13)
+  fullstack-admin (~> 0.2.15)
   jeweler
   rails_i18n_gettext
   rinku (~> 1.2.2)

data/VERSION

@@ -1 +1 @@
-0.3.29
+0.3.30

data/app/models/link.rb

@@ -4,9 +4,9 @@ class Link < ActiveRecord::Base
   field :label, :string
   include Positionable
  
-  field :description, :text 
-  has_attached :image
-  has_attached :icon
+  # field :description, :text 
+  # has_attached :image
+  # has_attached :icon
   
   belongs_to :link_owner, :polymorphic => true
   belongs_to :linked, :polymorphic => true

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

@@ -1,12 +1,3 @@
-<%= f.inputs do %>
-<%= f.input :label %>
-<%= f.input :description %>
-<%= f.input :nofollow %>
-<% end %>
-<%= f.inputs do %>
- <%= f.input :image %>
- <%= f.input :icon %>  
-<% end %>
-
+<%= f.resource_inputs(:except => [:url]) %>
 <hr/>
-<%= render :partial => "admin/links/linked_fields", :locals => {:f => f} %>
+<%= render :partial => "admin/links/linked_fields", :locals => {:f => f, :index => index} %>

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

@@ -7,8 +7,7 @@
     <%= 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 class="linked-id-field-placeholder" id="linked_id_field_placeholder_<%= index %>" 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 %>

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.3.29"
+  s.version = "0.3.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2013-01-11"
+  s.date = "2013-01-15"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -179,7 +179,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.2.13"])
+      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.2.15"])
       s.add_runtime_dependency(%q<ars-permalink>, [">= 0"])
       s.add_runtime_dependency(%q<acts-as-taggable-on>, [">= 0"])
       s.add_runtime_dependency(%q<acts_as_indexed>, [">= 0"])
@@ -190,7 +190,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.2.13"])
+      s.add_dependency(%q<fullstack-admin>, ["~> 0.2.15"])
       s.add_dependency(%q<ars-permalink>, [">= 0"])
       s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
       s.add_dependency(%q<acts_as_indexed>, [">= 0"])
@@ -202,7 +202,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.13"])
+    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.15"])
     s.add_dependency(%q<ars-permalink>, [">= 0"])
     s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
     s.add_dependency(%q<acts_as_indexed>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.29
+  version: 0.3.30
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-15 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.2.13
+        version: 0.2.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: 0.2.15
 - !ruby/object:Gem::Dependency
   name: ars-permalink
   requirement: !ruby/object:Gem::Requirement
@@ -345,7 +345,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1205689212739904660
+      hash: -4367642732034536460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: