Merge pull request #255 from MITx/release_fixes

Added a favicon.
2012-07-22 15:58:02 -07:00
parent 6caee537a1 0cac360225
commit 06c2d1f10e
3 changed files with 6 additions and 2 deletions
--- a/lms/static/images/favicon.ico
+++ b/lms/static/images/favicon.ico
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -3,7 +3,9 @@
 <html>
 <head>
  <%block name="title"><title>edX</title></%block>
-
+  
+  <link rel="icon" type="image/image/x-icon" href="${static.url('images/favicon.ico')}" />
+  
  <link href='http://fonts.googleapis.com/css?family=Open+Sans:800italic,400,800' rel='stylesheet' type='text/css'>
  <link rel="stylesheet" href="${static.url('css/vendor/jquery.treeview.css')}" type="text/css" media="all" />

--- a/lms/urls.py
+++ b/lms/urls.py
@@ -74,7 +74,9 @@ urlpatterns = ('',
        {'template': 'copyright.html'}, name="copyright"),
    url(r'^honor$', 'static_template_view.views.render', 
        {'template': 'honor.html'}, name="honor"),
-        
+    
+    
+    (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),
    
    # TODO: These urls no longer work. They need to be updated before they are re-enabled
    # url(r'^send_feedback$', 'util.views.send_feedback'),