Added confirmation modals, fixed reply to emails, and added premailer

app/views/layouts/application.html.haml

@@ -17,26 +17,36 @@
 		= yield :head
 
 	%body{ class: page_style }
-		= render 'shared/navbar'
-		%main#main
-			- if content_for?(:side_bar)
-				%nav#side-bar
-					= yield :side_bar
-			-# - flash.each do |key, msg|
-			-# 	= content_tag :div, msg, :id => key
-			%header#banner=yield :banner
-			- if @submenu
-				=row do
-					= columns(medium: 12) do
-						%nav.sub-menu
-							- @submenu.each do |href,key|
-								%a{href: href, class: request.fullpath.start_with?(href) ? 'current' : nil}=_"menu.submenu.#{key}"
-			- if has_content?
-				#content=yield
-			- else
-				= yield
-		#footer
-			%footer= render 'shared/footer'
+		#primary-content
+			= render 'shared/navbar'
+			%main#main
+				- if content_for?(:side_bar)
+					%nav#side-bar
+						= yield :side_bar
+				-# - flash.each do |key, msg|
+				-# 	= content_tag :div, msg, :id => key
+				%header#banner=yield :banner
+				- if @submenu
+					=row do
+						= columns(medium: 12) do
+							%nav.sub-menu
+								- @submenu.each do |href,key|
+									%a{href: href, class: request.fullpath.start_with?(href) ? 'current' : nil}=_"menu.submenu.#{key}"
+				- if has_content?
+					#content=yield
+				- else
+					= yield
+			#footer
+				%footer= render 'shared/footer'
+		#content-overlay
+			#overlay
+			.dlg#confirmation-dlg
+				.dlg-content
+					%h2.title=_'modals.confirm'
+					.dlg-inner
+						%p.message=''
+						%a.button.confirm=_'modals.yes_button'
+						%button.delete=_'modals.no_button'
 		
 		= yield :footer_scripts if content_for?(:footer_scripts)
 		- add_inline_script :main

app/views/layouts/user_mailer.html.haml

@@ -4,7 +4,7 @@
 		%meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
 		%meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}/
 		%title=@subject
-		%style{type: 'text/css'}=Rails.application.assets.find_asset("user-mailer.css").to_s
+		= stylesheet_link_tag 'user-mailer'
 	%body
 		%table{:border => "0", :cellpadding => "0", :cellspacing => "0", id: @wrapper_id.present? ? "bb_#{@wrapper_id.to_s}" : 'backgroundTable'}
 			%tr
@@ -20,7 +20,7 @@
 							%td{colspan: 2, style: 'height: 16px'}=' '.html_safe
 						%tr
 							%td{style: 'width: 50%; text-align: left'}
-								%img.image_fix{:src => (@host + image_url('bblogo-paypal'))}
+								%img.image_fix{:src => ((Rails.env.development? || Rails.env.test? ? 'https://preview-en.bikebike.org/' : @host) + image_url('bblogo-paypal'))}
 							%td{style: 'width: 50%; text-align: left'}
 								%a{href: @host}="© Bike!Bike! #{Date.today.year}".html_safe
 						%tr