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:
parent
c6f2b4f641
commit
b023459600
3 changed files with 27 additions and 14 deletions
|
|
@ -1,5 +1,4 @@
|
||||||
module ApplicationHelper
|
module ApplicationHelper
|
||||||
|
|
||||||
def bootstrap_class_for(flash_type)
|
def bootstrap_class_for(flash_type)
|
||||||
logger.debug "flash_type is #{flash_type}"
|
logger.debug "flash_type is #{flash_type}"
|
||||||
case 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)
|
registration.send(field.to_sym).strftime("%d %b %H:%M") if registration.send(field.to_sym)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def getdate(var)
|
def getdate(var)
|
||||||
if var.kind_of?(String)
|
if var.kind_of?(String)
|
||||||
DateTime.parse(var).strftime("%a, %d %b")
|
DateTime.parse(var).strftime("%a, %d %b")
|
||||||
|
|
@ -112,4 +111,23 @@ module ApplicationHelper
|
||||||
|
|
||||||
result
|
result
|
||||||
end
|
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
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
= content_for :splash_logo do
|
= content_for :brand do
|
||||||
= link_to @conference.title, "#", :class => 'navbar-brand'
|
= link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
|
||||||
= render :partial => "home/conference_details", :locals => {:conference => @conference}
|
= render :partial => "home/conference_details", :locals => {:conference => @conference}
|
||||||
|
|
|
||||||
|
|
@ -7,20 +7,15 @@
|
||||||
%span.icon-bar
|
%span.icon-bar
|
||||||
%span.icon-bar
|
%span.icon-bar
|
||||||
%span.icon-bar
|
%span.icon-bar
|
||||||
= yield(:splash_logo)
|
= brand
|
||||||
= link_to CONFIG['name'], root_path, :class => 'navbar-brand', :title => "Open Source Event Manager"
|
|
||||||
.collapse.navbar-collapse
|
.collapse.navbar-collapse
|
||||||
= yield(:splash_header)
|
|
||||||
- if @conference && !@conference.short_title.nil?
|
|
||||||
%p.navbar-text
|
|
||||||
= @conference.short_title
|
|
||||||
-if user_signed_in?
|
-if user_signed_in?
|
||||||
%ul.nav.navbar-nav.navbar-right
|
%ul.nav.navbar-nav.navbar-right
|
||||||
%li.dropdown
|
%li.dropdown
|
||||||
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "current-user-detail"}
|
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "current-user-detail"}
|
||||||
- if not current_user.person.public_name.empty?
|
- if not current_user.person.public_name.empty?
|
||||||
#{current_user.person.public_name}
|
#{current_user.person.public_name}
|
||||||
-else
|
-else
|
||||||
#{current_user.email}
|
#{current_user.email}
|
||||||
= image_tag(current_user.person.gravatar_url(size: '18'), title: "Yo #{current_user.person.public_name}!", :alt => '')
|
= image_tag(current_user.person.gravatar_url(size: '18'), title: "Yo #{current_user.person.public_name}!", :alt => '')
|
||||||
%b.caret
|
%b.caret
|
||||||
|
|
@ -37,7 +32,7 @@
|
||||||
%li
|
%li
|
||||||
= link_to(new_registration_path('user')) do
|
= link_to(new_registration_path('user')) do
|
||||||
%span.glyphicon.glyphicon-heart
|
%span.glyphicon.glyphicon-heart
|
||||||
Sign Up
|
Sign Up
|
||||||
%li.dropdown.visible-desktop
|
%li.dropdown.visible-desktop
|
||||||
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
|
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
|
||||||
%span.glyphicon.glyphicon-user
|
%span.glyphicon.glyphicon-user
|
||||||
|
|
@ -54,4 +49,4 @@
|
||||||
%br
|
%br
|
||||||
= link_to "Forgot your password?", new_password_path('user')
|
= link_to "Forgot your password?", new_password_path('user')
|
||||||
%li.hidden-lg
|
%li.hidden-lg
|
||||||
= link_to('Sign In', new_user_session_path)
|
= link_to('Sign In', new_user_session_path)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue