Permalink
Browse files

Merged with recent changes.

  • Loading branch information...
1 parent f7c5763 commit 5d8764c8ec0d138a308b5c90003261c5673124a6 @livid committed Mar 23, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 feed.py
  2. +1 −1 main.py
  3. +1 −1 tpl/desktop/signin.html
View
2 feed.py
@@ -39,7 +39,7 @@ def get(self):
if topics is None:
q = db.GqlQuery("SELECT * FROM Topic ORDER BY created DESC LIMIT 10")
topics = []
- IGNORED = ['newbie', 'in', 'flamewar', 'pointless', 'tuan', '528491', 'chamber', 'autistic', 'blog', 'love', 'flood']
+ IGNORED = ['newbie', 'in', 'flamewar', 'pointless', 'tuan', '528491', 'chamber', 'autistic', 'blog', 'love', 'flood', 'fanfou', 'closed']
for topic in q:
if topic.node.name not in IGNORED:
topics.append(topic)
View
2 main.py
@@ -96,7 +96,7 @@ def get(self):
i = i + 1
memcache.set('home_nodes_new', nodes_new, 86400)
template_values['nodes_new'] = nodes_new
- ignored = ['newbie', 'in', 'flamewar', 'pointless', 'tuan', '528491', 'chamber', 'autistic', 'blog', 'love', 'flood', 'beforesunrise', 'diary', 'fanfou']
+ ignored = ['newbie', 'in', 'flamewar', 'pointless', 'tuan', '528491', 'chamber', 'autistic', 'blog', 'love', 'flood', 'beforesunrise', 'diary', 'fanfou', 'closed']
if browser['ios']:
home_rendered = memcache.get('home_rendered_mobile')
if home_rendered is None:
View
2 tpl/desktop/signin.html
@@ -32,13 +32,13 @@
</td>
<td width="200" align="left">
<input type="password" class="sl" name="p" value="{{ p|escape }}" />
- <input type="hidden" value="{{next}}" class="sl" name="next" />
</td>
</tr>
<tr>
<td width="80" align="right">
</td>
<td width="200" align="left">
+ <input type="hidden" value="{{ next }}" name="next" />
<input type="submit" value="{{ l10n.signin }}" class="super normal button" />
</td>
</tr>

0 comments on commit 5d8764c

Please sign in to comment.