bhf 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f344e5b10c973d0d42c55159deb54c645e7a0e24
-  data.tar.gz: 1091824278485c4d3be0c94fdde0269dbabf1184
+  metadata.gz: efd84f0c58a39fc43e2aa2fe6a253335a8dce56b
+  data.tar.gz: 4b64fe048aaa0a67edd554e25f5bbe5c49178e68
 SHA512:
-  metadata.gz: 31617fbd1004836e2045abf8e26195a593a2e63d0d28c38616ae5be813022e7179fd4de6dada51fb8f65f56ff6f36f774f51fecb5c33a96caa6631cda2e7ef00
-  data.tar.gz: 74cb8070bb915bc29a02893125ac3c9c23db534e1a6d6190f7b526282139602c6eddf9effc2474452406ea0617e3ad1b3c814a6b94ef5de1d742bec34bee4e10
+  metadata.gz: c836650024dec75f04624a7014b5c1762621e5f1f3b999b98291cc40fa4ea9d27fb3aa0603499508d5cfe2d54849d501dae1c2f6cf9373d744ab9b20eca5d533
+  data.tar.gz: 5ecfd72626e8ea55cbfba02fe689d4a57f0528607c8043810004af929259d2232fcdf780a722293d6b1b21142012e5448ecaf9c4a518b59342cba5259d9f3f0e

data/Gemfile.lock

@@ -33,13 +33,13 @@ GEM
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.7.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.1.4)
+    docile (1.1.5)
     erubis (2.7.0)
     execjs (2.2.1)
     faraday (0.9.0)
@@ -60,10 +60,10 @@ GEM
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
-    hashie (3.1.0)
+    hashie (3.2.0)
     highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -89,7 +89,7 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
-    oauth2 (0.9.4)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

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

@@ -9,9 +9,8 @@
 Turbolinks.pagesCached(0);
 
 (function(){
-	var stackIndexCounter = 0;
 	var lang = document.html.get('lang').split('-')[0];
-	lang = (lang === 'en') ? 'en-US' : lang.toLowerCase()+'-'+lang.toUpperCase()
+	lang = (lang === 'en') ? 'en-US' : lang.toLowerCase()+'-'+lang.toUpperCase();
 	Locale.use(lang);
 
 	var ajaxNote = new Ajaxify();
@@ -70,12 +69,13 @@ Turbolinks.pagesCached(0);
 		var newEntryInjectArea = parent.getElement('.quick_edit_inject');
 		var relation = parent.getElement('.relation');
 		var entry = linkElem.getParent('.quick_edit_entry');
+		var parsedTemplate;
 		if ( ! entry) {
 			entry = parent.getElement('.quick_edit_active');
 		}
 		
 		if (json) {
-			var parsedTemplate = entryTemplate.innerHTML.replace(new RegExp('%7Bobject_id%7D', 'g'), '{object_id}').substitute(json)
+			parsedTemplate = entryTemplate.innerHTML.replace(new RegExp('%7Bobject_id%7D', 'g'), '{object_id}').substitute(json);
 		}
 		
 		if (eventNames.contains('successAndAdd')) {
@@ -110,6 +110,17 @@ Turbolinks.pagesCached(0);
 			
 		}
 	};
+		
+	var scrollContent = function(){
+		editStack.bricksArray.each(function(quickEdit){
+			var innerForm = quickEdit.holder.getElement('form');
+			if ( ! innerForm) { return; }
+			var scroll = document.body.scrollTop - 83;
+			if (scroll + innerForm.getSize().y > document.body.clientHeight) { return; }
+			quickEdit.holder.setStyle('padding-top', scroll);
+		});
+	};
+	
 	
 	window.addEvent('bhfDomChunkReady', function(mainScope){
 		
@@ -133,10 +144,10 @@ Turbolinks.pagesCached(0);
 			onFailure: function(){
 				ajaxNote.failure();
 			},
-			onStartRequest: function(form){
+			onStartRequest: function(){
 				ajaxNote.loading();
 			},
-			onFormInjected: function(form){
+			onFormInjected: function(){
 				scrollContent();
 				ajaxNote.success();
 			},
@@ -155,7 +166,7 @@ Turbolinks.pagesCached(0);
 		var platforms = mainScope.getElements('.platform');
 		var mainForm = mainScope.getElementById('main_form');
 		
-		mainScope.getElements('.quick_edit_select').addEvent('change', function(e){
+		mainScope.getElements('.quick_edit_select').addEvent('change', function(){
 			var parent = this.getParent('.quick_edit_block');
 			var optionElem = this.options[this.selectedIndex];
 			var editElem = parent.getElement('.js_edit_field');
@@ -178,10 +189,10 @@ Turbolinks.pagesCached(0);
 		
 		mainScope.addEvent('click:relay(.js_delete)', function(e){
 			e.target.addEvents({
-				'ajax:success': function(html){
+				'ajax:success': function(){
 					updateElementsAfterQuickEditSuccess(['successAndRemove'], e.target);
 				},
-				'ajax:failure': function(html){
+				'ajax:failure': function(){
 					alert(Locale.get('Notifications.failure'));
 				}
 			});
@@ -190,9 +201,8 @@ Turbolinks.pagesCached(0);
 
 		if (platforms.length) {
 			quickEditOptions = Object.merge({
-				onSuccessAndNext: function(json){
+				onSuccessAndNext: function(){
 					var tr = this.linkElem;
-					var qe;
 					var nextTr = tr.getNext('tr');
 
 					if (nextTr) {
@@ -200,6 +210,7 @@ Turbolinks.pagesCached(0);
 						editStack.addEditBrick(quickEditOptions, nextTr.getElement('a'), nextTr);
 					}
 					else {
+						var trIndex;
 						var platform = tr.getParent('.platform');
 						var loadMore = platform.getElement('.load_more');
 						if (loadMore) {
@@ -250,7 +261,7 @@ Turbolinks.pagesCached(0);
 		}
 		else if (mainForm) {
 			quickEditOptions = Object.merge({
-				onSuccessAndNext: function(json){
+				onSuccessAndNext: function(){
 					var a = this.linkElem;
 					var li = a.getParent('li');
 					if ( ! li) { 
@@ -288,20 +299,10 @@ Turbolinks.pagesCached(0);
 			});
 		}
 		
-		var scrollContent = function(){
-			editStack.bricksArray.each(function(quickEdit){
-				var innerForm = quickEdit.holder.getElement('form');
-				if ( ! innerForm) { return; }
-				var scroll = document.body.scrollTop - 83;
-				if (scroll + innerForm.getSize().y > document.body.clientHeight) { return; }
-				quickEdit.holder.setStyle('padding-top', scroll);
-			});
-		};
-		
 		mainScope.getElements('.js_sortable').each(function(sortableElems){
 			new Sortables(sortableElems, {
 				handle: '.handle',
-				onStart: function(element, clone){
+				onStart: function(element){
 					element.addClass('dragged');
 				},
 				onComplete: function(element){
@@ -333,7 +334,7 @@ Turbolinks.pagesCached(0);
 			var parent = this.getParent();
 			var newText = parent.get('data-empty-field-text');
 			if (this.value) {
-				newText = text.getLast() || this.value;
+				newText = text.getLast() || this.value;
 			}
 			parent.getElement('.h_text').set('text', newText);
 		});
@@ -356,4 +357,4 @@ Turbolinks.pagesCached(0);
 	window.addEvent('domready', bodyCallback);
 	window.addEvent('platformUpdate', scopeCallback);
 	window.addEvent('quickEditFormInject', scopeCallback);
-})();
+}());

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

@@ -474,7 +474,9 @@ table.data_table
 
 .quick_edit_holder
   .error_explanation
-    margin-left: 0
+    margin-top: -10px
+    margin-left: -20px
+    margin-right: -20px
 
 form
   .node
@@ -607,13 +609,25 @@ form
       text-decoration: underline
   
   .error_explanation
-    margin-left: 20px
+    h5
+      padding: 10px 20px
+      background: $r1
+      color: $w1
+      font-weight: normal
+    ul
+      padding: 5px 20px
+      background: $w1
+      list-style: square
+      li
+        margin: 0 20px
+        padding: 5px 0
+        color: $r1
     label
-      color: $r1
+      color: $k1
       cursor: pointer
       display: block
       &:hover
-        color: $orange
+        color: $r1
 
 .qe_button
   text-decoration: none

data/app/controllers/bhf/application_controller.rb

@@ -34,7 +34,7 @@ class Bhf::ApplicationController < ActionController::Base
 
     def get_account_roles(area = nil)
       return unless current_account
-      
+
       if area
         if current_account.respond_to?(:bhf_area_roles)
           return current_account.bhf_area_roles(area).collect(&:identifier)
@@ -53,7 +53,7 @@ class Bhf::ApplicationController < ActionController::Base
 
     def set_title
       @app_title = Rails.application.class.to_s.split('::').first
-      
+
       @title = if params[:bhf_area]
         t("bhf.areas.page_title.#{params[:bhf_area]}", 
           area: params[:bhf_area],
@@ -85,14 +85,13 @@ class Bhf::ApplicationController < ActionController::Base
 
     def set_message(type, model = nil)
       key = model && ActiveModel::Naming.singular(model)
-      
       I18n.t("bhf.activerecord.notices.models.#{key}.#{type}", model: model.model_name.human, default: I18n.t("activerecord.notices.messages.#{type}"))
     end
 
     def init_time
       @start_time = Time.now
     end
-    
+
     def find_platform(platform_name)
       Bhf::Platform::Base.new(@settings.find_platform_settings(platform_name))
     end

data/app/views/bhf/form/column/_paperclip.haml

@@ -5,7 +5,7 @@
     - if file.file?
       
       - if type_is_image?(file.content_type)
-        = image_tag find_smallest_size_url_for_file(file), class: 'uploaded_image'
+        = link_to image_tag(find_smallest_size_url_for_file(file), class: 'uploaded_image'), file.url
       - else
         = link_to file.original_filename, file.url, class: 'uploaded_file'
       

data/bhf.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bhf 0.9.4 ruby lib
+# stub: bhf 0.9.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Anton Pawlik"]
-  s.date = "2014-07-12"
+  s.date = "2014-07-14"
   s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid."
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [

data/lib/bhf/settings/yaml_parser.rb

@@ -1,14 +1,13 @@
 module Bhf::Settings
 
   class YAMLParser
-    
+
     attr_accessor :settings_hash
-    
+
     def initialize(roles_array, area = nil)
       roles_settings = roles_yml(roles_array, area)
 
       if Bhf.configuration.abstract_settings.any?
-  
         tmp_pages = get_settings_array(Bhf.configuration.abstract_settings)['pages']
         abstract_platform_settings = tmp_pages.each_with_object({}) do |abstract_pages, hash|
           abstract_pages.each do |abstract_page|
@@ -17,7 +16,7 @@ module Bhf::Settings
             end
           end
         end
-  
+
         roles_settings['pages'].each_with_index do |pages, i_1|
           pages.each_pair do |key_1, page|
             page.each_with_index do |platform, i_2|
@@ -34,15 +33,25 @@ module Bhf::Settings
           end
         end
       end
-      
+
       @settings_hash = roles_settings
     end
 
-
     def get_settings_array(array, dir = nil)
-      array.each_with_object({'pages' => []}) do |r, account_roles|
-        pages = load_yml("#{dir}/#{r}")['pages']
-        account_roles['pages'] += pages if pages
+      array.each_with_object({'pages' => []}) do |file_name, tmp_settings_hash|
+        absolut_path = false
+        file_path = if dir
+          "#{dir}/#{file_name}"
+        else
+          if file_name[0,1] == '/'
+            absolut_path = true
+            file_name
+          else
+            "/#{file_name}"
+          end
+        end
+        pages = load_yml(file_path, absolut_path)['pages']
+        tmp_settings_hash['pages'] += pages if pages
       end
     end
 
@@ -63,7 +72,7 @@ module Bhf::Settings
               end
             end
           end
-          if !merged
+          unless merged
             merged_files['pages'] << pages
           end
         end
@@ -73,10 +82,15 @@ module Bhf::Settings
       end
     end
 
-    def load_yml(suffix = nil)
-      YAML::load(IO.read("config/bhf#{suffix}.yml"))
+    def load_yml(suffix = nil, absolut_path = false)
+      file_path = if absolut_path
+        "#{suffix}.yml"
+      else
+        "config/bhf#{suffix}.yml"
+      end
+      YAML::load(IO.read(file_path))
     end
-  
+
   end
 
 end

metadata

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