Merge lp:~svwilliams/loco-team-portal/707131-link-to-agenda-log into lp:loco-team-portal

Proposed by Stephen V. Williams on 2011-11-20
Status: Merged
Merged at revision: 577
Proposed branch: lp:~svwilliams/loco-team-portal/707131-link-to-agenda-log
Merge into: lp:loco-team-portal
Diff against target: 28 lines (+4/-1) 2 files modified
To merge this branch: bzr merge lp:~svwilliams/loco-team-portal/707131-link-to-agenda-log
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve on 2012-12-16
Chris Johnston 2011-11-20 Needs Fixing on 2012-03-04
Review via email: mp+82827@code.launchpad.net

Commit Message

added a small irc image to serve as the link
modified team-detail-agenda item to include the link if it exists

Description of the Change

added a small irc image to serve as the link
modified team-detail-agenda item to include the link if it exists

This doesn't necessarily need to be an IRC log entry so I can modify that text if you'd like and we can select another image to make 16x16. Let me know, I tried to use images that already existed to represent the agenda item log link.

To post a comment you must log in.
Chris Johnston (cjohnston) wrote :

Works for me.. I'm expecting to get a bug stating that the icon is not intuitive though. Could you please change the title to something along the lines of "Log for agenda item" with agenda item being the name of the agenda item.. Also, please set up the title to be translated.

review: Needs Fixing
Michael Hall (mhall119) wrote :

I'm happy with the image and wording, but it does need to be translatable.

512. By Stephen V. Williams on 2012-03-02

update tooltip and added trans for the tool tip

Chris Johnston (cjohnston) wrote :

Please uncommit the change for requirements.txt... There is already a MP for that (https://code.launchpad.net/~chrisjohnston/loco-team-portal/bzr-req-update/+merge/95074)

review: Needs Fixing
Adnane Belmadiaf (daker) wrote :

i merged you code with the new layout.

review: Approve

Preview Diff

1=== added file 'loco_directory/media/images/team/irc_sm.png'
2Binary files loco_directory/media/images/team/irc_sm.png 1970-01-01 00:00:00 +0000 and loco_directory/media/images/team/irc_sm.png 2012-03-02 18:31:19 +0000 differ
3=== modified file 'loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html'
4--- loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2012-02-07 14:36:29 +0000
5+++ loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2012-03-02 18:31:19 +0000
6@@ -17,6 +17,9 @@
7 {% endif %}
8 - <a class="agenda-sig" target="launchpaduser" href="https://launchpad.net/~{{ item.owner.user.username}}">{{ item.owner.realname }}</a>
9 @ {{ item.created_date|date:"D, d N Y H:i T" }}
10+ {% if item.log %}
11+ <a href="{{item.log}}" title="{% trans 'Log for Agenda Item:' %} {{item.title}}"><img src="/media/images/team/irc_sm.png" alt="Log Link" /></a>
12+ {% endif %}
13 {% if item.description %}
14 <div class="agenda-description">{{ item.description|markdown:'safe' }}</div>
15 {% endif %}
16
17=== modified file 'requirements.txt'
18--- requirements.txt 2012-02-07 14:36:29 +0000
19+++ requirements.txt 2012-03-02 18:31:19 +0000
20@@ -8,7 +8,7 @@
21
22 Django==1.1.2
23 South==0.7.3
24-bzr==2.4b4
25+bzr>=2.4b
26 distribute==0.6.10
27 # django-openid-auth==0.4
28 http://launchpad.net/django-openid-auth/trunk/0.4/+download/django-openid-auth_0.4.tar.gz

Subscribers

People subscribed via source and target branches