0
@@ -64,9 +64,7 @@
0
         {% if request.session.nickname %}
0
             <form method="post" action="/share/">
0
                 <input type="hidden" name="next" value="{{ request.path }}" />
0
-                {% if room %}
0
-                    <input type="hidden" name="room" value="{{ room }}" />
0
-                {% endif %}
0
+                {% block extra_post %}{% endblock %}
0
                 <input name="title" />
0
                 <input type="submit" value="{% block share_button_value %}Share{% endblock %}" />
0
             </form>
0
@@ -82,27 +80,25 @@
0
             <li id="{{ entry.id }}" class="entry">
0
             {% if not entry.hidden %}
0
                 <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> 
0
-                {% if entry.room %}
0
-                    {% ifnotequal entry.room.nickname room %}
0
+                {% block room_prefix %}
0
+                    {% if entry.room %}
0
                         <a href="{% url room entry.room.nickname %}">{{ entry.room.name }}</a>:
0
-                    {% endifnotequal %}
0
-                {% endif %}
0
-                {% if not entry.anonymous %}
0
-                    {% if not entry.user.nickname %}
0
-                        <a href="{% url user entry.user.id %}">{{ entry.user.name }}</a>
0
-                    {% else %}
0
-                        {% ifnotequal entry.user.nickname profile.nickname %}
0
-                            <a href="{% url user entry.user.nickname %}">{% ifequal request.session.nickname entry.user.nickname %}You{% else %}{{ entry.user.name }}{% endifequal %}</a>
0
-                        {% endifnotequal %}
0
                     {% endif %}
0
-                {% endif %}
0
-                {% ifnotequal entry.user.nickname profile.nickname %}
0
-                    {% if not permalink %}
0
-                        {% if entry.friendof %}
0
-                            (friend of <a href="{% url user entry.friendof.nickname %}">{{ entry.friendof.name }}</a>)
0
+                {% endblock %}
0
+                {% block user_prefix %}
0
+                    {% if not entry.anonymous %}
0
+                        {% if not entry.user.nickname %}
0
+                            <a href="{% url user entry.user.id %}">{{ entry.user.name }}</a>
0
+                        {% else %}
0
+                            <a href="{% url user entry.user.nickname %}">{% ifequal request.session.nickname entry.user.nickname %}You{% else %}{{ entry.user.name }}{% endifequal %}</a>
0
                         {% endif %}
0
                     {% endif %}
0
-                {% endifnotequal %}
0
+                {% endblock %}
0
+                {% block friend_of %}
0
+                    {% if entry.friendof %}
0
+                        (friend of <a href="{% url user entry.friendof.nickname %}">{{ entry.friendof.name }}</a>)
0
+                    {% endif %}
0
+                {% endblock %}
0
                 {{ entry|find_verb }}
0
                 {% ifequal entry.service.id 'twitter' %}
0
                     {% if request.session.googlemobileproxy %}

0
@@ -10,6 +10,10 @@
0
     <link rel="shortcut icon" href="http://friendfeed.com/rooms/{{ profile.nickname }}/picture?size=medium" type="image/jpeg" />
0
 {% endblock %}
0
 
0
+{% block extra_post %}
0
+    <input type="hidden" name="room" value="{{ profile.nickname }}" />
0
+{% endblock %}
0
+
0
 {% block share_button_value %}Share to {% firstof profile.name profile.nickname %}{% endblock %}
0
 
0
 {% block below_share %}
0
@@ -25,3 +29,5 @@
0
         </div>
0
     </div>
0
 {% endblock %}
0
+
0
+{% block room_prefix %}{% endblock %}

0
@@ -50,3 +50,5 @@
0
         {% endif %}
0
     </div>
0
 {% endblock %}
0
+
0
+{% block user_prefix %}{% endblock %}