bhf 0.8.0 → 0.8.2

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

@@ -10,7 +10,7 @@ var ArrayFields = new Class({
 		var template = elem.getElement('input').clone().erase('value');
 		var currentNr = 0;
 		
-		new Element('span.add_field', {text: '+'})
+		new Element('span.plus_button.qe_button.default_form_align', {text: '+'})
 			.inject(elem)
 			.addEvent('click', function(e){
 				var newInput = template.clone();

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

@@ -21,7 +21,7 @@ var MultipleFields = new Class({
 
 		elem.set('type', 'hidden');
 
-		new Element('span.add_field', {text: '+'})
+		new Element('span.plus_button.qe_button.default_form_align', {text: '+'})
 			.inject(elem, 'after')
 			.addEvent('click', function(e){
 				this.addField(elem, template);
@@ -45,6 +45,6 @@ var MultipleFields = new Class({
 				});
 				elem.set('value', values.join(this.options.spliter));
 			}.bind(this))
-			.inject(elem.getParent('.input').getElement('.add_field'), 'before');
+			.inject(elem.getParent('.input').getElement('.plus_button'), 'before');
 	}
 });

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

@@ -23,7 +23,7 @@ var PlatformHelper = new Class({
 			if (hidden_search) {
 				hidden_search.destroy();
 			}
-			new Request.HTML({
+			var request = new Request.HTML({
 				method: 'get',
 				url: e.target.get('action'),
 				onFailure: function(){
@@ -31,7 +31,7 @@ var PlatformHelper = new Class({
 				},
 				onSuccess: function(a, b, html){
 					scope.innerHTML = html;
-					_this.fireEvent('searchSuccess')
+					_this.fireEvent('searchSuccess', [request])
 				}
 			}).send({data: e.target});
 		});
@@ -45,15 +45,10 @@ var PlatformHelper = new Class({
 				this.removeClass('clicked');
 			}.bind(this), 1500);
 		});
-		scope.getElements('.delete').addEvent('click', function(e){
-			e.target.addEvents({
-				'ajax:success': function(html){
-					this.getParent('tr').dispose();
-				},
-				'ajax:failure': function(html){
-					alert(Locale.get('Notifications.failure'));
-				}
-			});
+		scope.getElements('.js_delete').addEvent('mouseenter', function(){
+			this.getParent('tr').addClass('background_delete');
+		}).addEvent('mouseleave', function(){
+			this.getParent('tr').removeClass('background_delete');
 		});
 	}
 });

data/app/assets/javascripts/bhf/classes/{AjaxEdit.js → QuickEdit.js}

@@ -1,4 +1,4 @@
-var AjaxEdit = new Class({
+var QuickEdit = new Class({
 	version: 0.2,
 	
 	options: {
@@ -13,9 +13,9 @@ var AjaxEdit = new Class({
 		this.holder = new Element('div.quick_edit_holder');
 	},
 	
-	startEdit: function(element, wrapElement){
-		this.wrapElement = wrapElement ? wrapElement : element;
-		this.newEntry = this.wrapElement.hasClass('add_field');
+	startEdit: function(element){
+		this.linkElem = element;
+		this.newEntry = this.linkElem.hasClass('js_add_field');
 		
 		this.fireEvent('startRequest');
 		this.currentRequest = new Request.HTML({
@@ -33,7 +33,7 @@ var AjaxEdit = new Class({
 					nextElem.addClass('hide');
 				}
 				
-				window.fireEvent('quickEditReady', [this.holder]);
+				window.fireEvent('quickEditFormInject', [this.holder]);
 			}.bind(this)
 		}).send();
 	},
@@ -51,7 +51,7 @@ var AjaxEdit = new Class({
 			}.bind(this),
 			onFailure: function(invalidForm){
 				this.injectForm(invalidForm.response);
-				window.fireEvent('quickEditReady', [this.holder]);
+				window.fireEvent('quickEditFormInject', [this.holder]);
 			}.bind(this),
 			onSuccess: function(json){
 				if ( ! eventNames.contains('successAndNext')) {
@@ -60,11 +60,11 @@ var AjaxEdit = new Class({
 				eventNames.each(function(eventName){
 					this.fireEvent(eventName, [json]);
 				}.bind(this));
-				this.fireEvent('save');
+				this.fireEvent('save', [eventNames, this.linkElem, json]);
 			}.bind(this)
 		}).send({data: form});
 	},
-	
+		
 	disableButtons: function(){
 		this.holder.getElements('.open, .cancel, .save_and_next, .save').set('disabled', 'disabled');
 	},
@@ -82,7 +82,7 @@ var AjaxEdit = new Class({
 		
 		this.holder.getElements('.open').addEvent('click', function(e){
 			e.preventDefault();
-			Turbolinks.visit((this.wrapElement.getElement('a') || this.wrapElement).get('href'));
+			Turbolinks.visit((this.linkElem.getElement('a') || this.linkElem).get('href'));
 		}.bind(this));
 		this.holder.getElements('.cancel').addEvent('click', function(e){
 			e.preventDefault();

data/app/assets/javascripts/bhf/classes/{AjaxEditStack.js → QuickEditStack.js}

@@ -1,4 +1,4 @@
-var AjaxEditStack = new Class({
+var QuickEditStack = new Class({
 	version: 0.1,
 
 	options: {
@@ -15,7 +15,7 @@ var AjaxEditStack = new Class({
 		var qi = this.bricksIndex;
 		var qe = this.bricksArray[qi];
 		if ( ! qe) {
-			qe = new AjaxEdit(editOptions);
+			qe = new QuickEdit(editOptions);
 			this.bricksArray.push(qe);
 		}
 		
@@ -28,24 +28,8 @@ var AjaxEditStack = new Class({
 			}
 		});
 		
-		qe.addEvents({
-			startRequest: function(){
-				this.wrapElement.addClass('live_edit');
-				setTimeout(function(){
-					this.wrapElement.addClass('live_edit');
-				}.bind(this), 10);
-			},
-			closed: function(){
-				this.wrapElement.addClass('animate');
-				setTimeout(function(){
-					this.wrapElement.removeClass('live_edit');
-				}.bind(this));
-				setTimeout(function(){
-					this.wrapElement.removeClass('animate');
-				}.bind(this), 600);
-			}
-		});
-		qe.startEdit(link, linkParent);
+		qe.addEvents(this.options.permanentQuickEditEvents);
+		qe.startEdit(link);
 	},
 	addStack: function(){
 		this.bricksIndex = this.bricksIndex + 1;

data/app/assets/javascripts/bhf/mootools-core-1.5.0-full-compat.js

@@ -6029,6 +6029,7 @@ var Request = this.Request = new Class({
 		}, this);
 
 		this.fireEvent('request');
+		this.url = url;
 		xhr.send(data);
 		if (!this.options.async) this.onStateChange();
 		else if (this.options.timeout) this.timer = this.timeout.delay(this.options.timeout, this);

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

@@ -17,18 +17,18 @@ provides:
 ...
 */
 
-window.addEvent('domready', function(){
+(function($){
+  var domReadyCallback = function(){
+    rails.csrf = {
+      token: rails.getCsrf('token'),
+      param: rails.getCsrf('param')
+    };
   
-  rails.csrf = {
-    token: rails.getCsrf('token'),
-    param: rails.getCsrf('param')
+    rails.applyEvents();
   };
-  
-  // rails.applyEvents();
-});
+  window.addEvent('domready', domReadyCallback);
+  document.addEventListener('page:load', domReadyCallback);
 
-(function($){
-  
   window.rails = {
     /**
      * If el is passed as argument, events will only be applied to
@@ -37,7 +37,7 @@ window.addEvent('domready', function(){
     applyEvents: function(el){
       el = $(el || document.body);
       var apply = function(selector, action, callback){
-        el.getElements(selector).addEvent(action, callback);
+        el.addEvent(action + ':relay(' + selector + ')', callback);
       };
       
       apply('form[data-remote="true"]', 'submit', rails.handleRemote);
@@ -157,4 +157,4 @@ window.addEvent('domready', function(){
     
   });
   
-})(document.id);
+})(document.id);

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

@@ -126,6 +126,7 @@ header
         border-color: transparent
         background: transparent
 
+
 .font_size_bigger
   font-size: 1.2em
     
@@ -209,7 +210,7 @@ header
     .group
       margin-top: 0
       margin-bottom: 10px
-      margin-left: 20px
+      margin-left: 14px
       padding: 0
       button
         border: none
@@ -239,6 +240,8 @@ header
         float: right
         margin-top: 10px
         margin-right: 10px
+      &.cancel:hover
+        background: $r1
       &.save
         margin-right: 16px
 
@@ -377,6 +380,9 @@ table.data_table
       &.live_edit td
         background: $b2
         border-bottom-color: $b2
+      &.background_delete td
+        background: $r1
+        border-bottom-color: $r1
       &.dragged
         td
           opacity: 0.4
@@ -460,6 +466,10 @@ table.data_table
     min-height: 20px
     padding-top: 5px
 
+.quick_edit_holder
+  .error_explanation
+    margin-left: 0
+
 form
   .node
     display: table-row
@@ -482,7 +492,24 @@ form
       color: $g6
     .field_with_errors
       color: $r1
+  .select_input
+    .quick_edit.js_edit_field,
+    .qe_delete.js_delete
+      margin-left: 10px
+    .plus_button
+      margin-left: 20px
+    .icon.edit
+      position: relative
+      top: -2px
+      background-position: 0 -150px
+      &.live_edit,
+      &:hover
+        background-position: 0 -200px
+      
   .input
+    input[type="file"]
+      display: block
+      padding: 3px 0 6px 0
     input[type="password"],
     input[type="text"],
     .uploaded_image,
@@ -551,52 +578,12 @@ form
         color: $b1
     .warning
       font-weight: bold
-  .add_field,
-  .relation .quick_edit
-    color: $b1
-    text-decoration: none
-    border: 2px solid $b1
-    background: white
-    padding: 3px 4px
-    border-radius: 4px
-    margin-left: -6px
-    display: inline-block
-    margin-bottom: 8px
-    &:hover
-      color: white
-      background-color: $b1
-    &.live_edit
-      color: white
-      background-color: $b2
-      border-color: $b2
-    &.animate
-      +transition-duration(.3)
-  .add_field
-    font-size: 20px
-    font-weight: bold
-    padding: 0 8px 6px 8px
-    line-height: 20px
-    cursor: pointer
-  .relation
-    li
-      &:hover
-        .delete
-          opacity: 1
-          +transition-duration(0.5)
-      .delete
-        opacity: 0
-        font-size: 20px
-        font-weight: bold
-        padding: 0 8px 6px 8px
-        line-height: 20px
-        &:hover
-          color: $r1
   
   input[type="submit"]
     margin-right: 20px
   input[type="submit"].alt_button
     background: $w1
-    color: $b1
+    color: $g5
     font-weight: normal
     +transition-duration(0)
     &:active,
@@ -605,15 +592,14 @@ form
   .cancel
     color: $g5
     &:hover
-      color: $g6
-      text-decoration: underline
+      color: $r1
   .info
     font-style: italic
     font-size: 12px
     color: $g6
     a
       text-decoration: underline
-      
+  
   .error_explanation
     margin-left: 20px
     label
@@ -623,6 +609,57 @@ form
       &:hover
         color: $orange
 
+.qe_button
+  text-decoration: none
+  background: white
+  padding: 3px 6px
+  border-radius: 4px
+  display: inline-block
+  margin-bottom: 8px
+  &:hover
+    color: white
+    background-color: $b1
+  &.live_edit
+    color: white
+    background-color: $b2
+    border-color: $b2
+  &.animate
+    +transition-duration(.3)
+  &.plus_button
+    font-size: 20px
+    font-weight: bold
+    padding: 0 8px 6px 8px
+    line-height: 20px
+    cursor: pointer
+
+.default_form_align
+  margin-left: -6px
+
+a
+  &[href='null'],
+  &[href='']
+    opacity: 0.3
+    pointer-events: none
+
+.relation
+  margin-left: -6px
+  input
+    margin-right: 5px
+  li:hover
+    .qe_delete
+      opacity: 1
+      //+transition-duration(0.5)
+  .qe_delete
+    opacity: 0
+
+.qe_delete
+  font-size: 20px
+  font-weight: bold
+  padding: 0 8px 6px 8px
+  line-height: 20px
+  &:hover
+    color: $r1
+
 
 footer
   padding: 20px 0 60px 0
@@ -971,7 +1008,7 @@ input[type="submit"].alt_button,
   z-index: 4000
   +border-bottom-radius(4)
   background: $b1 image-url('bhf/ajax_loader.gif') no-repeat center 16px
-  +box-shadow(0, 1, 4)
+  +box-shadow(0, 3, 8, #333)
   +transition-duration(0.6)
   &.loading
     height: 100px
@@ -1072,7 +1109,8 @@ input[type="submit"].alt_button,
   border: 1px solid transparent
   &:hover
     border-color: $g4
-
+  &:active
+    border-color: $b2
 
 .wmd-spacer
   width: 1px
@@ -1139,4 +1177,4 @@ 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)
   .icon
     background-image: image-url('bhf/pictos_2x.png')
-    background-size: 440px 152px
+    background-size: 440px 260px

data/app/controllers/bhf/application_controller.rb

@@ -1,6 +1,6 @@
 class Bhf::ApplicationController < ActionController::Base
 
-  before_filter :init_time, :check_admin_account, :setup_current_account, :load_config, :set_title, :set_areas
+  before_filter :init_time, :check_admin_account, :setup_current_account, :load_settings, :set_title, :set_areas
 
   helper_method :current_account
   layout 'bhf/application'
@@ -50,8 +50,9 @@ class Bhf::ApplicationController < ActionController::Base
       end
     end
 
-    def load_config
-      @settings = Bhf::SettingsParser::parse(get_account_roles(params[:bhf_area]), params[:bhf_area])
+    def load_settings
+      yaml_parser = Bhf::Settings::YAMLParser.new(get_account_roles(params[:bhf_area]), params[:bhf_area])
+      @settings = Bhf::Settings::Base.new(yaml_parser.settings_hash, current_account)
     end
 
     def set_title
@@ -95,7 +96,10 @@ class Bhf::ApplicationController < ActionController::Base
     def init_time
       @start_time = Time.now
     end
-
+    
+    def find_platform(platform_name)
+      Bhf::Platform::Base.new(@settings.find_platform_settings(platform_name))
+    end
 
     def redirect_back_or_default(default, msg)
       redirect_to(params[:return_to] || default, flash: msg)