Adnane Belmadiaf has proposed merging lp:~adnane002/loco-directory/fix.624299
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#624299 Add Chat page
https://bugs.launchpad.net/bugs/624299
--
https://code.launchpad.net/~adnane002/loco-directory/fix.624299/+merge/33716
Your team loco-directory-dev is requested to review the proposed merge of
lp:~adnane002/loco-directory/fix.624299 into lp:loco-directory.
=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py 2010-08-20 02:05:30 +0000
+++ loco_directory/common/views.py 2010-08-26 00:02:40 +0000
@@ -30,6 +30,11 @@
context = {}
return render_to_response('about_loco.html', context,
RequestContext(request))
+
+def irc_chat(request):
+ context = {}
+ return render_to_response('irc_chat.html', context,
+ RequestContext(request))
def using_locodir(request):
context = {}
=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html 2010-08-20 13:05:47 +0000
+++ loco_directory/templates/base.html 2010-08-26 00:02:40 +0000
@@ -14,6 +14,7 @@
<a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a>
<a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a>
<a class="main-nav-item {% ifequal url_base 'about-loco' %}current{% endifequal %}" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a></li>
+ <a class="main-nav-item {% ifequal url_base 'irc_chat' %}current{% endifequal %}" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a></li>
{% if user.is_authenticated %}
<a class="main-nav-item" href="/logout" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
{% else %}
=== added file 'loco_directory/templates/irc_chat.html'
--- loco_directory/templates/irc_chat.html 1970-01-01 00:00:00 +0000
+++ loco_directory/templates/irc_chat.html 2010-08-26 00:02:40 +0000
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %} {% trans "IRC Chat" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
+
+{% block sub_nav_links %}
+{% endblock %}
+{% block search %}{% endblock %}
+
+{% block content %}
+
+ <h1>{% trans "IRC Chat" %}</h1>
+ <article class="main-content">
+ <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28"; width="900" height="400"></iframe>
+ </article>
+{% endblock %}
=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py 2010-08-20 02:05:30 +0000
+++ loco_directory/urls.py 2010-08-26 00:02:40 +0000
@@ -9,6 +9,7 @@
url(r'^$', 'common.views.index', name='home'),
url(r'^language/', 'common.views.set_language', name='set_language'),
url(r'^about/$', 'common.views.about', name='about'),
+ url(r'^irc/$', 'common.views.irc_chat', name='irc_chat'),
url(r'^about-loco/$', 'common.views.about_loco', name='about_loco'),
url(r'^using-locodir/$', 'common.views.using_locodir', name='using_locodir'),
url(r'^openid/', include('django_openid_auth.urls')),
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
