Fixes #60 and #56

lagotto · Oct 7, 2014 · ca188f2 · ca188f2
1 parent 41a0e7c
commit ca188f2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
@@ -24,7 +24,6 @@ def show
 
   def simple
     @tab = :select_articles
-    @title = "Simple Search"
 
     render "simple"
   end

diff --git a/app/views/layouts/_favicon.html.slim b/app/views/layouts/_favicon.html.slim
@@ -0,0 +1,4 @@
+- if APP_CONFIG["mode"] == "plos"
+  = favicon_link_tag "/favicon.plos.ico"
+- else
+  = favicon_link_tag "/favicon.ico"
diff --git a/app/views/layouts/_title.html.slim b/app/views/layouts/_title.html.slim
@@ -0,0 +1,5 @@
+title
+  - if @title
+    => @title
+    ' |
+  = APP_CONFIG["mode"] == "plos" ? "ALM Reports" : "Parascope"
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -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'
@@ -13,7 +14,6 @@ html.no-js lang="en"
       = javascript_include_tag "html5shiv"
     <![endif]-->
 
-
     = font
 
     script src="http://www.google.com/jsapi"

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon.plos.ico b/public/favicon.plos.ico