bhf 0.6.15 → 0.6.20

data/{vendor → app}/assets/stylesheets/bhf/application.css.sass

@@ -132,6 +132,8 @@ header
   background: #EAEAEA
   box-sizing: border-box
   +box-shadow(0, 1, 4, rgba($k1, 0.5))
+.quick_edit_helper,
+#main
   > h3
     padding: 9px 20px
     background: #dbdbdb
@@ -153,14 +155,21 @@ header
     color: $g3
     +text-shadow(#fff)
   .quick_edit_holder
-    +transition-duration(0.3)
-    +transition-delay(0.2)
+    &.collapsed
+      width: 50px
+      max-width: auto
+      background: rgb(197, 197, 197)
+      .quick_edit_helper
+        display: none
+
     overflow-x: auto
     position: relative
     max-width: 400px
     width: 400px
     vertical-align: top
+    padding: 0
     form
+      padding: 10px 20px
       margin-left: 0
       padding-bottom: 10px
     .node,
@@ -175,10 +184,6 @@ header
       width: 300px
       height: 100px
     
-  .quick_edit_holder
-    padding: 0
-    form
-      padding: 10px 20px
     .group
       margin-top: 0
       margin-bottom: 10px
@@ -197,10 +202,10 @@ header
         &:focus
           outline: 0
         &.save
-          border-right: 1px solid $b2
           &:hover
             color: darken($b2, 15%)
         &.save_and_next
+          border-left: 1px solid $b2
           text-indent: -9999px
           background: image-url('bhf/pictos.png') no-repeat -140px -40px
           width: 40px
@@ -209,7 +214,7 @@ header
             background-position: -140px -90px
         
 
-    > button
+    .quick_edit_helper > a
       &.cancel,
       &.open
         float: right
@@ -626,7 +631,8 @@ input[type="submit"].alt_button,
   +text-shadow(#444, -1)
   +transition-duration(0.3)
   &:hover
-    background: $b1    
+    background: $b1
+    text-decoration: none
   &:active
     background: darken($b2, 5%)
   &:focus
@@ -947,8 +953,7 @@ input[type="submit"].alt_button,
     marign-left: -120px
     font-weight: bold
     
-  
-  
+
 
 .wmd-preview,
 .wmd-output 

data/app/controllers/bhf/pages_controller.rb

@@ -14,7 +14,7 @@ class Bhf::PagesController < Bhf::ApplicationController
 
     @platforms = platform_options.each_with_object([]) do |opts, obj|
       platform = Bhf::Platform.new(opts, @page, current_account)
-      next if platform.model.bhf_embedded? || platform.table_hide?
+      next if platform.table_hide?
       platform.pagination = Bhf::Pagination.new(platform.entries_per_page)
       paginate_platform_objects(platform)
       obj << platform

data/app/views/bhf/entries/_form.haml

@@ -1,4 +1,4 @@
-- html = { id: (:main_form unless @quick_edit), multipart: (!@quick_edit && @platform.has_file_upload?) }
+- html = { id: (:main_form unless @quick_edit), multipart: (!@quick_edit && @platform.has_file_upload?), class: 'js_bhf_form' }
 = form_for @object, url: @form_url, builder: Bhf::Form::Builder, html: html do |f|
 
   - if f.object.errors.any?

data/app/views/bhf/pages/macro/column/_hash.haml

@@ -1 +1 @@
-= f.object.send(field.name).inspect
+= object.send(column.name).inspect

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

@@ -6,9 +6,6 @@
     %link{href: '/favicon.ico', rel: 'icon', type: 'image/x-icon'}
     - (['bhf/application'] + Bhf::Engine.config.css.to_a).each do |css|
       = stylesheet_link_tag css
-    - (['bhf/application'] + Bhf::Engine.config.js.to_a).each do |js|
-      = javascript_include_tag js, {:'data-turbolinks-eval' => false}
-
   %body
     %header
       %h1
@@ -30,4 +27,6 @@
       = render 'bhf/user'
       = render 'bhf/footer'
 
-    =# yield :js_inject
+    - (['bhf/application'] + Bhf::Engine.config.js.to_a).each do |js|
+      = javascript_include_tag js, {:'data-turbolinks-eval' => false}
+

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

@@ -1,7 +1,9 @@
-%button.alt_button.cancel= t('bhf.quick_edit.buttons.cancel')
-%button.alt_button.open= t('bhf.quick_edit.buttons.open')
-= yield
-.button.group
-  %button.save{class: ('create' if @object.new_record?)}= @object.new_record? ? t('bhf.quick_edit.buttons.create') : t('bhf.quick_edit.buttons.save')
-  - unless @object.new_record?
-    %button.save_and_next{title: t('bhf.quick_edit.buttons.save_and_next')}= t('bhf.quick_edit.buttons.save_and_next')
+.quick_edit_helper
+  %a.alt_button.cancel= t('bhf.quick_edit.buttons.cancel')
+  - unless @platform.table_hide?
+    %a.alt_button.open= t('bhf.quick_edit.buttons.open')
+  = yield
+  .button.group
+    %button.save{class: ('create' if @object.new_record?)}= @object.new_record? ? t('bhf.quick_edit.buttons.create') : t('bhf.quick_edit.buttons.save')
+    - unless @object.new_record?
+      %button.save_and_next{title: t('bhf.quick_edit.buttons.save_and_next')}= t('bhf.quick_edit.buttons.save_and_next')

data/config/routes.rb

@@ -1,3 +1,4 @@
 unless Bhf::Engine.config.remove_default_routes
   Rails.application.routes.draw(&Bhf::Engine.config.bhf_routes)
+  #(bhf_)((.+)_?(path|url))
 end

data/lib/bhf/platform.rb

@@ -22,6 +22,7 @@ module Bhf
       model_name = I18n.t(t_model_path, count: 0, default: @name.singularize.capitalize)
       @title_zero = I18n.t("bhf.platforms.#{@name}.title", count: 0, default: model_name)
 
+      @model = model
       @page_name = page_name
       @user = user
     end
@@ -31,7 +32,7 @@ module Bhf
     end
     
     def table_hide?
-      table_options(:hide) == true
+      table_options(:hide) == true || model.bhf_embedded?
     end
     
     def search_field?
@@ -81,6 +82,7 @@ module Bhf
     end
 
     def model
+      return @model if @model
       return @data['model'].constantize if @data['model']
       @name.singularize.camelize.constantize
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.20
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,40 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- app/assets/images/bhf/ajax_loader.gif
+- app/assets/images/bhf/bg.png
+- app/assets/images/bhf/mooeditable-toolbarbuttons-tango.png
+- app/assets/images/bhf/pictos.png
+- app/assets/images/bhf/pictos_2x.png
+- app/assets/images/bhf/small_ajax_loader.gif
+- app/assets/images/bhf/small_ajax_loader_h.gif
+- app/assets/images/bhf/wmd-buttons.png
+- app/assets/images/logo_bhf.svg
+- app/assets/javascripts/bhf/application.js
+- app/assets/javascripts/bhf/classes/AjaxEdit.js
+- app/assets/javascripts/bhf/classes/AjaxEditStack.js
+- app/assets/javascripts/bhf/classes/Ajaxify.js
+- app/assets/javascripts/bhf/classes/ArrayFields.js
+- app/assets/javascripts/bhf/classes/FormHelper.js
+- app/assets/javascripts/bhf/classes/Locale.de-DE.js
+- app/assets/javascripts/bhf/classes/Locale.en-US.js
+- app/assets/javascripts/bhf/classes/MooEditable.js
+- app/assets/javascripts/bhf/classes/MultipleFields.js
+- app/assets/javascripts/bhf/classes/Picker.js
+- app/assets/javascripts/bhf/classes/Picker_Attach.js
+- app/assets/javascripts/bhf/classes/Picker_Date.js
+- app/assets/javascripts/bhf/classes/PlatformHelper.js
+- app/assets/javascripts/bhf/classes/Setlatlng.js
+- app/assets/javascripts/bhf/classes/showdown.js
+- app/assets/javascripts/bhf/classes/wmd.js
+- app/assets/javascripts/bhf/mootools-core-1.4.5-full-compat.js
+- app/assets/javascripts/bhf/mootools-more-1.4.0.1.js
+- app/assets/javascripts/bhf/mootools_ujs.js
+- app/assets/stylesheets/bhf/MooEditable.css.scss
+- app/assets/stylesheets/bhf/application.css.sass
+- app/assets/stylesheets/bhf/functions.css.sass
+- app/assets/stylesheets/bhf/reset.css.sass
+- app/assets/stylesheets/bhf/typo.css.scss
 - app/controllers/bhf/application_controller.rb
 - app/controllers/bhf/embed_entries_controller.rb
 - app/controllers/bhf/entries_controller.rb
@@ -175,40 +209,7 @@ files:
 - lib/bhf/pagination.rb
 - lib/bhf/platform.rb
 - lib/bhf/settings.rb
-- lib/bhf/view_helpers.rb
 - lib/rails/generators/bhf/templates/initializer.rb
-- vendor/assets/images/bhf/ajax_loader.gif
-- vendor/assets/images/bhf/bg.png
-- vendor/assets/images/bhf/mooeditable-toolbarbuttons-tango.png
-- vendor/assets/images/bhf/pictos.png
-- vendor/assets/images/bhf/pictos_2x.png
-- vendor/assets/images/bhf/small_ajax_loader.gif
-- vendor/assets/images/bhf/small_ajax_loader_h.gif
-- vendor/assets/images/bhf/wmd-buttons.png
-- vendor/assets/images/logo_bhf.svg
-- vendor/assets/javascripts/bhf/application.js
-- vendor/assets/javascripts/bhf/classes/AjaxEdit.js
-- vendor/assets/javascripts/bhf/classes/Ajaxify.js
-- vendor/assets/javascripts/bhf/classes/ArrayFields.js
-- vendor/assets/javascripts/bhf/classes/BrowserUpdate.js
-- vendor/assets/javascripts/bhf/classes/Locale.de-DE.js
-- vendor/assets/javascripts/bhf/classes/Locale.en-US.js
-- vendor/assets/javascripts/bhf/classes/MooEditable.js
-- vendor/assets/javascripts/bhf/classes/MultipleFields.js
-- vendor/assets/javascripts/bhf/classes/Picker.js
-- vendor/assets/javascripts/bhf/classes/Picker_Attach.js
-- vendor/assets/javascripts/bhf/classes/Picker_Date.js
-- vendor/assets/javascripts/bhf/classes/Setlatlng.js
-- vendor/assets/javascripts/bhf/classes/showdown.js
-- vendor/assets/javascripts/bhf/classes/wmd.js
-- vendor/assets/javascripts/bhf/mootools-core-1.4.5-full-compat.js
-- vendor/assets/javascripts/bhf/mootools-more-1.4.0.1.js
-- vendor/assets/javascripts/bhf/mootools_ujs_ap.js
-- vendor/assets/stylesheets/bhf/MooEditable.css.scss
-- vendor/assets/stylesheets/bhf/application.css.sass
-- vendor/assets/stylesheets/bhf/functions.css.sass
-- vendor/assets/stylesheets/bhf/reset.css.sass
-- vendor/assets/stylesheets/bhf/typo.css.scss
 - README.md
 homepage: http://github.com/antpaw/bhf
 licenses:

data/lib/bhf/view_helpers.rb

@@ -1,19 +0,0 @@
-module Bhf
-  module ViewHelpers
-    module ActionView
-
-      def bhf_edit(object, options = {}) # TODO: add a block of html for custom editing buttons and links
-        return unless session[Bhf::Engine.config.session_auth_name.to_s] == true
-
-        options[:platform_name] ||= object.class.to_s.pluralize.downcase
-        
-        if object.respond_to?(:'bhf_can_edit?', true)
-          return unless object.bhf_can_edit?(options)
-        end
-
-        render partial: 'bhf/helper/frontend_edit', locals: { platform_name: options[:platform_name], object: object }
-      end
-
-    end
-  end
-end

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

@@ -1,372 +0,0 @@
-//= require turbolinks
-//= require ./mootools-core-1.4.5-full-compat.js
-//= require ./mootools-more-1.4.0.1.js
-//= require ./mootools_ujs_ap
-//= require_tree ./classes/
-var lang = document.html.get('lang');
-if (lang === 'en') {
-	lang = 'en-US';
-}
-else {
-	lang = lang+'-'+lang.toUpperCase();
-}
-Locale.use(lang);
-
-var ajaxNote = new Ajaxify();
-var bhfInit = function(){
-	var quickEdit = new AjaxEdit();
-	ajaxNote.setup();
-	var wysiwyg = [];
-	var setupJsForm = function(scope){
-		scope.getElements('.wysiwyg').each(function(elem){
-			wysiwyg.push(elem.mooEditable());
-		});
-
-		scope.getElements('.multiple_field').each(function(elem){
-			new MultipleFields(elem);
-		});
-		scope.getElements('.array_holder').each(function(elem){
-			new ArrayFields(elem);
-		});
-
-		scope.getElements('.picker').each(function(input){
-			var options = {
-				timePicker: true,
-				format: '%B %d, %Y %H:%M'
-			};
-			if (input.hasClass('date')) {
-				options = {
-					timePicker: false,
-					format: '%B %d, %Y'
-				};
-			}
-			else if (input.hasClass('time')) {
-				options = {
-					pickOnly: 'time',
-					format: '%H:%M'
-				};
-			}
-	
-			var hiddenInput = input.clone();
-			input.value = new Date().parse(input.value).format(options.format);
-			input.erase('name');
-			hiddenInput.set('type', 'hidden').inject(input, 'after');
-	
-			new Picker.Date(input, Object.merge({
-				onSelect: function(date){
-					hiddenInput.value = date.format('db');
-				}
-			}, options));
-		});
-
-		scope.getElements('.wmd_editor').each(function(mdTa){
-			var headline, toggleHtmlPreview, toggleLivePreview, livePreview, htmlPreview;
-	
-			var togglePreview = function(e){
-				var htmlMode = e.target.hasClass('toggle_html_preview');
-				livePreview.toggleClass('hide', htmlMode);
-				htmlPreview.toggleClass('hide', !htmlMode);
-				toggleLivePreview.toggleClass('active', !htmlMode);
-				toggleHtmlPreview.toggleClass('active', htmlMode);
-			};
-	
-			headline = new Element('h6.preview_switch', {text: 'Preview'});
-	
-			toggleHtmlPreview = new Element('span.toggle_html_preview', {text: 'HTML'})
-				.addEvent('click', togglePreview)
-				.inject(headline);
-			toggleLivePreview = new Element('span.toggle_live_preview', {text: 'Live'})
-				.addEvent('click', togglePreview)
-				.inject(headline);
-
-			headline.inject(mdTa, 'after');
-	
-			livePreview = new Element('div.wmd-preview.hide').inject(headline, 'after');
-			htmlPreview = new Element('div.wmd-output.hide').inject(livePreview, 'after');
-	
-			new WMDEditor({
-				input: mdTa,
-				button_bar: new Element('div').inject(mdTa, 'before'),
-				preview: livePreview,
-				output: htmlPreview,
-				buttons: 'bold italic link image  ol ul heading hr  undo redo help',
-				modifierKeys: false,
-				autoFormatting: false
-			});
-		});
-
-		scope.getElements('.map_data_lat').each(function(lat){
-			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'),
-		onStartRequest: function(form){
-			ajaxNote.loading();
-		},
-		onFormInjected: function(form){
-			setupJsForm(form);
-			scrollContent();
-			ajaxNote.success();
-		},
-		onSave: function(form){
-			ajaxNote.success();
-		},
-		onBeforeSubmit: function(){
-			ajaxNote.loading();
-			wysiwyg.each(function(elem){
-				elem.saveContent();
-			});
-		}
-	});
-
-	var platforms = document.body.getElements('.platform');
-	var mainForm = document.id('main_form');
-
-	if (platforms.length) {
-		var setupSortables = function(scope){
-			scope.getElements('.sortable').each(function(sortableElems){
-				new Sortables(sortableElems, {
-					handle: '.handle',
-					onFailure: function(invalidForm){
-						ajaxNote.failure();
-					},
-					onStart: function(element, clone){
-						element.addClass('dragged');
-					},
-					onComplete: function(element){
-						element.removeClass('dragged');
-						new Request({
-							method: 'put',
-							url: this.element.getParent('tbody').get('data-sort-url')
-						}).send({data: {order: this.serialize()}});
-					}
-				});
-			});
-		};
-		var updatePlatform = function(href, platform, callback){
-			ajaxNote.loading();
-			new Request.HTML({
-				method: 'get',
-				url: href,
-				onFailure: function(invalidForm){
-					ajaxNote.failure();
-				},
-				onSuccess: function(a, b, html, js){
-					platform.innerHTML = html;
-					if (callback) {
-						callback.call();
-					}
-					setupSortables(platform);
-					Browser.exec(js);
-					ajaxNote.success();
-					windowHight = document.body.clientHeight;
-					window.fireEvent('platformUpdate', [platform]);
-				}
-			}).send();
-		};
-
-		platforms.addEvents({
-			'click:relay(.pagination a, thead a)': function(e){
-				e.preventDefault();
-				updatePlatform(this.get('href'), this.getParent('.platform'));
-			},
-			'submit:relay(.search)': function(e){
-				ajaxNote.loading();
-				e.preventDefault();
-				var parent = this.getParent('.platform');
-				var hidden_search = e.target.getElement('.hidden_search');
-				if (hidden_search) {
-					hidden_search.destroy();
-				}
-
-				new Request.HTML({
-					method: 'get',
-					url: this.get('action'),
-					onFailure: function(invalidForm){
-						ajaxNote.failure();
-					},
-					onSuccess: function(a, b, html){
-						parent.innerHTML = html;
-						setupSortables(parent);
-						ajaxNote.success();
-						window.fireEvent('platformUpdate', [parent]);
-					}
-				}).send({data: this});
-			},
-			'click:relay(.quick_edit)': function(e){
-				e.preventDefault();
-				quickEdit.startEdit(this, this.getParent('tr'));
-			},
-			'click:relay(.action a)': function(e){
-				this.addClass('clicked');
-				setTimeout(function(){
-					this.removeClass('clicked');
-				}.bind(this), 1500);
-			},
-			'click:relay(.delete)': function(e){
-				e.target.addEvents({
-					'ajax:success': function(html){
-						this.getParent('tr').dispose();
-					},
-					'ajax:failure': function(html){
-						alert(Locale.get('Messages.warning'));
-					}
-				});
-			}
-		});
-
-		quickEdit.addEvents({
-			onFailure: function(invalidForm){
-				ajaxNote.failure();
-			},
-			successAndChange: function(json){
-				var tr = this.wrapElement;
-				tr.getElements('td').each(function(td){
-					var name = td.get('data-column-name');
-					if ( ! name) { return; }
-					var a = td.getElement('a.quick_edit');
-					(a ? a : td).innerHTML = json[name] || '';
-				});
-			},
-			successAndNext: function(json){
-				var tr = this.wrapElement;
-				var nextTr = tr.getNext('tr');
-
-				if (nextTr) {
-					quickEdit.startEdit(nextTr.getElement('a'), nextTr);
-				}
-				else {
-					var platform = tr.getParent('.platform');
-					var loadMore = platform.getElement('.load_more');
-					if (loadMore) {
-						trIndex = tr.getParent('tbody').getElements('tr').indexOf(tr);
-						updatePlatform(loadMore.get('href'), platform, function(){
-							platform.getElements('tbody tr').each(function(newTr, index){
-								if (trIndex === index) {
-									nextTr = newTr.getNext('tr');
-									quickEdit.startEdit(nextTr.getElement('a'), nextTr);
-								}
-							});
-						});
-					}
-					else {
-						nextTr = platform.getElements('tbody tr')[0];
-						quickEdit.startEdit(nextTr.getElement('a'), nextTr);
-					}
-				}
-			}
-		});
-		setupSortables(document.body);
-	}
-	else if (mainForm) {
-		setupJsForm(mainForm);
-
-		mainForm.addEvents({
-			'click:relay(.quick_edit)': function(e){
-				e.preventDefault();
-				quickEdit.startEdit(this);
-			},
-			'click:relay(.delete)': function(e){
-				e.target.addEvents({
-					'ajax:success': function(html){
-						var relation = e.target.getParent('.relation');
-						if (relation.getElements('li').length < 2) {
-							relation.getPrevious('.empty').removeClass('hide');
-							if (relation.hasClass('has_one') || relation.hasClass('embeds_one')) {
-								relation.getNext('.add_field').removeClass('hide');
-							}
-						}
-						e.target.getParent('li').dispose();
-					},
-					'ajax:failure': function(html){
-						alert(Locale.get('Messages.warning'));
-					}
-				});
-			}
-		});
-
-		quickEdit.addEvents({
-			onFailure: function(invalidForm){
-				ajaxNote.failure();
-			},
-			successAndAdd: function(json){
-				var relation = this.wrapElement.getPrevious('.relation');
-				relation.getPrevious('.empty').addClass('hide');
-				if (relation.hasClass('has_one') || relation.hasClass('embeds_one')) {
-					relation.getNext('.add_field').addClass('hide');
-				}
-				relation.adopt(
-					new Element('li').adopt(
-						new Element('a.quick_edit', {text: json.to_bhf_s || '', href: json.edit_path})
-					)
-				);
-			},
-			successAndChange: function(json){
-				this.wrapElement.set('text', json.to_bhf_s || '');
-			},
-			successAndNext: function(json){
-				var a = this.wrapElement;
-				var li = a.getParent('li');
-				if ( ! li) { 
-					this.close();
-					return;
-				}
-				var holder = li.getNext('li');
-
-				if ( ! holder) {
-					holder = li.getParent('ul');
-				}
-				quickEdit.startEdit(holder.getElement('a'));
-			}
-		});
-	}
-
-	var fm = $('flash_massages');
-	if (fm) {
-		fm.removeClass.delay(10000, fm, 'show');
-	}
-
-	new BrowserUpdate({vs:{i:8,f:7,o:10.01,s:4,n:9}});
-};
-
-
-window.addEvent('domready', bhfInit);
-
-if (document.addEventListener) {
-	document.addEventListener('page:fetch', function(){
-		ajaxNote.loading();
-	});
-
-	document.addEventListener('page:load', function(){
-		bhfInit();
-		rails.applyEvents();
-		ajaxNote.success();
-	});
-}
-
-var initHelper = function(callback){
-	var scopedCallback = function(){
-		callback(document.body);
-	};
-	if (document.addEventListener) {
-		document.addEventListener('page:load', scopedCallback);
-	}
-	window.addEvent('domready', scopedCallback);
-	window.addEvent('platformUpdate', callback);
-	window.addEvent('quickEditReady', callback);
-	
-};