bhf 0.6.24 → 0.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2f874df9f3ff1c7a94379210ce8c67f477bcdb0
-  data.tar.gz: 0bb5f09233d8f597c937405eb9c98040b75b55f7
+  metadata.gz: f826ec1cab0c75468cbe892bb70cc694a2cb9622
+  data.tar.gz: dd15052e8817004eca77a99a373b9981a95eed6d
 SHA512:
-  metadata.gz: 050eb6069d93dfb6aabdcff6c72cd7fb5d3a953037942238a75ef7872a81f98f4668c16bdb614974e0c5cb86cb5266d5a9207015cb4e976469841b827fa9b7c2
-  data.tar.gz: a46b44d403bea18b718af7470753b0ac7cdd6e26b4d6e36be258e7954bd789003a5eeb3ed22ae5a9c63bcb1afbddbaab239b47fffd95a2c23fd99685079415c2
+  metadata.gz: a9d417a62b0f4a47d97e3c306d7c51f3b53eaf1178f0e24075831996c3ce60678714e07d604a6bb54f0a824623e3b871ccab4d623fac705f9efee0a8a2bcbc20
+  data.tar.gz: ebcba5e793e609b52b51b1b53a96849180d6e594c554eec566bc5a4cdc126c662753cb86f7d7936a8ed5c728a27c25409f6f678904534af1582097bf613cb67c

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

@@ -278,6 +278,15 @@ var initHelper = function(callback){
 			fm.removeClass.delay(10000, fm, 'show');
 		}
 		
+		mainScope.getElements('.initial_referral').each(function(elem){
+			setTimeout(function(){
+				elem.removeClass('live_edit');
+				setTimeout(function(){
+					elem.removeClass('animate');
+				}, 600);
+			}, 500);
+		});
+		
 		ajaxNote.success();
 	});
 })();

data/app/assets/javascripts/bhf/classes/AjaxEdit.js

@@ -19,7 +19,7 @@ var AjaxEdit = new Class({
 		this.newEntry = this.wrapElement.hasClass('add_field');
 		
 		this.fireEvent('startRequest');
-		new Request.HTML({
+		this.currentRequest = new Request.HTML({
 			method: 'get',
 			evalScripts: false,
 			url: element.get('href'),
@@ -73,8 +73,11 @@ var AjaxEdit = new Class({
 	},
 	
 	close: function(){
+		if (this.currentRequest) {
+			this.currentRequest.cancel();
+		}
 		this.holder.dispose();
-		this.fireEvent('closed')
+		this.fireEvent('closed');
 	},
 	
 	injectForm: function(form){

data/app/assets/javascripts/bhf/classes/FormHelper.js

@@ -84,7 +84,7 @@ var FormHelper = new Class({
 				button_bar: new Element('div').inject(mdTa, 'before'),
 				preview: livePreview,
 				output: htmlPreview,
-				buttons: 'bold italic link image  ol ul heading hr  undo redo help',
+				buttons: 'bold italic link image  ol ul heading hr  undo redo',
 				modifierKeys: false,
 				autoFormatting: false
 			});

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

@@ -493,10 +493,10 @@ form
       &.wysiwyg
         height: 400px
     .errors
-      color: red
+      color: $r1
     .field_with_errors
       input
-        border-color: red
+        border-color: $r1
     [disabled]
       background: $g2 !important
     input[type="submit"],
@@ -597,7 +597,7 @@ form
   .error_explanation
     margin-left: 20px
     label
-      color: red
+      color: $r1
       cursor: pointer
       display: block
       &:hover
@@ -1124,7 +1124,7 @@ input[type="submit"].alt_button,
 
 
 .translation_missing
-  color: red !important
+  color: $r1 !important
   
 
 @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)

data/app/controllers/bhf/application_controller.rb

@@ -103,7 +103,7 @@ class Bhf::ApplicationController < ActionController::Base
     end
 
     def redirect_back_or_default(default, msg)
-      redirect_to(session[:return_to] || default, msg)
+      redirect_to(session[:return_to] || default, flash: msg)
       session[:return_to] = nil
     end
 

data/app/controllers/bhf/entries_controller.rb

@@ -30,7 +30,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
       if @quick_edit
         render json: object_to_bhf_display_hash, status: :ok
       else
-        redirect_back_or_default(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('create.success', @model))
+        redirect_back_or_default(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), {notice: set_message('create.success', @model), referral_entry: {id: @object.id, platform: @platform.name}})
       end
     else
       @form_url = entries_path(@platform.name)
@@ -52,7 +52,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
       if @quick_edit
         render json: object_to_bhf_display_hash, status: :ok
       else
-        redirect_back_or_default(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('update.success', @model))
+        redirect_back_or_default(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), {notice: set_message('update.success', @model), referral_entry: {id: @object.id, platform: @platform.name}})
       end
     else
       @form_url = entry_path(@platform.name, @object)
@@ -128,20 +128,15 @@ class Bhf::EntriesController < Bhf::ApplicationController
 
     def manage_many_to_many
       return unless params[:has_and_belongs_to_many]
-      params[:has_and_belongs_to_many].each_pair do |relation, all_ids|
+      params[:has_and_belongs_to_many].each_pair do |relation, ids|
         reflection = @model.reflections[relation.to_sym]
 
-
-        if all_ids.any?
-          reflection.klass.unscoped.find(all_ids.keys).each do |relation_obj|
+        next unless ids.any?
+        reflection.klass.unscoped.find(ids.keys).each do |relation_obj|
+          if ids[relation_obj.id.to_s].blank?
             @object.send(relation).delete(relation_obj)
-          end
-          
-          ids = all_ids.values.reject(&:blank?)
-          if ids.any?
-            reflection.klass.unscoped.find(ids).each do |relation_obj|
-              @object.send(relation) << relation_obj
-            end
+          else
+            @object.send(relation) << relation_obj
           end
         end
       end

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

@@ -1,4 +1,5 @@
-- unless flash.blank?
+- f = {notice: (flash[:notice] if flash[:notice]), error: (flash[:error] if flash[:error])}.reject {|k, v| v.blank?}
+- unless f.blank?
   %ul#flash_massages.show
-    - flash.each do |type, msg|
-      %li{class: type}= msg.html_safe
+    - f.each do |type, msg|
+      %li{class: type}= msg.to_s.html_safe

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

@@ -1,4 +1,8 @@
 - platform.pagination.template = self
+- referral_id = nil
+- if flash[:referral_entry]
+  - referral_id = flash[:referral_entry][:platform] == platform.name && flash[:referral_entry][:id]
+
 - if platform.custom_partial
   = render partial: "bhf/pages/#{platform.custom_partial}", locals: {platform: platform}
 - else
@@ -33,7 +37,7 @@
         - platform.objects.each do |object|
           - edit_link = edit_entry_path(platform.name, object)
           - custom_link = send(platform.custom_link, platform.name, object) if platform.custom_link
-          %tr{id: "#{object.id}_#{platform.name}"}
+          %tr{id: "#{object.id}_#{platform.name}", class: ('animate live_edit initial_referral' if referral_id == object.id)}
             - if platform.sortable
               %td.drag
                 %span.handle.icon  

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

@@ -29,4 +29,3 @@
 
     - (['bhf/application'] + Bhf::Engine.config.js.to_a).each do |js|
       = javascript_include_tag js, {:'data-turbolinks-eval' => false}
-

data/config/locales/de.yml

@@ -28,7 +28,7 @@ de:
         success: "%{model} wurde erfolgreich aktiviert"
         error: "%{model} Fehler"
       validation:
-        header: "Durch diese Fehler konnte %{name} nicht gespeichert werden:"
+        header: 'Durch diese Fehler konnte "%{name}" nicht gespeichert werden:'
         error: Fehler
       file:
         delete: Datei löschen

data/config/locales/en.yml

@@ -28,7 +28,7 @@ en:
         success: "%{model} was activated successfuly"
         error: "%{model} error"
       validation:
-        header: "%{error} prohibited this %{name} from being saved:"
+        header: '%{error} prohibited this "%{name}" from being saved:'
         error: error
       file:
         delete: Delete file

data/lib/bhf/pagination.rb

@@ -1,30 +1,14 @@
-module Kaminari
-  module Helpers
-    class Tag
-      def initialize(template, options = {}) #:nodoc:
-        @template, @options = template, options.dup
-        @param_name = @options.delete(:param_name) || Kaminari.config.param_name
-        @theme = @options[:theme] ? "#{@options.delete(:theme)}/" : ''
-        @params = @options[:params] ? template.params.merge(@options.delete :params) : template.params
-      end
-
-      def to_s(locals = {}) #:nodoc:
-        @template.render :partial => "kaminari/#{@theme}#{self.class.name.demodulize.underscore}", :locals => @options.merge(locals), :formats => [:html]
-      end
-
-      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 ? nil : page))
-          return @template.url_for @params
-        end
-        
-        @template.url_for @params.merge(@param_name => (page <= 1 ? nil : page))
-      end
+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 ? nil : page))
+      return @template.url_for @params
     end
+    
+    @template.url_for @params.merge(@param_name => (page <= 1 ? nil : page))
   end
 end
-# TODO: check for support here
-# https://github.com/amatsuda/kaminari/pull/491
+# TODO: check for support here https://github.com/amatsuda/kaminari/pull/491
 
 
 module Bhf

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.24
+  version: 0.6.25
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails