bhf 0.4.13 → 0.4.14

data/app/controllers/bhf/entries_controller.rb

@@ -19,7 +19,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
       manage_many_to_many
       after_save
 
-      redirect_back_or_default(bhf_entries_path(@platform.name), notice: set_message('create.success', @model))
+      redirect_back_or_default(bhf_page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('create.success', @model))
     else
       @form_url = bhf_entries_path(@platform.name)
       render :new
@@ -35,7 +35,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
       if @quick_edit
         render json: object_to_bhf_display_hash, status: :ok
       else
-        redirect_back_or_default(bhf_entries_path(@platform.name), notice: set_message('update.success', @model))
+        redirect_back_or_default(bhf_page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('update.success', @model))
       end
     else
       @form_url = bhf_entry_path(@platform.name, @object)

data/app/helpers/bhf/application_helper.rb

@@ -1,6 +1,10 @@
 module Bhf
   module ApplicationHelper
 
+    def show_t(platform)
+      t("bhf.helpers.entry.models.#{platform.model_name}.show", platform_name: platform.title_singular, default: t('bhf.helpers.entry.show'))
+    end
+
     def new_t(platform)
       t("bhf.helpers.entry.models.#{platform.model_name}.new", platform_name: platform.title_singular, default: t('bhf.helpers.entry.new'))
     end

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

@@ -0,0 +1,7 @@
+%h3= show_t @platform
+.dl
+  - @platform.definitions.each do |column|
+    %p
+      %span.dt= @platform.model.human_attribute_name(column.name) + ':'
+      %span.dd{class: "#{column.field.macro} #{column.field.display_type}", :'data-column-name' => column.name}
+        = render(partial: "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}", locals: {column: column, object: @object})

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

@@ -30,6 +30,7 @@
       - if platform.objects.any?
         - platform.objects.each do |object|
           - edit_link = edit_bhf_entry_path(platform.name, object)
+          - custom_link = send(platform.custom_link, platform.name, object) if platform.custom_link
           %tr{id: "#{object.id}_#{platform.name}"}
             - if platform.sortable
               %td.drag
@@ -41,11 +42,13 @@
                   - ' '
                 - else
                   - render(partial: "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}", locals: {column: column, object: object})
-                = link_to_if !has_link?(column.field.overwrite_display_type), a.html_safe, edit_link, class: 'quick_edit'
+                = link_to_if !has_link?(column.field.overwrite_display_type), a.html_safe, (platform.custom_link ? custom_link : edit_link), class: ('quick_edit' unless platform.custom_link)
 
             %td.action
-              = link_to edit_t(platform), edit_link, class: 'edit'
-              = link_to delete_t(platform), bhf_entry_path(platform.name, object), method: :delete, remote: true, class: :delete, confirm: t('bhf.helpers.promts.confirm')
+              - if platform.display_edit
+                = link_to edit_t(platform), edit_link, class: 'edit'
+              - if platform.display_delete
+                = link_to delete_t(platform), bhf_entry_path(platform.name, object), method: :delete, remote: true, class: :delete, confirm: t('bhf.helpers.promts.confirm')
       - else
         %td.no_entries{colspan: platform.columns_count}
           = t 'bhf.pagination.info', name_zero: platform.title, count: 0

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

@@ -0,0 +1 @@
+= link_to_if object.send(column.name), object.send(column.name)

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

@@ -0,0 +1,2 @@
+- if object.send(column.name)
+  = image_tag object.send(column.name), alt: object.send(column.name), class: 'preview_image'

data/config/locales/de.yml

@@ -9,6 +9,7 @@ de:
       promts:
         confirm: Sind Sie sicher?
       entry:
+        show: "%{platform_name} anzeigen"
         new: "%{platform_name} anlegen"
         edit: "%{platform_name} editieren"
         delete: "%{platform_name} löschen"

data/config/locales/en.yml

@@ -12,7 +12,7 @@ en:
       promts:
         confirm: Are you sure?
       entry:
-        new: "Create a new %{platform_name}"
+        show: "Show %{platform_name}"
         edit: "Edit %{platform_name}"
         delete: "Delete %{platform_name}"
         empty: Empty

data/config/routes.rb

@@ -6,7 +6,7 @@ Rails.application.routes.draw do
     get 'page/:page', to: 'pages#show', as: :page
     
     scope ':platform' do
-      resources :entries, except: [:index, :show] do
+      resources :entries, except: [:index] do
         resources :embed_entries, except: [:index, :show], as: :embed
         put :sort, on: :collection
       end

data/lib/bhf/platform.rb

@@ -96,6 +96,13 @@ module Bhf
       end
     end
 
+    def definitions
+      default_attrs(show_options(:definitions), @collection).
+      each_with_object([]) do |field, obj|
+        obj << Bhf::Data::Column.new(field)
+      end
+    end
+
     def entries_per_page
       table_options(:per_page)
     end
@@ -113,6 +120,10 @@ module Bhf
       @data['table']
     end
 
+    def show
+      @data['show']
+    end
+
     def form
       @data['form']
     end
@@ -131,6 +142,18 @@ module Bhf
       table_options 'sortable'
     end
 
+    def display_edit
+      table_options 'display_edit'
+    end
+
+    def display_delete
+      table_options 'display_delete'
+    end
+    
+    def custom_link
+      table_options 'custom_link'
+    end
+
     def custom_partial
       table_options 'partial'
     end
@@ -234,6 +257,10 @@ module Bhf
       def table_options(key, attribute = nil)
         lookup_options table, key, attribute
       end
+      
+      def show_options(key, attribute = nil)
+        lookup_options show, key, attribute
+      end
 
       def lookup_options(main_key, key, attribute = nil)
         if main_key

data/vendor/assets/javascripts/bhf/application.js

@@ -45,7 +45,7 @@ window.addEvent('domready', function(){
 			}
 			
 			var hiddenInput = input.clone();
-			input.value = new Date().parse(input.value).format(options.format);
+			input.value = new Date.parse(input.value).format(options.format);
 			input.erase('name');
 			hiddenInput.set('type', 'hidden').inject(input, 'after');
 			

data/vendor/assets/stylesheets/bhf/application.css.sass

@@ -75,6 +75,21 @@ header
           +bg-gradient($b2, $b1)
           +text-shadow(#0068B3, -1)
             
+.preview_image
+  @extend .default_input
+  vertical-align: middle
+  padding: 2px
+  width: auto
+  max-width: 400px
+  max-height: 200px
+
+.dl
+  +text-shadow(#fff)
+  .dt
+    display: inline-block
+    min-width: 200px
+    color: $g1
+    
 
 #content
   display: table

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000Z
+date: 2012-06-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70188163672520 !ruby/object:Gem::Requirement
+  requirement: &70201485646540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70188163672520
+  version_requirements: *70201485646540
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70188163671540 !ruby/object:Gem::Requirement
+  requirement: &70201485645620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70188163671540
+  version_requirements: *70201485645620
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &70188163670540 !ruby/object:Gem::Requirement
+  requirement: &70201485642100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70188163670540
+  version_requirements: *70201485642100
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70188163669420 !ruby/object:Gem::Requirement
+  requirement: &70201485641140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70188163669420
+  version_requirements: *70201485641140
 - !ruby/object:Gem::Dependency
   name: mootools-rails
-  requirement: &70188163668320 !ruby/object:Gem::Requirement
+  requirement: &70201485640160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70188163668320
+  version_requirements: *70201485640160
 description: Gets you there on time
 email: anton.pawlik@gmail.com
 executables: []
@@ -112,6 +112,7 @@ files:
 - app/views/bhf/entries/form/has_one/_account_scope.haml
 - app/views/bhf/entries/form/has_one/_static.haml
 - app/views/bhf/entries/new.haml
+- app/views/bhf/entries/show.haml
 - app/views/bhf/helper/_field_errors.haml
 - app/views/bhf/helper/_flash.haml
 - app/views/bhf/helper/_frontend_edit.haml
@@ -124,6 +125,8 @@ files:
 - app/views/bhf/pages/macro/column/_array.haml
 - app/views/bhf/pages/macro/column/_boolean.haml
 - app/views/bhf/pages/macro/column/_date.haml
+- app/views/bhf/pages/macro/column/_file.haml
+- app/views/bhf/pages/macro/column/_image.haml
 - app/views/bhf/pages/macro/column/_number.haml
 - app/views/bhf/pages/macro/column/_primary_key.haml
 - app/views/bhf/pages/macro/column/_string.haml