bhf 0.4.24 → 0.4.25

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

@@ -13,12 +13,11 @@
         - if platform.sortable
           %th.drag
         - platform.columns.each do |column|
-          %th{class: "#{column.field.macro} #{column.field.display_type} #{order_class(column.name, platform.name)}"}
+          - db_column_name = platform.model.column_names.include?(column.name+'_id') ? column.name+'_id' : column.name
+          %th{class: "#{column.field.macro} #{column.field.display_type} #{order_class(db_column_name, platform.name)}"}
             - column_name = platform.model.human_attribute_name(column.name)
-            - # TODO: link only if column.name is a database column
-            - #   column_names = platform.model.column_names
-            - #   column_name = column_names.include?(column.name+'_id') ? column.name+'_id' : column.name
-            = link_to_if column.field.macro == :column, column_name, current_order_path(column.name, platform.name)
+            - can_sort = platform.model.column_names.include?(db_column_name)
+            = link_to_if can_sort, column_name, current_order_path(db_column_name, platform.name)
         %th.action
 
     %tfoot
@@ -46,7 +45,8 @@
 
             %td.action{class: (:wider if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
               - if platform.show_duplicate
-                = link_to duplicate_t(platform), duplicate_bhf_entry_path(platform.name, object), class: 'duplicate', method: :post
+                - dt = duplicate_t(platform)
+                = link_to dt, duplicate_bhf_entry_path(platform.name, object), class: 'duplicate', method: :post, title: dt
               - unless platform.hide_edit
                 = link_to edit_t(platform), edit_link, class: 'edit'
               - unless platform.hide_delete

data/lib/bhf/platform.rb

@@ -59,7 +59,7 @@ module Bhf
       end
 
       if options[:order]
-        chain = chain.except(:order).order("#{options[:order]} #{options[:direction]}")
+        chain = chain.reorder("#{options[:order]} #{options[:direction]}")
       end
 
       if search? && options[:search].present?

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

@@ -206,7 +206,10 @@ table.data_table
     +box-shadow(0, 1, 4, #ccc)
     background: #C9C9C9
     background: -webkit-gradient(linear, left top, left bottom, from(#CCCCCC), color-stop(50%, #CCCCCC), color-stop(51%, #DCDCDC), to(#DCDCDC))
-    background-size: 0 2px
+    background-size: 100% 2px
+    border: 1px solid #C4C4C4
+    border-bottom: 0
+    border-top: 0
     text-align: left
     h4,
     .info
@@ -231,9 +234,8 @@ table.data_table
     padding-left: 17px
   th:first-child
     padding-left: 20px
-
-  td,
-  th
+  
+  td
     &:first-child
       +border-left-radius(4)
     &:last-child
@@ -249,6 +251,10 @@ table.data_table
       background: #3E3E3E
       +text-shadow(#000, -1)
       color: #C2C2C2
+      &:first-child
+        +border-bottom-left-radius(4)
+      &:last-child
+        +border-bottom-right-radius(4)
       &.primary_key
         text-transform: uppercase
       &.sorted

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.4.24
+  version: 0.4.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000Z
+date: 2012-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70188237223700 !ruby/object:Gem::Requirement
+  requirement: &70169993257680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70188237223700
+  version_requirements: *70169993257680
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70188237223220 !ruby/object:Gem::Requirement
+  requirement: &70169993256840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70188237223220
+  version_requirements: *70169993256840
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &70188237222740 !ruby/object:Gem::Requirement
+  requirement: &70169993255940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70188237222740
+  version_requirements: *70169993255940
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70188237222260 !ruby/object:Gem::Requirement
+  requirement: &70169993254520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70188237222260
+  version_requirements: *70169993254520
 - !ruby/object:Gem::Dependency
   name: mootools-rails
-  requirement: &70188237221780 !ruby/object:Gem::Requirement
+  requirement: &70169993253180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70188237221780
+  version_requirements: *70169993253180
 description: Gets you there on time
 email: anton.pawlik@gmail.com
 executables: []