favicon added,

fix for html head, title added
laDanz · Jan 20, 2014 · fa9f60f · fa9f60f
1 parent 7f38cf7
commit fa9f60f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/BuLiTipp/BuLiTipp/.gitignore b/BuLiTipp/BuLiTipp/.gitignore
@@ -1,2 +1,3 @@
 /local_settings.py
 /database.db
+/database_test.db
diff --git a/BuLiTipp/BuLiTippApp/static/favicon.ico b/BuLiTipp/BuLiTippApp/static/favicon.ico
diff --git a/BuLiTipp/BuLiTippApp/templates/base.html b/BuLiTipp/BuLiTippApp/templates/base.html
@@ -1,4 +1,6 @@
-{% extends 'bootstrap.html'	%}
+{% extends 'bootstrap3/bootstrap3.html'	%}
+
+{% block bootstrap3_title %}TippBuLi.de{% endblock %}
 
 {% load bootstrap3 %}
 

diff --git a/BuLiTipp/BuLiTippApp/templates/bootstrap.html b/BuLiTipp/BuLiTippApp/templates/bootstrap.html
diff --git a/BuLiTipp/bootstrap3/templates/bootstrap3/bootstrap3.html b/BuLiTipp/bootstrap3/templates/bootstrap3/bootstrap3.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 {% load bootstrap3 %}
 <html>
 	<head>
@@ -9,6 +9,7 @@
 		<link href="/static/themes/{{ user.theme.location }}/css/bootstrap.min.css" rel="stylesheet" title="main">
 		<link rel="stylesheet" media="screen" href="/static/css/custom.css">		
 		<link rel="stylesheet" media="screen" href="/static/themes/{{ user.theme.location }}/custom.css">
+		<link rel="icon" href="/static/favicon.ico" type="image/x-icon">
 
 		{% bootstrap_javascript jquery=1 %}
 		<script type="text/javascript" src="/static/js/js.js"></script>