bhf 0.7.0.rc2 → 0.7.0.rc3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/images/bhf/pictos.png +0 -0
- data/app/assets/images/bhf/pictos_2x.png +0 -0
- data/app/assets/stylesheets/bhf/application.css.sass +21 -3
- data/app/views/bhf/helper/_frontend_edit.haml +1 -1
- data/app/views/layouts/bhf/application.haml +3 -3
- data/lib/bhf/pagination.rb +12 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 36b6cbfef7e6bd75713e819daa01085e321f93bf
|
|
4
|
+
data.tar.gz: 60e9cda045dca7d4dc80b1479a8564ee380e94fc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f1a94e9739d4e96c20111bc5b6176f515b9b59850aa78fe8398f1ecdde3a7a56a5dd4efddd6864116eed3076557ddd6ee84e2b28ce6a3609723932a2725fb568
|
|
7
|
+
data.tar.gz: 040cfc96340a581e5d234a2509b0396ac10b3987f6f144894ccbaef430aad9dd95b9149a4132b64f675f50c8f8dc782e758c5ff2832ac86fbf0b2aa6a289bbfb
|
|
Binary file
|
|
Binary file
|
|
@@ -137,7 +137,25 @@ header
|
|
|
137
137
|
padding: 9px 20px
|
|
138
138
|
background: #dbdbdb
|
|
139
139
|
|
|
140
|
-
|
|
140
|
+
#area_select
|
|
141
|
+
-webkit-appearance: none
|
|
142
|
+
-moz-appearance: none
|
|
143
|
+
-ms-appearance: none
|
|
144
|
+
appearance: none
|
|
145
|
+
outline: 0
|
|
146
|
+
border: 0
|
|
147
|
+
float: right
|
|
148
|
+
padding: 4px
|
|
149
|
+
border-radius: 0
|
|
150
|
+
width: 34px
|
|
151
|
+
color: white
|
|
152
|
+
text-indent: -300px
|
|
153
|
+
margin-top: 32px
|
|
154
|
+
font-size: 15px
|
|
155
|
+
cursor: pointer
|
|
156
|
+
background-color: transparent
|
|
157
|
+
background-position: -393px 0
|
|
158
|
+
|
|
141
159
|
|
|
142
160
|
|
|
143
161
|
#content
|
|
@@ -1135,11 +1153,11 @@ input[type="submit"].alt_button,
|
|
|
1135
1153
|
@media screen and (-webkit-min-device-pixel-ratio: 1.5), screen and (min--moz-device-pixel-ratio: 1.5), screen and (min-device-pixel-ratio: 1.5)
|
|
1136
1154
|
.icon
|
|
1137
1155
|
background-image: image-url('bhf/pictos_2x.png')
|
|
1138
|
-
background-size:
|
|
1156
|
+
background-size: 440px 152px
|
|
1139
1157
|
#content
|
|
1140
1158
|
.quick_edit_holder
|
|
1141
1159
|
.group
|
|
1142
1160
|
button
|
|
1143
1161
|
&.save_and_next
|
|
1144
1162
|
background-image: image-url('bhf/pictos_2x.png')
|
|
1145
|
-
background-size:
|
|
1163
|
+
background-size: 440px 152px
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
- link_title = t('bhf.helpers.entry.edit', platform_name: object.to_bhf_s)
|
|
2
2
|
|
|
3
|
-
= link_to bhf.edit_entry_path(platform_name, object, bhf_area: area), class: 'bhf_edit', data: {:'no-turbolink' => true}, title: link_title do
|
|
3
|
+
= link_to bhf.edit_entry_path(platform_name, object, area ? {bhf_area: area} : {}), class: 'bhf_edit', data: {:'no-turbolink' => true}, title: link_title do
|
|
4
4
|
= block ? block : link_title
|
|
@@ -13,9 +13,9 @@
|
|
|
13
13
|
- logo = Rails.application.assets.find_asset('logo_bhf.png') ? 'logo_bhf.png' : 'logo_bhf.svg'
|
|
14
14
|
= link_to image_tag(asset_path(logo)), main_app.root_url, :'data-no-turbolink' => true
|
|
15
15
|
|
|
16
|
-
- if @areas and @areas.
|
|
17
|
-
= select_tag :area_select, options_from_collection_for_select(@areas, 'path', 'name', main_app.bhf_path(params[:bhf_area]))
|
|
18
|
-
|
|
16
|
+
- if @areas and @areas.length > 1
|
|
17
|
+
= select_tag :area_select, options_from_collection_for_select(@areas, 'path', 'name', main_app.bhf_path(params[:bhf_area])), class: 'icon'
|
|
18
|
+
|
|
19
19
|
- if @config && @config.pages.any?
|
|
20
20
|
%nav
|
|
21
21
|
%ul{class: ('shrink_space' if @config.pages.count > 7)}
|
data/lib/bhf/pagination.rb
CHANGED
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
Kaminari::Helpers::Tag.class_eval do
|
|
2
|
+
def page_url_for(page)
|
|
3
|
+
if @param_name.is_a?(Array)
|
|
4
|
+
@params[@param_name[0]] = (@params[@param_name[0]] || {}).merge(@param_name[1] => (page <= 1 ? 1 : page))
|
|
5
|
+
return @template.url_for @params
|
|
6
|
+
end
|
|
7
|
+
|
|
8
|
+
@template.url_for @params.merge(@param_name => (page <= 1 ? 1 : page))
|
|
9
|
+
end
|
|
10
|
+
end
|
|
11
|
+
|
|
1
12
|
module Bhf
|
|
2
13
|
|
|
3
14
|
class Pagination
|
|
@@ -15,7 +26,7 @@ module Bhf
|
|
|
15
26
|
|
|
16
27
|
links = if !(page_links = template.paginate(platform.objects, {
|
|
17
28
|
theme: 'bhf',
|
|
18
|
-
param_name:
|
|
29
|
+
param_name: [platform.name, :page],
|
|
19
30
|
params: template.params
|
|
20
31
|
})).blank?
|
|
21
32
|
"#{load_more(platform)} #{page_links}"
|