Merge pull request #33 from openteam/favicon

favico for Errbit

Merge pull request #33 from openteam/favicon
favico for Errbit
Nick Recobra
2 parents f297f622 f135e748
Showing 2 changed files with 6 additions and 5 deletions Show diff stats
app/views/layouts/application.html.haml
public/favicon.ico
 !!! html
 %html
   %head
-    %title 
+    %title
       Errbit &mdash;
       = yield(:page_title).present? ? yield(:page_title) : yield(:title)
     %meta{ :content => "text/html; charset=utf-8", "http-equiv" => "content-type" }/
+    = favicon_link_tag
     = csrf_meta_tag
     = javascript_include_tag :defaults
     = stylesheet_link_tag 'reset', 'application'
@@ -14,9 +15,9 @@
       %div
         = link_to 'Errbit', root_path, :id => 'site-name'
         = render 'shared/session'
-      
+
     = render 'shared/navigation' if current_user
-    
+
     #content-wrapper
       #content-title
         %h1= yield :title
@@ -24,8 +25,8 @@
         - if (action_bar = yield(:action_bar)).present?
           #action-bar
             = action_bar
-      #content      
+      #content
         = render :partial => 'shared/flash_messages'
         = yield
     #footer= "Powered by #{link_to 'Errbit', 'http://github.com/jdpace/errbit', :target => '_blank'}: the open source error catcher.".html_safe
-    = yield :scripts
 \ No newline at end of file
+    = yield :scripts
1	1	!!! html
2	2	%html
3	3	%head
4		- %title
	4	+ %title
5	5	Errbit —
6	6	= yield(:page_title).present? ? yield(:page_title) : yield(:title)
7	7	%meta{ :content => "text/html; charset=utf-8", "http-equiv" => "content-type" }/
	8	+ = favicon_link_tag
8	9	= csrf_meta_tag
9	10	= javascript_include_tag :defaults
10	11	= stylesheet_link_tag 'reset', 'application'
...	...	@@ -14,9 +15,9 @@
14	15	%div
15	16	= link_to 'Errbit', root_path, :id => 'site-name'
16	17	= render 'shared/session'
17		-
	18	+
18	19	= render 'shared/navigation' if current_user
19		-
	20	+
20	21	#content-wrapper
21	22	#content-title
22	23	%h1= yield :title
...	...	@@ -24,8 +25,8 @@
24	25	- if (action_bar = yield(:action_bar)).present?
25	26	#action-bar
26	27	= action_bar
27		- #content
	28	+ #content
28	29	= render :partial => 'shared/flash_messages'
29	30	= yield
30	31	#footer= "Powered by #{link_to 'Errbit', 'http://github.com/jdpace/errbit', :target => '_blank'}: the open source error catcher.".html_safe
31		- = yield :scripts
32	32	\ No newline at end of file
	33	+ = yield :scripts
...	...