LoCo Team Portal

Merge lp:~daker/loco-team-portal/fix.715581 into lp:loco-team-portal

  1. fix.715581
  2. Merge into 0.2
Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 631
Merged at revision: 631
Proposed branch: lp:~daker/loco-team-portal/fix.715581
Merge into: lp:loco-team-portal
Diff against target: 120 lines (+29/-41)
4 files modified
loco_directory/meetings/views.py (+1/-1)
loco_directory/templates/meetings/agenda_item_new.html (+14/-20)
loco_directory/templates/meetings/agenda_item_update.html (+13/-19)
loco_directory/templates/meetings/team_meeting_new.html (+1/-1)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.715581
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+156299@code.launchpad.net

Commit message

Made the agenda item description field bigger

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py 2012-12-04 21:25:51 +0000
+++ loco_directory/meetings/views.py 2013-03-31 12:34:25 +0000
@@ -163,7 +163,7 @@
163def team_meeting_select(request):163def team_meeting_select(request):
164 teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()])164 teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()])
165 if len(teams) == 0:165 if len(teams) == 0:
166 request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not a member of any LoCo Teams.')))166 request.user.message_set.create(message='%s' % (_('You are not a member of any LoCo Teams.')))
167 return redirect('meeting-list')167 return redirect('meeting-list')
168 elif len(teams) == 1:168 elif len(teams) == 1:
169 url = reverse('team-meeting-new', args=[teams[0].lp_name])169 url = reverse('team-meeting-new', args=[teams[0].lp_name])
170170
=== modified file 'loco_directory/templates/meetings/agenda_item_new.html'
--- loco_directory/templates/meetings/agenda_item_new.html 2013-03-12 20:39:39 +0000
+++ loco_directory/templates/meetings/agenda_item_new.html 2013-03-31 12:34:25 +0000
@@ -8,29 +8,23 @@
8{% endblock %}8{% endblock %}
99
10{% block extrahead %}{{ block.super }}10{% block extrahead %}{{ block.super }}
11{{form.media}}11{{ form.media }}
12{% endblock %}12{% endblock %}
1313
14{% block extrafooter %}
15<script type="text/javascript"><!--
16$(document).ready(function(){
17 $('span[rel*=help]').colorTip({color:'orange'});
18});
19--></script>
20{% endblock %}
2114
22{% block content %}15{% block content %}
23<div class="row">16<div class="row">
24<section class="span-9">17 <section class="span-9">
25 <form action="." method="post">{% csrf_token %}18 <div class="box_content">
26 <fieldset>19 <div class="pagelet">
27 <h3>{% trans "Add new Agenda Item for " %}{{ team_meeting_object.name}}</h3>20 <form action="." method="post" class="form">{% csrf_token %}
28 {{ form.as_template }}21 <h2>{% trans "Add new Agenda Item for " %}{{ team_meeting_object.name }}</h2>
29 </fieldset>22 {{ form.as_template }}
30 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}23 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
31 <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />24 <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" />
32 </form>25 </form>
33</section>26 </div>
27 </div>
28 </section>
34</div>29</div>
3530{% endblock %}
36{% endblock %}
37\ No newline at end of file31\ No newline at end of file
3832
=== modified file 'loco_directory/templates/meetings/agenda_item_update.html'
--- loco_directory/templates/meetings/agenda_item_update.html 2013-03-12 20:39:39 +0000
+++ loco_directory/templates/meetings/agenda_item_update.html 2013-03-31 12:34:25 +0000
@@ -9,29 +9,23 @@
9{% endblock %}9{% endblock %}
1010
11{% block extrahead %}{{ block.super }}11{% block extrahead %}{{ block.super }}
12{{form.media}}12{{ form.media }}
13{% endblock %}13{% endblock %}
1414
15{% block extrafooter %}
16<script type="text/javascript"><!--
17$(document).ready(function(){
18 $('span[rel*=help]').colorTip({color:'orange'});
19});
20--></script>
21{% endblock %}
2215
23{% block content %}16{% block content %}
24<div class="row">17<div class="row">
25<section class="span-9">18 <section class="span-9">
26 <form action="." method="post">{% csrf_token %}19 <div class="box_content">
27 <fieldset>20 <div class="pagelet">
28 <h3>{% trans "Update Agenda Item" %}</h3>21 <form action="." method="post" class="form">{% csrf_token %}
29 {{ form.as_template }}22 <h2>{% trans "Update Agenda Item" %}</h2>
30 </fieldset>23 {{ form.as_template }}
31 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}24 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
32 <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />25 <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" />
33 </form>26 </form>
27 </div>
28 </div>
34 </section>29 </section>
35</div>30</div>
3631{% endblock %}
37{% endblock %}
38\ No newline at end of file32\ No newline at end of file
3933
=== modified file 'loco_directory/templates/meetings/team_meeting_new.html'
--- loco_directory/templates/meetings/team_meeting_new.html 2013-02-17 01:44:52 +0000
+++ loco_directory/templates/meetings/team_meeting_new.html 2013-03-31 12:34:25 +0000
@@ -22,4 +22,4 @@
22 </div>22 </div>
23 </section>23 </section>
24</div>24</div>
25{% endblock %}25{% endblock %}
26\ No newline at end of file26\ No newline at end of file

Subscribers

People subscribed via source and target branches