From 94a47f48bfe4a7f0c69454b89e04135f48851a35 Mon Sep 17 00:00:00 2001
From: Petko Bordjukov <bordjukov@gmail.com>
Date: Thu, 20 Aug 2015 00:50:35 +0300
Subject: [PATCH] Add titles to all public-facing views

---
 lib/initfest/views/devise/confirmations/new.slim  | 2 +-
 lib/initfest/views/devise/passwords/edit.slim     | 2 +-
 lib/initfest/views/devise/passwords/new.slim      | 2 +-
 lib/initfest/views/devise/registrations/edit.slim | 7 +------
 lib/initfest/views/devise/registrations/new.slim  | 2 +-
 lib/initfest/views/devise/sessions/new.slim       | 2 +-
 lib/initfest/views/public/events/edit.slim        | 2 ++
 lib/initfest/views/public/events/index.slim       | 2 ++
 lib/initfest/views/public/events/new.slim         | 2 ++
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/initfest/views/devise/confirmations/new.slim b/lib/initfest/views/devise/confirmations/new.slim
index ec3f53b..09f7953 100644
--- a/lib/initfest/views/devise/confirmations/new.slim
+++ b/lib/initfest/views/devise/confirmations/new.slim
@@ -1,4 +1,4 @@
-- content_for(:title) { "#{t :resend_instructions_header}" }
+- content_for(:title) { t :resend_instructions_header }
 
 h2.entry-title = t :resend_instructions_header
 
diff --git a/lib/initfest/views/devise/passwords/edit.slim b/lib/initfest/views/devise/passwords/edit.slim
index b482ae7..4625f73 100644
--- a/lib/initfest/views/devise/passwords/edit.slim
+++ b/lib/initfest/views/devise/passwords/edit.slim
@@ -1,4 +1,4 @@
-- content_for(:title) { "#{t :change_pass}" }
+- content_for(:title) { t :change_pass }
 
 h2.entry-title = t :change_pass
 
diff --git a/lib/initfest/views/devise/passwords/new.slim b/lib/initfest/views/devise/passwords/new.slim
index f922c41..abd97ca 100644
--- a/lib/initfest/views/devise/passwords/new.slim
+++ b/lib/initfest/views/devise/passwords/new.slim
@@ -1,4 +1,4 @@
-- content_for(:title) { "#{t :lostpass}" }
+- content_for(:title) { t :lostpass }
 
 h2.entry-title = t :lostpass
 
diff --git a/lib/initfest/views/devise/registrations/edit.slim b/lib/initfest/views/devise/registrations/edit.slim
index 2cce2ab..904b25a 100644
--- a/lib/initfest/views/devise/registrations/edit.slim
+++ b/lib/initfest/views/devise/registrations/edit.slim
@@ -1,12 +1,7 @@
-- content_for(:title) { t :edit_speaker_profile }
+- content_for(:title) { t :login_data }
 
 = simple_form_for(resource, wrapper: :default, as: resource_name, url: registration_path(resource_name), html: { method: :put, multipart: true }) do |f|
   .form_inputs
-    / h2
-    /   - if current_user.personal_profile(current_conference).present?
-    /     = link_to t(:personal_profile), edit_personal_profile_path
-    /   - else
-    /     = link_to t(:personal_profile), new_personal_profile_path
 
   .form-inputs
     h3.entry-title = t :login_data
diff --git a/lib/initfest/views/devise/registrations/new.slim b/lib/initfest/views/devise/registrations/new.slim
index 701848f..7afa260 100644
--- a/lib/initfest/views/devise/registrations/new.slim
+++ b/lib/initfest/views/devise/registrations/new.slim
@@ -1,4 +1,4 @@
-- content_for(:title) { "#{t :registration}" }
+- content_for(:title) { t :registration }
 
 h2.entry-title = t :registration
 
diff --git a/lib/initfest/views/devise/sessions/new.slim b/lib/initfest/views/devise/sessions/new.slim
index 88d20b9..4905d5d 100644
--- a/lib/initfest/views/devise/sessions/new.slim
+++ b/lib/initfest/views/devise/sessions/new.slim
@@ -1,4 +1,4 @@
-- content_for(:title) { "#{t :login}" }
+- content_for(:title) { t :login }
 
 h2.entry-title = t :login
 
diff --git a/lib/initfest/views/public/events/edit.slim b/lib/initfest/views/public/events/edit.slim
index 494bc75..e9cd2f7 100644
--- a/lib/initfest/views/public/events/edit.slim
+++ b/lib/initfest/views/public/events/edit.slim
@@ -1,3 +1,5 @@
+- content_for(:title) { t 'views.events.edit_event', event_type: @event.event_type.name.mb_chars.downcase, title: @event.title }
+
 h2= t('views.events.edit_event', event_type: @event.event_type.name.mb_chars.downcase, title: @event.title)
 
 = render 'form'
diff --git a/lib/initfest/views/public/events/index.slim b/lib/initfest/views/public/events/index.slim
index 112c5c3..dd8a9b4 100644
--- a/lib/initfest/views/public/events/index.slim
+++ b/lib/initfest/views/public/events/index.slim
@@ -1,3 +1,5 @@
+- content_for(:title) { t 'views.navigation.my_submissions' }
+
 h1.entry-title = t 'views.navigation.my_submissions'
 
 ul.my_submissions
diff --git a/lib/initfest/views/public/events/new.slim b/lib/initfest/views/public/events/new.slim
index ce047f3..4d23a39 100644
--- a/lib/initfest/views/public/events/new.slim
+++ b/lib/initfest/views/public/events/new.slim
@@ -1,3 +1,5 @@
+- content_for(:title) { t 'views.events.submit_event', event_type: @event.event_type.name.mb_chars.downcase }
+
 h2= t('views.events.submit_event', event_type: @event.event_type.name.mb_chars.downcase)
 
 = render 'form'