bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fixed errors on conference edit page

Browse Source
This commit is contained in:
Godwin 2016-12-14 21:03:18 -08:00
parent 02e349261c
commit 116885f6dd
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/_application.scss
View File

@ -2982,7 +2982,7 @@ a.logo {
margin-bottom: 2em; margin-bottom: 2em;
.button { .button {
margin: 0 0.25em; margin: 0 0.25em 0.5em;
} }
} }
} }

1
app/controllers/admin_controller.rb
View File

@ -11,6 +11,7 @@ class AdminController < ApplicationController
return do_404 unless logged_in? && current_user.administrator? return do_404 unless logged_in? && current_user.administrator?
@this_conference = Conference.find_by!(slug: params[:slug]) @this_conference = Conference.find_by!(slug: params[:slug])
@page_title = 'articles.conferences.headings.edit' @page_title = 'articles.conferences.headings.edit'
@main_title_vars = { vars: { title: @this_conference.title } }
render 'new' render 'new'
end end

5
config/locales/en.yml
View File

@ -932,6 +932,7 @@ en:
headings: headings:
conferences: National and Regional Conferences conferences: National and Regional Conferences
Conference_List: Conferences Conference_List: Conferences
edit: Edit Conference
types: types:
future: Upcoming conferences future: Upcoming conferences
passed: Passed conferences passed: Passed conferences
@ -1357,6 +1358,10 @@ en:
forms: forms:
labels: labels:
generic: generic:
type: Type
year: Year
is_public: Public
is_featured: Featured
start_date: Start Date start_date: Start Date
end_date: End Date end_date: End Date
search: Search search: Search