bhf 0.4.24 → 0.4.25

Sign up to get free protection for your applications and to get access to all the features.
@@ -13,12 +13,11 @@
13
13
  - if platform.sortable
14
14
  %th.drag
15
15
  - platform.columns.each do |column|
16
- %th{class: "#{column.field.macro} #{column.field.display_type} #{order_class(column.name, platform.name)}"}
16
+ - db_column_name = platform.model.column_names.include?(column.name+'_id') ? column.name+'_id' : column.name
17
+ %th{class: "#{column.field.macro} #{column.field.display_type} #{order_class(db_column_name, platform.name)}"}
17
18
  - column_name = platform.model.human_attribute_name(column.name)
18
- - # TODO: link only if column.name is a database column
19
- - # column_names = platform.model.column_names
20
- - # column_name = column_names.include?(column.name+'_id') ? column.name+'_id' : column.name
21
- = link_to_if column.field.macro == :column, column_name, current_order_path(column.name, platform.name)
19
+ - can_sort = platform.model.column_names.include?(db_column_name)
20
+ = link_to_if can_sort, column_name, current_order_path(db_column_name, platform.name)
22
21
  %th.action
23
22
 
24
23
  %tfoot
@@ -46,7 +45,8 @@
46
45
 
47
46
  %td.action{class: (:wider if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
48
47
  - if platform.show_duplicate
49
- = link_to duplicate_t(platform), duplicate_bhf_entry_path(platform.name, object), class: 'duplicate', method: :post
48
+ - dt = duplicate_t(platform)
49
+ = link_to dt, duplicate_bhf_entry_path(platform.name, object), class: 'duplicate', method: :post, title: dt
50
50
  - unless platform.hide_edit
51
51
  = link_to edit_t(platform), edit_link, class: 'edit'
52
52
  - unless platform.hide_delete
data/lib/bhf/platform.rb CHANGED
@@ -59,7 +59,7 @@ module Bhf
59
59
  end
60
60
 
61
61
  if options[:order]
62
- chain = chain.except(:order).order("#{options[:order]} #{options[:direction]}")
62
+ chain = chain.reorder("#{options[:order]} #{options[:direction]}")
63
63
  end
64
64
 
65
65
  if search? && options[:search].present?
@@ -206,7 +206,10 @@ table.data_table
206
206
  +box-shadow(0, 1, 4, #ccc)
207
207
  background: #C9C9C9
208
208
  background: -webkit-gradient(linear, left top, left bottom, from(#CCCCCC), color-stop(50%, #CCCCCC), color-stop(51%, #DCDCDC), to(#DCDCDC))
209
- background-size: 0 2px
209
+ background-size: 100% 2px
210
+ border: 1px solid #C4C4C4
211
+ border-bottom: 0
212
+ border-top: 0
210
213
  text-align: left
211
214
  h4,
212
215
  .info
@@ -231,9 +234,8 @@ table.data_table
231
234
  padding-left: 17px
232
235
  th:first-child
233
236
  padding-left: 20px
234
-
235
- td,
236
- th
237
+
238
+ td
237
239
  &:first-child
238
240
  +border-left-radius(4)
239
241
  &:last-child
@@ -249,6 +251,10 @@ table.data_table
249
251
  background: #3E3E3E
250
252
  +text-shadow(#000, -1)
251
253
  color: #C2C2C2
254
+ &:first-child
255
+ +border-bottom-left-radius(4)
256
+ &:last-child
257
+ +border-bottom-right-radius(4)
252
258
  &.primary_key
253
259
  text-transform: uppercase
254
260
  &.sorted
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bhf
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.24
4
+ version: 0.4.25
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-26 00:00:00.000000000Z
12
+ date: 2012-10-03 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70188237223700 !ruby/object:Gem::Requirement
16
+ requirement: &70169993257680 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70188237223700
24
+ version_requirements: *70169993257680
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: kaminari
27
- requirement: &70188237223220 !ruby/object:Gem::Requirement
27
+ requirement: &70169993256840 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.12.4
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70188237223220
35
+ version_requirements: *70169993256840
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: haml-rails
38
- requirement: &70188237222740 !ruby/object:Gem::Requirement
38
+ requirement: &70169993255940 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.3.4
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70188237222740
46
+ version_requirements: *70169993255940
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: sass-rails
49
- requirement: &70188237222260 !ruby/object:Gem::Requirement
49
+ requirement: &70169993254520 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 3.1.4
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70188237222260
57
+ version_requirements: *70169993254520
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: mootools-rails
60
- requirement: &70188237221780 !ruby/object:Gem::Requirement
60
+ requirement: &70169993253180 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: 1.0.1
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70188237221780
68
+ version_requirements: *70169993253180
69
69
  description: Gets you there on time
70
70
  email: anton.pawlik@gmail.com
71
71
  executables: []