bhf 0.3.10 → 0.3.11

data/app/controllers/bhf/application_controller.rb

@@ -1,7 +1,5 @@
 class Bhf::ApplicationController < ActionController::Base
 
-  protect_from_forgery
-
   before_filter :init_time, :check_admin_account, :setup_current_account, :load_config, :set_title
 
   helper_method :current_account

data/app/controllers/bhf/embed_entries_controller.rb

@@ -0,0 +1,78 @@
+class Bhf::EmbedEntriesController < Bhf::EntriesController
+
+  def new
+    @form_url = bhf_entry_embed_index_path(@platform.name, @model.get_embedded_parent(params[:entry_id]))
+
+    render 'bhf/entries/new', ({:layout => 'bhf/quick_edit'} if @quick_edit) || {}
+  end
+
+  def edit
+    @form_url = bhf_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
+
+    render 'bhf/entries/edit', ({:layout => 'bhf/quick_edit'} if @quick_edit) || {}
+  end
+
+  def create
+    before_save
+    if @object.save
+      manage_many_to_many
+      after_save
+
+      edit_path = edit_bhf_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
+      if @quick_edit
+        render :json => object_to_bhf_display_hash.merge(:edit_path => edit_path), :status => :ok
+      else
+        redirect_back_or_default(edit_path, :notice => set_message('create.success', @model))
+      end
+    else
+      @form_url = bhf_entry_embed_index_path(@platform.name, @model.get_embedded_parent(params[:entry_id]))
+
+      r_settings = {:status => :unprocessable_entity}
+      r_settings[:layout] = 'bhf/quick_edit' if @quick_edit
+      render 'bhf/entries/new', r_settings
+    end
+  end
+
+  def update
+    before_save
+    if @object.update_attributes(params[@model_sym])
+      manage_many_to_many
+      after_save
+
+      if @quick_edit
+        render :json => object_to_bhf_display_hash, :status => :ok
+      else
+        redirect_back_or_default(edit_bhf_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object), :notice => set_message('update.success', @model))
+      end
+    else
+      @form_url = bhf_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
+
+      r_settings = {:status => :unprocessable_entity}
+      r_settings[:layout] = 'bhf/quick_edit' if @quick_edit
+      render 'bhf/entries/edit', r_settings
+    end
+  end
+
+  def destroy
+    @object.destroy
+    if @quick_edit
+      head :ok
+    else
+      redirect_back_or_default(bhf_page_path(@platform.page_name), :notice => set_message('destory.success', @model))
+    end
+  end
+
+
+  private
+
+    def load_object
+      @object = @model.bhf_find_embed(params[:entry_id], params[:id])
+      after_load
+    end
+
+    def load_new_object
+      @object = @model.bhf_new_embed(params[:entry_id], params[@model_sym])
+      after_load
+    end
+
+end

data/app/controllers/bhf/entries_controller.rb

@@ -1,11 +1,9 @@
 class Bhf::EntriesController < Bhf::ApplicationController
   before_filter :load_platform, :load_model, :set_page, :set_quick_edit
   before_filter :load_object, :except => [:create, :new, :sort]
+  before_filter :load_new_object, :only => [:create, :new]
 
   def new
-    @object = @model.new
-    after_load
-
     @form_url = bhf_entries_path(@platform.name)
   end
 
@@ -16,9 +14,6 @@ class Bhf::EntriesController < Bhf::ApplicationController
   end
 
   def create
-    @object = @model.new(params[@model_sym])
-    after_load
-
     before_save
     if @object.save
       manage_many_to_many
@@ -95,6 +90,11 @@ class Bhf::EntriesController < Bhf::ApplicationController
       after_load
     end
 
+    def load_new_object
+      @object = @model.new(params[@model_sym])
+      after_load
+    end
+
     def manage_many_to_many
       return unless params[:has_and_belongs_to_many]
       params[:has_and_belongs_to_many].each_pair do |relation, ids|
@@ -131,4 +131,5 @@ class Bhf::EntriesController < Bhf::ApplicationController
     def set_quick_edit
       @quick_edit = request.xhr?
     end
+    
 end

data/app/controllers/bhf/pages_controller.rb

@@ -14,6 +14,7 @@ class Bhf::PagesController < Bhf::ApplicationController
 
     @platforms = platform_options.each_with_object([]) do |opts, obj|
       platform = Bhf::Platform.new(opts, @page, current_account)
+      next if platform.model.bhf_embedded?
       platform.pagination = Bhf::Pagination.new(platform.entries_per_page)
       paginate_platform_objects(platform)
       obj << platform

data/app/helpers/bhf/entries_helper.rb

@@ -13,11 +13,15 @@ module Bhf
     end
 
     def is_image?(file)
-      ['.png', '.jpg', '.jpeg', '.gif', '.svg'].each do |file_extention|
-        return true if file.downcase.include? file_extention
-      end
-      false
+      file.match(/\.png|\.jpg|\.jpeg|\.gif|\.svg/i).to_b
     end
 
+    def reflection_title(f, field)
+      title = f.object.class.human_attribute_name(field.reflection.name)
+      if field.link
+        title = t("bhf.platforms.#{field.link}.title", :count => f.object.send(field.reflection.name).to_a.count, :default => title)
+      end
+      title
+    end
   end
 end

data/app/views/bhf/entries/_form.haml

@@ -2,7 +2,7 @@
 = form_for @object, :url => @form_url, :builder => Bhf::Form::Builder, :html => html do |f|
 
   - if f.object.errors.any?
-    = render :partial => 'validation_errors', :locals => {:f => f}
+    = render :partial => 'bhf/entries/validation_errors', :locals => {:f => f}
 
   - @platform.fields.each do |field|
     - unless field.form_type == :hidden

data/app/views/bhf/entries/edit.haml

@@ -1,2 +1,2 @@
 %h3= edit_t @platform
-= render 'form'
+= render 'bhf/entries/form'

data/app/views/bhf/entries/form/belongs_to/_select.haml

@@ -1,7 +1,7 @@
 - data_source ||= field.reflection.klass.all
 - fk = field.reflection.primary_key_name
 .node
-  .label= f.label fk
+  .label= f.label fk, reflection_title(f, field)
   .input
     = f.select fk, options_from_collection_for_select(data_source, :id, :to_bhf_s, f.object.send(fk)), :include_blank => true
     = render :partial => 'bhf/helper/field_errors', :locals => {:f => f, :field => fk}

data/app/views/bhf/entries/form/belongs_to/_static.haml

@@ -1,9 +1,6 @@
 = reflection_node f, field do
   - ref_object = f.object.send(field.reflection.name)
   - if ref_object.blank?
-    = t 'bhf.helpers.entry.empty'
+    = t 'bhf.helpers.entry.empty', :count => 1
   - else
-    - if field.link
-      = link_to ref_object.to_bhf_s, edit_bhf_entry_path(field.link, ref_object), :class => 'quick_edit'
-    - else
-      = ref_object.to_bhf_s
+    = link_to_if field.link, ref_object.to_bhf_s, edit_bhf_entry_path(field.link || 0, ref_object), :class => 'quick_edit'

data/app/views/bhf/entries/form/column/_array.haml

@@ -0,0 +1,8 @@
+= node f, field do
+  .array_holder
+    = f.fields_for field.name do |x|
+      - if f.object.send(field.name).blank?
+        = x.text_field nil, :class => 'array_fields', :id => nil
+      - else
+        - f.object.send(field.name).each do |entry|
+          = x.text_field nil, :value => entry, :class => 'array_fields', :id => nil

data/app/views/bhf/entries/form/embeds_many/_static.haml

@@ -0,0 +1,14 @@
+= reflection_node f, field do
+  - ref_objects = f.object.send(field.reflection.name)
+  - if ref_objects.blank?
+    = t 'bhf.helpers.entry.empty', :count => 2
+  - else
+    %ul.relation
+      - ref_objects.each do |ref_object|
+        %li
+          = link_to_if field.link, ref_object.to_bhf_s, edit_bhf_entry_embed_path(field.link || 0, f.object, ref_object), :class => 'quick_edit'
+          = link_to_if field.link, '×'.html_safe, bhf_entry_embed_path(field.link || 0, f.object, ref_object), :method => :delete, :confirm => t('bhf.helpers.promts.confirm'), :class => 'delete', :remote => true
+
+  - # FIXME: empty ul js problem
+  - if field.link
+    = link_to '+', new_bhf_entry_embed_path(field.link, f.object), :class => 'add_field quick_edit'

data/app/views/bhf/entries/form/embeds_one/_static.haml

@@ -0,0 +1,13 @@
+= reflection_node f, field do
+  - ref_objects = f.object.send(field.reflection.name)
+  - if ref_objects.blank?
+    = t 'bhf.helpers.entry.empty', :count => 0
+  - else
+    %ul.relation
+      - ref_objects.to_a.each do |ref_object|
+        %li
+          = link_to_if field.link, ref_object.to_bhf_s, edit_bhf_entry_embed_path(field.link || 0, f.object, ref_object), :class => 'quick_edit'
+          = link_to_if field.link, '×'.html_safe, bhf_entry_embed_path(field.link || 0, f.object, ref_object), :method => :delete, :confirm => t('bhf.helpers.promts.confirm'), :class => 'delete', :remote => true
+
+  - if field.link
+    = link_to '+', new_bhf_entry_embed_path(field.link, f.object), :class => 'add_field quick_edit'

data/app/views/bhf/entries/form/has_and_belongs_to_many/_static.haml

@@ -1,12 +1,8 @@
 = reflection_node f, field do
   - ref_objects = f.object.send(field.reflection.name)
   - if ref_objects.blank?
-    = t 'bhf.helpers.entries.empty'
+    = t 'bhf.helpers.entry.empty', :count => 2
   - else
     %ul
       - ref_objects.each do |ref_object|
-        %li
-          - if field.link
-            = link_to ref_object.to_bhf_s, edit_bhf_entry_path(field.link, ref_object), :class => 'quick_edit'
-          - else
-            = ref_object.to_bhf_s
+        %li= link_to_if field.link, ref_object.to_bhf_s, edit_bhf_entry_path(field.link || 0, ref_object), :class => 'quick_edit'

data/app/views/bhf/entries/form/has_many/_static.haml

@@ -1,12 +1,8 @@
 = reflection_node f, field do
   - ref_objects = f.object.send(field.reflection.name)
   - if ref_objects.blank?
-    = t 'bhf.helpers.entries.empty'
+    = t 'bhf.helpers.entry.empty', :count => 2
   - else
     %ul
       - ref_objects.each do |ref_object|
-        %li
-          - if field.link
-            = link_to ref_object.to_bhf_s, edit_bhf_entry_path(field.link, ref_object), :class => 'quick_edit'
-          - else
-            = ref_object.to_bhf_s
+        %li= link_to_if field.link, ref_object.to_bhf_s, edit_bhf_entry_path(field.link || 0, ref_object), :class => 'quick_edit'

data/app/views/bhf/entries/form/has_one/_static.haml

@@ -1,9 +1,6 @@
 = reflection_node f, field do
   - ref_object = f.object.send(field.reflection.name)
   - if ref_object.blank?
-    = t 'bhf.helpers.entry.empty'
+    = t 'bhf.helpers.entry.empty', :count => 1
   - else
-    - if field.link
-      = link_to ref_object.to_bhf_s, edit_bhf_entry_path(field.link, ref_object), :class => 'quick_edit'
-    - else
-      = ref_object.to_bhf_s
+    = link_to_if field.link, ref_object.to_bhf_s, edit_bhf_entry_path(field.link || 0, ref_object), :class => 'quick_edit'

data/app/views/bhf/entries/new.haml

@@ -1,2 +1,2 @@
 %h3= new_t @platform
-= render 'form'
+= render 'bhf/entries/form'

data/app/views/bhf/helper/_reflection_node.haml

@@ -1,7 +1,7 @@
 .node
   .label
-    %p= f.object.class.human_attribute_name(field.reflection.name)
+    %p= reflection_title(f, field)
   .input
     = input
     = render :partial => 'bhf/helper/field_errors', :locals => {:f => f, :field => field.reflection.name}
-    = render :partial => 'bhf/helper/info', :locals => {:info => field.info}
+    = render :partial => 'bhf/helper/info', :locals => {:info => field.info}

data/app/views/bhf/pages/_platform.haml

@@ -13,9 +13,7 @@
       - platform.columns.each do |column|
         %th{:class => "#{column.field.macro} #{column.field.display_type} #{order_class(column.name, platform.name)}"}
           - column_name = platform.model.human_attribute_name(column.name)
-          - link = link_to column_name, current_order_path(column.name, platform.name)
-          = column.field.macro == :column ? link : column_name
-
+          = link_to_if column.field.macro == :column, column_name, current_order_path(column.name, platform.name)
       %th.action
 
   %tfoot
@@ -29,7 +27,7 @@
         - edit_link = edit_bhf_entry_path(platform.name, object)
         %tr{:id => "#{object.id}_#{platform.name}"}
           - if platform.sortable
-            %td
+            %td.drag
               %span.handle  
           - platform.columns.each do |column|
             %td{:class => "#{column.field.macro} #{column.field.display_type}", :'data-column-name' => column.name}
@@ -37,13 +35,13 @@
                 - ' '
               - else
                 - render(:partial => "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}", :locals => {:column => column, :object => object})
-              
-              = has_link?(column.field.overwrite_display_type) ? a.html_safe : link_to(a.html_safe, edit_link, :class => 'quick_edit')
+              = link_to_if !has_link?(column.field.overwrite_display_type), a.html_safe, edit_link, :class => 'quick_edit'
+
           %td.action
             = link_to edit_t(platform), edit_link, :class => 'edit'
             = link_to delete_t(platform), bhf_entry_path(platform.name, object), :method => :delete, :confirm => t('bhf.helpers.promts.confirm'), :class => 'delete'
-            -# TODO: :remote => true, authlogic problem?
+            - # TODO: :remote => true
     - else
       %td.no_entries{:colspan => platform.columns_count}
-        = t 'bhf.pagination.info.nothing_found', :name => t('bhf.pagination.entries')
+        = t 'bhf.pagination.info', :name_zero => platform.title, :count => 0
         = link_to new_t(platform), new_bhf_entry_path(platform.name)

data/app/views/bhf/pages/macro/belongs_to/_default.haml

@@ -1,2 +1,2 @@
 - ref_object = object.send(column.name)
-= ref_object.blank? ? t('bhf.helpers.entry.empty') : ref_object.to_bhf_s
+= ref_object.blank? ? t('bhf.helpers.entry.empty', :count => 1) : ref_object.to_bhf_s

data/app/views/bhf/pages/macro/column/_array.haml

@@ -0,0 +1 @@
+= object.send(column.name)[0..5].join(', ')

data/app/views/bhf/pages/macro/column/_boolean.haml

@@ -1 +1 @@
-= t("bhf.helpers.boolean.#{object.send(column.name) ? 'a' : 'b'}")  
+= t("bhf.helpers.boolean.#{object.send(column.name) ? 'a' : 'b'}")

data/app/views/bhf/pages/macro/embeds_many/_default.haml

@@ -0,0 +1 @@
+= render :partial => 'bhf/pages/macro/has_many/default', :locals => {:ref_objects => object.send(column.name)}

data/app/views/bhf/pages/macro/embeds_one/_default.haml

@@ -0,0 +1 @@
+= render :partial => 'bhf/pages/macro/has_one/default', :locals => {:ref_object => object.send(column.name)}

data/app/views/bhf/pages/macro/has_and_belongs_to_many/_default.haml

@@ -1,2 +1 @@
-- ref_objects = object.send(column.name)
-= ref_objects.blank? ? t('bhf.helpers.entries.empty') : ref_objects.collect(&:to_bhf_s).join(', ')
+= render :partial => 'bhf/pages/macro/has_many/default', :locals => {:ref_objects => object.send(column.name)}

data/app/views/bhf/pages/macro/has_many/_default.haml

@@ -1,2 +1,2 @@
-- ref_objects = object.send(column.name)
-= ref_objects.blank? ? t('bhf.helpers.entries.empty') : ref_objects.collect(&:to_bhf_s).join(', ')
+- ref_objects ||= object.send(column.name)
+= ref_objects.blank? ? t('bhf.helpers.entry.empty', :count => 2) : ref_objects.collect(&:to_bhf_s).join(', ')

data/app/views/bhf/pages/macro/has_one/_default.haml

@@ -1,2 +1,2 @@
-- ref_object = object.send(column.name)
-= ref_object.blank? ? t('bhf.helpers.entry.empty') : ref_object.to_bhf_s
+- ref_object ||= object.send(column.name)
+= ref_object.blank? ? t('bhf.helpers.entry.empty', :count => 1) : ref_object.to_bhf_s

data/app/views/bhf/pages/show.haml

@@ -1,3 +1,3 @@
--# %h2= t('bhf.pages.headline')
+- # %h2= t('bhf.pages.headline')
 - @platforms.each do |platform|
   .platform= render :partial => 'platform', :locals => {:platform => platform}

data/app/views/kaminari/bhf/_gap.html.haml

@@ -0,0 +1 @@
+%span.page_number.gap= t('bhf.pagination.truncate')

data/app/views/kaminari/bhf/_next_page.html.haml

@@ -0,0 +1,2 @@
+= link_to_unless current_page.last?, t('bhf.pagination.next_label'), url, :remote => remote do |name|
+  %span= name

data/app/views/kaminari/bhf/_page.html.haml

@@ -0,0 +1,2 @@
+= link_to_unless page.current?, page, url, :remote => remote, :class => 'page_number' do |name|
+  %em= name

data/app/views/kaminari/bhf/_paginator.html.haml

@@ -0,0 +1,10 @@
+= paginator.render do
+  = prev_page_tag
+
+  - each_page do |page|
+    - if page.left_outer? || page.right_outer? || page.inside_window?
+      = page_tag page
+    - elsif !page.was_truncated?
+      = gap_tag
+
+  = next_page_tag

data/app/views/kaminari/bhf/_prev_page.html.haml

@@ -0,0 +1,2 @@
+= link_to_unless current_page.first?, t('bhf.pagination.previous_label'), url, :remote => remote do |name|
+  %span= name

data/app/views/layouts/bhf/application.haml

@@ -8,7 +8,7 @@
     - ([:bhf] + Bhf::Engine.config.css.to_a).each do |css|
       = stylesheet_link_tag "/stylesheets/#{css}"
     = javascript_include_tag '/javascripts/bhf'
-    =# javascript_include_tag '/javascripts/bhf/mootools-core-1.3.2-full-compat-yc.js', '/javascripts/bhf/mootools-more-1.3.2.1.js', '/javascripts/bhf/mootools_rails_driver-0.4.1.js', '/javascripts/bhf/class/BrowserUpdate', '/javascripts/bhf/class/Ajaxify', '/javascripts/bhf/class/AjaxEdit', '/javascripts/bhf/class/MooEditable', '/javascripts/bhf/class/Datepicker', '/javascripts/bhf/class/MultipleFields', '/javascripts/bhf/bhf_application'
+    =# javascript_include_tag '/javascripts/bhf/mootools-core-1.3.2-full-compat-yc.js', '/javascripts/bhf/mootools-more-1.3.2.1.js', '/javascripts/bhf/mootools_rails_driver-0.4.1.js', '/javascripts/bhf/class/BrowserUpdate', '/javascripts/bhf/class/Ajaxify', '/javascripts/bhf/class/AjaxEdit', '/javascripts/bhf/class/MooEditable', '/javascripts/bhf/class/Datepicker', '/javascripts/bhf/class/MultipleFields', '/javascripts/bhf/class/ArrayFields', '/javascripts/bhf/bhf_application'
   %body
     %header
       %h1= link_to image_tag('/images/logo_bhf.png'), root_url

data/app/views/layouts/bhf/quick_edit.haml

@@ -1,5 +1,7 @@
 %button.alt_button.cancel= t('bhf.quick_edit.buttons.cancel')
 %button.alt_button.open= t('bhf.quick_edit.buttons.open')
 = yield
-%button.save= t('bhf.quick_edit.buttons.save')
-%button.save_and_next= t('bhf.quick_edit.buttons.save_and_next')
+.button.group
+  %button.save{:class => ('create' if @object.new_record?)}= @object.new_record? ? t('bhf.quick_edit.buttons.create') : t('bhf.quick_edit.buttons.save')
+  - unless @object.new_record?
+    %button.save_and_next{:title => t('bhf.quick_edit.buttons.save_and_next')}= t('bhf.quick_edit.buttons.save_and_next')

data/config/locales/de.yml

@@ -14,8 +14,6 @@ de:
         delete: "%{platform_name} löschen"
         empty: Leer
         cancel: Abbrechen
-      entries:
-        empty: Leer
       login:
         success: Login war erfolgreich
         error: Konnte nicht eingeloggen
@@ -34,14 +32,15 @@ de:
         cancel: Abbrechen
         open: Öffnen
         save: Speichern
-        save_and_next: Speichern und weiter
+        create: Erstellen
+        save_and_next: Speichern und weiter zum nächsten Eintrag gehen
     
     pagination:
       previous_label: « Vorheriges
       next_label: Nächstes »
+      truncate: …
       load_more: Mehr anzeigen
       load_less: Weniger anzeigen
-      entry: Eintrag
       entries: Einträge
       info:
         default: "Es werden <strong>%{offset_start} - %{offset_end}</strong> von <strong>%{count}</strong> %{name} angezeigt"