Browse Source

Fix the URLs in the Help widget and fix the "add chatroom" feature

pull/16/merge
Jaussoin Timothée 10 years ago
parent
commit
305311bb25
  1. 18
      app/widgets/Help/Help.php
  2. 12
      app/widgets/Help/help.js
  3. 21
      app/widgets/Help/help.tpl
  4. 2
      app/widgets/Help/locales.ini

18
app/widgets/Help/Help.php

@ -4,7 +4,23 @@ class Help extends WidgetBase
{
function load()
{
$this->addjs('help.js');
}
function ajaxAddChatroom()
{
$r = new Rooms;
$r->ajaxChatroomAdd(
array(
'jid' => 'movim@conference.movim.eu',
'name'=> 'Movim Chatroom',
'nick' => false,
'autojoin' => 0
)
);
$r->ajaxJoin('movim@conference.movim.eu');
RPC::call('movim_redirect', $this->route('chat'));
}
function display()

12
app/widgets/Help/help.js

@ -1,12 +0,0 @@
var Help = {
joinChatroom : function() {
var hash = new H();
hash.set('jid', 'movim@conference.movim.eu');
hash.set('name', 'Movim Chatroom');
hash.set('nick', false);
hash.set('autojoin', 0);
Bookmark_ajaxBookmarkMucAdd(hash);
Bookmark_ajaxBookmarkMucJoin('movim@conference.movim.eu', '');
}
}

21
app/widgets/Help/help.tpl

@ -1,9 +1,9 @@
<div class="tabelem" title="{$c->__('page.help')}" id="help_widget">
<ul class="thick active">
<li class="condensed action">
<a href="http://wiki.movim.eu" target="_blank">
<a href="https://github.com/edhelas/movim/wiki" target="_blank">
<span class="icon bubble color blue">
<i class="zmdi zmdi-format-subject"></i>
<i class="zmdi zmdi-github-alt"></i>
</span>
<span>{$c->__('wiki.question')}</span>
<p>{$c->__('wiki.button')}</p>
@ -13,7 +13,7 @@
</div>
</li>
<li class="condensed action">
<a href="http://wiki.movim.eu/en:mailing_list" target="_blank">
<a href="https://github.com/edhelas/movim/wiki/Mailing-List" target="_blank">
<span class="icon bubble color orange">
<i class="zmdi zmdi-email"></i>
</span>
@ -24,12 +24,15 @@
<i class="zmdi zmdi-chevron-right"></i>
</div>
</li>
<li class="condensed">
<span class="icon bubble color green">
<i class="zmdi zmdi-comment-text-alt"></i>
</span>
<span>{$c->__('chatroom.question')}</span>
<p>{$c->__('chatroom.button')}<br/>movim@conference.movim.eu</p>
<li class="condensed action" onclick="Help_ajaxAddChatroom()">
<span class="icon bubble color green">
<i class="zmdi zmdi-comment-text-alt"></i>
</span>
<span>{$c->__('chatroom.question')}</span>
<p>{$c->__('chatroom.button')}<br/>movim@conference.movim.eu</p>
<div class="action">
<i class="zmdi zmdi-accounts-add"></i>
</div>
</li>
</ul>
<!--

2
app/widgets/Help/locales.ini

@ -20,4 +20,4 @@ button = Join the Mailing List
[chatroom]
question = Chat with the team ?
button = Join the Chatroom
button = Add the chatroom
Loading…
Cancel
Save