Merge branch 'master' of github.com:psychobunny/node-forum

This commit is contained in:
Julian Lam
2013-06-05 13:35:12 -04:00
3 changed files with 19 additions and 5 deletions

View File

@@ -1,5 +1,9 @@
.category {
.span9 {
margin-bottom: 50px;
}
a {
li {
list-style: none;
@@ -192,6 +196,11 @@
}
.block-content {
padding: 10px;
.img-polaroid {
width: 20%;
height: auto;
max-width: 48px;
}
}
border-radius: 5px;

View File

@@ -10,7 +10,6 @@
Why don't you try posting one?
</div>
<div class="category row">
<div class="{topic_row_size}">
<ul id="topics-container">
<!-- BEGIN topics -->
@@ -69,7 +68,7 @@
</div>
<div class="block-content">
<!-- BEGIN active_users -->
<a href="/users/{active_users.username}"><img title="{active_users.username}" style="width: 48px; height: 48px; /*temporary*/" src="/graph/users/{active_users.username}/picture" class="img-polaroid" /></a>
<a href="/users/{active_users.username}"><img title="{active_users.username}" src="/graph/users/{active_users.username}/picture" class="img-polaroid" /></a>
<!-- END active_users -->
</div>
</div>
@@ -79,7 +78,7 @@
</div>
<div class="block-content">
<!-- BEGIN moderators -->
<a href="/users/{moderators.username}"><img title="{moderators.username}" style="width: 48px; height: 48px; /*temporary*/" src="/graph/users/{moderators.username}/picture" class="img-polaroid" /></a>
<a href="/users/{moderators.username}"><img title="{moderators.username}" src="/graph/users/{moderators.username}/picture" class="img-polaroid" /></a>
<!-- END moderators -->
</div>
</div>

View File

@@ -101,7 +101,10 @@ var express = require('express'),
res.send("Unable to locate an rss feed at this location.");
return;
}
res.send(data);
res.setHeader('Content-Type', 'application/xml');
res.setHeader('Content-Length', data.length);
res.end(data);
});
return;
}
@@ -125,7 +128,10 @@ var express = require('express'),
res.send("Unable to locate an rss feed at this location.");
return;
}
res.send(data);
res.setHeader('Content-Type', 'application/xml');
res.setHeader('Content-Length', data.length);
res.end(data);
});
return;
}