fullstack-cms 0.2.32.fix → 0.2.33

data/Gemfile

@@ -14,6 +14,7 @@ gem "awesome_nested_set"
 gem "rails_i18n_gettext"
 gem "sitemap", :git => "git://github.com/viseztrance/rails-sitemap.git"
 gem "whenever"
+gem 'rinku', '~> 1.2.2', :require => 'rails_rinku'
 
 gem 'bluecloth'
 # gem 'i18n_fields'

data/Gemfile.lock

@@ -246,6 +246,7 @@ GEM
     remotipart (1.0.2)
     resource-presentation-helpers (0.1.1)
       rails
+    rinku (1.2.2)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -279,5 +280,6 @@ DEPENDENCIES
   fullstack-admin (~> 0.1.53)
   jeweler
   rails_i18n_gettext
+  rinku (~> 1.2.2)
   sitemap!
   whenever

data/VERSION

@@ -1 +1 @@
-0.2.32.fix
+0.2.33

data/app/controllers/admin/photos_controller.rb

@@ -32,7 +32,11 @@ class Admin::PhotosController < Admin::BaseController
   def update
       @photo.attributes = params[:photo]
       @photo.save
-      respond_with(@photo)
+      if request.format == "json"      
+        render :json => {:success => true} 
+      else
+        respond_with(@photo)
+      end
   end
   
   def destroy

data/app/models/photo.rb

@@ -1,4 +1,6 @@
 class Photo < ActiveRecord::Base
+  include Positionable
+  default_scope order(:position)
 
   validates_attachment :image, :presence => true,
     :size => { :in => 0..2.megabytes }

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

@@ -1,8 +1,10 @@
-  <li class="span2">
+  <li class="span2" data-id="<%= photo.id %>">
     <div class="thumbnail">
-      <%= image_tag photo.url(:thumb), :style => "height: 141px", :'data-zoom-url' => photo.url %>
+      <%= image_tag photo.url(:thumb), :style => "height: 141px" %>
       <div class="thumbnail-toolbar">
-        <%= btn t('fullstack.admin.edit', :default => "Edit"), edit_admin_photo_path(photo), :'data-target' => '#edit-photo-modal', :'data-toggle' => 'modal' %>
+        <%= 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") %>
       </div>      
     </div>

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

@@ -21,7 +21,7 @@
 
     <h4 class="page-header"><%= t('fullstack.admin.resources.photos', :default => "Photos") %> <span class="badge counter"><%= photographable.photos.size %></span></h4>
 
-<ul class="thumbnails">
+<ul class="thumbnails sortable" id="photographable-thumbnails">
   <% photographable.photos.order('created_at DESC').each do |photo| %>
             <%= render :partial => "admin/photos/photo", :locals => {:photo => photo} %>
   <% end %>
@@ -30,4 +30,21 @@
 </div>
 
   <div class="modal fade" id="edit-photo-modal"></div>
-<% end %>
+<% end %>
+
+<% content_for :javascripts do -%>
+  
+<script type="text/javascript" charset="utf-8">
+$(document).ready(function(){
+  $("#photographable-thumbnails").bind('sortstop', function(e, ui){
+    $(this).find("> li").each(function(i, e){
+      var photo_id = $(this).data('id');
+      var url = '<%= admin_photos_path %>/' + photo_id + ".json";
+      $.post(url, {_method: "put", photo: {position: i}});      
+    });
+  });
+  
+});
+</script>
+  
+<% end -%>

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.2.32.fix"
+  s.version = "0.2.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-10-03"
+  s.date = "2012-10-26"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -143,6 +143,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails_i18n_gettext>, [">= 0"])
       s.add_runtime_dependency(%q<sitemap>, [">= 0"])
       s.add_runtime_dependency(%q<whenever>, [">= 0"])
+      s.add_runtime_dependency(%q<rinku>, ["~> 1.2.2"])
       s.add_runtime_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
@@ -154,6 +155,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails_i18n_gettext>, [">= 0"])
       s.add_dependency(%q<sitemap>, [">= 0"])
       s.add_dependency(%q<whenever>, [">= 0"])
+      s.add_dependency(%q<rinku>, ["~> 1.2.2"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
@@ -166,6 +168,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails_i18n_gettext>, [">= 0"])
     s.add_dependency(%q<sitemap>, [">= 0"])
     s.add_dependency(%q<whenever>, [">= 0"])
+    s.add_dependency(%q<rinku>, ["~> 1.2.2"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end

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

@@ -41,6 +41,8 @@
       %>
     <% end %>
   <% end %>
+  
+  <meta name="keywords" content="bed and breakfast bologna, bed and breakfast bologna ospedale maggiore, bed and breakfast bologna aereoporto, bed and breakfast bologna fiera" />
 
  <link rel="shortcut icon" href="/favicon.ico?v=2" />
   <%= stylesheet_link_tag 'site/site' %>

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

@@ -36,9 +36,7 @@ Fullstack::Cms.configure do |config|
   # = Settings =
   # ============
   
-  config.setting(:google_analytics_code, :localized => false)
-  config.setting(:facebook_app_id, :localized => false)
-  
+  config.setting(:google_analytics_code, :localized => false)  
   config.setting(:title)
   config.setting(:slogan)
   config.setting(:description, :kind => :text)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.32.fix
-  prerelease: 7
+  version: 0.2.33
+  prerelease: 
 platform: ruby
 authors:
 - mcasimir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack-admin
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rinku
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +315,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4051166054774937559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -307,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: CMS system built on fullstack