sbdevcore 0.2.13 → 0.2.14

data/app/models/index.rb

@@ -42,4 +42,8 @@ class Index < ActiveRecord::Base
     self.name ||= (self.title ||= self.owner.name).tableize rescue nil
     self.title ||= self.name.titleize rescue nil
   end
+
+  def title
+    owner.try('title') ? owner.title : read_attribute(:title)
+  end
 end

data/app/views/indices/_form.html.haml

@@ -1,7 +1,9 @@
 - f ||= local_assigns[:locals][:f]
 - index ||= f.object
+- index ||= f.object
 %div{:id => f.object.id.to_s}
   = f.input :title
+
   = f.input(:page_title) unless index.owner.is_a?(Gallery)
   = f.input(:keywords, :input_html => { :rows => 5 }) unless index.owner.is_a?(Gallery)
   = f.input(:page_description, :input_html => { :rows => 5 }) unless index.owner.is_a?(Gallery)

data/app/views/indices/_show.html.haml

@@ -2,6 +2,9 @@
 - render_seo index
 .asset
   %h1.title=index.title.titleize
+  %p.asset-admin
+    = link_to "Edit Page", edit_index_path(index.id), :rel=>"#overlay", :class => "overlayed"
+    = link_to("Remove Page", index, :confirm => 'Are you sure?', :method => :delete) if index.owner.is_a?(Gallery)
   = render :partial => 'shared/asset_show', :collection => index.assets, :as => :asset
   - if admin_signed_in?
     .asset
@@ -11,9 +14,6 @@
         = link_to "Add Video", new_index_video_path(index.id), :rel=>"#overlay", :class => "overlayed"
         = link_to "Add Downloadable File", new_index_downloadable_path(index.id), :rel=>"#overlay", :class => "overlayed"
         = link_to "Add Gallery", new_index_gallery_path(index.id), :rel=>"#overlay", :class => "overlayed" if (index.gallery.nil? && !index.owner.is_a?(Gallery))
-    %p.asset-admin
-      = link_to "Edit Page", edit_index_path(index.id), :rel=>"#overlay", :class => "overlayed"
-      = link_to("Remove Page", index, :confirm => 'Are you sure?', :method => :delete) if index.owner.is_a?(Gallery) 
 - unless index.gallery.nil?
   =content_for(:post_content) do
     - if admin_signed_in?

data/app/views/indices/edit.html.haml

@@ -1,3 +1,3 @@
 = simple_form_for @index, :validate => true, :html => { :multipart => true }  do |f|
-  = render :partial => 'form', :locals => {:f => f, :index => @index}
+  = render :partial => 'form', :object => f, :as => "f"
   = f.button :submit

data/lib/sbdevcore/engine.rb

@@ -13,7 +13,6 @@ require 'pg'
 require 'formalize-rails'
 require 'will_paginate'
 require 'aws/s3'
-require 'aasm'
 require 'inherited_resources'
 require 'friendly_id'
 require 'sbdevcore'

data/lib/sbdevcore/version.rb

@@ -1,3 +1,3 @@
 module Sbdevcore
-  VERSION = "0.2.13"
+  VERSION = "0.2.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sbdevcore
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-24 00:00:00.000000000Z
+date: 2011-09-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
-  requirement: &2160327700 !ruby/object:Gem::Requirement
+  requirement: &2160329100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160327700
+  version_requirements: *2160329100
 - !ruby/object:Gem::Dependency
   name: prioritizable
-  requirement: &2160327200 !ruby/object:Gem::Requirement
+  requirement: &2160328480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2160327200
+  version_requirements: *2160328480
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2160326640 !ruby/object:Gem::Requirement
+  requirement: &2160316600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160326640
+  version_requirements: *2160316600
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2160326040 !ruby/object:Gem::Requirement
+  requirement: &2160316060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160326040
+  version_requirements: *2160316060
 - !ruby/object:Gem::Dependency
   name: haml-edge
-  requirement: &2160325580 !ruby/object:Gem::Requirement
+  requirement: &2160315520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160325580
+  version_requirements: *2160315520
 - !ruby/object:Gem::Dependency
   name: sitemap_generator
-  requirement: &2160325040 !ruby/object:Gem::Requirement
+  requirement: &2160314920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160325040
+  version_requirements: *2160314920
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &2160324620 !ruby/object:Gem::Requirement
+  requirement: &2160314420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160324620
+  version_requirements: *2160314420
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &2160311160 !ruby/object:Gem::Requirement
+  requirement: &2160313920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160311160
+  version_requirements: *2160313920
 - !ruby/object:Gem::Dependency
   name: client_side_validations
-  requirement: &2160310340 !ruby/object:Gem::Requirement
+  requirement: &2160313300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160310340
+  version_requirements: *2160313300
 - !ruby/object:Gem::Dependency
   name: formalize-rails
-  requirement: &2160309760 !ruby/object:Gem::Requirement
+  requirement: &2160312760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160309760
+  version_requirements: *2160312760
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &2160308880 !ruby/object:Gem::Requirement
+  requirement: &2160312080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.0.pre4
   type: :runtime
   prerelease: false
-  version_requirements: *2160308880
+  version_requirements: *2160312080
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2160308240 !ruby/object:Gem::Requirement
+  requirement: &2160311480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160308240
+  version_requirements: *2160311480
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &2160307500 !ruby/object:Gem::Requirement
+  requirement: &2160310840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160307500
+  version_requirements: *2160310840
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &2160306840 !ruby/object:Gem::Requirement
+  requirement: &2160310140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +164,7 @@ dependencies:
         version: 4.0.0.beta8
   type: :runtime
   prerelease: false
-  version_requirements: *2160306840
+  version_requirements: *2160310140
 description: Core
 email:
 - aosalias@gmail.com