diff --git a/sopy/templates/base.html b/sopy/templates/base.html index 90849c7..945aa97 100644 --- a/sopy/templates/base.html +++ b/sopy/templates/base.html @@ -1,3 +1,4 @@ +{% from 'user.html' import user_display -%} @@ -30,8 +31,8 @@ {% if current_user.anonymous %}
  • Log In
    • {% else %} -
  • {{ current_user.display_name }}
    • -
  • Log Out
    • +
  • {{ user_display(current_user) }}
    • +
  • Log Out
    • {% endif %} diff --git a/sopy/templates/transcript/detail.html b/sopy/templates/transcript/detail.html index 3662697..7d1240f 100644 --- a/sopy/templates/transcript/detail.html +++ b/sopy/templates/transcript/detail.html @@ -1,4 +1,5 @@ {% extends 'transcript/base.html' %} +{% from 'user.html' import user_link %} {% block content %}
    @@ -17,8 +18,7 @@

    {% block title %}{{ item.title }}{% endblock %}

    {% for message in item.messages %}
      -
      • -
    • {{ message.user.display_name }}
      • +
    • {{ user_link(message.user) }}
    • {{ message.ts.strftime('%Y-%m-%d %H:%M') }}
      • {% if message.stars %}
    • {{ message.stars }}
      • {% endif %}
    diff --git a/sopy/templates/transcript/update.html b/sopy/templates/transcript/update.html index a83dfab..9fa3afc 100644 --- a/sopy/templates/transcript/update.html +++ b/sopy/templates/transcript/update.html @@ -1,4 +1,5 @@ {% extends 'transcript/base.html' %} +{% from 'user.html' import user_link %} {% set script_ace = True %} @@ -48,7 +49,7 @@

    {% block title %}{% if item is none %}Add Transcript{% e {% for message in item.messages %} - {{ message.user.display_name }} + {{ user_link(message.user) }} {% if message.rendered %}{{ message.content|safe }}{% else %}
    {{ message.content }}
    {% endif %} {% endfor %} diff --git a/sopy/templates/user.html b/sopy/templates/user.html new file mode 100644 index 0000000..9acc0d1 --- /dev/null +++ b/sopy/templates/user.html @@ -0,0 +1,10 @@ +{% macro user_display(user, height=16) %} + + + {{ user.display_name }} + +{% endmacro %} + +{% macro user_link(user, height=24) -%} + {{ user_display(user, height) }} +{%- endmacro %} diff --git a/sopy/templates/wiki/detail.html b/sopy/templates/wiki/detail.html index d4bc6f6..dd3aab3 100644 --- a/sopy/templates/wiki/detail.html +++ b/sopy/templates/wiki/detail.html @@ -1,4 +1,5 @@ {% extends 'wiki/base.html' %} +{% from 'user.html' import user_link %} {% block content %}
    @@ -8,7 +9,7 @@

    {% block title %}{{ page.title }}{% endblock %}

    {% if page.community %}
    This page is in community mode. Any user with 100 rep may edit it.
    {% endif %}
      -
    • Last edited on {{ page.updated|datetimeformat }} by {{ page.author.display_name }}
      • +
    • Last edited on {{ page.updated|datetimeformat }} by {{ user_link(page.author) }}
      • {% if has_group('editor') or page.draft or page.community %}
    • Edit
      • {% endif %} {% if has_group('editor') %}
    • Remove
      • {% endif %}