bhf 0.6.21 → 0.6.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea3828bf228388314f66419153703d30d693255f
-  data.tar.gz: c8391df2548607b8a27363b550b73edaa0610b3e
+  metadata.gz: d655617e2044bd17eed546420dbb327be3a5249c
+  data.tar.gz: a469136f9ff5e25146665d49ba4de00ce72fa09e
 SHA512:
-  metadata.gz: 95313defc1225ba4e8b4965a4a799136a0060edb80facee19a279a9e370411bb1631d7ec2739d2e5cc3d4b4b6c778e0c0ecda133e6eb467af862b7423ffa8754
-  data.tar.gz: 1fd7e80f81ca5f5fe5ee4b9a6b55e4edd7ac5090f118496e291a9d112bac2af369940b7a8da6023a89c988446ca921fd9d26536cd4ada92c3b35b78d27e0caec
+  metadata.gz: bad7751589cf51c48fa5ccba35fd4d4b99ec73a345f1436bbf3592bdeafb01f2225020504913459d7c4e7288594de89ca032ebc727ee0c3d4ca89fbfe5ea8af2
+  data.tar.gz: fec1926b811562320c7bdc0d3c09ed947e9493ccd0bb31e1ab8b8eb6bc6f9f38f36df4ab0a1b31387a28a6bf262bec4dafc2274e9ce0ce5be57ec944e2a3a756

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

@@ -207,7 +207,7 @@ var initHelper = function(callback){
 						e.target.getParent('li').dispose();
 					},
 					'ajax:failure': function(html){
-						alert(Locale.get('Messages.warning'));
+						alert(Locale.get('Notifications.failure'));
 					}
 				});
 			});

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

@@ -10,28 +10,8 @@ var AjaxEdit = new Class({
 	
 	initialize: function(_options){
 		this.setOptions(_options);
-		this.holder = new Element('div.quick_edit_holder').addEvents({
-			'click:relay(.open)': function(e){
-				e.preventDefault();
-				Turbolinks.visit((this.wrapElement.getElement('a') || this.wrapElement).get('href'));
-			}.bind(this),
-			'click:relay(.cancel)': function(e){
-				e.preventDefault();
-				this.close();
-			}.bind(this),
-			'click:relay(.save_and_next)': function(e){
-				e.preventDefault();
-				this.submit(this.newEntry ? ['successAndAdd'] : ['successAndChange', 'successAndNext']);
-			}.bind(this),
-			'click:relay(.save)': function(e){
-				e.preventDefault();
-				this.submit(this.newEntry ? ['successAndAdd'] : ['successAndChange']);
-			}.bind(this),
-			'submit:relay(form)': function(e){
-				e.preventDefault();
-				this.submit(this.newEntry ? ['successAndAdd'] : ['successAndChange']);
-			}.bind(this)
-		});
+		this.holder = new Element('div.quick_edit_holder');
+		
 	},
 	
 	startEdit: function(element, wrapElement){
@@ -106,9 +86,31 @@ var AjaxEdit = new Class({
 	
 	injectForm: function(form){
 		this.holder.innerHTML = form;
+		
+		this.holder.getElements('.open').addEvent('click', function(e){
+			e.preventDefault();
+			Turbolinks.visit((this.wrapElement.getElement('a') || this.wrapElement).get('href'));
+		}.bind(this));
+		this.holder.getElements('.cancel').addEvent('click', function(e){
+			e.preventDefault();
+			this.close();
+		}.bind(this));
+		this.holder.getElements('.save_and_next').addEvent('click', function(e){
+			e.preventDefault();
+			this.submit(this.newEntry ? ['successAndAdd'] : ['successAndChange', 'successAndNext']);
+		}.bind(this));
+		this.holder.getElements('.save').addEvent('click', function(e){
+			e.preventDefault();
+			this.submit(this.newEntry ? ['successAndAdd'] : ['successAndChange']);
+		}.bind(this));
+		this.holder.getElements('form').addEvent('submit', function(e){
+			e.preventDefault();
+			this.submit(this.newEntry ? ['successAndAdd'] : ['successAndChange']);
+		}.bind(this));
+		
 		this.holder.inject($(this.options.holderParent));
 		
-		this.fireEvent('formInjected', [this.holder]);		
+		this.fireEvent('formInjected', [this.holder]);
 	},
 	
 	hide: function(){

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

@@ -51,7 +51,7 @@ var PlatformHelper = new Class({
 					this.getParent('tr').dispose();
 				},
 				'ajax:failure': function(html){
-					alert(Locale.get('Messages.warning'));
+					alert(Locale.get('Notifications.failure'));
 				}
 			});
 		});

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

@@ -24,7 +24,7 @@ window.addEvent('domready', function(){
     param: rails.getCsrf('param')
   };
   
-  rails.applyEvents();
+  // rails.applyEvents();
 });
 
 (function($){

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

@@ -6,6 +6,7 @@ $w1: #fff
 $w2: #F1F1F1
 $k1: #000
 $b1: #38A5E9
+$r1: #E93838
 $b2: #0F8FDD
 $g1: #7F7F7F
 $g2: #ccc
@@ -50,6 +51,12 @@ header
       height: 50px
   nav
     padding-top: 25px
+    .shrink_space
+      li
+        margin-right: 5px
+        a
+          padding-left: 19px
+          padding-right: 19px
     li
       float: left
       font-weight: bold
@@ -60,10 +67,10 @@ header
           +text-shadow(#fff)
           +bg-gradient(#eaeaea, #D5D5D5)
           +box-shadow(0, 1, 4)
-          color: #414756
+          color: #3e3e3e
           &:hover
-            +bg-gradient(#D5D5D5, #FFFFFF)
-            color: #414756
+            +bg-gradient(#FFFFFF, #FFFFFF)
+            color: $b2
             border-color: #FFFFFF
             +text-shadow(#fff)
       a
@@ -242,7 +249,7 @@ table.data_table
       color: #3E3E3E
     .info
       margin: 0 20px 0 10px
-      width: 290px
+      min-width: 290px
       text-transform: uppercase
       font-size: 12px
       color: $g1
@@ -458,7 +465,7 @@ form
       color: $g3
       +text-shadow(#fff)
     .field_with_errors
-      color: red
+      color: $r1
   .input
     input[type="password"],
     input[type="text"],
@@ -510,18 +517,6 @@ form
     .multiple_field,
     .array_fields
       display: block
-    .add_field
-      display: block
-      font-size: 20px
-      font-weight: bold
-      width: 30px
-      margin-left: -8px
-      cursor: pointer
-      text-align: center
-      color: $k1 !important
-      text-decoration: none !important
-      &:hover
-        color: $b1 !important
     .uploaded_file,
     .uploaded_image
       padding: 2px
@@ -540,19 +535,44 @@ form
         color: $b1
     .warning
       font-weight: bold
-    .quick_edit
-      text-decoration: underline
-      color: $b2
-    .relation
-      li
-        &:hover
-          .delete
-            opacity: 1
-            +transition-duration(0.5)
+  .add_field,
+  .relation .quick_edit
+    color: $b1
+    text-decoration: none
+    border: 2px solid $b1
+    background: white
+    padding: 3px 6px
+    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
+  .add_field
+    font-size: 20px
+    font-weight: bold
+    padding: 0 8px 6px 8px
+    line-height: 20px
+    cursor: pointer
+  .relation
+    li
+      &:hover
         .delete
-          opacity: 0
-          &:hover
-            color: $b1
+          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
       
   .cancel
     margin-left: 20px

data/app/controllers/bhf/application_controller.rb

@@ -71,8 +71,8 @@ class Bhf::ApplicationController < ActionController::Base
 
 
     def set_title
-      @title = Bhf::Engine.config.page_title ||
-               (Rails.application.class.to_s.split('::').first+' &ndash; Admin').html_safe
+      @app_title = Rails.application.class.to_s.split('::').first
+      @title = Bhf::Engine.config.page_title || ("#{@app_title} &ndash; Admin").html_safe
     end
 
     def set_message(type, model = nil)

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

@@ -3,7 +3,7 @@
   %head
     %meta{charset: 'utf-8'}
     %title= @title
-    %link{href: '/favicon.ico', rel: 'icon', type: 'image/x-icon'}
+    %link{href: "/favicon.ico?#{@app_title.downcase}", rel: 'icon', type: 'image/x-icon'}
     - (['bhf/application'] + Bhf::Engine.config.css.to_a).each do |css|
       = stylesheet_link_tag css
   %body
@@ -13,7 +13,7 @@
         = link_to image_tag(asset_path(logo)), main_app.root_url, :'data-no-turbolink' => true
       - if @config && @config.pages.any?
         %nav
-          %ul
+          %ul{class: ('shrink_space' if @config.pages.count > 7)}
             - @config.pages.each do |page|
               %li{class: ('active' if @page == page)}
                 = link_to t("bhf.pages.navigation.#{page}", default: page.capitalize), page_path(page)

data/config/routes.rb

@@ -1,4 +1,5 @@
 Bhf::Engine.routes.draw do
+  
   root to: 'application#index'
   
   get 'page/:page', to: 'pages#show', as: :page
@@ -6,11 +7,10 @@ Bhf::Engine.routes.draw do
   scope ':platform' do
     resources :entries, except: [:index] do
       put :sort, on: :collection
+      post :duplicate, on: :member
       
       resources :embed_entries, except: [:index, :show], as: :embed
-      post :duplicate, on: :member
     end
   end
   
-  #()((.+)_?(path|url))
 end

data/lib/bhf/platform.rb

@@ -161,7 +161,7 @@ module Bhf
     end
 
     def hide_create
-      table_options 'hide_create'
+      table_options('hide_create') || table_options('hide_new')
     end
 
     def show_duplicate

metadata

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