From 22954553751acc73c492546ab4738b4e0282b8a0 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Sun, 2 Feb 2014 19:23:45 +0100
Subject: [PATCH] =?UTF-8?q?K=C3=A6rlighed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings-sample.py            |  2 ++
 static/js/app.js              |  3 +++
 static/sass/screen.scss       | 13 +++++++++++++
 static/stylesheets/screen.css | 17 +++++++++++++++++
 templates/base.html           | 10 +++++++---
 5 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 static/js/app.js

diff --git a/settings-sample.py b/settings-sample.py
index e6fbac8..fef6125 100755
--- a/settings-sample.py
+++ b/settings-sample.py
@@ -152,3 +152,5 @@ LOGGING = {
 
 # User profile
 AUTH_PROFILE_MODULE = 'main.UserProfile'
+
+LOGIN_REDIRECT_URL = '/register/'
diff --git a/static/js/app.js b/static/js/app.js
new file mode 100644
index 0000000..b385915
--- /dev/null
+++ b/static/js/app.js
@@ -0,0 +1,3 @@
+$(document).ready(function() {
+    $("#footer .credits .love").tooltip();
+}); 
diff --git a/static/sass/screen.scss b/static/sass/screen.scss
index 495000a..f199b74 100644
--- a/static/sass/screen.scss
+++ b/static/sass/screen.scss
@@ -115,3 +115,16 @@ body {
     }
 
 }
+#footer .credits {
+    text-align: center;
+    margin: 2em;
+    font-size: 10px;
+    color: grey;
+    img {
+        margin-top: 10px;
+        display: inline-block;
+    }
+    .love {
+        color: #faafba;
+    }
+}
diff --git a/static/stylesheets/screen.css b/static/stylesheets/screen.css
index 81d2492..0af3f9e 100644
--- a/static/stylesheets/screen.css
+++ b/static/stylesheets/screen.css
@@ -7845,3 +7845,20 @@ body .glyphicon .white {
   display: block;
   width: 100%;
 }
+
+/* line 118, ../sass/screen.scss */
+#footer .credits {
+  text-align: center;
+  margin: 2em;
+  font-size: 10px;
+  color: grey;
+}
+/* line 123, ../sass/screen.scss */
+#footer .credits img {
+  margin-top: 10px;
+  display: inline-block;
+}
+/* line 127, ../sass/screen.scss */
+#footer .credits .love {
+  color: #faafba;
+}
diff --git a/templates/base.html b/templates/base.html
index 80ce50f..3122e19 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -22,10 +22,12 @@
         {%block content%}
         {%endblock%}
         <div id="footer" class="row">
-            <div class="col-md-12 text-right">
+            <div class="col-md-12">
                 {%block footer %}
-                    <br />
-                    <img src="{{ STATIC_URL }}img/edb_brick.png" alt="EDB" />
+                <div class="credits">
+                    Laget med <span class="love" title="kærlighed">♥</span> av <a href="http://edb.neuf.no/">KAK: EDB</a><br/>
+                     <a href="http://edb.neuf.no/"><img src="{{ STATIC_URL }}img/edb_brick.png" alt="EDB" /></a>
+                </div>
                 {%endblock%}
             </div>
         </div>
@@ -34,6 +36,8 @@
     <script type="text/javascript" src="{{ STATIC_URL }}js/jquery-1.7.1.min.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/collapse.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/dropdown.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/tooltip.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}js/app.js"></script>
     {%block tailinc %}
     {%endblock%}
 </body>