From 4488f87607bee12e6d383621b6b158dd73b2a1ca Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <alexandre.aubin@cern.ch> Date: Mon, 7 May 2018 21:49:44 +0200 Subject: [PATCH] Embed the chatroom directly in the help page --- help.md | 17 +++++------------ help_ar.md | 13 +++---------- help_fr.md | 17 ++++++----------- 3 files changed, 14 insertions(+), 33 deletions(-) diff --git a/help.md b/help.md index 3d2d8cdd..00fab758 100644 --- a/help.md +++ b/help.md @@ -9,16 +9,12 @@ <li><em>Be patient</em>, it can take a few minutes before someone sees your messages.</li> </ul> </div> -<strong>Nickname</strong> : <input id="nickname" value="foobar__" type="text"> + +<iframe src="https://kiwiirc.com/client/irc.freenode.org/?nick=foobar|?&theme=mini#yunohost" style="border:0; width:100%; height:450px;"></iframe> + </br> </br> -<button id="joinChatroom" type="button" class="btn btn-success" style="font-weight:bold;"> - <span class="glyphicon glyphicon-comment"></span> Join the chatroom -</button> -</br> -</br> -<em>Note : you can also connect using your favorite XMPP client to </br> -support@conference.yunohost.org</em> +<em>Note : this room is also available via XMPP <small>(support@conference.yunohost.org)</small>, or Matrix <small>(#freenode_#yunohost:matrix.org)</small></em> </center> <h3>... or ask on the forum !</h3> @@ -47,10 +43,7 @@ dev@conference.yunohost.org and apps@conference.yunohost.org</em> </center> <script> -document.getElementById("joinChatroom").onclick = function() { - var nickname = document.getElementById("nickname").value; - window.location.href = "https://kiwiirc.com/client/irc.freenode.net/yunohost/?nick="+nickname; -} + document.getElementById("goForum").onclick = function() { var nickname = document.getElementById("nickname").value; window.location.href = "https://forum.yunohost.org/latest"; diff --git a/help_ar.md b/help_ar.md index 46577b9d..d9da626f 100644 --- a/help_ar.md +++ b/help_ar.md @@ -11,12 +11,9 @@ </div> <div dir="rtl"><strong>الإسم المستعار</strong> : <input id="nickname" value="foobar__" type="text"> </div> -</br> -</br> -<div dir="rtl"><button id="joinChatroom" type="button" class="btn btn-success" style="font-weight:bold;"> - <span class="glyphicon glyphicon-comment"></span> إنضم إلى غرفة المحادثة -</button> -</div> + +<iframe src="https://kiwiirc.com/client/irc.freenode.org/?nick=foobar|?&theme=mini#yunohost" style="border:0; width:100%; height:450px;"></iframe> + </br> </br> <div dir="rtl"> @@ -56,10 +53,6 @@ dev@conference.yunohost.org and apps@conference.yunohost.org</em> </center> <script> -document.getElementById("joinChatroom").onclick = function() { - var nickname = document.getElementById("nickname").value; - window.location.href = "https://kiwiirc.com/client/irc.freenode.net/yunohost/?nick="+nickname; -} document.getElementById("goForum").onclick = function() { var nickname = document.getElementById("nickname").value; window.location.href = "https://forum.yunohost.org/latest"; diff --git a/help_fr.md b/help_fr.md index 5d227e6c..f032fa8f 100644 --- a/help_fr.md +++ b/help_fr.md @@ -9,15 +9,14 @@ <li><em>Soyez patient</em>, cela peut prendre plusieurs minutes avant que quelqu'un remarque vos messages.</li> </ul> </div> -<strong>Pseudonyme</strong> : <input id="nickname" value="foobar__" type="text"> + +<iframe +src="https://kiwiirc.com/client/irc.freenode.org/?nick=foobar|?&theme=mini#yunohost" +style="border:0; width:100%; height:450px;"></iframe> + </br> </br> -<button id="joinChatroom" type="button" class="btn btn-success" style="font-weight:bold;"> - <span class="glyphicon glyphicon-comment"></span> Rejoindre le salon -</button> -</br> -</br> -<em>Note : vous pouvez aussi vous connecter via votre client XMPP favori à</br> +<em>Note : ce salon est aussi accessible via XMPP <small>(support@conference.yunohost.org)</small>, ou Matrix <small>(#freenode_#yunohost:matrix.org)</small>.</em> support@conference.yunohost.org</em> </center> @@ -47,10 +46,6 @@ dev@conference.yunohost.org et apps@conference.yunohost.org</em> </center> <script> -document.getElementById("joinChatroom").onclick = function() { - var nickname = document.getElementById("nickname").value; - window.location.href = "https://kiwiirc.com/client/irc.freenode.net/yunohost/?nick="+nickname; -} document.getElementById("goForum").onclick = function() { var nickname = document.getElementById("nickname").value; window.location.href = "https://forum.yunohost.org/latest";