bhf 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 043a3e069140a01bcae533841cc98168c176fac1
-  data.tar.gz: edca1e7e3f4e700035d655dddb92b80406510878
+  metadata.gz: c880f3b7fff3a7663c6ff37e0f6057989dc7ebd7
+  data.tar.gz: 51d2986c62a939d21d67a47c1302aee18049779f
 SHA512:
-  metadata.gz: dbcf39951771042a468e166887d5beb94212cb67eba0f5b574702076a6542245d1fb854fdaee6a57c4c4a97d3968c969aa5093760fb50c4f39028eabfd38a69a
-  data.tar.gz: 0f8d1429c88cada969c6910f0a453597dd26831255b9591b78faa55d4c8463e6d00b7c78a41424fa2957bd76de4220902ff6c6328bc6445849d3ccbaa1577abd
+  metadata.gz: a7f1416447383a6571375412f7c0cdab3d73e72935851a93716d98603f9953491de8b8dcebbff50375cd9fe913fcc4b4ab67e95a0e0d8609ebb72825218cbe75
+  data.tar.gz: e9fac0457c3fc796fa996779b059f66c73b189af2873cda1599100fc3988c1951e4d292ccfc40d2ad55dee810a50848569175ea3a621c2ee01fbb501cf0ad20d

data/app/controllers/bhf/entries_controller.rb

@@ -75,9 +75,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
   end
   
   def sort
-    return unless @platform.sortable
-    
-    sort_attr = @platform.sortable.to_sym
+    sort_attr = (@platform.sortable_property || @platform.sortable).to_sym
     
     params[:order].each do |order|
       @model.

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

@@ -1,4 +1,4 @@
 - unless flash.blank?
   %ul#flash_massages.show
     - flash.each do |type, msg|
-      %li{class: type}= msg
+      %li{class: type}= msg.html_safe

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

@@ -1,6 +1,6 @@
 - platform.pagination.template = self
 - if platform.custom_partial
-  = render partial: "bhf/pages/#{platform.custom_partial}"
+  = render partial: "bhf/pages/#{platform.custom_partial}", locals: {platform: platform}
 - else
   %table.data_table{id: "#{platform.name}_platform", class: (platform.custom_columns? ? :custom_columns : :default_columns)}
     %caption
@@ -36,7 +36,7 @@
           %tr{id: "#{object.id}_#{platform.name}"}
             - if platform.sortable
               %td.drag
-                %span.handle  
+                %span.handle.icon  
             -# TODO: external link partial from anpex
             - platform.columns.each do |column|
               %td{class: "#{column.field.macro} #{column.field.display_type}", :'data-column-name' => column.name}
@@ -49,11 +49,11 @@
             %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_bhf_entry_path(platform.name, object), class: 'duplicate', method: :post, title: dt
+                = link_to dt, duplicate_bhf_entry_path(platform.name, object), class: 'icon duplicate', method: :post, title: dt
               - unless platform.hide_edit
-                = link_to edit_t(platform), edit_link, class: 'edit'
+                = link_to edit_t(platform), edit_link, class: 'icon edit'
               - unless platform.hide_delete
-                = link_to delete_t(platform), bhf_entry_path(platform.name, object), method: :delete, remote: true, class: :delete, data: {confirm: t('bhf.helpers.promts.confirm')}
+                = link_to delete_t(platform), bhf_entry_path(platform.name, object), method: :delete, remote: true, class: 'icon delete', data: {confirm: t('bhf.helpers.promts.confirm')}
       - else
         %td.no_entries{colspan: platform.columns_count}
           = t 'bhf.pagination.info', name_zero: platform.title, count: 0

data/lib/bhf/platform.rb

@@ -146,6 +146,10 @@ module Bhf
       table_options 'sortable'
     end
 
+    def sortable_property
+      table_options 'sortable_property'
+    end
+
     def hide_edit
       table_options 'hide_edit'
     end

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

@@ -99,6 +99,18 @@ var bhfInit = function(){
 			new Setlatlng(lat);
 	    });
 	};
+	var windowHight = document.body.clientHeight;
+	window.onresize = function(e){
+		windowHight = document.body.clientHeight;
+	};
+	var scrollContent = function(){
+		var innerForm = quickEdit.holder.getElement('form');
+		if ( ! innerForm) { return; }
+		var scroll = document.body.scrollTop-83;
+		if (scroll + innerForm.getSize().y > windowHight) { return; }
+		quickEdit.holder.setStyle('padding-top', scroll);
+	};
+	// window.onscroll = scrollContent;
 
 	quickEdit.setup({
 		holderParent: $('content'),
@@ -307,25 +319,10 @@ var bhfInit = function(){
 			}
 		});
 	}
-	var windowHight = document.body.clientHeight;
-	window.onresize = function(e){
-		windowHight = document.body.clientHeight;
-	};
-	var scrollContent = function(){
-		var innerForm = quickEdit.holder.getElement('form');
-		if ( ! innerForm) { return; }
-		var scroll = document.body.scrollTop-70;
-		if (scroll < 10) {
-			scroll = 10;
-		}
-		if (scroll + innerForm.getSize().y > windowHight) { return; }
-		quickEdit.holder.setStyle('padding-top', scroll);
-	};
-	window.onscroll = scrollContent;
 
 	var fm = $('flash_massages');
 	if (fm) {
-		fm.removeClass.delay(4000, fm, 'show');
+		fm.removeClass.delay(10000, fm, 'show');
 	}
 
 	new BrowserUpdate({vs:{i:8,f:7,o:10.01,s:4,n:9}});

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

@@ -263,13 +263,13 @@ table.data_table
       &.primary_key
         text-transform: uppercase
       &.sorted
-        +box-inner-shadow(0, -15, 50, #000)
+        background: #000
         & a:after,
         &.desc:hover a:after
-          content: ' ▼'
+          content: ' ▲'
         &:hover a:after,
         &.desc a:after
-          content: ' ▲'
+          content: ' ▼'
         a
           color: #FFFFFF
           +text-shadow
@@ -299,7 +299,6 @@ table.data_table
         a
           font-weight: bold
           display: inline
-			
     a
       display: block
       padding: 5px 3px
@@ -309,33 +308,12 @@ table.data_table
         padding: 0
         margin-right: 5px
         display: inline-block
-        text-indent: -9999px
-        width: 20px
-        height: 20px
-        background: image-url('bhf/pictos.png') no-repeat
-        &.clicked
-          background: image-url('bhf/small_ajax_loader.gif') no-repeat center center
-      &.duplicate
-        width: 24px
-      &.duplicate
-        background-position: -348px 0
-        &:active
-          background-position: -348px -101px
-      &.edit
-        &:active
-          background-position: 0 -101px
-      &.delete
-        background-position: -50px 0
-        &:active
-          background-position: -50px -101px
 
     .handle
-      background: image-url('bhf/pictos.png') no-repeat -94px 0
-      cursor: move
       display: block
     
 
-    tr      
+    tr
       &:hover td,
       &.live_edit td
         +bg-gradient($b1, $b2)
@@ -354,9 +332,9 @@ table.data_table
           &:hover
             background-position: -50px -100px
         .handle
-          background-position: -94px -50px
+          background-position: -98px -50px
           &:hover
-            background-position: -94px -100px
+            background-position: -98px -100px
         .duplicate,
         .edit,
         .delete
@@ -394,6 +372,25 @@ table.data_table
   tbody
     .primary_key
       color: #999
+.icon
+  text-indent: -9999px
+  display: inline-block
+  width: 20px
+  height: 20px
+  background: image-url('bhf/pictos.png') no-repeat
+  &.duplicate,
+  &.edit,
+  &.delete
+    &.clicked
+      background: image-url('bhf/small_ajax_loader.gif') no-repeat center center
+  &.duplicate
+    width: 24px
+    background-position: -348px 0
+  &.delete
+    background-position: -50px 0
+  &.handle
+    background-position: -98px 0
+    cursor: move
 
 .default_input
   border: 1px solid transparent
@@ -908,7 +905,12 @@ input[type="submit"].alt_button,
 
 .hide
   display: none !important
-  
+.float_left
+  float: left
+.float_right
+  float: right
+.clear
+  clear: both
   
 #ajax_holder
   text-indent: -9999px
@@ -1083,18 +1085,9 @@ 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)
-  table.data_table
-    tbody
-      a
-        &.duplicate,
-        &.edit,
-        &.delete
-          background-image: image-url('bhf/pictos_2x.png')
-          background-size: 377px 152px
-      .handle
-        background-image: image-url('bhf/pictos_2x.png')
-        background-size: 377px 152px
-
+  .icon
+    background-image: image-url('bhf/pictos_2x.png')
+    background-size: 377px 152px
   #content
     .quick_edit_holder
       .group

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors:
 - Anton Pawlik