freeberry 0.2.5 → 0.2.6

data/README.rdoc

@@ -10,16 +10,17 @@ For more instruction see {Wiki}[http://wiki.github.com/galetahub/freeberry].
 In your Gemfile:
   
   gem 'devise', '1.1.3'
-  gem 'paperclip', '2.3.3'
-  gem 'nokogiri', '1.4.3.1'
+  gem 'paperclip', '2.3.6'
+  gem 'nokogiri', '1.4.4'
   gem 'declarative_authorization', '0.5.1'
   gem 'responders', '0.6.2'
   gem 'inherited_resources', '1.1.2'
   gem 'haddock', '0.2.2'
-  gem 'will_paginate', '2.3.15'
   gem "mime-types", '1.16', :require => 'mime/types'
+  gem "ckeditor", '3.4.3.pre'
   
-  gem "ckeditor", :git => 'git://github.com/galetahub/rails-ckeditor.git', :branch => 'rails3'
+  gem 'awesome_nested_set', :git => 'git://github.com/galetahub/awesome_nested_set.git'
+  gem 'will_paginate', :git => 'git://github.com/galetahub/will_paginate.git', :branch => 'rails3'
   gem "freeberry", :git => "git://github.com/galetahub/freeberry.git"
 
 Bundler
@@ -29,7 +30,6 @@ Bundler
 Plugins:
 
   rails plugin install git://github.com/galetahub/enum_field.git
-  rails plugin install git://github.com/galetahub/awesome_nested_set.git
   rails plugin install git://github.com/galetahub/salty_slugs.git
   rails plugin install git://github.com/galetahub/auto_html.git
   rails plugin install git://github.com/galetahub/attach_file_field.git  
@@ -37,31 +37,38 @@ Plugins:
 === Generators
 
 Plugin attach_file_field wants generate assets:
+
   rails generate attach_file_field
 
 Devise (http://github.com/plataformatec/devise)
+
   rails generate devise:install
 
 Ckeditor (http://github.com/galetahub/rails-ckeditor)
+
   rails generate ckeditor:base
   rails generate ckeditor:migration
 
 Freeberry
+
   rails generate freeberry:base
   rails generate freeberry:models
 
 === Configuration
 
 Create yml files:
+
   cp config/application.yml.sample config/application.yml
   cp config/database.yml.sample config/database.yml
 
 Create database and load seed data:
+
   rake db:create
   rake db:migrate
   rake db:seed
 
 In config/application.rb:
+
   config.autoload_paths += %W( #{config.root}/app/models/defaults )
 
 == Usage

data/app/controllers/manage/assets_controller.rb

@@ -1,10 +1,11 @@
 class Manage::AssetsController < Manage::BaseController
-  before_filter :find_klass, :only => [:create]
+  before_filter :find_klass, :only => [:create, :sort]
   before_filter :find_asset, :only => [:destroy]
   
+  filter_access_to :sort, :require => :update
+  
   respond_to :html, :xml
   
-  # POST /manage/assets
   def create
     @asset ||= @klass.new(params[:asset])
     
@@ -21,7 +22,6 @@ class Manage::AssetsController < Manage::BaseController
     end
   end
   
-  # DELETE /manage/assets/1
   def destroy
     @asset.destroy
     
@@ -30,6 +30,16 @@ class Manage::AssetsController < Manage::BaseController
     end
   end
   
+  def sort
+    params[:picture].each_with_index do |id, index|
+      @klass.move_to(index, id)
+    end
+    
+    respond_with(@klass) do |format|
+      format.html { head :ok }
+    end
+  end
+  
   protected
   
     def find_asset

data/config/locales/manage/en.yml

@@ -200,6 +200,19 @@ en:
         created_at_asc: "date ascending"
         title_desc: "by title descending"
         title_asc: "by title ascending"
+    
+    sort_columns:
+      _: "-"
+      created_at_desc: "by date descending"
+      created_at_asc: "date ascending"
+      title_desc: "by title descending"
+      title_asc: "by title ascending"
+      name_desc: "by name descending"
+      name_asc: "by name ascending"
+      position_desc: "the attitude of descending"
+      position_asc: "for the position of the ascending"
+      sort_order_desc: "to sort in descending order"
+      sort_order_asc: "to sort in ascending order"
       
   flash:
     manage:      

data/config/locales/manage/ru.yml

@@ -200,6 +200,19 @@ ru:
         created_at_asc: "по дате по возрастанию"
         title_desc: "по названию по убыванию"
         title_asc: "по названию по возрастанию"
+    
+    sort_columns:
+      _: "-"
+      created_at_desc: "по дате по убыванию"
+      created_at_asc: "по дате по возрастанию"
+      title_desc: "по названию по убыванию"
+      title_asc: "по названию по возрастанию"
+      name_desc: "по названию по убыванию"
+      name_asc: "по названию по возрастанию"
+      position_desc: "за позицией по убыванию"
+      position_asc: "за позицией по возрастанию"
+      sort_order_desc: "по сортировке по убыванию"
+      sort_order_asc: "по сортировке по возрастанию"
       
   flash:
     manage:      

data/config/locales/manage/uk.yml

@@ -200,12 +200,25 @@ uk:
         created_at_asc: "за датою за зростанням"
         title_desc: "за назвою за спаданням"
         title_asc: "за назвою за зростанням"
+    
+    sort_columns:
+      _: "-"
+      created_at_desc: "за датою за спаданням"
+      created_at_asc: "за датою за зростанням"
+      title_desc: "за назвою за спаданням"
+      title_asc: "за назвою за зростанням"
+      name_desc: "за назвою за спаданням"
+      name_asc: "за назвою за зростанням"
+      position_desc: "за позицією за спаданням"
+      position_asc: "за позицією за зростанням"
+      sort_order_desc: "по сортуванню за спаданням"
+      sort_order_asc: "по сортуванню за зростанням"
       
   flash:
     manage:      
       actions:
         create:
-          success: "Запис успішно створена"
+          success: "Запис успішно створено"
           failure: "Виникли помилки при збереженні даних"
         update:
           success: "Запис успішно оновлено"

data/config/routes.rb

@@ -16,8 +16,10 @@ Rails.application.routes.draw do
 		  resources :posts
 		end
 		
+		resources :assets, :only => [:create, :destroy] do
+      post :sort, :on => :collection
+    end
+		
     resources :settings
-    resources :pictures
-    resources :assets, :only => [:create, :destroy]
   end
 end

data/lib/freeberry.rb

@@ -9,6 +9,7 @@ module Freeberry
   autoload :ModelFilter,          'freeberry/model_filter'
   autoload :Transliteration,      'freeberry/transliteration'
   autoload :AccessibleAttributes, 'freeberry/accessible_attributes'
+  autoload :Utils,                'freeberry/utils'
   
   # Controllers
   module Controllers
@@ -31,6 +32,8 @@ module Freeberry
     autoload :Asset,         'freeberry/models/asset'
     autoload :Header,        'freeberry/models/header'
   end
+  
+  IMAGE_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/jpg', 'image/pjpeg', 'image/tiff', 'image/x-png']
 end
 
 require 'freeberry/railtie'

data/lib/freeberry/controllers/authorized_system.rb

@@ -8,7 +8,7 @@ module Freeberry
         # Send current_user to Declarative authorization module
         base.before_filter :set_current_user
         
-        base.helper_method :content_manager?, :current_client, :client_logged_in?, :account_signed_in?
+        base.helper_method :content_manager?
       end
     
       module ClassMethods
@@ -49,28 +49,6 @@ module Freeberry
         def content_manager?
           user_signed_in? && current_user.admin?
         end
-        
-        # For RPXNow
-        def client_logged_in?
-          !!current_client
-        end
-        
-        def current_client=(new_client)
-          session[:client_id] = new_client ? new_client.id : nil
-          @current_client = new_client || false
-        end
-        
-        def current_client
-          @current_client ||= client_login_from_session unless @current_client == false
-        end
-        
-        def client_login_from_session
-          self.current_client = RpxClient.find_by_id(session[:client_id]) if session[:client_id]
-        end
-        
-        def account_signed_in?
-          user_signed_in? || client_logged_in?
-        end
       end
     end
   end

data/lib/freeberry/header_tools.rb

@@ -2,29 +2,23 @@
 module Freeberry
   module HeaderTools
     def self.included(base)
-      base.extend(ClassMethods)
+      base.send(:extend, ClassMethods)
+      base.send(:include, InstanceMethods)
     end
     
     module ClassMethods
       def self.extended(base)
-        base.has_one :header, :as=>:headerable, :dependent=>:destroy
-        base.after_update :save_header
-      
-        base.send :include, InstanceMethods
+        base.class_eval do
+          has_one :header, :as => :headerable, :dependent => :delete
+          accepts_nested_attributes_for :header, :reject_if => :all_blank
+        end
       end
     end
     
     module InstanceMethods
-      def page_header=(value)
-        h = self.header || self.build_header
-        h.attributes = value
+      def default_header
+        header || build_header
       end
-    
-      private
-      
-        def save_header
-          self.header.save(:validate => false) unless self.header.nil?
-        end
     end
   end
 end

data/lib/freeberry/models/asset.rb

@@ -14,9 +14,13 @@ module Freeberry
             belongs_to :assetable, :polymorphic => true
     
             before_validation :make_content_type
-            before_create :read_dimensions, :parameterize_file_name
+            before_create :read_dimensions, :parameterize_filename
           end
         end
+        
+        def move_to(index, id)
+          update_all(["sort_order = ?", index], ["id = ?", id.to_i])
+        end
       end
       
       module InstanceMethods
@@ -45,7 +49,7 @@ module Freeberry
         end
         
         def format_created_at
-          I18n.l(self.created_at, :format=>"%d.%m.%Y %H:%M")
+          I18n.l(created_at, :format => "%d.%m.%Y %H:%M")
         end
         
         def to_xml(options = {})
@@ -68,11 +72,11 @@ module Freeberry
         end
         
         def has_dimensions?
-          self.respond_to?(:width) && self.respond_to?(:height)
+          respond_to?(:width) && respond_to?(:height)
         end
         
         def image?
-          ["image/jpeg", "image/tiff", "image/png", "image/gif", "image/bmp"].include?(self.data_content_type)
+          Freeberry::IMAGE_TYPES.include?(data_content_type)
         end
         
         def geometry
@@ -82,6 +86,13 @@ module Freeberry
         
         protected
         
+          def parameterize_filename
+            unless data_file_name.blank?
+              filename = Freeberry::Utils.parameterize_filename(data_file_name)
+              self.data.instance_write(:file_name, filename)
+            end  
+          end
+        
           def read_dimensions
             if image? && has_dimensions?
               self.width = geometry.width
@@ -89,17 +100,8 @@ module Freeberry
             end
           end
           
-          def parameterize_file_name
-            unless data_file_name.blank?
-              extension = File.extname(data_file_name).downcase
-              filename = File.basename(data_file_name, extension).downcase.parameterize
-                      
-              self.data.instance_write(:file_name, [filename, extension].join)
-            end
-          end
-          
           def make_content_type
-            if data_content_type == "application/octet-stream"
+            if data_content_type.blank? || data_content_type == "application/octet-stream"
               content_types = MIME::Types.type_for(filename)
               self.data_content_type = content_types.first.to_s unless content_types.empty?
             end

data/lib/freeberry/models/comment.rb

@@ -10,20 +10,13 @@ module Freeberry
       module ClassMethods
         def self.extended(base)
           base.class_eval do
-            belongs_to :commentable, :polymorphic => true, :counter_cache => :comments_count
+            belongs_to :commentable, :polymorphic => true, :counter_cache => true
             belongs_to :author, :polymorphic => true
             
-            validates :user_name, :presence => true, :length => { :maximum => 100 }, 
-                      :format => { :with => /\A[^[:cntrl:]\\<>\/&]*\z/ }
-            validates :user_email, :presence => true, :length => { :within => 6..100 }, 
-                      :format => { :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
-            validates :content, :presence => true, :length => { :maximum => 500 }
-            validates :commentable_type, :presence => true, :inclusion => { :in => %w( Post Broadcast ) }
-            
-            validates :author_type, :inclusion => { :in => %w( User Client ) }, :allow_blank => true
-            
             before_validation :make_author
             
+            scope :recently, order("#{quoted_table_name}.created_at DESC")
+            scope :siblings_for, lambda { |item| where(["commentable_type = ? AND commentable_id = ?", item.commentable_type, item.commentable_id]) }
             scope :follows, where(:is_follow => true)
           end
         end
@@ -31,16 +24,20 @@ module Freeberry
       
       module InstanceMethods
         def comments_count
-          @comments_count ||= self.class.count(:conditions=>["commentable_id = ? AND commentable_type = ?", self.commentable_id, self.commentable_type])
+          @comments_count ||= siblings.count
           @comments_count
         end
+        
+        def siblings
+          self.class.siblings_for(self)
+        end
     
         protected
     
           def make_author
-          	unless self.author.nil?
-            	self.user_email = self.author.email
-            	self.user_name = self.author.name
+          	unless author.nil?
+            	self.user_email = author.email if author.respond_to?(:email)
+            	self.user_name = author.name if author.respond_to?(:name)
           	end
           end
       end

data/lib/freeberry/models/header.rb

@@ -10,8 +10,6 @@ module Freeberry
       module ClassMethods
         def self.extended(base)
           base.class_eval do
-            validates_presence_of :headerable_type, :headerable_id
-    
             belongs_to :headerable, :polymorphic => true
           end
         end

data/lib/freeberry/railtie.rb

@@ -5,26 +5,26 @@ require 'freeberry'
 module Freeberry
   class Engine < ::Rails::Engine   
     config.before_initialize do
-      ActiveSupport::XmlMini.backend = 'Nokogiri'
+      ::ActiveSupport::XmlMini.backend = 'Nokogiri'
       
-      Responders::FlashResponder.flash_keys = [ :success, :failure ]
-      InheritedResources.flash_keys = [ :success, :failure ]
+      ::Responders::FlashResponder.flash_keys = [ :success, :failure ]
+      ::InheritedResources.flash_keys = [ :success, :failure ]
         
       config.i18n.load_path += Dir[File.join(File.dirname(__FILE__), "../../config", 'locales', '**', '*.{rb,yml}').to_s]
       
-      I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
+      ::I18n::Backend::Simple.send(:include, ::I18n::Backend::Pluralization)
       
-      ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.send :include, Freeberry::MysqlUtils
-        ActiveRecord::Base.send :include, Freeberry::AccessibleAttributes
+      ::ActiveSupport.on_load :active_record do
+        ::ActiveRecord::Base.send :include, Freeberry::MysqlUtils
+        ::ActiveRecord::Base.send :include, Freeberry::AccessibleAttributes
       end
     end
     
     config.after_initialize do
-      ActionController::Base.send :include, Freeberry::Controllers::AuthorizedSystem
-      ActionController::Base.send :include, Freeberry::Controllers::HeadOptions
+      ::ActionController::Base.send :include, Freeberry::Controllers::AuthorizedSystem
+      ::ActionController::Base.send :include, Freeberry::Controllers::HeadOptions
     
-      ActionView::Base.send :include, Freeberry::Controllers::HelperTools
+      ::ActionView::Base.send :include, Freeberry::Controllers::HelperTools
     end
     
     rake_tasks do

data/lib/freeberry/utils.rb

@@ -2,6 +2,13 @@
 module Freeberry
   class Utils
     class << self
+      def parameterize_filename(filename)
+        extension = File.extname(filename)
+        basename = filename.gsub(/#{extension}$/, "")
+        
+        [basename.parameterize('_'), extension].join.downcase
+      end
+      
       def form_field(form_name, field_name, column, options={})
         field = case column.type
           when :string, :binary, :integer, :float, :decimal then 

data/lib/freeberry/version.rb

@@ -2,7 +2,7 @@ module Freeberry
   module Version
     MAJOR = 0
     MINOR = 2
-    RELEASE = 5
+    RELEASE = 6
 
     def self.dup
       "#{MAJOR}.#{MINOR}.#{RELEASE}"

data/lib/generators/freeberry/base/templates/helpers/manage/assets_helper.rb

@@ -1,12 +1,10 @@
 module Manage::AssetsHelper
   
-  def manage_assets_path_with_session_information(klass='Asset', options = {})
-    options.symbolize_keys!
+  def manage_assets_path_with_session_information(klass = 'Asset', options = {})
+    options = { :format => :xml, :protocol => "http://" }.merge(options)
     session_key = Rails.application.config.send(:session_options)[:key]
     
     options[session_key] = Rack::Utils.escape(cookies[session_key])
-    options[:format] = :xml
-    options[:protocol] = "http://"
     options[:klass] = klass
     
     if protect_against_forgery?

data/lib/generators/freeberry/base/templates/javascripts/rails.js

@@ -1,3 +1,12 @@
+/*
+ * jquery-ujs
+ *
+ * http://github.com/rails/jquery-ujs/blob/master/src/rails.js
+ *
+ * This rails.js file supports jQuery 1.4.3 and 1.4.4 .
+ *
+ */ 
+
 jQuery(function ($) {
     var csrf_token = $('meta[name=csrf-token]').attr('content'),
         csrf_param = $('meta[name=csrf-param]').attr('content');
@@ -19,16 +28,22 @@ jQuery(function ($) {
         },
 
         /**
-         * Handles execution of remote calls firing overridable events along the way
+         * Handles execution of remote calls. Provides following callbacks:
+         *
+         * - ajax:before   - is execute before the whole thing begings
+         * - ajax:beforeSend  - is executed before firing ajax call
+         * - ajax:success  - is executed when status is success
+         * - ajax:complete - is executed when the request finishes, whether in failure or success.
+         * - ajax:error    - is execute in case of error
          */
         callRemote: function () {
             var el      = this,
                 method  = el.attr('method') || el.attr('data-method') || 'GET',
                 url     = el.attr('action') || el.attr('href'),
-                dataType  = el.attr('data-type')  || 'script';
+                dataType  = el.attr('data-type')  || ($.ajaxSettings && $.ajaxSettings.dataType);
 
             if (url === undefined) {
-              throw "No URL specified for remote call (action or href must be present).";
+                throw "No URL specified for remote call (action or href must be present).";
             } else {
                 if (el.triggerAndReturn('ajax:before')) {
                     var data = el.is('form') ? el.serializeArray() : [];
@@ -38,7 +53,8 @@ jQuery(function ($) {
                         dataType: dataType,
                         type: method.toUpperCase(),
                         beforeSend: function (xhr) {
-                            el.trigger('ajax:loading', xhr);
+                            xhr.setRequestHeader("Accept", "text/javascript");
+                            el.trigger('ajax:beforeSend', xhr);
                         },
                         success: function (data, status, xhr) {
                             el.trigger('ajax:success', [data, status, xhr]);
@@ -47,12 +63,10 @@ jQuery(function ($) {
                             el.trigger('ajax:complete', xhr);
                         },
                         error: function (xhr, status, error) {
-                            el.trigger('ajax:failure', [xhr, status, error]);
+                            el.trigger('ajax:error', [xhr, status, error]);
                         }
                     });
                 }
-
-                el.trigger('ajax:after');
             }
         }
     });
@@ -60,28 +74,16 @@ jQuery(function ($) {
     /**
      *  confirmation handler
      */
-    var jqueryVersion = $().jquery;
 
-    if ( (jqueryVersion === '1.4') || (jqueryVersion === '1.4.1') || (jqueryVersion === '1.4.2')){
-      $('a[data-confirm],input[data-confirm]').live('click.rails', function () {
-          var el = $(this);
-          if (el.triggerAndReturn('confirm')) {
-              if (!confirm(el.attr('data-confirm'))) {
-                  return false;
-              }
-          }
-      });
-    } else {
-      $('body').delegate('a[data-confirm],input[data-confirm]', 'click.rails', function () {
-          var el = $(this);
-          if (el.triggerAndReturn('confirm')) {
-              if (!confirm(el.attr('data-confirm'))) {
-                  return false;
-              }
-          }
-      });
-    }
-    
+    $('body').delegate('a[data-confirm], button[data-confirm], input[data-confirm]', 'click.rails', function () {
+        var el = $(this);
+        if (el.triggerAndReturn('confirm')) {
+            if (!confirm(el.attr('data-confirm'))) {
+                return false;
+            }
+        }
+    });
+  
 
 
     /**
@@ -104,8 +106,8 @@ jQuery(function ($) {
             form = $('<form method="post" action="'+href+'"></form>'),
             metadata_input = '<input name="_method" value="'+method+'" type="hidden" />';
 
-        if (csrf_param != null && csrf_token != null) {
-          metadata_input += '<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />';
+        if (csrf_param !== undefined && csrf_token !== undefined) {
+            metadata_input += '<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />';
         }
 
         form.hide()
@@ -132,10 +134,10 @@ jQuery(function ($) {
         });
     };
 
-    $(disable_with_form_remote_selector).live('ajax:before', disable_with_input_function);
+    $(disable_with_form_remote_selector).live('ajax:before.rails', disable_with_input_function);
     $(disable_with_form_not_remote_selector).live('submit.rails', disable_with_input_function);
 
-    $(disable_with_form_remote_selector).live('ajax:complete', function () {
+    $(disable_with_form_remote_selector).live('ajax:complete.rails', function () {
         $(this).find(disable_with_input_selector).each(function () {
             var input = $(this);
             input.removeAttr('disabled')
@@ -143,4 +145,10 @@ jQuery(function ($) {
         });
     });
 
+    var jqueryVersion = $().jquery;
+
+    if ( (jqueryVersion === '1.4') || (jqueryVersion === '1.4.1') || (jqueryVersion === '1.4.2') ){
+        alert('This rails.js does not support the jQuery version you are using. Please read documentation.');
+    }
+
 });

data/lib/generators/freeberry/base/templates/views/layouts/application.html.erb

@@ -14,7 +14,7 @@
   <script src="https://www.google.com/jsapi?key=" type="text/javascript"></script>
   <script language="Javascript" type="text/javascript">
   //<![CDATA[
-    google.load("jquery", "1.4.3");
+    google.load("jquery", "1.4.4");
     google.load("swfobject", "2.2");
   //]]>
   </script>

data/lib/generators/freeberry/base/templates/views/layouts/manage.html.erb

@@ -11,7 +11,7 @@
  	<script src="https://www.google.com/jsapi?key=" type="text/javascript"></script>
   <script language="Javascript" type="text/javascript">
   //<![CDATA[
-    google.load("jquery", "1.4.3");
+    google.load("jquery", "1.4.4");
     google.load("jqueryui", "1.8.6");
     google.load("swfobject", "2.2");
   //]]>

data/lib/generators/freeberry/base/templates/views/manage/assets/_collection.html.erb

@@ -1,6 +1,6 @@
 <% unless model.new_record? %>
-  <% javascript "jquery.fancybox-1.3.1.pack.js" %>
-  <% stylesheet "jquery.fancybox-1.3.1.css" %>
+  <% javascript "jquery.fancybox-1.3.2.pack.js" %>
+  <% stylesheet "fancybox/jquery.fancybox-1.3.2.css" %>
   
   <div class="gray-blocks">
     <div style="padding: 20px;" class="bg-bl">
@@ -21,16 +21,29 @@
   
   <script type='text/javascript'>
     $(document).ready(function(){
-      $("div.galery a.fancybox").fancybox({
+      /*$("div.galery a.fancybox").fancybox({
 				'titleShow'		: true,
 				'transitionIn'	: 'none',
 				'transitionOut'	: 'none'
-			});
-     
+			});*/
+      
       $('div.galery a.del').bind("ajax:complete", function(){
         var pid = $(this).attr('href').replace('/manage/assets/', '');
         $('#picture_' + pid).fadeOut(1);
       });
+      
+      $("div.galery").sortable({
+			  revert: true,
+			  update: function(event, ui){
+			    var data = $('div.galery').sortable('serialize');
+			    $.ajax({
+            url: "<%= sort_manage_assets_path(:klass => model.pictures.name) %>",
+            data: data,
+            dataType: 'script',
+            type: 'POST'
+          });
+			  }
+		  });
     });
   </script>
 <% end %>

data/lib/generators/freeberry/base/templates/views/manage/assets/_picture.html.erb

@@ -1,4 +1,4 @@
-<%= content_tag(:div, :class=>"ill", :id=>"picture_#{picture.id}") do %>
+<%= content_tag(:div, :class=>"ill", :id => dom_id(picture)) do %>
   <%= link_to image_tag("manage/empty.gif", :alt=>t('manage.delete'), :title=>t('manage.delete')), 
           manage_asset_path(picture), 
           :remote => true,
@@ -6,5 +6,5 @@
           :confirm => t('manage.confirm_delete'),
           :class => "del" %>
           
-  <%= link_to image_tag(picture.url(:thumb), :alt=>picture.filename, :title=>picture.filename), picture.url(:content), :class => "fancybox" %>
+  <%= link_to image_tag(picture.url(:thumb), :title => picture.filename), picture.url(:content), :class => "fancybox" %>
 <% end %>

data/lib/generators/freeberry/base/templates/views/manage/assets/_swfscript.html.erb

@@ -17,7 +17,7 @@
 				file_size_limit : "10 MB",
 				file_types : "*.jpg;*.jpeg;*.png;*.gif",			// or you could use something like: "*.doc;*.wpd;*.pdf",
 				file_types_description : "All Images",
-				file_upload_limit : 10,
+				file_upload_limit : 20,
 				file_queue_limit : 0,
 
 				// The event handler functions are defined in handlers.js

data/lib/generators/freeberry/base/templates/views/manage/posts/_form.html.erb

@@ -1,13 +1,10 @@
-<% javascript "calendar/ui.datepicker-#{I18n.locale}" %>
+<% javascript "datepicker/jquery.ui.datepicker-#{I18n.locale}" %>
 
 <div class="edit-cont">
   <div class="inputs-bl">
     <%= form.label "title" %>
     <%= form.text_field "title", :class=>"text name" %>
-        
-    <%= form.label "content" %>
-    <%= form.cktext_area "content", options_for_ckeditor %>
-        
+    
     <%= form.label :published_at %>
     <%= form.text_field :published_at %>
     
@@ -19,6 +16,9 @@
 			    dateFormat: 'dd.mm.yy'
 		    });
 	    });
-	  </script>
+	  </script>   
+     
+    <%= form.label "content" %>
+    <%= form.cktext_area "content", options_for_ckeditor(:width => 860) %>
   </div>
 </div>

data/lib/generators/freeberry/base/templates/views/manage/structures/_form.html.erb

@@ -11,7 +11,7 @@
     <div class="bot-bg">
       <div class="wh-title"><%= t('manage.keywords') %></div>
       <div class="elem-bl">
-        <%= fields_for "structure[page_header]", @structure.header || Header.new do |h| %>
+        <%= form.fields_for :header, @structure.header || Header.new do |h| %>
           <%= h.label "title" %><br/>
           <%= h.text_field "title", :class=>"text" %><br/>
 

data/lib/generators/freeberry/manage_scaffold/templates/multiplay/views/model_filter.html.erb

@@ -19,11 +19,11 @@
   </div>
   <div class="sort">
   	<label><%%= t('manage.sort') %></label>
-    <div class="select"><%%= link_to_function t("manage.<%= plural_name %>.sort.#{@search.order_column}_#{@search.order_type}"), "SelectList.toggle(event)", :class=>"corn", :id=>'sort_select' %></div>
+    <div class="select"><%%= link_to_function t("<%= plural_name %>.#{@search.order_column}_#{@search.order_type}", :scope => [:manage, :sort_columns], :default => :"#{@search.order_column}_#{@search.order_type}"), "SelectList.toggle(event)", :class=>"corn", :id=>'sort_select' %></div>
     <div id='sort_select_list' class="select-list" style='display:none;'>
       <% model.attributes.each do |attribute, value| -%>
-      <%%= link_to_sort(t('manage.<%= plural_name %>.sort.<%= attribute %>_desc'), :name=><%= attribute.inspect %>, :order_type=>'desc') %>
-      <%%= link_to_sort(t('manage.<%= plural_name %>.sort.<%= attribute %>_asc'), :name=><%= attribute.inspect %>, :order_type=>'asc') %>      
+      <%%= link_to_sort(t('<%= plural_name %>.<%= attribute %>_desc', :scope => [:manage, :sort_columns], :default => :<%= attribute %>_desc), :name => <%= attribute.inspect %>, :order_type => 'desc') %>
+      <%%= link_to_sort(t('<%= plural_name %>.<%= attribute %>_asc', :scope => [:manage, :sort_columns], :default => :<%= attribute %>_asc), :name => <%= attribute.inspect %>, :order_type => 'asc') %>      
       <% end %>
     </div>
   </div>

data/lib/generators/freeberry/manage_scaffold/templates/single/views/model_filter.html.erb

@@ -5,7 +5,7 @@
     <%%= cookie_content_tag(:div, :id=>"block_filter", :class=>"filt") do %>
       <%%= form_for @search, :as => :search, :url=>manage_<%= plural_name %>_path, :html=>{:method=>:get, :id=>"form_filter"} do |f| %>
         <% model.attributes.each do |attribute, value| -%>
-          <%%= f.label :<%= attribute %>, t('activerecord.attributes.<%= singular_name %>.<%= attribute %>') %>
+          <%%= f.label :<%= attribute %>, t('<%= singular_name %>.<%= attribute %>', :scope => [:activerecord, :attributes]) %>
           <%%= f.text_field :<%= attribute %>, :class=>"text" %>
         <% end -%>
           
@@ -19,11 +19,11 @@
   </div>
   <div class="sort">
   	<label><%%= t('manage.sort') %></label>
-    <div class="select"><%%= link_to_function t("manage.<%= plural_name %>.sort.#{@search.order_column}_#{@search.order_type}"), "SelectList.toggle(event)", :class=>"corn", :id=>'sort_select' %></div>
+    <div class="select"><%%= link_to_function t("<%= plural_name %>.#{@search.order_column}_#{@search.order_type}", :scope => [:manage, :sort_columns], :default => :"#{@search.order_column}_#{@search.order_type}"), "SelectList.toggle(event)", :class=>"corn", :id=>'sort_select' %></div>
     <div id='sort_select_list' class="select-list" style='display:none;'>
       <% model.attributes.each do |attribute, value| %>
-      <%%= link_to_sort(t('manage.<%= plural_name %>.sort.<%= attribute %>_desc'),:name => <%= attribute.inspect %>, :order_type => 'desc') %>
-      <%%= link_to_sort(t('manage.<%= plural_name %>.sort.<%= attribute %>_asc'), :name => <%= attribute.inspect %>, :order_type => 'asc') %>
+      <%%= link_to_sort(t('<%= plural_name %>.<%= attribute %>_desc', :scope => [:manage, :sort_columns], :default => :<%= attribute %>_desc), :name => <%= attribute.inspect %>, :order_type => 'desc') %>
+      <%%= link_to_sort(t('<%= plural_name %>.<%= attribute %>_asc', :scope => [:manage, :sort_columns], :default => :<%= attribute %>_asc), :name => <%= attribute.inspect %>, :order_type => 'asc') %>
       <% end %>
     </div>
   </div>

data/lib/generators/freeberry/models/templates/create_assets.rb

@@ -12,6 +12,7 @@ class FreeberryCreateAssets < ActiveRecord::Migration
 		  
 		  t.integer :locale, :limit => 1, :default => 0
 		  t.integer :user_id
+		  t.integer :sort_order, :default => 0
 		  
       t.timestamps
     end

data/lib/generators/freeberry/models/templates/models/avatar.rb

@@ -29,10 +29,10 @@ class Avatar < Asset
 	                  :url  => "/assets/avatars/:id/:style_:basename.:extension",
                     :path => ":rails_root/public/assets/avatars/:id/:style_:basename.:extension",
                     :convert_options => { :all => "-strip" },
-	                  :styles => { :thumb => "50x50#", :small=>"32x32#" }
+	                  :styles => { :thumb => "50x50#", :small => "32x32#" }
 	
 	validates_attachment_size :data, :less_than => 1.megabyte
-	validates_attachment_content_type :data, :content_type => ['image/gif', 'image/jpeg', 'image/png', 'image/tiff', 'image/x-png']
+	validates_attachment_content_type :data, :content_type => Freeberry::IMAGE_TYPES
 	
 	attr_accessible :data
 end

data/lib/generators/freeberry/models/templates/models/comment.rb

@@ -3,10 +3,24 @@ class Comment < ActiveRecord::Base
   
   using_access_control
   
+  validates :content, :presence => true, :length => { :maximum => 500 }
+  validates :commentable_type, :presence => true, :inclusion => { :in => %w( Post Article ) }         
+  validates :author_type, :inclusion => { :in => %w( User FreeberryAuth::Account ) }, :allow_blank => true
+  
+  with_options :if => :anonymous? do |anonymous|
+    anonymous.validates :user_name, :length => { :maximum => 100 }, :presence => true,
+              :format => { :with => /\A[^[:cntrl:]\\<>\/&]*\z/ }
+    anonymous.validates :user_email, :length => { :within => 6..100 }, :presence => true,
+              :format => { :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
+  end
+  
   attr_accessible :user_name, :user_email, :content, :is_follow
 
+  #after_create :send_notifiers
+
   auto_html_for :content do
     html_escape
+    big_words :length => 80, :tag => "span"
     image
     youtube :width => 500, :height => 300
     vimeo :width => 500, :height => 300
@@ -14,4 +28,21 @@ class Comment < ActiveRecord::Base
     simple_format
     sanitize
   end
+  
+  def anonymous?
+    author.nil?
+  end
+  
+  def siblings
+    self.class.siblings_for(self)
+  end
+  
+  protected
+  
+    def send_notifiers
+      emails = [ commentable.user.try(:email) ]
+      emails.concat(siblings.follows.select("user_email").map(&:user_email).uniq)
+      emails.delete_if{ |email| email.blank? || email == user_email }
+      emails.each { |email| Notifier.comment(email, self).deliver }
+    end
 end

data/lib/generators/freeberry/models/templates/models/picture.rb

@@ -27,9 +27,12 @@ class Picture < Asset
                     :url  => "/assets/pictures/:id/:style_:basename.:extension",
                     :path => ":rails_root/public/assets/pictures/:id/:style_:basename.:extension",
                     :convert_options => { :all => "-strip" },
-	                  :styles => { :content => '575>', :thumb => '80x80#', :cover => '400x250#' }
+	                  :styles => { :content => '575>', :thumb => '80x80#' }
 	
 	validates_attachment_size :data, :less_than => 2.megabytes
+	validates_attachment_content_type :data, :content_type => Freeberry::IMAGE_TYPES
 	
 	attr_accessible :data
+	
+	default_scope order("#{quoted_table_name}.sort_order")
 end

data/lib/generators/freeberry/models/templates/models/structure.rb

@@ -5,5 +5,7 @@ class Structure < ActiveRecord::Base
   
   has_slug :prepend_id => false
   
-  attr_accessible :title, :kind, :position, :parent_id, :redirect_url
+  attr_accessible :title, :kind, :position, :parent_id, :redirect_url,
+                  :position_type, :slug, :parent, :structure_type, 
+                  :header_attributes, :is_visible
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freeberry
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Igor Galeta
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +02:00
+date: 2010-12-01 00:00:00 +02:00
 default_executable: 
 dependencies: []