Return-Path: 
 <commits-return-1636-apmail-community-commits-archive=community.apache.org@community.apache.org>
X-Original-To: apmail-community-commits-archive@minotaur.apache.org
Delivered-To: apmail-community-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6B7EC18A15
	for <apmail-community-commits-archive@minotaur.apache.org>;
 Mon,  8 Jun 2015 15:18:14 +0000 (UTC)
Received: (qmail 78989 invoked by uid 500); 8 Jun 2015 15:18:14 -0000
Delivered-To: apmail-community-commits-archive@community.apache.org
Received: (qmail 78966 invoked by uid 500); 8 Jun 2015 15:18:14 -0000
Mailing-List: contact commits-help@community.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@community.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@community.apache.org>
List-Post: <mailto:commits@community.apache.org>
List-Id: <commits.community.apache.org>
Reply-To: dev@community.apache.org
Delivered-To: mailing list commits@community.apache.org
Received: (qmail 78957 invoked by uid 99); 8 Jun 2015 15:18:14 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 15:18:14 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 393E5AC00B3
	for <commits@community.apache.org>; Mon,  8 Jun 2015 15:18:14 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1684204 - in /comdev/tools/events_list: models.py
 templates/events/index.html
Date: Mon, 08 Jun 2015 15:18:14 -0000
To: commits@community.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150608151814.393E5AC00B3@hades.apache.org>

Author: rgardler
Date: Mon Jun  8 15:18:13 2015
New Revision: 1684204

URL: http://svn.apache.org/r1684204
Log:
add city and country to list

Modified:
    comdev/tools/events_list/models.py
    comdev/tools/events_list/templates/events/index.html

Modified: comdev/tools/events_list/models.py
URL: http://svn.apache.org/viewvc/comdev/tools/events_list/models.py?rev=1684204&r1=1684203&r2=1684204&view=diff
==============================================================================
--- comdev/tools/events_list/models.py (original)
+++ comdev/tools/events_list/models.py Mon Jun  8 15:18:13 2015
@@ -13,6 +13,8 @@ class Group(models.Model):
     def __unicode__(self):
         return u'{n}, {c}, {s}, {co}'.format(n=self.name, c=self.city, s=self.state, co=self.country)
 
+class Hashtag(models.Model):
+    hashtag = models.CharField(max_length=15)
     
 class Event(models.Model):
     name = models.CharField(max_length=200)
@@ -23,6 +25,7 @@ class Event(models.Model):
     local_start = models.DateTimeField()
     local_end = models.DateTimeField()
     utc_offset = models.BigIntegerField()
+    hashtag = models.ForeignKey(Hashtag)
     is_applicable = models.BooleanField(help_text = "Indicates if an event is applicable to our audience or not.", default=True)
     
     @property

Modified: comdev/tools/events_list/templates/events/index.html
URL: http://svn.apache.org/viewvc/comdev/tools/events_list/templates/events/index.html?rev=1684204&r1=1684203&r2=1684204&view=diff
==============================================================================
--- comdev/tools/events_list/templates/events/index.html (original)
+++ comdev/tools/events_list/templates/events/index.html Mon Jun  8 15:18:13 2015
@@ -12,7 +12,7 @@
   {% for event in upcoming_events_list %}
   <tr>
     <td><a href="{{ event.event_url }}">{{ event.name }}</a></td>
-    <td>{{ event.group.city }}, {{ event.group.state }}</td>
+    <td>{{ event.group.city }}, {{ event.group.state }}</a></td>
     <td>{{ event.group.country }}</td>
     <td>{{ event.local_start }}</td>
     <td><a href="{% url 'toggleNA' event.id %}">Mark N/A</a></td>