Mirrors
/
movim
mirror of https://github.com/movim/movim
3
0
Fork 0
Code Releases Activity
Browse Source

Update the dependencies 

Add SendTo to Tag and Post pages
pull/856/head
Timothée Jaussoin 6 years ago
parent
08788c7e5b
commit
998490f2c5
5 changed files with 40 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      app/views/tag.tpl
  2. 6
      app/widgets/Post/_post_comments.tpl
  3. 6
      app/widgets/Post/_post_comments_error.tpl
  4. 16
      app/widgets/SendTo/_sendto_share.tpl
  5. 50
      composer.lock

1
app/views/tag.tpl
View File

@ -3,6 +3,7 @@
<?php $this->widget('Notification');?>
<?php $this->widget('VisioLink');?>
<?php $this->widget('Notifications');?>
<?php $this->widget('SendTo');?>
<nav class="color dark">
<?php $this->widget('Presence');?>

6
app/widgets/Post/_post_comments.tpl
View File

@ -142,11 +142,9 @@
<button class="button flat gray" onclick="Post.comment()">
<i class="material-icons">comment</i> {$c->__('post.comment_add')}
</button>
{if="$c->getUser()->hasPubsub()"}
<a class="button flat gray" onclick="Post.share()">
<i class="material-icons">share</i> {$c->__('button.share')}
<a class="button flat gray" onclick="SendTo_ajaxSendSearch('{$post->getRef()}')">
<i class="material-icons">send</i> {$c->__('button.share')}
</a>
{/if}
</p>
</li>
{/if}

6
app/widgets/Post/_post_comments_error.tpl
View File

@ -11,9 +11,9 @@
<li class="block">
<p class="center">
{if="$c->getUser()->hasPubsub()"}
<button class="button icon flat gray" onclick="Post.share()">
<i class="material-icons">share</i> {$c->__('button.share')}
</button>
<button class="button icon flat gray" onclick="Post.share()">
<i class="material-icons">share</i> {$c->__('button.share')}
</button>
{/if}
</p>
</li>

16
app/widgets/SendTo/_sendto_share.tpl
View File

@ -7,13 +7,15 @@
{autoescape="off"}
{$card}
{/autoescape}
<li>
<span class="control icon active gray"
onclick="MovimUtils.redirect('{$c->route('publish', [$post->server, $post->node, $post->nodeid, 'share'])}')">
<i class="material-icons">share</i>
</span>
<p class="normal line">{$c->__('sendto.attach')}</p>
</li>
{if="$c->getUser()->hasPubsub()"}
<li>
<span class="control icon active gray"
onclick="MovimUtils.redirect('{$c->route('publish', [$post->server, $post->node, $post->nodeid, 'share'])}')">
<i class="material-icons">share</i>
</span>
<p class="normal line">{$c->__('sendto.attach')}</p>
</li>
{/if}
</ul>
{/if}

50
composer.lock
View File

@ -8,16 +8,16 @@
"packages": [
{
"name": "cakephp/cache",
"version": "3.8.0",
"version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/cache.git",
"reference": "f7ff72a590f9dc69a9788fb78045a70fc86723fc"
"reference": "f2b840c9a9b8ba9ab12c5db031d96a312d270536"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cakephp/cache/zipball/f7ff72a590f9dc69a9788fb78045a70fc86723fc",
"reference": "f7ff72a590f9dc69a9788fb78045a70fc86723fc",
"url": "https://api.github.com/repos/cakephp/cache/zipball/f2b840c9a9b8ba9ab12c5db031d96a312d270536",
"reference": "f2b840c9a9b8ba9ab12c5db031d96a312d270536",
"shasum": ""
},
"require": {
@ -48,11 +48,11 @@
"caching",
"cakephp"
],
"time": "2019-06-24T11:34:33+00:00"
"time": "2019-07-12T13:57:37+00:00"
},
{
"name": "cakephp/collection",
"version": "3.8.0",
"version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/collection.git",
@ -98,7 +98,7 @@
},
{
"name": "cakephp/core",
"version": "3.8.0",
"version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/core.git",
@ -148,7 +148,7 @@
},
{
"name": "cakephp/database",
"version": "3.8.0",
"version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/database.git",
@ -196,16 +196,16 @@
},
{
"name": "cakephp/datasource",
"version": "3.8.0",
"version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/datasource.git",
"reference": "a8fb302598d0038c8b5f0f83763dded27ef4e780"
"reference": "c46eff4f12fd72f01dd6987d5bfa0d7e5c92af70"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cakephp/datasource/zipball/a8fb302598d0038c8b5f0f83763dded27ef4e780",
"reference": "a8fb302598d0038c8b5f0f83763dded27ef4e780",
"url": "https://api.github.com/repos/cakephp/datasource/zipball/c46eff4f12fd72f01dd6987d5bfa0d7e5c92af70",
"reference": "c46eff4f12fd72f01dd6987d5bfa0d7e5c92af70",
"shasum": ""
},
"require": {
@ -242,11 +242,11 @@
"entity",
"query"
],
"time": "2019-06-13T02:05:57+00:00"
"time": "2019-07-09T14:11:51+00:00"
},
{
"name": "cakephp/log",
"version": "3.8.0",
"version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/log.git",
@ -291,7 +291,7 @@
},
{
"name": "cakephp/utility",
"version": "3.8.0",
"version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/utility.git",
@ -2243,16 +2243,16 @@
},
{
"name": "react/cache",
"version": "v0.6.0",
"version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/cache.git",
"reference": "a42d149e15b8312918327d5be2ba757cd2f23ff9"
"reference": "aa10d63a1b40a36a486bdf527f28bac607ee6466"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/cache/zipball/a42d149e15b8312918327d5be2ba757cd2f23ff9",
"reference": "a42d149e15b8312918327d5be2ba757cd2f23ff9",
"url": "https://api.github.com/repos/reactphp/cache/zipball/aa10d63a1b40a36a486bdf527f28bac607ee6466",
"reference": "aa10d63a1b40a36a486bdf527f28bac607ee6466",
"shasum": ""
},
"require": {
@ -2279,7 +2279,7 @@
"promise",
"reactphp"
],
"time": "2019-07-04T14:45:59+00:00"
"time": "2019-07-11T13:45:28+00:00"
},
{
"name": "react/child-process",
@ -2326,16 +2326,16 @@
},
{
"name": "react/dns",
"version": "v0.4.18",
"version": "v0.4.19",
"source": {
"type": "git",
"url": "https://github.com/reactphp/dns.git",
"reference": "b6778e74f33d38aa1f86d4718b0c6e45806a50d2"
"reference": "6852fb98e22d2e5bb35fe5aeeaa96551b120e7c9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/dns/zipball/b6778e74f33d38aa1f86d4718b0c6e45806a50d2",
"reference": "b6778e74f33d38aa1f86d4718b0c6e45806a50d2",
"url": "https://api.github.com/repos/reactphp/dns/zipball/6852fb98e22d2e5bb35fe5aeeaa96551b120e7c9",
"reference": "6852fb98e22d2e5bb35fe5aeeaa96551b120e7c9",
"shasum": ""
},
"require": {
@ -2367,7 +2367,7 @@
"dns-resolver",
"reactphp"
],
"time": "2019-07-09T10:19:27+00:00"
"time": "2019-07-10T21:00:53+00:00"
},
{
"name": "react/event-loop",

Write Preview
Loading…
Cancel
Save