bhf 0.7.0.rc2 → 0.7.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a4319f752fa5bc3aac8cd6e74ada41ce4e29522
-  data.tar.gz: 9a1b4a651175b69945460b5614f6f8923c06ee01
+  metadata.gz: 36b6cbfef7e6bd75713e819daa01085e321f93bf
+  data.tar.gz: 60e9cda045dca7d4dc80b1479a8564ee380e94fc
 SHA512:
-  metadata.gz: ed2d4b0bfb10c7896094f80406730fec6bff1247c88593a9f42113633ae7073150b4bf23fa2e7da571afaa67f8382103da69cd2e3b3bb21cf277621af003903e
-  data.tar.gz: c0c9e52ad513a1b1f713ca8600e867c53dac161ddba7560a2259be01233042998383eb26b861ced7fe286414ca6b52943329250cb880c25013344734c759e3f9
+  metadata.gz: f1a94e9739d4e96c20111bc5b6176f515b9b59850aa78fe8398f1ecdde3a7a56a5dd4efddd6864116eed3076557ddd6ee84e2b28ce6a3609723932a2725fb568
+  data.tar.gz: 040cfc96340a581e5d234a2509b0396ac10b3987f6f144894ccbaef430aad9dd95b9149a4132b64f675f50c8f8dc782e758c5ff2832ac86fbf0b2aa6a289bbfb

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

@@ -137,7 +137,25 @@ header
     padding: 9px 20px
     background: #dbdbdb
 
-
+#area_select
+  -webkit-appearance: none
+  -moz-appearance: none
+  -ms-appearance: none
+  appearance: none
+  outline: 0
+  border: 0
+  float: right
+  padding: 4px
+  border-radius: 0
+  width: 34px
+  color: white
+  text-indent: -300px
+  margin-top: 32px
+  font-size: 15px
+  cursor: pointer
+  background-color: transparent
+  background-position: -393px 0
+  
 
 
 #content
@@ -1135,11 +1153,11 @@ input[type="submit"].alt_button,
 @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)
   .icon
     background-image: image-url('bhf/pictos_2x.png')
-    background-size: 377px 152px
+    background-size: 440px 152px
   #content
     .quick_edit_holder
       .group
         button
           &.save_and_next
             background-image: image-url('bhf/pictos_2x.png')
-            background-size: 377px 152px
+            background-size: 440px 152px

data/app/views/bhf/helper/_frontend_edit.haml

@@ -1,4 +1,4 @@
 - link_title = t('bhf.helpers.entry.edit', platform_name: object.to_bhf_s)
 
-= link_to bhf.edit_entry_path(platform_name, object, bhf_area: area), class: 'bhf_edit', data: {:'no-turbolink' => true}, title: link_title do
+= link_to bhf.edit_entry_path(platform_name, object, area ? {bhf_area: area} : {}), class: 'bhf_edit', data: {:'no-turbolink' => true}, title: link_title do
   = block ? block : link_title

data/app/views/layouts/bhf/application.haml

@@ -13,9 +13,9 @@
         - logo = Rails.application.assets.find_asset('logo_bhf.png') ? 'logo_bhf.png' : 'logo_bhf.svg'
         = link_to image_tag(asset_path(logo)), main_app.root_url, :'data-no-turbolink' => true
 
-      - if @areas and @areas.any?
-        = select_tag :area_select, options_from_collection_for_select(@areas, 'path', 'name', main_app.bhf_path(params[:bhf_area]))
-
+      - if @areas and @areas.length > 1
+        = select_tag :area_select, options_from_collection_for_select(@areas, 'path', 'name', main_app.bhf_path(params[:bhf_area])), class: 'icon'
+        
       - if @config && @config.pages.any?
         %nav
           %ul{class: ('shrink_space' if @config.pages.count > 7)}

data/lib/bhf/pagination.rb

@@ -1,3 +1,14 @@
+Kaminari::Helpers::Tag.class_eval do
+  def page_url_for(page)
+    if @param_name.is_a?(Array)
+      @params[@param_name[0]] = (@params[@param_name[0]] || {}).merge(@param_name[1] => (page <= 1 ? 1 : page))
+      return @template.url_for @params
+    end
+
+    @template.url_for @params.merge(@param_name => (page <= 1 ? 1 : page))
+  end
+end
+
 module Bhf
 
   class Pagination
@@ -15,7 +26,7 @@ module Bhf
 
       links = if !(page_links = template.paginate(platform.objects, {
         theme: 'bhf',
-        param_name: "#{platform.name}[page]",
+        param_name: [platform.name, :page],
         params: template.params
       })).blank?
         "#{load_more(platform)} #{page_links}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.7.0.rc2
+  version: 0.7.0.rc3
 platform: ruby
 authors:
 - Anton Pawlik