diff --git a/app/assets/images/shared/favicon.ico b/app/assets/images/shared/favicon.ico new file mode 100644 index 0000000..c0d7145 Binary files /dev/null and b/app/assets/images/shared/favicon.ico differ diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b74a394..55be21c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,6 +1,6 @@ module ApplicationHelper def full_title(page_title) - base_title = "ENSL" + base_title = "NSL" if page_title.empty? base_title @@ -10,7 +10,7 @@ module ApplicationHelper end def active_theme - 'flat' + 'default' end def theme_stylesheet_link_tag diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 454a4ed..81ba9a4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,7 +5,7 @@ - + <%= favicon_link_tag 'shared/favicon.ico' %> <%= theme_stylesheet_link_tag %> <%= javascript_include_tag 'application' %> <%= csrf_meta_tag %> diff --git a/app/views/layouts/errors.html.erb b/app/views/layouts/errors.html.erb index 3cf1b53..b647100 100644 --- a/app/views/layouts/errors.html.erb +++ b/app/views/layouts/errors.html.erb @@ -5,7 +5,7 @@ - + <%= favicon_link_tag 'shared/favicon.ico' %> <%= stylesheet_link_tag "themes/#{active_theme}/errors" %> diff --git a/app/views/layouts/forums.html.erb b/app/views/layouts/forums.html.erb index 66a3e7e..9105e51 100644 --- a/app/views/layouts/forums.html.erb +++ b/app/views/layouts/forums.html.erb @@ -1,11 +1,11 @@ - ENSL + <%= full_title(yield(:title)) %> - + <%= favicon_link_tag 'shared/favicon.ico' %> <%= theme_stylesheet_link_tag %> <%= javascript_include_tag 'application' %> <%= csrf_meta_tag %> diff --git a/app/views/layouts/full.html.erb b/app/views/layouts/full.html.erb index d9f8a7c..3b904d3 100644 --- a/app/views/layouts/full.html.erb +++ b/app/views/layouts/full.html.erb @@ -1,11 +1,11 @@ - ENSL + <%= full_title(yield(:title)) %> - + <%= favicon_link_tag 'shared/favicon.ico' %> <%= theme_stylesheet_link_tag %> <%= javascript_include_tag 'application' %> <%= csrf_meta_tag %>