Merge lp:~pablorubianes-uy/loco-team-portal/fix.1320270 into lp:loco-team-portal

Proposed by Pablo Rubianes
Status: Needs review
Proposed branch: lp:~pablorubianes-uy/loco-team-portal/fix.1320270
Merge into: lp:loco-team-portal
Diff against target: 27 lines (+7/-7)
1 file modified
loco_directory/templates/irc_chat.html (+7/-7)
To merge this branch: bzr merge lp:~pablorubianes-uy/loco-team-portal/fix.1320270
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Review via email: mp+235416@code.launchpad.net

Description of the change

I add a note in the IRC page, to tell users that the LoCoTeams channel is not a Ubuntu support channel.

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1

review: Approve

Unmerged revisions

683. By Pablo Rubianes

Addition of a note to the IRC page, bug #1320270

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/irc_chat.html'
2--- loco_directory/templates/irc_chat.html 2014-03-23 20:55:33 +0000
3+++ loco_directory/templates/irc_chat.html 2014-09-21 19:49:48 +0000
4@@ -6,16 +6,16 @@
5 {% block content %}
6 <div class="row">
7 <section class="span-12">
8-<h1>{% trans "Ubuntu LoCo Teams IRC Chat" %}</h1>
9-
10- <p>{% trans "Why not join other team members from different LoCos around the world on IRC in the #ubuntu-locoteams IRC channel. This is where LoCo enthusiasts like to hang out. It is open to everyone, you don't have to be a leader. This is the perfect channel to ask questions about LoCo team issues or planning events. It is also a great place to talk and socialize with members of other LoCo teams." %}</p>
11- <p>{% trans "It's a great place to chat to with members from different teams, get ideas from them and learn how other teams interact. Why not join, idle and learn. Encourage other members of your LoCo to join this channel by mentioning it on your wiki page or in your IRC channel's topic." %}</p>
12-</section></div>
13-
14+ <h1>{% trans "Ubuntu LoCo Teams IRC Chat" %}</h1>
15+
16+ <p>{% trans "Why not join other team members from different LoCos around the world on IRC in the #ubuntu-locoteams IRC channel. This is where LoCo enthusiasts like to hang out. It is open to everyone, you don't have to be a leader. This is the perfect channel to ask questions about LoCo team issues or planning events. It is also a great place to talk and socialize with members of other LoCo teams." %}</p>
17+ <p>{% trans "It's a great place to chat to with members from different teams, get ideas from them and learn how other teams interact. Why not join, idle and learn. Encourage other members of your LoCo to join this channel by mentioning it on your wiki page or in your IRC channel's topic." %}</p>
18+ </section>
19+</div>
20 <div class="row">
21 <section class="span-12 alone">
22 <h2>Webchat</h2>
23- <br />
24+ <p>{% trans "Note: If you are looking for Ubuntu support please go to the #ubuntu IRC channel" %}</p>
25 <div id="ircchat">
26 {% if user.is_authenticated %}
27 <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28&nick={{ user.username|irc }}" width="900" height="400"></iframe>

Subscribers

People subscribed via source and target branches