fullstack-cms 0.3.14 → 0.3.15

data/Gemfile

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

data/Gemfile.lock

@@ -41,20 +41,20 @@ GEM
       activerecord (>= 3.0)
     awesome_nested_set (2.1.3)
       activerecord (>= 3.0.0)
-    aws-sdk (1.7.1)
+    aws-sdk (1.8.0)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
     bluecloth (2.2.0)
-    bootstrap-datepicker-rails (0.6.32)
+    bootstrap-datepicker-rails (0.6.33)
       railties (>= 3.0)
     bootstrap-helpers (0.1.8)
       rails
     builder (3.0.0)
     checkin (0.5.1)
-    chosen-rails (0.9.9)
+    chosen-rails (0.9.11)
       coffee-rails (~> 3.2)
       railties (~> 3.0)
       sass-rails (~> 3.2)
@@ -78,7 +78,7 @@ GEM
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
-    devise-i18n (0.5.11)
+    devise-i18n (0.5.12)
     devise-i18n-views (0.2.5)
     erubis (2.7.0)
     execjs (1.4.0)
@@ -121,7 +121,7 @@ GEM
       remotipart
       resource-presentation-helpers
       squeel
-    fullstack-admin (0.2.11)
+    fullstack-admin (0.2.12)
       bootstrap-datepicker-rails
       bootstrap-helpers (~> 0.1.7)
       chosen-rails
@@ -181,9 +181,9 @@ GEM
     multi_json (1.3.6)
     multi_xml (0.5.1)
     net-ssh (2.6.2)
-    nokogiri (1.5.5)
+    nokogiri (1.5.6)
     orm_adapter (0.4.0)
-    paperclip (3.3.1)
+    paperclip (3.4.0)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -215,7 +215,7 @@ GEM
       i18n (~> 0.5)
     rails-slow-assets-workaround (0.1.1)
       rails
-    rails_config (0.3.1)
+    rails_config (0.3.2)
       activesupport (>= 3.0)
     rails_i18n_gettext (0.0.4)
       rails (~> 3.0)
@@ -240,7 +240,7 @@ GEM
     resource-presentation-helpers (0.1.1)
       rails
     rinku (1.2.2)
-    sass (3.2.3)
+    sass (3.2.4)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -275,7 +275,7 @@ DEPENDENCIES
   ars-permalink
   awesome_nested_set
   bluecloth
-  fullstack-admin (~> 0.2.11)
+  fullstack-admin (~> 0.2.12)
   jeweler
   rails_i18n_gettext
   rinku (~> 1.2.2)

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/app/helpers/crumbs_helper.rb

@@ -0,0 +1,43 @@
+module CrumbsHelper
+
+  # breadcrumb("Home" => "/", "Blog" => [:site, :blog], @post.title => request.path )
+  
+  def breadcrumb(crumbs = {})
+    crumbs = crumbs.to_a
+    buff = ""
+    buff << '<ul class="breadcrumb">'
+    active = crumbs.pop
+    crumbs.each do |title, path|
+      path = !path.is_a?(String) ? polymorphic_path(path) : h(path)
+      
+      buff << <<-eos
+      <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+        <a itemprop="url" href="#{path}">
+          <span itemprop="title">#{h(title)}</span>
+        </a> 
+        <span class="divider">/</span>
+      </li>
+      eos
+      
+    end
+    
+    title, path = active
+    path = !path.is_a?(String) ? polymorphic_path(path) : h(path)
+    
+    buff << <<-eos
+      <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active">
+        <a itemprop="url" href="#{path}">
+          <span itemprop="title">#{h(title)}</span>
+        </a> 
+      </li>
+      eos
+    
+    
+    buff << '</ul>'
+    content_for( :breadcrumb,  buff.html_safe )
+    nil
+  end
+
+end
+
+

data/app/support/deny.rb

@@ -15,7 +15,7 @@ module Deny
   
   def deny!(options = {})
     negate = false
-    expr = options.has_key?(:if)
+    expr = if options.has_key?(:if)
       options.delete(:if)
     elsif options.has_key?(:unless)
       negate = true

data/app/views/admin/base/_fields.html.erb

@@ -1,4 +1,6 @@
-<%= f.resource_inputs %>
+<%= f.box t('fullstack.admin.info', :default => "Info") do  %>
+  <%= f.resource_inputs %>
+<% end %>
 
 <% if partial?("other_fields") %>
 <%= render :partial => "other_fields", :locals => {:f => f} %>

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

@@ -1,18 +1 @@
-<% if current_resource && current_resource.respond_to?(:photos) %>
-
-<%= tabs do |t| %>
-  <%= t.pane t('fullstack.admin.info', :default => "Info")  do %>  
-    
-    <%= render :partial => "simple_form" %>
-    
-  <% end %>
-  <%= t.pane t('fullstack.admin.resources.photos', :default => "Photos") do %>
-    
-    <%= photo_uploader(current_resource) %>
-  
-  <% end %>
-<% end %>
-
-<% else %>
-  <%= render :partial => "simple_form" %>
-<% end %>
+<%= render :partial => "simple_form" %>

data/app/views/admin/base/_simple_form.html.erb

@@ -3,6 +3,12 @@
     <%= f.errors %>
     <%= render :partial => "fields", :locals => {:f => f} %>
   
+    <% if current_resource && current_resource.respond_to?(:photos) %>
+      <%= f.box t('fullstack.admin.resources.photos', :default => "Photos") do %>
+        <%= photo_uploader(current_resource) %>
+      <% end %>
+    <% end %>
+  
     <%= f.actions do %>
       <%= f.resource_submit %>
     <% end %>

data/app/views/admin/photos/_photo.html.erb

@@ -1,7 +1,7 @@
   <li class="span2" data-id="<%= photo.id %>" data-photo-id='<%= photo.id %>'>
     <div class="thumbnail">
       <%= image_tag photo.url(:thumb), :style => "height: 141px" %>
-      <div class="thumbnail-toolbar">
+      <div class="thumbnail-toolbar btn-group">
         <%= btn '<i class="icon-zoom-in"></i>'.html_safe, photo.url, :rel => "facebox", :'data-tip' => t('fullstack.admin.preview', :default => "Preview") %>        
         <%= btn '<i class="icon-edit"></i>'.html_safe, edit_admin_photo_path(photo), :'data-target' => '#edit-photo-modal', :'data-toggle' => 'modal', :"data-tip" => t('fullstack.admin.edit', :default => "Edit") %>
         <%= btn '', admin_photo_path(photo), :remote => true, :method => :delete, :confirm => t('fullstack.admin.are_you_sure', :default => "Are you sure?"), :icon => :trash, :type => :danger, :icon_color => :white, :'data-tip' => t('fullstack.admin.delete', :default => "Delete") %>

data/app/views/admin/photos/_photo_uploader.html.erb

@@ -34,6 +34,8 @@
   
 <script type="text/javascript" charset="utf-8">
 $(document).ready(function(){
+  $("#photographable-thumbnails img").css("cursor", "move");
+  
   $("#photographable-thumbnails").bind('sortstop', function(e, ui){
     $(this).find("> li").each(function(i, e){
       var photo_id = $(this).data('id');

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.3.14"
+  s.version = "0.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-12-07"
+  s.date = "2012-12-27"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "app/controllers/admin/users_controller.rb",
     "app/controllers/site/base_controller.rb",
     "app/errors/denied_error.rb",
+    "app/helpers/crumbs_helper.rb",
     "app/helpers/i18n_helper.rb",
     "app/helpers/markdown_helper.rb",
     "app/helpers/menus_helper.rb",
@@ -162,7 +163,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.11"])
+      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.2.12"])
       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"])
@@ -173,7 +174,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.11"])
+      s.add_dependency(%q<fullstack-admin>, ["~> 0.2.12"])
       s.add_dependency(%q<ars-permalink>, [">= 0"])
       s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
       s.add_dependency(%q<acts_as_indexed>, [">= 0"])
@@ -185,7 +186,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.11"])
+    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.12"])
     s.add_dependency(%q<ars-permalink>, [">= 0"])
     s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
     s.add_dependency(%q<acts_as_indexed>, [">= 0"])

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

@@ -1,5 +1,4 @@
 DeviseController.class_eval do
-  authorize :scope => "site"
   before_filter :set_page_title
   
   protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-27 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.11
+        version: 0.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.12
 - !ruby/object:Gem::Dependency
   name: ars-permalink
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +194,7 @@ files:
 - app/controllers/admin/users_controller.rb
 - app/controllers/site/base_controller.rb
 - app/errors/denied_error.rb
+- app/helpers/crumbs_helper.rb
 - app/helpers/i18n_helper.rb
 - app/helpers/markdown_helper.rb
 - app/helpers/menus_helper.rb
@@ -328,7 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3533437621798221490
+      hash: 2985390891517279258
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: