Merge pull request #434 from differentreality/typo

fix typo openSUSE
This commit is contained in:
Stella Rouzi 2014-08-15 13:23:28 +03:00
commit 83731d37dd
3 changed files with 3 additions and 3 deletions

View file

@ -3,7 +3,7 @@
= semantic_form_for(@conference, :url => admin_conference_path(@conference.short_title),:html => {:multipart => true}) do |f|
= f.input :make_conference_public, hint: 'This will enable the visitors to view the splash page(the "View Conference" button will be visible now on the home page), it is recommended to enable this after you have finished setting up all the components for display'
= f.input :include_program_in_splash, hint: 'On setting this true you will enable the program component to be displayed on the splash page.This component includes tracks, keynote speakers and the schedule'
= f.input :title, :hint => "The full name of the conference, such as 'OpenSUSE Conference 2013'"
= f.input :title, :hint => "The full name of the conference, such as 'openSUSE Conference 2013'"
= f.input :short_title, :hint => "A short title, such as 'osc2013', to be used in URLs"
= f.input :color, :hint => "The color will be used eg for the dashboard.", :input_html => {:size => 6, :type => "color"}
- if !@conference.logo.blank?

View file

@ -13,4 +13,4 @@
.tab-pane.active#show
= render partial: 'edit_show'
.tab-pane#edit
= render partial: 'edit_form'
= render partial: 'edit_form'

View file

@ -6,6 +6,6 @@ describe 'admin/conference/edit' do
@conference = create(:conference, title: 'openSUSE')
assign :conference, @conference
render template: 'admin/conference/edit.html.haml'
expect(rendered).to include('OpenSUSE')
expect(rendered).to include('openSUSE')
end
end