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

[Adnane Belmadiaf]

Made the agenda item description field bigger

[Chris Johnston (cjohnston)]

review: Approve

=== 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 @@
 def team_meeting_select(request):
     teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()])
     if len(teams) == 0:
-        request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not a member of any LoCo Teams.')))
+        request.user.message_set.create(message='%s' % (_('You are not a member of any LoCo Teams.')))
         return redirect('meeting-list')
     elif len(teams) == 1:
         url = reverse('team-meeting-new', args=[teams[0].lp_name])

=== 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 @@
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}
-{{form.media}}
+{{ form.media }}
 {% endblock %}
 
-{% block extrafooter %}
-<script type="text/javascript"><!--
-$(document).ready(function(){
-    $('span[rel*=help]').colorTip({color:'orange'});
-});
---></script>
-{% endblock %}
 
 {% block content %}
 <div class="row">
-<section class="span-9">
-    <form action="." method="post">{% csrf_token %}
-        <fieldset>
-            <h3>{% trans "Add new Agenda Item for " %}{{ team_meeting_object.name}}</h3>
-            {{ form.as_template }}
-        </fieldset>
-        {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
-        <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
-    </form>
-</section>
+    <section class="span-9">
+        <div class="box_content">
+            <div class="pagelet">
+                <form action="." method="post" class="form">{% csrf_token %}
+                    <h2>{% trans "Add new Agenda Item for " %}{{ team_meeting_object.name }}</h2>
+                    {{ form.as_template }}
+                    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+                    <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" />
+                </form>
+            </div>
+        </div>
+    </section>
 </div>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file

=== 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 @@
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}
-{{form.media}}
+{{ form.media }}
 {% endblock %}
 
-{% block extrafooter %}
-<script type="text/javascript"><!--
-$(document).ready(function(){
-    $('span[rel*=help]').colorTip({color:'orange'});
-});
---></script>
-{% endblock %}
 
 {% block content %}
 <div class="row">
-<section class="span-9">
-    <form action="." method="post">{% csrf_token %}
-        <fieldset>
-            <h3>{% trans "Update Agenda Item" %}</h3>
-            {{ form.as_template }}
-        </fieldset>
-        {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
-        <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" />
-    </form>
+    <section class="span-9">
+        <div class="box_content">
+            <div class="pagelet">
+                <form action="." method="post" class="form">{% csrf_token %}
+                    <h2>{% trans "Update Agenda Item" %}</h2>
+                    {{ form.as_template }}
+                    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
+                    <input type="submit" name="submit" value="{% trans "Submit" %}" class="btn" />
+                </form>
+            </div>
+        </div>
     </section>
 </div>
-
-{% endblock %}
+{% endblock %}
\ No newline at end of file

=== 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 @@
         </div>
     </section>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file