bhf 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56e1533c1a02d076775f99d6a4486f6c53bb656e
-  data.tar.gz: d6f2464941ec7dfc1e72105d40245491ea7e53be
+  metadata.gz: f344e5b10c973d0d42c55159deb54c645e7a0e24
+  data.tar.gz: 1091824278485c4d3be0c94fdde0269dbabf1184
 SHA512:
-  metadata.gz: 5751ca1838daa57380d1dcf7c63673b679194555cb2303522a45c6e513a49b16f31b0ca91ccf0bd691ef61c0e9cadd7de86dcddc76ab827a11be81a630ac92cf
-  data.tar.gz: ec360eef6e1ab6524d6f8eabaf6357cbc9c0bc6ed8e13f6c4a7ac72c7a4dbee238a7fa8e0eeb0db416d577863b7cc34e81b4069994bd55b12aad64370fdae666
+  metadata.gz: 31617fbd1004836e2045abf8e26195a593a2e63d0d28c38616ae5be813022e7179fd4de6dada51fb8f65f56ff6f36f774f51fecb5c33a96caa6631cda2e7ef00
+  data.tar.gz: 74cb8070bb915bc29a02893125ac3c9c23db534e1a6d6190f7b526282139602c6eddf9effc2474452406ea0617e3ad1b3c814a6b94ef5de1d742bec34bee4e10

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

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

@@ -120,7 +120,6 @@ Turbolinks.pagesCached(0);
 			});
 		}
 		
-		var quickEditArray = [];
 		var quickEditOptions;
 		
 		ajaxNote.setup();
@@ -289,9 +288,8 @@ Turbolinks.pagesCached(0);
 			});
 		}
 		
-		
 		var scrollContent = function(){
-			quickEditArray.each(function(quickEdit){
+			editStack.bricksArray.each(function(quickEdit){
 				var innerForm = quickEdit.holder.getElement('form');
 				if ( ! innerForm) { return; }
 				var scroll = document.body.scrollTop - 83;
@@ -299,8 +297,6 @@ Turbolinks.pagesCached(0);
 				quickEdit.holder.setStyle('padding-top', scroll);
 			});
 		};
-		// window.onscroll = scrollContent;
-		
 		
 		mainScope.getElements('.js_sortable').each(function(sortableElems){
 			new Sortables(sortableElems, {

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

@@ -264,10 +264,11 @@ table.data_table
     .info
       margin: 0 20px 0 10px
       min-width: 290px
-      text-transform: uppercase
+      white-space: nowrap
       font-size: 12px
+      font-style: normal
+      text-transform: uppercase
       color: $g5
-      white-space: nowrap
       strong
         color: $g6
     form
@@ -392,8 +393,13 @@ table.data_table
     th.drag
       width: 24px
   tfoot
+    .custom_footer_td
+      text-align: right
+      padding-right: 20px
     td
       padding-top: 10px
+      &:first-child
+        padding-left: 20px
   thead,
   tbody
     .primary_key,

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

@@ -11,7 +11,6 @@
   %table.data_table{id: "#{platform.name}_platform", class: (platform.custom_columns? ? :custom_columns : :default_columns)}
     %caption
       %h4= platform.title
-      %p.info= platform.pagination.info platform
       - unless platform.hide_create
         %p.create= link_to new_t(platform), new_entry_path(platform.name), class: :alt_button
       - unless platform.custom_partial
@@ -28,8 +27,15 @@
 
     %tfoot
       %tr
-        %td{colspan: platform.columns_count}
+        - colspan_1 = platform.columns_count+1
+        - if platform.custom_footer
+          - colspan_1 = (platform.columns_count / 2.to_f).ceil
+          - colspan_2 = (platform.columns_count / 2.to_f).floor
+        %td{colspan: colspan_1}
           = platform.pagination.create(platform) unless platform.sortable
+        - if platform.custom_footer
+          %td.custom_footer_td{colspan: colspan_2}
+            = render partial: "bhf/platform/#{platform.custom_footer}", locals: { platform: platform }
 
     %tbody.quick_edit_block{class: ('js_sortable' if platform.sortable), data: {sort_url: sort_entries_path(platform.name)}}
       - if platform.objects.any?
@@ -70,23 +76,24 @@
           - unless platform.hide_create
             = link_to new_t(platform), new_entry_path(platform.name)
 
-      %template.quick_edit_template{type: 'text/template'}
-        %tr.quick_edit_entry{id: "{object_id}_#{platform.name}"}
-          - edit_link = edit_entry_path(platform.name, '{object_id}')
-          - if platform.sortable
-            %td.drag
-              %span.handle.icon  
-          - platform.columns.each do |column|
-            - css_classes = [column.macro, column.display_type]
-            - custom_link = send(platform.custom_link, platform: platform.name, id: '{object_id}') if platform.custom_link
-            %td{class: css_classes}
-              = render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: "{#{column.name}}", object: platform.model.new, link: (platform.custom_link ? custom_link : edit_link), add_quick_link: (!platform.custom_link && platform.table_quick_edit)})
+      - if platform.table_quick_edit
+        %template.quick_edit_template{type: 'text/template'}
+          %tr.quick_edit_entry{id: "{object_id}_#{platform.name}"}
+            - edit_link = edit_entry_path(platform.name, '{object_id}')
+            - if platform.sortable
+              %td.drag
+                %span.handle.icon  
+            - platform.columns.each do |column|
+              - css_classes = [column.macro, column.display_type]
+              - custom_link = send(platform.custom_link, platform: platform.name, id: '{object_id}') if platform.custom_link
+              %td{class: css_classes}
+                = render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: "{#{column.name}}", object: platform.model.new, link: (platform.custom_link ? custom_link : edit_link), add_quick_link: (!platform.custom_link && platform.table_quick_edit)})
 
-          %td.action{class: ('wider' if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
-            - if platform.show_duplicate
-              - dt = duplicate_t(platform)
-              = link_to dt, duplicate_entry_path(platform.name, '{object_id}'), class: 'icon duplicate', method: :post, title: dt
-            - unless platform.hide_edit
-              = link_to edit_t(platform), edit_link, class: 'icon edit'
-            - unless platform.hide_delete
-              = link_to delete_t(platform), entry_path(platform.name, '{object_id}'), method: :delete, remote: true, class: 'icon delete js_delete', data: {confirm: t('bhf.helpers.promts.confirm', platform_title: platform.title_singular)}
+            %td.action{class: ('wider' if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
+              - if platform.show_duplicate
+                - dt = duplicate_t(platform)
+                = link_to dt, duplicate_entry_path(platform.name, '{object_id}'), class: 'icon duplicate', method: :post, title: dt
+              - unless platform.hide_edit
+                = link_to edit_t(platform), edit_link, class: 'icon edit'
+              - unless platform.hide_delete
+                = link_to delete_t(platform), entry_path(platform.name, '{object_id}'), method: :delete, remote: true, class: 'icon delete js_delete', data: {confirm: t('bhf.helpers.promts.confirm', platform_title: platform.title_singular)}

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

@@ -4,6 +4,8 @@
     
     - if platform.scopes
       = f.select :scope, options_from_collection_for_select(platform.scopes, :value, :name, (p && p[:scope])), {}, class: 'js_submit_form_on_change'
+      
+    %p.info= platform.pagination.info platform
 
     - if platform.search_field?
       = s.text_field :text, value: get_value([:search, :text], p), placeholder: t('bhf.helpers.searchform.placeholder')

data/bhf.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bhf 0.9.3 ruby lib
+# stub: bhf 0.9.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Anton Pawlik"]
-  s.date = "2014-07-11"
+  s.date = "2014-07-12"
   s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid."
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [

data/lib/bhf/platform/base.rb

@@ -80,7 +80,14 @@ module Bhf::Platform
     end
 
     def fields
-      @fields ||= remove_excludes(default_attrs(form_value(:display), attributes), form_value(:exclude))
+      return @fields if @fields
+      
+      tmp = default_attrs(form_value(:display), attributes)
+      if sortable and ! form_value(:display)
+        tmp = remove_excludes(tmp, [sortable_property.to_s])
+      end
+      
+      @fields = remove_excludes(tmp, form_value(:exclude))
     end
 
     def columns
@@ -127,6 +134,10 @@ module Bhf::Platform
       table_value(:custom_search)
     end
 
+    def custom_footer
+      table_value(:custom_footer)
+    end
+
     def table_columns
       table_value(:display) || table_value(:columns)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails