User menu, css cleanups

main/models.py

@@ -128,6 +128,13 @@ class UserProfile(models.Model):
         else:
             return datetime.min
 
+    def profile_image_url(self):
+        from django.templatetags.static import static
+        if self.image:
+            return static('img/unknown_person.png')
+
+        return self.image
+
     def __unicode__(self):
         return u"{0}".format(self.user)
 

static/sass/screen.scss

@@ -6,12 +6,32 @@
 @import "datepicker";
 
 body {
-
     h2 {
         margin-top: 0;
     }
+    .glyphicon .white {
+        color: white;
+    }
+}
+#header {
+    .dropdown-toggle {
+        padding-top: 0;
+        padding-bottom: 0;
 
-    #customer {
+        img {
+            width: 40px;
+            @include border-radius(50% 50%);
+        }
+        .name {
+            display: inline-block;
+            padding-top: 15px;
+            padding-bottom: 15px;
+            padding-left: 8px;
+        }
+    }
+}
+
+#customer {
     ul {
         @include inline-block-list;
 
@@ -37,9 +57,9 @@ body {
             }
         }
     }
-    }
+}
 
-    #register {
+#register {
     #products {
         margin-bottom:2em;
         ul {
@@ -86,8 +106,8 @@ body {
     input[name=customer_name] {
         display: block;
     }
-    }
+}
-    #log {
+#log {
     h2 {
         display:inline-block;
     }
@@ -100,8 +120,8 @@ body {
             font-weight: bold;
         }
     }
-    }
+}
-    #inventory {
+#inventory {
     tr {
         &.info {
             border-left: 8px solid #d9edf7;
@@ -126,8 +146,8 @@ body {
             color: #888;
         }
     }
-    }
+}
-    #inventory-report {
+#inventory-report {
     .form-control {
         width: auto;
     }
@@ -139,20 +159,6 @@ body {
             color: #da7878;
         }
     }
-    }
-    /* General styles*/
-    .glyphicon .white {
-        color: white;
-    }
-}
-.form-login {
-    max-width: 320px;
-    margin: 4em auto;
-    [type=submit] {
-        display: block;
-        width: 100%;
-    }
-
 }
 #footer .credits {
     text-align: center;
@@ -175,3 +181,12 @@ body {
         height: 32px;
     }
 }
+.form-login {
+    max-width: 320px;
+    margin: 4em auto;
+    [type=submit] {
+        display: block;
+        width: 100%;
+    }
+
+}

templates/base.html

@@ -6,10 +6,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="x-django-static-url" content="{{ STATIC_URL }}">
     <link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/screen.css" type="text/css" media="screen, projection">
-    <link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/print.css" type="text/css" media="print"> 
-    <!--[if lt IE 8]>
-    <link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/ie.css" type="text/css" media="screen, projection">
-    <![endif]-->
     {%block headinc %}
     {%endblock%}
 </head>

templates/nav.html

@@ -22,7 +22,7 @@
             <li><a href="{% url 'login' %}">Logg inn</a></li>
             {% else %}
             <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Innstillinger <b class="caret"></b></a>
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="{{ user.get_profile.profile_image_url }}" /><span class="name">{{ user.first_name }}</span> <b class="caret"></b></a>
                 <ul class="dropdown-menu">
                     <li class="{% if active = "create_user" %}active{% endif %}"><a href="{% url 'create-user' %}"><i class="glyphicon glyphicon-plus"></i> Ny bruker</a></li>
                     {% if request.user.is_superuser %}<li><a href="/admin"><i class="glyphicon glyphicon-cog"></i> Administrasjon</a></li>{% endif %}