Use a single entry for navigation branding:

Allow a view to override the brand (esp. for conference splash pages),
Use the app name link for the admin control panel,
use the conference short title for end user content within a conference,
fall back to the app name link.

Visually, there are two substantial changes:
(1) the conference title (or short title) serves as the brand when viewing
conference content;
(2) the short title isn't shown redundantly on the navbar and the top of the
sidebar when editing a conf.
This commit is contained in:
James Mason 2014-05-28 13:44:37 -07:00
parent c6f2b4f641
commit b023459600
3 changed files with 27 additions and 14 deletions

View file

@ -1,5 +1,4 @@
module ApplicationHelper
def bootstrap_class_for(flash_type)
logger.debug "flash_type is #{flash_type}"
case flash_type
@ -31,7 +30,7 @@ module ApplicationHelper
registration.send(field.to_sym).strftime("%d %b %H:%M") if registration.send(field.to_sym)
end
end
def getdate(var)
if var.kind_of?(String)
DateTime.parse(var).strftime("%a, %d %b")
@ -112,4 +111,23 @@ module ApplicationHelper
result
end
def default_brand
link_to CONFIG['name'], root_path,
class: 'navbar-brand',
title: 'Open Source Event Manager'
end
def short_title_brand(conference)
link_to conference.short_title, conference_path(conference.short_title),
class: 'navbar-brand',
title: conference.title
end
def brand
content_for(:brand) ||
(default_brand if controller.class.parent == Admin) ||
(short_title_brand(@conference) if @conference) ||
default_brand
end
end