Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/bug-635852 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #635852 Remove sub-nav and put webchat in main-content alone on IRC Chat page https://bugs.launchpad.net/bugs/635852 -- https://code.launchpad.net/~chrisjohnston/loco-directory/bug-635852/+merge/35195 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/bug-635852 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-09-11 15:22:03 +0000 +++ loco_directory/locale/loco-directory.pot 2010-09-11 17:24:46 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-11 15:21+0000\n" +"POT-Creation-Date: 2010-09-11 17:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -43,8 +43,8 @@ msgid "not attending" msgstr "" -#: events/models.py:20 -msgid "Name of the Event" +#: events/models.py:20 templates/events/team_event_list.inc.html:4 +msgid "Event Name" msgstr "" #: events/models.py:21 @@ -68,6 +68,10 @@ msgstr "" #: events/models.py:24 +msgid "Announcement" +msgstr "" + +#: events/models.py:24 msgid "URL to the announcement" msgstr "" @@ -111,6 +115,10 @@ msgid "Venue of the Event" msgstr "" +#: events/models.py:113 +msgid "Event Venue" +msgstr "" + #: events/models.py:146 events/models.py:163 msgid "the Team Event" msgstr "" @@ -630,11 +638,11 @@ msgid "Microblogging" msgstr "" -#: templates/irc_chat.html:4 templates/irc_chat.html.py:12 +#: templates/irc_chat.html:4 templates/irc_chat.html.py:10 msgid "Ubuntu LoCo Teams IRC Chat" msgstr "" -#: templates/irc_chat.html:14 +#: templates/irc_chat.html:12 msgid "" "Why not join other team members from different LoCos around the world on IRC " "in the locoteams channel. This is where LoCo enthusiasts like to hang out. " @@ -643,7 +651,7 @@ "events or just to talk to others." msgstr "" -#: templates/irc_chat.html:15 +#: templates/irc_chat.html:13 msgid "" "It's a great place to chat to other members from different teams, get ideas " "off them and learn how other teams interact. Why not join and idle and learn " @@ -1072,10 +1080,6 @@ msgid "Comment:" msgstr "" -#: templates/events/team_event_list.inc.html:4 -msgid "Event Name" -msgstr "" - #: templates/events/team_event_list.inc.html:7 msgid "Global Event" msgstr "" === modified file 'loco_directory/templates/irc_chat.html' --- loco_directory/templates/irc_chat.html 2010-09-11 15:22:03 +0000 +++ loco_directory/templates/irc_chat.html 2010-09-11 17:24:46 +0000 @@ -3,9 +3,7 @@ {% block title %} {% trans "Ubuntu LoCo Teams IRC Chat" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} -{% block sub_nav_links %} -{% endblock %} -{% block search %}{% endblock %} +{% block sub_nav %}{% endblock %} {% block content %} @@ -14,7 +12,9 @@ <p>{% trans "Why not join other team members from different LoCos around the world on IRC in the locoteams channel. This is where LoCo enthusiasts like to hang out. It is open to everyone, you don't have to be a leader,it's a welcoming channel open to everyone to ask questions about LoCo team issues, planning events or just to talk to others." %}</p> <p>{% trans "It's a great place to chat to other members from different teams, get ideas off them and learn how other teams interact. Why not join and idle and learn from one another. Encourage your own team to join this channel, by adding it to your wiki information on IRC, or in your channel topic also." %}</p> </article> -<article class="main-content"> +<article class="main-content alone"> + <h2>Webchat</h2> + <br /> <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28"; width="900" height="400"></iframe> </article> {% endblock %}
_______________________________________________ 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
