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

[Adnane Belmadiaf]

Show a team's blog feed on the team details page

Preview : http://i.imgur.com/DD8Oj.png

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

584. By Adnane Belmadiaf on 2012-12-18

Remove print statement

=== modified file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css	2012-12-13 22:48:12 +0000
+++ loco_directory/media/css/styles.css	2012-12-18 22:38:19 +0000
@@ -670,6 +670,7 @@
 
 .events-meetings-wrapper {
     margin-top: 5px;
+    border-bottom: 1px solid #E6E6E6;
 }
 
 .events-meetings-wrapper h3.title
@@ -710,6 +711,16 @@
     font-style: italic;
 }
 
+.team-planet-wrapper {
+    margin-top: 5px;
+}
+
+.team-planet-wrapper h3.title {
+    margin: 0;
+    padding-left: 15px;
+    padding-bottom: 5px;
+}
+
 .team-photos-wrapper {
     border-top: #CCC 1px dotted;
     padding-top: 10px;
@@ -1166,6 +1177,14 @@
     position: relative;
 }
 
+article.team-blog-entry  {
+    border-top: 1px dotted #DFDCD9;
+    overflow: hidden;
+    padding: 15px 20px;
+    margin: 0;
+    position: relative;
+}
+
 .blog-entry-image {
     float: left;
     margin: 0 10px 0 0;

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2012-11-28 00:46:29 +0000
+++ loco_directory/teams/views.py	2012-12-18 22:38:19 +0000
@@ -16,6 +16,7 @@
 
 from events.models import TeamEvent
 from meetings.models import TeamMeeting
+from articles.models import Article
 
 import forms
 
@@ -148,8 +149,10 @@
     return render_to_response('teams/team_meeting_history.html', context,
                   RequestContext(request))
 
+
 def team_detail(request, team_slug):
     team_object = get_object_or_404(Team, lp_name=team_slug)
+    articles = Article.objects.filter(source__team=team_object)[:5]
     is_member = False
     is_admin = False
     if request.user.is_authenticated():
@@ -157,12 +160,14 @@
         is_admin = launchpad.is_admin_or_owner(request.user.username, team_object) or launchpad.is_user_on_loco_council(request.user)
     context = {
         'team': team_object,
-        'is_member' : is_member,
-        'is_admin' : is_admin,
+        'articles': articles,
+        'is_member': is_member,
+        'is_admin': is_admin,
     }
     return render_to_response('teams/team_detail.html',
                                          context, RequestContext(request))
 
+
 @login_required
 def select_other_team(request, team_slug):
     team_object = get_object_or_404(Team, lp_name=team_slug)

=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html	2012-12-13 23:11:46 +0000
+++ loco_directory/templates/index.html	2012-12-18 22:38:19 +0000
@@ -72,11 +72,11 @@
             <h4 class="blog-entry-title"><a href="{{ article.get_absolute_url }}">{{ article.title }}</a></h4>
             <div class="blog-entry-author">
                 {% if article.source.team %}
-                    <a class="team" href="{% url team-detail article.source.team %}" target="_blank">{{ article.source.team.name }}</a>
+                    <a class="team" href="{% url team-detail article.source.team %}">{{ article.source.team.name }}</a>
                 {% endif %}
                 {% if article.source.user %}
                     {% if article.source.team %}, {% endif %}
-                    <a class="user" href="{% url profile-detail article.source.user.user.username %}" target="_blank">{{ article.source.user }}</a>
+                    <a class="user" href="{% url profile-detail article.source.user.user.username %}">{{ article.source.user }}</a>
                 {% endif %}
             </div>
             <div class="blog-entry-text">

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2012-12-09 15:08:12 +0000
+++ loco_directory/templates/teams/team_detail.html	2012-12-18 22:38:19 +0000
@@ -201,6 +201,35 @@
                 {% endif %}
             </div>
 
+            {% if articles %}
+            <div class="team-planet-wrapper">
+                <div style="overflow: auto;">
+                    <h3 class="title">{% trans "Planet Feed" %}</h3>
+                </div>
+                {% for article in articles %}
+                <article class="team-blog-entry">
+                    {% if article.source.user %}
+                        <img class="blog-entry-image" src="{{ article.source.user.mugshot }}" />
+                    {% endif %}
+                    <h4 class="blog-entry-title">
+                        <a href="{{ article.get_absolute_url }}" title="{{ article.title }}">{{ article.title }}</a>
+                    </h4>
+                    <div class="blog-entry-author">
+                        {% if article.source.user %}
+                        <a class="user" href="{% url profile-detail article.source.user.user.username %}">{{ article.source.user }}</a>
+                        {% endif %}
+                    </div>
+                    <div class="blog-entry-text">
+                        <p>{{ article.content|safe|striptags|truncatewords_html:100 }}</p>
+                        <p class="more">
+                            <a href="{{ article.get_absolute_url }}" title="{{ article.title }}">{% trans 'Read More' %} ›</a>
+                        </p>
+                    </div>
+                </article>
+                {% endfor %}
+            </div>
+            {% endif %}
+
             {% if team.flickr_id or team.picasa_id or team.pixie_id %}
             <div class="team-photos-wrapper">
                 {% with team.name as team_name %}