bhf 0.4.10 → 0.4.11

data/app/controllers/bhf/entries_controller.rb

@@ -35,7 +35,6 @@ class Bhf::EntriesController < Bhf::ApplicationController
       if @quick_edit
         render json: object_to_bhf_display_hash, status: :ok
       else
-        redirect_to params[:link_back] and return if params[:link_back]
         redirect_back_or_default(bhf_entry_path(@platform.name, @object), notice: set_message('update.success', @model))
       end
     else

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

@@ -1,5 +1,4 @@
 = node f, field do
-  .location_map_holder
-    = f.hidden_field :lat, :'data-default-lat' => 42.6259285, class: 'map_data_lat'
-    = f.hidden_field :lng, :'data-default-lng' => -70.6519888, class: 'map_data_lng'
-    = javascript_include_tag 'http://maps.googleapis.com/maps/api/js?sensor=false'
+  = f.hidden_field :lat, :'data-default-lat' => 42.6259285, class: 'map_data_lat'
+  = f.hidden_field :lng, :'data-default-lng' => -70.6519888, class: 'map_data_lng'
+  = javascript_include_tag 'http://maps.googleapis.com/maps/api/js?sensor=false'

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

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_field field.name, class: 'multiple_fields', :'data-spliter' => (f.object.send("#{field.name}_spliter") if f.object.respond_to?(:"#{field.name}_spliter"))
+  = f.text_field field.name, class: 'multiple_field', :'data-spliter' => (f.object.send("#{field.name}_spliter") if f.object.respond_to?(:"#{field.name}_spliter"))

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

@@ -19,7 +19,7 @@ window.addEvent('domready', function(){
 			wysiwyg.push(elem.mooEditable());
 		});
 		
-		scope.getElements('.multiple_fields').each(function(elem){
+		scope.getElements('.multiple_field').each(function(elem){
 			new MultipleFields(elem);
 		});
 		scope.getElements('.array_holder').each(function(elem){

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

@@ -167,13 +167,6 @@ header
         
 
     > button
-      //
-        &.save,
-        &.save_and_next
-          margin-left: -6px
-          padding: 6px 25px
-          font-size: 13px
-        
       &.cancel,
       &.open
         float: right
@@ -368,8 +361,12 @@ table.data_table
   background: #FFF
   +border-radius(2)
   +box-shadow(0, 1, 0, #FFFFFF)
-  padding: 3px 5px 2px 5px
+  padding: 2px 5px 2px 5px
   width: 300px
+  +box-model
+  min-height: 32px
+  margin: 0
+  margin-bottom: 4px
   &:focus
     outline: 0
     +transition-duration(1)
@@ -385,33 +382,37 @@ table.data_table
 form
   .node
     display: table-row
-    &.string,
-    &.number,
-    &.text,
-    &.password
-      .input,
-      .label
-        padding-top: 0
+    &.primary_key
       .label
-        label
-          padding-top: 5px
+        text-transform: uppercase
+    &.static
+      .input
+        padding-top: 5px
+    //
+      &.string,
+      &.number,
+      &.text,
+      &.password
+        .input,
+        .label
+          padding-top: 0
+        .label
+          label
+            padding-top: 5px
+    .input,
+    .label
+      display: table-cell
+      vertical-align: top
     .label
+      width: 200px
+      padding-top: 5px
       p,
       label
         display: block
         color: $g3
         +text-shadow(#fff)
-      width: 200px
       .field_with_errors
         color: red
-    &.primary_key
-      .label
-        text-transform: uppercase
-    .input,
-    .label
-      padding-top: 5px
-      vertical-align: top
-      display: table-cell
     .input
       input[type="password"],
       input[type="text"],
@@ -439,13 +440,18 @@ form
       textarea,
       .uploaded_image,
       .uploaded_file,
-      .mooeditable-container
+      .mooeditable-container,
+      .wmd-button-row,
+      .map_canvas
         margin-left: -6px
       input[type="file"]
         margin-left: -5px
       select
         font-size: 16px
-      .multiple_fields.template,
+        margin-top: 5px
+      input[type="checkbox"]
+        margin-top: 9px
+      .multiple_field,
       .array_fields
         display: block
       .add_field
@@ -468,12 +474,6 @@ form
         max-height: 200px
         margin-bottom: 5px
         display: block
-      .warning
-        font-weight: bold
-      .quick_edit
-        text-decoration: underline
-        color: $b2
-        
       .uploaded_file
         padding: 7px 5px 8px 7px
         background: #999
@@ -481,6 +481,11 @@ form
         &:hover
           background: #fff
           color: $b1
+      .warning
+        font-weight: bold
+      .quick_edit
+        text-decoration: underline
+        color: $b2
       .relation
         li
           &:hover
@@ -664,10 +669,9 @@ input[type="submit"].alt_button,
       display: none
 
 
-.location_map_holder
+.mappin
   .map_canvas
     @extend .default_input
-    margin-left: -6px
     height: 350px
     width: 500px
 
@@ -942,7 +946,6 @@ input[type="submit"].alt_button,
   background: $w1
   padding: 6px 5px 1px 5px
   @extend .default_input
-  margin-left: -6px
   margin-bottom: 5px
 #main .wmd_editor
   height: 400px

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,18 @@ date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70148313739300 !ruby/object:Gem::Requirement
+  requirement: &70357109306300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70148313739300
+  version_requirements: *70357109306300
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70148313738740 !ruby/object:Gem::Requirement
+  requirement: &70357109228880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70148313738740
+  version_requirements: *70357109228880
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &70148313738260 !ruby/object:Gem::Requirement
+  requirement: &70357109227660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70148313738260
+  version_requirements: *70357109227660
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70148313737760 !ruby/object:Gem::Requirement
+  requirement: &70357109226440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +54,18 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70148313737760
+  version_requirements: *70357109226440
 - !ruby/object:Gem::Dependency
   name: mootools-rails
-  requirement: &70148313737200 !ruby/object:Gem::Requirement
+  requirement: &70357109225240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70148313737200
+  version_requirements: *70357109225240
 description: Gets you there on time
 email: anton.pawlik@gmail.com
 executables: []