Skip to content

Commit

Permalink
Fixes #60 and #56
Browse files Browse the repository at this point in the history
  • Loading branch information
jure committed Oct 7, 2014
1 parent 41a0e7c commit cb9bca8
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 8 deletions.
1 change: 0 additions & 1 deletion app/controllers/search_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ def show

def simple
@tab = :select_articles
@title = "Simple Search"

render "simple"
end
Expand Down
4 changes: 4 additions & 0 deletions app/views/layouts/_favicon.html.slim
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- if APP_CONFIG["mode"] == "plos"
= favicon_link_tag "/favicon.plos.ico"
- else
= favicon_link_tag "/favicon.ico"
5 changes: 5 additions & 0 deletions app/views/layouts/_title.html.slim
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
title
- if @title
=> @title
' |
= APP_CONFIG["mode"] == "plos" ? "ALM Reports" : "Parascope"
4 changes: 2 additions & 2 deletions app/views/layouts/application.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ html.no-js lang="en"
meta charset="utf-8"
meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"

title #{@title} | ALM Reports
= render "layouts/title"
= render "layouts/favicon"

= stylesheet
= stylesheet_link_tag "print", :media => 'print'
Expand All @@ -13,7 +14,6 @@ html.no-js lang="en"
= javascript_include_tag "html5shiv"
<![endif]-->


= font

script src="http://www.google.com/jsapi"
Expand Down
10 changes: 5 additions & 5 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
match "/about" => "static_pages#about"
match "/samples" => "static_pages#samples"

# Any other routes are handled here, as ActionDispatch prevents RoutingError
# from hitting ApplicationController::rescue_action). See
# https://github.com/rails/rails/issues/671
# BE SURE TO KEEP THIS AS THE LAST LINE!
match "*path", :to => "application#routing_error"
# # Any other routes are handled here, as ActionDispatch prevents RoutingError
# # from hitting ApplicationController::rescue_action). See
# # https://github.com/rails/rails/issues/671
# # BE SURE TO KEEP THIS AS THE LAST LINE!
# match "*path", :to => "application#routing_error"

end
Binary file modified public/favicon.ico
Binary file not shown.
Binary file added public/favicon.plos.ico
Binary file not shown.

0 comments on commit cb9bca8

Please sign in to comment.