bhf 0.4.9 → 0.4.10

data/app/controllers/bhf/entries_controller.rb

@@ -35,6 +35,7 @@ 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

@@ -0,0 +1,5 @@
+= 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'

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

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_area field.name, class: ('markdown' unless @quick_edit)
+  = f.text_area field.name, class: ('wmd_editor' unless @quick_edit)

data/app/views/bhf/helper/_node.haml

@@ -1,4 +1,4 @@
-.node{class: field.display_type}
+.node{class: field.form_type}
   .label= f.label field.name
   .input
     = input

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

@@ -52,4 +52,4 @@
           = link_to new_t(platform), new_bhf_entry_path(platform.name)
 
 - if platform.custom_partial
-  = render partial: "bhf/pages/#{platform.custom_partial}", locals: {}
+  = render partial: "bhf/pages/#{platform.custom_partial}"

data/lib/bhf/pagination.rb

@@ -23,8 +23,8 @@ module Kaminari
     end
   end
 end
-# TODO: lets hope they fix nested params and we can remove this
-# https://github.com/amatsuda/kaminari/issues/145
+# TODO: lets hope they'll fix nested params and we can remove this
+# https://github.com/amatsuda/kaminari/issues/152
 
 
 module Bhf

data/lib/bhf/view_helpers.rb

@@ -2,7 +2,7 @@ module Bhf
   module ViewHelpers
     module ActionView
 
-      def bhf_edit(object, options = {}) # TODO: block of html for custom editing buttons and links
+      def bhf_edit(object, options = {}) # TODO: add a block of html for custom editing buttons and links
         return unless session[Bhf::Engine.config.session_auth_name.to_s] == true
 
         options[:platform_name] ||= object.class.to_s.pluralize.downcase

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

@@ -56,7 +56,7 @@ window.addEvent('domready', function(){
 			}, options));
 		});
 		
-		scope.getElements('.markdown').each(function(mdTa){
+		scope.getElements('.wmd_editor').each(function(mdTa){
 			var headline, toggleHtmlPreview, toggleLivePreview, livePreview, htmlPreview;
 			
 			var togglePreview = function(e){
@@ -91,6 +91,10 @@ window.addEvent('domready', function(){
 				autoFormatting: false
 			});
 		});
+		
+		scope.getElements('.map_data_lat').each(function(lat){
+			new Latlng(lat);
+	    });
 	};
 
 	// TODO: disable more ajax calls while ajax is loading
@@ -143,6 +147,7 @@ window.addEvent('domready', function(){
 				url: href,
 				onSuccess: function(a, b, html){
 					platform.innerHTML = html;
+					rails.applyEvents(platform);
 					if (callback) {
 						callback.call();
 					}

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

@@ -0,0 +1,64 @@
+var Latlng = new Class({
+	Implements: [Options, Events],
+	
+	options: {
+	},
+	
+	initialize: function(elem){
+		var latElem = elem;
+		var lngElem = elem.getNext('.map_data_lng');
+		var	setValues = function(lat, lng){
+			latElem.value = lat;
+			lngElem.value = lng;
+		};
+		
+		var center = new google.maps.LatLng(
+			latElem.value ? latElem.value : latElem.get('data-default-lat'),
+			lngElem.value ? lngElem.value : latElem.get('data-default-lng')
+		);
+		
+		var map = new google.maps.Map(new Element('div.map_canvas').inject(latElem, 'before'), {
+			zoom: 14,
+			mapTypeId: google.maps.MapTypeId.ROADMAP,
+			center: center,
+			mapTypeControl: true,
+			zoomControl: true,
+			zoomControlOptions: {
+				style: google.maps.ZoomControlStyle.SMALL
+			},
+			streetViewControl: false,
+			panControl: false,
+			scaleControl: false,
+			overviewMapControl: false
+		});
+		
+		var marker = new google.maps.Marker({
+			title: 'Location',
+			draggable: true
+		});
+		
+		if (latElem.value && lngElem.value) {
+			marker.position = new google.maps.LatLng(latElem.value, lngElem.value);
+			marker.setMap(map);
+		}
+		else {
+			if (navigator) {
+				navigator.geolocation.getCurrentPosition(function(e){
+					map.setCenter(new google.maps.LatLng(e.coords.latitude, e.coords.longitude));
+				});
+			}
+			google.maps.event.addListener(map, 'click', function(e){
+				marker.position = e.latLng;
+				marker.setMap(map);
+				setValues(marker.getPosition().Ka, marker.getPosition().La);
+				google.maps.event.clearListeners(map, 'click');
+			});
+		}
+		
+		google.maps.event.addListener(marker, 'dragend', function(){
+			var mPos = marker.getPosition();
+			map.panTo(mPos);
+			setValues(mPos.Sa, mPos.Ta);
+		});
+	}
+});

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

@@ -664,6 +664,14 @@ input[type="submit"].alt_button,
       display: none
 
 
+.location_map_holder
+  .map_canvas
+    @extend .default_input
+    margin-left: -6px
+    height: 350px
+    width: 500px
+
+
 // MooEditable
 
 @import MooEditable
@@ -685,8 +693,6 @@ input[type="submit"].alt_button,
       background: $g2 !important
       
       
-// Datepicker TODO: style div.datepicker
-
 .datepicker
   position: absolute
   width: 172px
@@ -938,7 +944,7 @@ input[type="submit"].alt_button,
   @extend .default_input
   margin-left: -6px
   margin-bottom: 5px
-#main .markdown
+#main .wmd_editor
   height: 400px
   width: 700px
 
@@ -977,8 +983,6 @@ input[type="submit"].alt_button,
   display: inline-block
   list-style: none
 
-// TODO: style this properly
-
 .wmd-button-row
   .wmd-bold-button
     background-position: 0px 0px

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70212146198000 !ruby/object:Gem::Requirement
+  requirement: &70148313739300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70212146198000
+  version_requirements: *70148313739300
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70212146194680 !ruby/object:Gem::Requirement
+  requirement: &70148313738740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70212146194680
+  version_requirements: *70148313738740
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &70212146193480 !ruby/object:Gem::Requirement
+  requirement: &70148313738260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70212146193480
+  version_requirements: *70148313738260
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70212146192520 !ruby/object:Gem::Requirement
+  requirement: &70148313737760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70212146192520
+  version_requirements: *70148313737760
 - !ruby/object:Gem::Dependency
   name: mootools-rails
-  requirement: &70212146185500 !ruby/object:Gem::Requirement
+  requirement: &70148313737200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70212146185500
+  version_requirements: *70148313737200
 description: Gets you there on time
 email: anton.pawlik@gmail.com
 executables: []
@@ -94,6 +94,7 @@ files:
 - app/views/bhf/entries/form/column/_boolean.haml
 - app/views/bhf/entries/form/column/_date.haml
 - app/views/bhf/entries/form/column/_file.haml
+- app/views/bhf/entries/form/column/_mappin.haml
 - app/views/bhf/entries/form/column/_markdown.haml
 - app/views/bhf/entries/form/column/_multiple_fields.haml
 - app/views/bhf/entries/form/column/_number.haml
@@ -169,6 +170,7 @@ files:
 - vendor/assets/javascripts/bhf/classes/Ajaxify.js
 - vendor/assets/javascripts/bhf/classes/ArrayFields.js
 - vendor/assets/javascripts/bhf/classes/BrowserUpdate.js
+- vendor/assets/javascripts/bhf/classes/Latlng.js
 - vendor/assets/javascripts/bhf/classes/Locale.de-DE.DatePicker.js
 - vendor/assets/javascripts/bhf/classes/Locale.en-US.DatePicker.js
 - vendor/assets/javascripts/bhf/classes/MooEditable.js