diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6c198475c..260f6da31 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3,6 +3,10 @@ module ApplicationHelper TEXT_SUCCESS = 'text-success'.freeze TEXT_DANGER = 'text-danger'.freeze + def page_title + current_organization || 'TimeOverflow' + end + # from gravatar def avatar_url(user, size = 32) gravatar_id = Digest::MD5::hexdigest(user.email).downcase diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0e02f748b..333227399 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,26 +4,17 @@ - - <% if content_for? :window_title %> - <%= content_for :window_title %> - <% else %> - <% if current_organization %> - <%= current_organization %> — - <% end %> - <%= yield :title %> - <% end %> - + <%= page_title %> <%= csrf_meta_tags %> <%= stylesheet_link_tag 'libs', media: 'all' %> <%= stylesheet_link_tag 'application', media: 'all' %> - <%= stylesheet_link_tag 'application', 'https://fonts.googleapis.com/css?family=Work+Sans:400,500,600,700' %> - <%= stylesheet_link_tag 'application', 'https://fonts.googleapis.com/icon?family=Material+Icons' %> + <%= stylesheet_link_tag 'https://fonts.googleapis.com/css?family=Work+Sans:400,500,600,700' %> + <%= stylesheet_link_tag 'https://fonts.googleapis.com/icon?family=Material+Icons' %> <%= javascript_include_tag 'libs' %> <%= javascript_include_tag 'application' %> - + <%= render 'navbar' %>
<%= render 'layouts/messages' unless devise_controller? %> @@ -38,19 +29,5 @@ <%= render 'application/footer' %>
- - -