bhf 0.6.14 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 004d9921d3a9648914d5eab02339ffe511bffb8f
-  data.tar.gz: 030b04fea3f166f78507b43a7ff7a371e85b6b0a
+  metadata.gz: 6396dd43cc2d51a062538a692225b11f26050f16
+  data.tar.gz: 0b633f0d8293dc708920b633d637b5d24816366c
 SHA512:
-  metadata.gz: 210ecf0ca1cdef8f593cf8f983e9483e07e2a016fd59a23454531b811e00613770f9b8b0d8013a704235ee9ea503314a73c5327f08db166d57c79b83bedb8737
-  data.tar.gz: 51a99231f6b1d30b273aa9309eeed2dc429d5fce22270a79570270515f0a06738b0e0f3deca7a6f5b2fb0bc5ed6d5b0769ed49db6002daa0808b56b033429103
+  metadata.gz: 45bd83105b6cb3243d96368f30e108bc0950d9591506a0b1d592418190f460c7103fbe2a655a5cf49408220636d1bcde7aeb0674a6611cb9d6ec50729402259a
+  data.tar.gz: d2ccfcae7e0cfa433abe7cecae13b8af14c00a3adeddabaa2488b90e55e0b2d1b8be521d508d581ed4464b5788ce9d226636096048c524691dd96f9fcb8a9f49

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?
+      next if platform.model.bhf_embedded? || platform.table_hide?
       platform.pagination = Bhf::Pagination.new(platform.entries_per_page)
       paginate_platform_objects(platform)
       obj << platform

data/app/views/bhf/entries/form/column/_hash.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  WIP
+  = f.object.send(field.name).inspect

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

@@ -3,8 +3,9 @@
   .dl.content_box
     - @platform.definitions.each do |column|
       - tmp = column.field.show_type ? column.field.show_type : column.field.display_type
-      = definition_item @object, column do
-        = render(partial: "bhf/pages/macro/#{column.field.macro}/#{tmp}", locals: {column: column, object: @object})
+      - if ! @object.send(column.name).blank?
+        = definition_item @object, column do
+          = render(partial: "bhf/pages/macro/#{column.field.macro}/#{tmp}", locals: {column: column, object: @object})
 
 - if @platform.show_extra_fields and @platform.show_extra_fields.any?
   .content_box

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

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

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

@@ -1,3 +1,2 @@
-- # %h2= t('bhf.pages.headline')
 - @platforms.each do |platform|
   .platform= render partial: 'platform', locals: {platform: platform}

data/lib/bhf.rb

@@ -6,7 +6,6 @@ require 'kaminari'
 
 module Bhf
   class Engine < Rails::Engine
-
     # Config defaults
     config.page_title = nil
     config.mount_at = 'bhf'

data/lib/bhf/data.rb

@@ -1,7 +1,7 @@
 module Bhf
   module Data
     class AbstractField
-      attr_reader :name, :info, :macro, :display_type, :form_type, :show_type, :overwrite_type, :overwrite_display_type, :overwrite_show_type
+      attr_reader :name, :info, :macro, :link, :display_type, :form_type, :show_type, :overwrite_type, :overwrite_display_type, :overwrite_show_type
       
       def initialize(props)
         @name = props[:name]
@@ -12,6 +12,7 @@ module Bhf
         @overwrite_display_type = props[:display_type]
         @info = props[:info]
         @macro = :column
+        @link = props[:link].downcase.to_sym unless props[:link].blank?
       end
     end
 

data/lib/bhf/mongoid/document.rb

@@ -48,7 +48,7 @@ module Bhf
           else
             self.class.to_s.humanize
           end
-          return "#{klass_name} ID: #{send(self.class.primary_key)}" if attributes[self.class.primary_key]
+          return "#{klass_name} ID: #{send(self.class.bhf_primary_key)}" if attributes[self.class.bhf_primary_key]
         end
 
         self.to_s.humanize

data/lib/bhf/platform.rb

@@ -30,6 +30,10 @@ module Bhf
       table_options(:search) != false
     end
     
+    def table_hide?
+      table_options(:hide) == true
+    end
+    
     def search_field?
       table_options(:search_field) != false
     end
@@ -202,7 +206,8 @@ module Bhf
               form_type: form_options(:types, attr_name) || attr_name,
               display_type: table_options(:types, attr_name) || attr_name,
               show_type: show_options(:types, attr_name) || table_options(:types, attr_name) || attr_name,
-              info: I18n.t("bhf.platforms.#{@name}.infos.#{attr_name}", default: '')
+              info: I18n.t("bhf.platforms.#{@name}.infos.#{attr_name}", default: ''),
+              link: form_options(:links, attr_name)
             })
           )
         end

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

@@ -3,19 +3,19 @@
 //= 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 lang = document.html.get('lang');
-	if (lang === 'en') {
-		lang = 'en-US';
-	}
-	else {
-		lang = lang+'-'+lang.toUpperCase();
-	}
-	Locale.use(lang);
 	var wysiwyg = [];
 	var setupJsForm = function(scope){
 		scope.getElements('.wysiwyg').each(function(elem){
@@ -141,6 +141,9 @@ var bhfInit = function(){
 			scope.getElements('.sortable').each(function(sortableElems){
 				new Sortables(sortableElems, {
 					handle: '.handle',
+					onFailure: function(invalidForm){
+						ajaxNote.failure();
+					},
 					onStart: function(element, clone){
 						element.addClass('dragged');
 					},
@@ -159,6 +162,9 @@ var bhfInit = function(){
 			new Request.HTML({
 				method: 'get',
 				url: href,
+				onFailure: function(invalidForm){
+					ajaxNote.failure();
+				},
 				onSuccess: function(a, b, html, js){
 					platform.innerHTML = html;
 					if (callback) {
@@ -190,6 +196,9 @@ var bhfInit = function(){
 				new Request.HTML({
 					method: 'get',
 					url: this.get('action'),
+					onFailure: function(invalidForm){
+						ajaxNote.failure();
+					},
 					onSuccess: function(a, b, html){
 						parent.innerHTML = html;
 						setupSortables(parent);
@@ -221,6 +230,9 @@ var bhfInit = function(){
 		});
 
 		quickEdit.addEvents({
+			onFailure: function(invalidForm){
+				ajaxNote.failure();
+			},
 			successAndChange: function(json){
 				var tr = this.wrapElement;
 				tr.getElements('td').each(function(td){
@@ -288,6 +300,9 @@ var bhfInit = function(){
 		});
 
 		quickEdit.addEvents({
+			onFailure: function(invalidForm){
+				ajaxNote.failure();
+			},
 			successAndAdd: function(json){
 				var relation = this.wrapElement.getPrevious('.relation');
 				relation.getPrevious('.empty').addClass('hide');

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

@@ -44,6 +44,9 @@ var AjaxEdit = new Class({
 			method: 'get',
 			evalScripts: false,
 			url: element.get('href'),
+			onFailure: function(invalidForm){
+				this.fireEvent('failure');
+			}.bind(this),
 			onSuccess: function(responseTree, responseElements, responseHTML, responseJavaScript){
 				this.injectForm(responseHTML);
 				eval(responseJavaScript);

data/vendor/assets/javascripts/bhf/classes/Ajaxify.js

@@ -4,7 +4,12 @@ var Ajaxify = new Class({
 	Implements: [Options, Events],
 
 	options: {
-		events: {
+		holder: new Element('div#ajax_holder'),
+		fadeOutDuration: 2000
+	},
+
+	initialize: function(_options) {
+		this.options.events = {
 			loading: {
 				name: 'ajax:loading',
 				text: 'Loading…'
@@ -15,14 +20,9 @@ var Ajaxify = new Class({
 			},
 			failure: {
 				name: 'ajax:failure',
-				text: 'Oops, something went wrong…'
+				text: Locale.get('Notifications.failure')
 			}
-		},
-		holder: new Element('div#ajax_holder'),
-		fadeOutDuration: 2000
-	},
-
-	initialize: function(_options) {
+		};
 		this.setOptions(_options);
 	},
 	
@@ -48,7 +48,7 @@ var Ajaxify = new Class({
 		this.setMessage('success', true);
 	},
 	failure: function(xhr){
-		this.setMessage('failure', true);
+		this.setMessage('failure', false);
 	},
 
 	setMessage: function(status, fadeOut) {

data/vendor/assets/javascripts/bhf/classes/Locale.de-DE.js

@@ -7,6 +7,7 @@ Locale.define('de-DE', 'DatePicker', {
 	week: 'W'
 });
 
-Locale.define('de-DE', 'Messages', {
-	warning: 'Etwas ist schief gelaufen!'
+Locale.define('de-DE', 'Notifications', {
+	failure: 'Etwas ist schief gelaufen!'
 });
+

data/vendor/assets/javascripts/bhf/classes/Locale.en-US.js

@@ -8,6 +8,6 @@ Locale.define('en-US', 'DatePicker', {
 });
 
 
-Locale.define('de-DE', 'Messages', {
-	warning: 'Something went wrong!'
+Locale.define('de-DE', 'Notifications', {
+	failure: 'Something went wrong!'
 });

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

@@ -99,6 +99,9 @@ header
     color: $g1
   a
     text-decoration: underline
+  .text
+    white-space: pre
+
 .default_table
   width: 100%
   td, th
@@ -931,8 +934,18 @@ input[type="submit"].alt_button,
     height: 100px
     opacity: 1
     top: -4px
-    
-    
+  &.failure
+    background-image: none
+    width: auto
+    opacity: 1
+    top: 0
+    text-indent: 0px    
+    +transition-duration(0)
+    height: auto
+    color: white
+    padding: 20px
+    marign-left: -120px
+    font-weight: bold
     
   
   

metadata

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