X-Git-Url: http://git.datanom.net/flask-test.git/blobdiff_plain/db4f0ba9d4aec596f179335f1d86b3dd2bb206c6..163c4d87c8cefd45e8c8836daa28c53956be1e1a:/app/templates/user.html

diff --git a/app/templates/user.html b/app/templates/user.html
index 7e76e61..7cef105 100644
--- a/app/templates/user.html
+++ b/app/templates/user.html
@@ -2,25 +2,37 @@
 {% extends "base.html" %}
 
 {% block content %}
-  <table>
-      <tr valign="top">
-          <td><img src="{{ user.avatar(128) }}"></td>
-          <td>
-	    <h1>User: {{ user.nickname }}</h1>
-		{% if user.about_me %}
-		    <p>{{ user.about_me }}</p>
-		{% endif %}
-		{% if user.last_seen %}
-		    <p><i>Last seen on: {{ user.last_seen }}</i></p>
-		{% endif %}
-		{% if user.id == g.user.id %}
-		    <p><a href="{{ url_for('edit') }}">Edit</a></p>
-		{% endif %}
-	  </td>
-      </tr>
-  </table>
-  <hr>
-  {% for post in posts %}
-      {% include 'post.html' %}
-  {% endfor %}
+    {% include 'flash.html' %}
+    <div class="well well-large" style="height: 140px;">
+        <div class="pull-right">
+            <img src="{{ user.avatar(128) }}" class="img-polaroid">
+        </div>
+        <h1>{{ user.nickname }}</h1>
+        {% if user.about_me %}<p>{{ user.about_me }}</p>{% endif %}
+        {% if user.last_seen %}<p><em>Last seen: {{ momentjs(user.last_seen).calendar() }}</em></p>{% endif %}
+        <p>Followers: {{ user.followers.count() - 1 }} | Following: {{ user.followed.count() - 1 }} |
+        {% if user.id == g.user.id %}
+            <a href="{{url_for('edit')}}">Edit your profile</a>
+        {% elif not g.user.is_following(user) %}
+            <a href="{{url_for('follow', nickname=user.nickname)}}">Follow</a>
+        {% else %}
+            <a href="{{url_for('unfollow', nickname=user.nickname)}}">Unfollow</a>
+        {% endif %}
+        </p>
+    </div>
+    {% for post in posts.items %}
+        {% include 'post.html' %}
+    {% endfor %}
+    <ul class="pager">
+        {% if posts.has_prev %}
+        <li class="previous"><a href="{{ url_for('user', nickname=user.nickname, page=posts.prev_num) }}">Newer posts</a></li>
+        {% else %}
+        <li class="previous disabled"><a href="#">Newer posts</a></li>
+        {% endif %}
+        {% if posts.has_next %}
+        <li class="next"><a href="{{ url_for('user', nickname=user.nickname, page=posts.next_num) }}">Older posts</a></li>
+        {% else %}
+        <li class="next disabled"><a href="#">Older posts</a></li>
+        {% endif %}
+    </ul>
 {% endblock %}