@@ -64,9 +64,7 @@ {% if request.session.nickname %} <form method="post" action="/share/"> <input type="hidden" name="next" value="{{ request.path }}" /> - {% if room %} - <input type="hidden" name="room" value="{{ room }}" /> - {% endif %} + {% block extra_post %}{% endblock %} <input name="title" /> <input type="submit" value="{% block share_button_value %}Share{% endblock %}" /> </form> @@ -82,27 +80,25 @@ <li id="{{ entry.id }}" class="entry"> {% if not entry.hidden %} <a href="{{ request.path }}?service={{ entry.service.id }}{% if request.GET.search %}&search={{ request.GET.search }}{% endif %}"><img src="{{ entry.service.iconUrl }}" alt="{{ entry.service.name }}" /></a> - {% if entry.room %} - {% ifnotequal entry.room.nickname room %} + {% block room_prefix %} + {% if entry.room %} <a href="{% url room entry.room.nickname %}">{{ entry.room.name }}</a>: - {% endifnotequal %} - {% endif %} - {% if not entry.anonymous %} - {% if not entry.user.nickname %} - <a href="{% url user entry.user.id %}">{{ entry.user.name }}</a> - {% else %} - {% ifnotequal entry.user.nickname profile.nickname %} - <a href="{% url user entry.user.nickname %}">{% ifequal request.session.nickname entry.user.nickname %}You{% else %}{{ entry.user.name }}{% endifequal %}</a> - {% endifnotequal %} {% endif %} - {% endif %} - {% ifnotequal entry.user.nickname profile.nickname %} - {% if not permalink %} - {% if entry.friendof %} - (friend of <a href="{% url user entry.friendof.nickname %}">{{ entry.friendof.name }}</a>) + {% endblock %} + {% block user_prefix %} + {% if not entry.anonymous %} + {% if not entry.user.nickname %} + <a href="{% url user entry.user.id %}">{{ entry.user.name }}</a> + {% else %} + <a href="{% url user entry.user.nickname %}">{% ifequal request.session.nickname entry.user.nickname %}You{% else %}{{ entry.user.name }}{% endifequal %}</a> {% endif %} {% endif %} - {% endifnotequal %} + {% endblock %} + {% block friend_of %} + {% if entry.friendof %} + (friend of <a href="{% url user entry.friendof.nickname %}">{{ entry.friendof.name }}</a>) + {% endif %} + {% endblock %} {{ entry|find_verb }} {% ifequal entry.service.id 'twitter' %} {% if request.session.googlemobileproxy %} templates/entries.html @@ -10,6 +10,10 @@ <link rel="shortcut icon" href="http://friendfeed.com/rooms/{{ profile.nickname }}/picture?size=medium" type="image/jpeg" /> {% endblock %} +{% block extra_post %} + <input type="hidden" name="room" value="{{ profile.nickname }}" /> +{% endblock %} + {% block share_button_value %}Share to {% firstof profile.name profile.nickname %}{% endblock %} {% block below_share %} @@ -25,3 +29,5 @@ </div> </div> {% endblock %} + +{% block room_prefix %}{% endblock %} templates/room.html @@ -50,3 +50,5 @@ {% endif %} </div> {% endblock %} + +{% block user_prefix %}{% endblock %} templates/user.html d385d8479ce13c044d75f3371c334035c3d617d8 Benjamin Golub bgolub@benjamin-golubs-macbook-pro.local http://github.com/bgolub/fftogo/commit/5b27f0cabbd5ef7677801f3921e332a874524580 5b27f0cabbd5ef7677801f3921e332a874524580 2008-08-26T08:47:37-07:00 2008-08-26T08:47:37-07:00 simplify a633f58559b7ac9a29eb7a37b06795c282325cae Benjamin Golub bgolub@benjamin-golubs-macbook-pro.local