Open Source Projects Europe

--- a/ForgeDiscussion/forgediscussion/templates/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/index.html
@@ -24,16 +24,10 @@
           </py:if>
           <div py:for="forum in forums"
                py:if="not forum.deleted or has_artifact_access('configure', app=c.app)()">
-            <div class="span-2 last">
-                <img py:if="forum.icon" src="${forum.url()}/icon"/>
-                <img py:if="not forum.icon" src="${g.forge_static('images/project_default.png')}"/>
-            </div>
-            <div class="span-14">
-              <h2>$forum.name</h2>
-              <div py:if="forum.deleted" class="notice">This forum has been deleted and is not visible to non-admin users</div>
-              ${Markup(g.markdown.convert(forum.description))}
-            </div>
-            ${c.subscription_form.display(value=forum, action=forum.url() + 'subscribe')}
+            <h2>$forum.name</h2>
+            <div py:if="forum.deleted" class="notice">This forum has been deleted and is not visible to non-admin users</div>
+            ${Markup(g.markdown.convert(forum.description))}
+            ${c.subscription_form.display(value=forum, threads=threads[forum._id], action=forum.url() + 'subscribe')}
             &nbsp;
             <div class="clear"/>
           </div>