From cdc08052b140fc1bca6bb8847f40a4e61a1e169f Mon Sep 17 00:00:00 2001 From: shlok007 Date: Mon, 24 Jul 2017 13:46:09 +0530 Subject: [PATCH] display organization name in menu bar --- app/views/admin/conferences/edit.html.haml | 1 - app/views/conferences/show.html.haml | 3 --- app/views/layouts/_navigation.html.haml | 5 ++++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/admin/conferences/edit.html.haml b/app/views/admin/conferences/edit.html.haml index 49d65235..2d5df126 100644 --- a/app/views/admin/conferences/edit.html.haml +++ b/app/views/admin/conferences/edit.html.haml @@ -9,7 +9,6 @@ = semantic_form_for(@conference, url: admin_conference_path(@conference.short_title), html: {multipart: true}) do |f| = f.input :title, hint: "The full title of the conference, e.g. 'openSUSE Conference 2014'" = f.input :short_title, hint: "A short title, e.g. 'oSC14', to be used in URLs" - = f.input :organization, hint: 'The organization in which this conference belongs', input_html: { disabled: true } = f.input :description, hint: markdown_hint('A description of the conference.'), input_html: { rows: 5, data: { provide: 'markdown-editable' } } = f.input :color, hint: 'The color will be used eg for the dashboard.', input_html: {size: 6, type: 'color'} = f.label 'Conference Logo' diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index b133c26a..fb488e22 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -22,9 +22,6 @@ .col-md-8 %h1 = @conference.title - %h3 - %i - = "( by #{@conference.organization.name} )" %p.lead - if @conference.venue = "#{@conference.venue.city} / #{@conference.venue.country_name}" diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml index 6683ea23..92be2e89 100644 --- a/app/views/layouts/_navigation.html.haml +++ b/app/views/layouts/_navigation.html.haml @@ -7,7 +7,10 @@ %span.icon-bar %span.icon-bar %span.icon-bar - = link_to (ENV['OSEM_NAME'] || 'OSEM'), root_path, class: 'navbar-brand', title: 'Open Source Event Manager' + - if @conference.nil? || @conference.new_record? + = link_to (ENV['OSEM_NAME'] || 'OSEM'), root_path, class: 'navbar-brand', title: 'Open Source Event Manager' + - else + = link_to (ENV['OSEM_NAME'] || "#{@conference.organization.name} Organization"), organizations_path, class: 'navbar-brand', title: 'Open Source Event Manager' .collapse.navbar-collapse - if content_for :splash_nav %ul.nav.navbar-nav#splash-nav