[PATCH conductor] BZ803330 Application title is set to "Aeolus Conductor | optional title"
jtomasek at redhat.com
jtomasek at redhat.com
Wed Mar 14 13:58:19 UTC 2012
From: Jiri Tomasek <jtomasek at redhat.com>
---
src/app/controllers/application_controller.rb | 6 +-----
src/app/views/layouts/application.html.haml | 4 +++-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb
index 8228933..57f706d 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base
# FIXME: not sure what we're doing aobut service layer w/ deltacloud
include ApplicationService
helper_method :current_user, :filter_view?
- before_filter :read_breadcrumbs, :set_locale, :set_default_title
+ before_filter :read_breadcrumbs, :set_locale
# General error handlers, must be in order from least specific
# to most specific
@@ -342,10 +342,6 @@ class ApplicationController < ActionController::Base
(ordered_languages & I18n.available_locales).first
end
- def set_default_title
- @title = t 'layout.appname'
- end
-
def redirect_to_original(extended_params = {})
path = params[:current_path]
# In cases when current_path contains prefix like '/conductor' recognize_path fails.
diff --git a/src/app/views/layouts/application.html.haml b/src/app/views/layouts/application.html.haml
index 12e4064..c7c5d1b 100644
--- a/src/app/views/layouts/application.html.haml
+++ b/src/app/views/layouts/application.html.haml
@@ -2,7 +2,9 @@
%html{"xml:lang" => "en", :lang => "en"}
%head
%meta{:charset => 'utf-8'}/
- %title= @title
+ %title
+ = t("layout.appname")
+ = "| #{@title}" unless @title.nil?
%link{:rel => 'shortcut icon', :href => '/favicon.ico'}
= stylesheet_link_tag '/stylesheets/reset.css'
= stylesheet_link_tag '/stylesheets/960.css'
--
1.7.7.6
More information about the aeolus-devel
mailing list