Some updates to translation engine, added dotenv but have not yet set it up.

app/views/layouts/application.html.haml

@@ -28,7 +28,6 @@
 		= javascript_include_tag '//use.typekit.net/iqv7hcg.js'
 		= javascript_include_tag 'application'
 		= javascript_include_tag 'nested_form'
-		= javascript_include_tag '//use.edgefonts.net/abel;amatic-sc.js'
 
 	%body{ class: (yield_or_default :page_style) }
 		= render 'shared/translation_control'

app/views/organizations/_form.html.haml

@@ -9,7 +9,7 @@
 		= field f, :name, :text_field
 		= field f, :slug, :text_field
 
-	.columns.medium-4
+	.columns.medium-4.small-text-centered
 		-#%h2=_'organization.create.intro-title', :t
 		-#%p=_'organization.create.intro', :p
 		=# field f, :avatar, :image_field
@@ -21,7 +21,6 @@
 		=#		= f.hidden_field :avatar_cache
 	.columns.medium-8
 		= field f, :email_address, :email_field
-		-#= field f, :url, :text_field
 		= f.fields_for :locations do |b|
 			= field_set_tag 'Location' do
 				= field b, :country, :country_select, {help: 'Select a Country'}

app/views/shared/_navbar.html.haml

@@ -1,5 +1,5 @@
 
-%nav.top-bar.row
+%nav.top-bar.row{ data: { :topbar => '' } }
 	#nav-inner
 		%ul.title-area
 			/ Title Area
@@ -10,22 +10,28 @@
 			%li.toggle-topbar.menu-icon
 				%a{href: "#"}
 					%span Menu
-		.top-bar-section
+		%section.top-bar-section
 			/ Left Nav Section
 			%ul.left
 				%li.active
-					%a{href: "/conferences/"} Conferences
+					= link_to (_'Conferences'), :controller => :conferences
 				%li
-					%a{href: "/organizations/"} Organizations
+					= link_to (_'Organizations'), :controller =>  :organizations
 				%li
-					%a{href: "/resources/"} Resources
+					= link_to (_'Resources'), '/resources'
 				/ Right Nav Section
 			%ul.right
 				- if current_user
-					%li.has-form.sign-out
-						= link_to "Sign Out", :logout, method: :post, :class => 'button'
-					%li.user-profile
-						= link_to image_tag(current_user.avatar_url(:icon)), current_user
+					%li.has-form.sign-out.hide-for-small
+						= link_to (_"Sign_Out"), :logout, method: :post, :class => 'button'
+					%li.user-profile.has-dropdown
+						= link_to current_user do
+							= image_tag(current_user.avatar_url(:icon))
+							%span
+								%span.show-for-small=current_user.username
+						%ul.dropdown
+							%li= link_to 'View Profile', current_user
+							%li= link_to 'Edit Profile', edit_user_path(current_user.id)
 				- else
 					%li.has-form.sign-in
-						= link_to "Sign In", :login, :class => 'button'
+						= link_to (_"Sign_In"), :login, :class => 'button'

app/views/user_sessions/_form.html.haml

@@ -1,4 +1,4 @@
 = form_tag user_sessions_path, :method => :post do
 	= field :email, :email_field
 	= field :password, :password_field_tag 
-	= actions :sign_in
+	= actions [:sign_in, :facebook_sign_in]

app/views/user_sessions/new.html.haml

@@ -4,10 +4,8 @@
 	.columns.medium-6
 		= render 'form'
 	.columns.medium-6
-		%h2
-			Create an Account
+		%h2 #{_ 'user.Create_Account'}
+		%p #{_ 'user.why_register', 'paragraph'}
 		%p
-			#{_ 'user.why_register', 'paragraph'}
-			= link_to 'Login with Facebook', auth_at_provider_path(:provider => :facebook)
 			= render '/users/form'