From 79c1bd43280da948530b75e0036e181a39d1e5f1 Mon Sep 17 00:00:00 2001
From: Fredrik Nygren <frny@valteo.net>
Date: Tue, 20 Aug 2013 21:55:31 +0200
Subject: [PATCH] Implement #37: Add avatar to navbar and profile page.

---
 data/templates/base.htm                    |  2 +-
 data/templates/display-sidebar-history.htm |  2 +-
 data/templates/display-sidebar-owner.htm   |  6 +++---
 data/templates/user.htm                    |  7 ++++++-
 www/css/phorkie.css                        | 10 ++++++++++
 www/www-header.php                         |  3 +++
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/data/templates/base.htm b/data/templates/base.htm
index 1dcf0fc..75f9d18 100644
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -45,7 +45,7 @@
      <ul class="nav pull-right">
       {% if identity %}
       <li>
-       <a href="user">{{name}}</a>
+       <a href="user"><img class="avatar-tiny" src="{{htmlhelper.getIconUrl(email, 20)}}" width="20" height="20" /> {{name}}</a>
       </li>
       {% endif %}
       {% if db.adapter %}
diff --git a/data/templates/display-sidebar-history.htm b/data/templates/display-sidebar-history.htm
index 6dda7e0..0e99b2f 100644
--- a/data/templates/display-sidebar-history.htm
+++ b/data/templates/display-sidebar-history.htm
@@ -9,7 +9,7 @@
   {% endfor %}
   {% endspaceless %}
   <a class="hash" href="{{repo.getLink('revision', commit.hash)}}">{{commit.hash|slice(0, 6)}}</a>
-  <img src="{{commit.getIconUrl}}" alt="{{commit.committerName}}" title="{{commit.committerName}}" width="20"/>
+  <img class="avatar-tiny" src="{{commit.getIconUrl}}" alt="{{commit.committerName}}" title="{{commit.committerName}}" width="20" height="20"/>
   <span class="nobr" title="{{commit.committerTime|date('c')}}">
    <span class="indent visible-tablet"></span>
    {{dh.get(commit.committerTime)}}
diff --git a/data/templates/display-sidebar-owner.htm b/data/templates/display-sidebar-owner.htm
index f84a5fa..032488d 100644
--- a/data/templates/display-sidebar-owner.htm
+++ b/data/templates/display-sidebar-owner.htm
@@ -1,9 +1,9 @@
 {% set owner = repo.getOwner %}
 <div class="well well-small vcard">
  <img src="{{htmlhelper.getIconUrl(owner.email, 48)}}" alt="{{owner.name}}"
-      width="48" height="48" class="photo"
-      style="float: left; padding-right: 1ex;"/>
+      width="48" height="48" class="photo avatar-small pull-left"
+      style="margin-right: 1em;" />
  <span class="fn">{{owner.name}}</span>
  <br/><span class="muted">owner</span>
  <span class="clearfix"/>
-</div>
\ No newline at end of file
+</div>
diff --git a/data/templates/user.htm b/data/templates/user.htm
index ab55b59..0856a6d 100644
--- a/data/templates/user.htm
+++ b/data/templates/user.htm
@@ -10,16 +10,21 @@
 <h3>User profile</h3>
 <dl>
  <dt>OpenID</dt>
- <dd><code>{{ identity }}</code>
+ <dd><code>{{ identity }}</code></dd>
 
  <dt>Name</dt>
  <dd><code>{{ name }}</code></dd>
 
  <dt>Email</dt>
  <dd><code>{{ email }}</code></dd>
+
+ <dt>Avatar image</dt>
+ <dd><img class="avatar-large" src="{{htmlhelper.getIconUrl(email, 92)}}"></dd>
 </dl>
 
 <p>
  You may change this data with your OpenID provider.
+ The avatar image is loaded from <a href="http://libravatar.org/">libravatar.org</a>,
+ or perhaps from your own avatar server.
 </p>
 {% endblock %}
diff --git a/www/css/phorkie.css b/www/css/phorkie.css
index 29e7d85..f752de7 100644
--- a/www/css/phorkie.css
+++ b/www/css/phorkie.css
@@ -166,3 +166,13 @@ form label.inline {
 .nobr {
     white-space:nowrap;
 }
+
+.avatar-large {
+    border-radius: 5px;
+}
+.avatar-small {
+    border-radius: 3px;
+}
+.avatar-tiny {
+    border-radius: 2px;
+}
diff --git a/www/www-header.php b/www/www-header.php
index 1888839..1d59b1c 100644
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -98,6 +98,9 @@ function render($tplname, $vars = array())
         $vars['email'] = $_SESSION['email'];
     }
     $vars['db'] = new Database();
+    if (!isset($vars['htmlhelper'])) {
+        $vars['htmlhelper'] = new HtmlHelper();
+    }
 
     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
     echo $template->render($vars);
-- 
2.30.2