From 116885f6dddad28944cfce7266a3c3146a3ccad6 Mon Sep 17 00:00:00 2001
From: Godwin <goodgodwin@hotmail.com>
Date: Wed, 14 Dec 2016 21:03:18 -0800
Subject: [PATCH] Fixed errors on conference edit page

---
 app/assets/stylesheets/_application.scss | 2 +-
 app/controllers/admin_controller.rb      | 1 +
 config/locales/en.yml                    | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index 68cb909..d93daa5 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -2982,7 +2982,7 @@ a.logo {
         margin-bottom: 2em;
 
         .button {
-            margin: 0 0.25em;
+            margin: 0 0.25em 0.5em;
         }
     }
 }
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 616c58d..89864f9 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -11,6 +11,7 @@ class AdminController < ApplicationController
     return do_404 unless logged_in? && current_user.administrator?
     @this_conference = Conference.find_by!(slug: params[:slug])
     @page_title = 'articles.conferences.headings.edit'
+    @main_title_vars = { vars: { title: @this_conference.title } }
     render 'new'
   end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1f55cb0..04f94c6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -932,6 +932,7 @@ en:
       headings:
         conferences: National and Regional Conferences
         Conference_List: Conferences
+        edit: Edit Conference
         types:
           future: Upcoming conferences
           passed: Passed conferences
@@ -1357,6 +1358,10 @@ en:
   forms:
     labels:
       generic:
+        type: Type
+        year: Year
+        is_public: Public
+        is_featured: Featured
         start_date: Start Date
         end_date: End Date
         search: Search