Browse Source

Complete #73

pull/469/head
Timothée Jaussoin 8 years ago
parent
commit
e879f5ba3b
  1. 1
      app/views/community.tpl
  2. 17
      app/widgets/Chat/_chat.tpl
  3. 10
      app/widgets/Chat/chat.js
  4. 16
      app/widgets/Navigation/navigation.tpl
  5. 10
      app/widgets/Post/_post_card.tpl
  6. 2
      app/widgets/Presence/_presence.tpl
  7. 1
      app/widgets/PublishBrief/_publishbrief.tpl
  8. 12
      app/widgets/PublishBrief/_publishbrief_embed_default.tpl
  9. 2
      app/widgets/Rooms/_rooms.tpl

1
app/views/community.tpl

@ -22,6 +22,7 @@
<?php if($this->user->isSupported('pubsub')) { ?>
<span
class="control icon gray active"
title="<?php echo __('communitysubscriptions.subscriptions'); ?>"
onclick="MovimUtils.redirect('<?php echo \Movim\Route::urlize('community', 'subscriptions'); ?>')">
<i class="zmdi zmdi-settings"></i>
</span>

17
app/widgets/Chat/_chat.tpl

@ -25,7 +25,10 @@
<i class="zmdi zmdi-more-vert"></i>
</span>
<span class="control icon active" onclick="Rooms_ajaxExit('{$room}'); MovimTpl.hidePanel(); {if="$anon"}Presence_ajaxLogout(){/if}">
<span
title="{$c->__('button.close')}"
class="control icon active"
onclick="Rooms_ajaxExit('{$room}'); MovimTpl.hidePanel(); {if="$anon"}Presence_ajaxLogout(){/if}">
<i class="zmdi zmdi-close"></i>
</span>
@ -95,7 +98,10 @@
<i class="zmdi zmdi-more-vert"></i>
</span>
<span class="control icon active" onclick="Chats_ajaxClose('{$jid|echapJS}'); MovimTpl.hidePanel();">
<span
title="{$c->__('button.close')}"
class="control icon active"
onclick="Chats_ajaxClose('{$jid|echapJS}'); MovimTpl.hidePanel();">
<i class="zmdi zmdi-close"></i>
</span>
<p class="line">
@ -137,11 +143,14 @@
</span>
{/if}
{if="$c->supported('upload')"}
<span class="upload control icon" onclick="Upload_ajaxRequest()">
<span class="upload control icon"
title="{$c->__('publish.attach')}"
onclick="Upload_ajaxRequest()">
<i class="zmdi zmdi-attachment-alt"></i>
</span>
{/if}
<span class="send control icon gray {if="$c->supported('upload')"}hide{else}show{/if}"
<span title="{$c->__('button.submit')}"
class="send control icon gray {if="$c->supported('upload')"}hide{else}show{/if}"
onclick="Chat.sendMessage()">
<i class="zmdi zmdi-mail-send"></i>
</span>

10
app/widgets/Chat/chat.js

@ -144,7 +144,7 @@ var Chat = {
Chat.clearReplace();
var textarea = Chat.getTextarea();
localStorage.removeItem(textarea.dataset.jid + '_message');
Chat.toggleAction(textarea.value.length);
Chat.toggleAction();
},
clearReplace: function()
{
@ -171,6 +171,8 @@ var Chat = {
textarea.value = localStorage.getItem(textarea.dataset.jid + '_message');
MovimUtils.textareaAutoheight(textarea);
Chat.toggleAction();
}, 0); // Fix Me
textarea.onkeydown = function(event) {
@ -222,7 +224,7 @@ var Chat = {
}
},5000);
Chat.toggleAction(this.value.length);
Chat.toggleAction();
};
textarea.oninput = function() {
@ -611,11 +613,11 @@ var Chat = {
i.setAttribute("title", displayed);
return i;
},
toggleAction: function(l) {
toggleAction: function() {
var send_button = document.querySelector(".chat_box span.send");
var attachment_button = document.querySelector(".chat_box span.upload");
if(send_button && attachment_button) {
if(l > 0){
if(Chat.getTextarea().value.length > 0){
MovimUtils.showElement(send_button);
MovimUtils.hideElement(attachment_button);
} else {

16
app/widgets/Navigation/navigation.tpl

@ -6,18 +6,6 @@
<p class="normal">Movim</p>
</li>
</a>
<!--<a class="classic on_desktop" href="{$c->route('root')}">
<li class="{if="$page == 'main'"}active{/if}">
<span class="primary icon bubble"><i class="zmdi zmdi-cloud-outline"></i></span>
<p class="normal">{$c->__('page.home')}</p>
</li>
</a>
<a class="classic on_mobile" href="{$c->route('root')}">
<li class="{if="$page == 'main'"}active{/if}">
<span class="primary icon bubble"><i class="zmdi zmdi-home"></i></span>
<p class="normal">{$c->__('page.home')}</p>
</li>
</a>-->
{if="$c->supported('pubsub')"}
<a class="classic"
href="{$c->route('news')}"
@ -57,7 +45,9 @@
</ul>
<ul class="list divided oppose active" dir="ltr">
<li onclick="Search_ajaxRequest()">
<li onclick="Search_ajaxRequest()"
title="{$c->__('button.search')}"
>
<span class="primary icon">
<i class="zmdi zmdi-search"></i>
</span>

10
app/widgets/Post/_post_card.tpl

@ -234,11 +234,17 @@
</a>
{/if}
{if="!$public"}
<a class="button icon flat gray" href="{$c->route('publish', [$post->origin, $post->node, $post->nodeid, 'share'])}">
<a
title="{$c->__('button.reply')}"
class="button icon flat gray"
href="{$c->route('publish', [$post->origin, $post->node, $post->nodeid, 'share'])}">
<i class="zmdi zmdi-mail-reply"></i>
</a>
{if="$post->isPublic()"}
<a class="button icon flat gray on_desktop" target="_blank" href="{$post->getPublicUrl()}">
<a title="{$c->__('post.public_yes')}"
class="button icon flat gray on_desktop"
target="_blank"
href="{$post->getPublicUrl()}">
<i title="{$c->__('menu.public')}" class="zmdi zmdi-portable-wifi"></i>
</a>
{/if}

2
app/widgets/Presence/_presence.tpl

@ -1,5 +1,5 @@
<a href="{$c->route('contact', $me->jid)}">
<li>
<li title="{$c->__('privacy.my_profile')}">
{$url = $me->getPhoto('s')}
{if="$url"}
<span

1
app/widgets/PublishBrief/_publishbrief.tpl

@ -40,6 +40,7 @@
<ul class="list middle">
<li>
<span class="primary icon gray bubble active privacy color"
title="{$c->__('post.public')}"
onclick="PublishBrief.togglePrivacy()">
<i class="zmdi zmdi-portable-wifi"></i>
</span>

12
app/widgets/PublishBrief/_publishbrief_embed_default.tpl

@ -1,8 +1,16 @@
<a class="button flat icon gray" href="#" onclick="PublishBrief_ajaxLink()">
<a
class="button flat icon gray"
title="{$c->__('publish.link')}"
href="#"
onclick="PublishBrief_ajaxLink()">
<i class="zmdi zmdi-link"></i>
</a>
{if="$c->supported('upload')"}
<a class="button flat icon gray" href="#" onclick="Upload_ajaxRequest()">
<a
class="button flat icon gray"
href="#"
title="{$c->__('publish.attach')}"
onclick="Upload_ajaxRequest()">
<i class="zmdi zmdi-attachment-alt"></i>
</a>
{/if}

2
app/widgets/Rooms/_rooms.tpl

@ -1,6 +1,6 @@
{if="!$c->supported('anonymous') && $c->getView() != 'room'"}
<ul class="list divided spaced middle {if="!$edit"}active{/if}">
<li class="subheader">
<li class="subheader" title="{$c->__('page.configuration')}">
{if="$conferences != null"}
<span class="control icon active gray" onclick="Rooms_ajaxDisplay({if="$edit"}false{else}true{/if});">
{if="$edit"}

Loading…
Cancel
Save