Skip to content

Commit

Permalink
Changes based on code review
Browse files Browse the repository at this point in the history
  • Loading branch information
DLu committed Oct 22, 2011
1 parent bc87d18 commit 4bd5f63
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion frontend.py
Expand Up @@ -269,7 +269,7 @@ def GET(self):
"""

if len(aliases) > 1:
ret += '<h2>Aliases: ' + ', '.join(aliases) + '</h2>\n'
ret += 'Aliases: ' + ', '.join(aliases) + '\n'


ret += render_record_table('Record by game size', overall_record,
Expand Down
4 changes: 2 additions & 2 deletions game.py
Expand Up @@ -241,8 +241,8 @@ def isotropic_url(self):
return 'http://dominion.isotropic.org/gamelog/%s' % path

@staticmethod
def get_councilroom_link_from_id(game_id):
return '<a href="/game?game_id=%s">' % game_id
def get_councilroom_link_from_id(game_id, extra=''):
return '<a href="/game?game_id=%s"%s>' % (game_id, extra)

def get_councilroom_open_link(self):
return self.get_councilroom_link_from_id(self.id)
Expand Down
10 changes: 6 additions & 4 deletions goals.py
Expand Up @@ -402,7 +402,7 @@ def GroupPriorityNameAndDate(goal_match_doc):
goal_name = goal_match_doc['goal']
img = GetGoalImageFilename(goal_name)
if goal_name not in seen_goal_yet:
if len(seen_goal_yet)>0:
if len(seen_goal_yet) > 0:
ret += "</div>"
ret += '<div style="clear: both;">&nbsp;</div>'
freq = goals_achieved_freq[goal_name]
Expand All @@ -415,16 +415,18 @@ def GroupPriorityNameAndDate(goal_match_doc):
seen_goal_yet.add(goal_name)

game_id = goal_match_doc['_id']
link = game.Game.get_councilroom_link_from_id(game_id)
link = game.Game.get_councilroom_link_from_id(game_id, ' class="goal"')
date = game.Game.get_datetime_from_id(game_id).strftime("%d %b %Y")

reason = attainer.get('reason', '')

ret += '<table class="goal_box cardborder blue">'
ret += '<td>%s<img src="%s" title="%s" width="50px"></a>' % (link, img, goal_name)
ret += '<td width="100px"><span class="goal_description">%s</span><br><span class="goal_date">%s</span>' % (reason, date)
ret += '<td width="100px">%s' % link
ret += '<span class="goal_description">%s</span><br>' % reason
ret += '<span class="goal_date">%s</span></a>' % date
ret += '</table>'

ret += '</div>'
ret += '</ul>'
ret += '<div style="clear: both;">&nbsp;</div>'
Expand Down
9 changes: 7 additions & 2 deletions static/css/mystyles.css
Expand Up @@ -109,8 +109,7 @@ h2.reaction {
}

.goal_name {
font-size: 25px;
font-family: 'IM Fell DW Pica', serif;
font-size: 22px;
font-weight: 700;
margin: 0px 0px 0px 20px;
}
Expand All @@ -135,3 +134,9 @@ letter-spacing:-1px;
font-family: 'Terminal Dosis', sans-serif;
font-variant:small-caps;
}

a.goal:link, a.goal:visited{
text-decoration:none;
color: black;
}

0 comments on commit 4bd5f63

Please sign in to comment.