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

[Adnane Belmadiaf]

Moved the comment form to the page details

[Chris Johnston (cjohnston)]

Please fix conflicts:

Contents conflict in loco_directory/templates/events/team_event_comment_new.html
Text conflict in loco_directory/templates/events/team_event_detail.html
Text conflict in loco_directory/templates/events/team_event_detail.inc.html

review: Needs Fixing

[lp:~daker/loco-team-portal/fix.978901]

528. By Adnane Belmadiaf on 2012-06-30

* Merged trunk
* Fixed conflicts

[Chris Johnston (cjohnston)]

Line 167 below, the team is missing <li></li>

review: Needs Fixing

[lp:~daker/loco-team-portal/fix.978901]

529. By Adnane Belmadiaf on 2012-06-30

* Added missing <li>

[Chris Johnston (cjohnston)]

Change to:

<div class="row">
    <section class="span-8">

and change the <legend> to an <h3>

Look at view-source:http://summit.linuxplumbersconf.org/lpc-2012/create_meeting/ for more info

review: Needs Fixing

[Chris Johnston (cjohnston)]

and the social stuff probably should be above the comments stuff, not below.

[lp:~daker/loco-team-portal/fix.978901]

530. By Adnane Belmadiaf on 2012-06-30

* Some ui changes

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2012-02-15 15:56:28 +0000
+++ loco_directory/events/urls.py	2012-06-30 19:01:18 +0000
@@ -25,7 +25,6 @@
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/delete/$', 'events.views.team_event_delete', name='team-event-delete'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/update/$', 'events.views.team_event_update', name='team-event-update'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/comment/$', 'events.views.team_event_comment_new', name='team-event-comment-new'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/copy/$', 'events.views.team_event_copy', name='team-event-copy'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'events.views.team_event_new', name='team-event-new'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'events.views.team_events_rss', name='team-events-rss'),

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2012-03-22 21:57:48 +0000
+++ loco_directory/events/views.py	2012-06-30 19:01:18 +0000
@@ -140,10 +140,28 @@
     for team_object in team_event_object.teams.all():
         is_member = is_member or launchpad.is_team_member(request.user, team_object)
 
+    if request.user.is_authenticated():
+        if request.method == 'POST':                
+            form = TeamEventCommentForm(data=request.POST)
+            if form.is_valid():
+                team_event_comment = form.save(commit=False)
+                team_event_comment.team_event = team_event_object
+                from userprofiles.models import create_profile
+                profile = create_profile(request.user.username)
+                team_event_comment.commenter_profile = profile
+                team_event_comment.save()
+                request.user.message_set.create(message=_('Comment saved.'))
+                return redirect( team_event_object )
+        else:
+            form = TeamEventCommentForm()
+    else:
+        form = None
+
     context = {
         'team_event_object': team_event_object,
         'user_is_attending': team_event_object.is_attending(request.user),
         'user_is_team_member': is_member,
+        'form': form,
     }
     return render_to_response('events/team_event_detail.html', 
                                          context, RequestContext(request))
@@ -354,36 +372,6 @@
     return render_to_response('events/team_event_register.html', 
                                      context, RequestContext(request))
 
-@login_required
-def team_event_comment_new(request, team_slug, team_event_id):
-    """
-    create a comment for a team event
-    """
-    team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
-    
-    if request.method == 'POST':                
-        form = TeamEventCommentForm(data=request.POST)
-        if form.is_valid():
-            team_event_comment = form.save(commit=False)
-            team_event_comment.team_event = team_event_object
-            from userprofiles.models import create_profile
-            profile = create_profile(request.user.username)
-            team_event_comment.commenter_profile = profile
-            team_event_comment.save()
-            request.user.message_set.create(message=_('Comment saved.'))
-            return redirect( team_event_object )
-    else:
-        form = TeamEventCommentForm()
-    
-    context = {
-        'team_event_object': team_event_object,
-        'form': form,
-    }
-    return render_to_response('events/team_event_comment_new.html', 
-                                     context, RequestContext(request))
-
-
-
 
 #################################################################
 # Global Events

=== removed file 'loco_directory/templates/events/team_event_comment_new.html'
--- loco_directory/templates/events/team_event_comment_new.html	2012-06-07 04:19:26 +0000
+++ loco_directory/templates/events/team_event_comment_new.html	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block page_name %}{% trans "Team Event Comment" %}{% endblock %}
-
-{% block extrahead %}{{ block.super }}
-{{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">
-        <fieldset>
-            <h3>{% trans "Team Event Comment" %}</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></div>
-
-{% include "events/team_event_detail.inc.html" %}
-
-{% endblock %}

=== added file 'loco_directory/templates/events/team_event_comment_new.inc.html'
--- loco_directory/templates/events/team_event_comment_new.inc.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/events/team_event_comment_new.inc.html	2012-06-30 19:01:18 +0000
@@ -0,0 +1,24 @@
+{% load i18n %}
+
+{% if user.is_authenticated %}
+<div class="row">
+    <section class="span-8">
+        <form action="." method="post">
+            <fieldset>
+                <h3>{%trans "Team Event Comment" %}</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>
+</div>
+
+{% else %}
+
+<div class="row">
+    <section class="span-8">
+        {% blocktrans with team_event_object.get_absolute_url as login_next %}To post your comment you need to <a href="openid/login/?next={{ login_next }}">login</a> or <a href="openid/login/?next={{ login_next }}">create</a> a new account{% endblocktrans %}
+    </section>
+</div>
+{% endif %}
\ No newline at end of file

=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/events/team_event_detail.html	2012-06-30 19:01:18 +0000
@@ -19,12 +19,21 @@
 <meta property="og:street-address" content="{{ team_event_object.venue.name }} "/>
 <meta property="og:locality" content="{% if team_event_object.venue.city %}{{ team_event_object.venue.city }}{% endif %}"/>
 {% endif %}
+{{form.media}}
+<script type="text/javascript">
+    $(document).ready(function(){
+        $('span[rel*=help]').colorTip({color:'orange'});
+    });
+</script>
 {% endblock %}
 
+
 {% block sub_nav_links %}
-{% for team in team_event_object.teams.all %}<li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>{% endfor %}
-
-<li><a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.first_team.lp_name team_event_object.id %}#comment">{% trans "Add Comment" %}</a></li>
+
+{% for team in team_event_object.teams.all %}
+    <li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>
+{% endfor %}
+
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
     <li><a class="sub-nav-item" href="{% url team-event-update team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Edit Details" %}</a></li>

=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2012-06-30 19:01:18 +0000
@@ -1,38 +1,40 @@
 {% load i18n markup %}
 <div class="row">
-<section class="span-6">
-    <h2>{{team_event_object.name}}</h2>
-    {% if team_event_object.description %}
-        <table id="team-event-basic">
-            <tr>
-                <td class="form-item-value">{{ team_event_object.description|markdown:'safe' }}</td>
-            </tr>
-        </table>
-    {% endif %}
-    <h3>{% trans "Details" %}</h3>
-    {% include "events/team_event_detail_basic.inc.html" %}
-</section>
-<section class="span-6 last">
-    <h3>
-            {% if team_event_object.registration %}
-                <a class="rsvp-link" href="{{team_event_object.registration}}" target="external_registration">{% trans 'Register' %}</a>
-            {% else %}
-                {% if user.is_authenticated and user_is_attending %}
-                    <a class="rsvp-link" href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Update Registration' %}</a>
+    <section class="span-6">
+        <h2>{{team_event_object.name}}</h2>
+        {% if team_event_object.description %}
+            <table id="team-event-basic">
+                <tr>
+                    <td class="form-item-value">{{ team_event_object.description|markdown:'safe' }}</td>
+                </tr>
+            </table>
+        {% endif %}
+        <h3>{% trans "Details" %}</h3>
+        {% include "events/team_event_detail_basic.inc.html" %}
+    </section>
+    <section class="span-6 last">
+        <h3>
+                {% if team_event_object.registration %}
+                    <a class="rsvp-link" href="{{team_event_object.registration}}" target="external_registration">{% trans 'Register' %}</a>
                 {% else %}
-                    <a class="rsvp-link" href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register' %}</a>
+                    {% if user.is_authenticated and user_is_attending %}
+                        <a class="rsvp-link" href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Update Registration' %}</a>
+                    {% else %}
+                        <a class="rsvp-link" href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register' %}</a>
+                    {% endif %}
                 {% endif %}
-            {% endif %}
-    </h3>
-    {% include "events/team_event_detail_attendees.inc.html" %}
-</section>
+        </h3>
+        {% include "events/team_event_detail_attendees.inc.html" %}
+    </section>
 </div>
 
 {% if team_event_object.teameventcomment_set.all %}
 <div class="row">
-<section class="span-12">
-    <h3>{% blocktrans with team_event_object.teameventcomment_set.all.count as comment_count %}Event Comments ({{ comment_count }}){% endblocktrans %}</h3>
-    {% include "events/team_event_detail_comments.inc.html" %}
-</section>
+    <section class="span-12">
+        <h3>{% blocktrans with team_event_object.teameventcomment_set.all.count as comment_count %}Event Comments ({{ comment_count }}){% endblocktrans %}</h3>
+        {% include "events/team_event_detail_comments.inc.html" %}
+    </section>
 </div>
 {% endif %}
+{% include "events/team_event_comment_new.inc.html" %}
+

=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
--- loco_directory/templates/events/team_event_detail_comments.inc.html	2011-08-07 02:53:40 +0000
+++ loco_directory/templates/events/team_event_detail_comments.inc.html	2012-06-30 19:01:18 +0000
@@ -1,13 +1,7 @@
 {% load i18n %}
 {% if team_event_object.teameventcomment_set.all %}
 <table id="team-event-comments">
-    <tr>
-        <td colspan="2" class="form-item-value">
-            <a href="{% url team-event-comment-new team_event_object.first_team.lp_name team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
-        </td>
-    </tr>
 {% regroup team_event_object.teameventcomment_set.all by local_date_created|date:"D d M Y" as comment_list %}
-
 {% for comment_date in comment_list %}
     <tr>
         <th class="form-item-label" scope="row" colspan=2><label>{{comment_date.grouper}}</label></th>