LoCo Team Portal

Merge lp:~toabctl/loco-team-portal/team_searchform_more_beautiful into lp:loco-team-portal

  1. team_searchform_more_beautiful
  2. Merge into 0.2
Proposed by Thomas Bechtold
Status: Merged
Merged at revision: not available
Proposed branch: lp:~toabctl/loco-team-portal/team_searchform_more_beautiful
Merge into: lp:loco-team-portal
Diff against target: 32 lines (+6/-4)
2 files modified
loco_directory/teams/forms.py (+4/-0)
loco_directory/templates/teams/team_list.html (+2/-4)
To merge this branch: bzr merge lp:~toabctl/loco-team-portal/team_searchform_more_beautiful
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+16875@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'loco_directory/media/img/search.png'
2Binary files loco_directory/media/img/search.png 1970-01-01 00:00:00 +0000 and loco_directory/media/img/search.png 2010-01-05 20:58:11 +0000 differ
3=== modified file 'loco_directory/teams/forms.py'
4--- loco_directory/teams/forms.py 2010-01-05 06:13:02 +0000
5+++ loco_directory/teams/forms.py 2010-01-05 20:58:11 +0000
6@@ -21,3 +21,7 @@
7 """
8 q = forms.CharField(label=_('Search'), required=False, max_length=100)
9
10+ def as_line(self):
11+ "Returns this form rendered. Only the fields. Nothing else HTML."
12+ return self._html_output(u'%(label)s %(errors)s%(field)s%(help_text)s', u'%s', '', u'%s', False)
13+
14
15=== modified file 'loco_directory/templates/teams/team_list.html'
16--- loco_directory/templates/teams/team_list.html 2010-01-05 06:13:02 +0000
17+++ loco_directory/templates/teams/team_list.html 2010-01-05 20:58:11 +0000
18@@ -14,12 +14,10 @@
19 {% if team_list %}
20 <p><b><a href="reapprovals">Upcoming Reapprovals</a></b></p>
21 <p>{% trans "Select a team below to see more information about it:" %}</p>
22-
23 <form action="." method="get">
24- {{ form.as_p }}
25- <input type="submit" value="{% trans "Search" %}" />
26+ {{ form.as_line }}
27+ <input type="image" src="/media/img/search.png" title="{% trans "Search" %}" />
28 </form>
29-
30 <table width="100%">
31 <tr>
32 <td width="100%" valign="top" class="col2_container">

Subscribers

People subscribed via source and target branches