Browse Source

Fix some warnings

Move the share system to the new PublishBrief widget
pull/392/head
Timothée Jaussoin 9 years ago
parent
commit
322a82ca51
  1. 6
      app/models/postn/Postn.php
  2. 21
      app/widgets/PublishBrief/PublishBrief.php
  3. 59
      app/widgets/PublishBrief/_publishbrief.tpl
  4. 2
      app/widgets/PublishBrief/_publishbrief_link.tpl
  5. 10
      app/widgets/PublishBrief/publishbrief.js
  6. 60
      app/widgets/PublishBrief/publishbrief.tpl
  7. 2
      app/widgets/Share/Share.php
  8. 5
      app/widgets/Upload/Upload.php

6
app/models/postn/Postn.php

@ -360,10 +360,10 @@ class Postn extends Model
[
'href' => $l['href'],
'url' => parse_url($l['href']),
'title'=> $l['title'],
'title'=> (isset($l['description'])) ? $l['title'] : false,
'rel' => 'related',
'description' => $l['description'],
'logo' => $l['logo']
'description' => (isset($l['description'])) ? $l['description'] : false,
'logo' => (isset($l['logo'])) ? $l['logo'] : false
]
);
break;

21
app/widgets/PublishBrief/PublishBrief.php

@ -14,6 +14,12 @@ class PublishBrief extends \Movim\Widget\Base
$this->addcss('publishbrief.css');
}
function ajaxGet()
{
$this->rpc('MovimTpl.fill', '#publishbrief', $this->preparePublishBrief());
$this->rpc('PublishBrief.checkEmbed');
}
function ajaxPublish($form)
{
$this->rpc('PublishBrief.disableSend');
@ -67,9 +73,7 @@ class PublishBrief extends \Movim\Widget\Base
$this->rpc('Dialog_ajaxClear');
//if(in_array($embed->type, ['photo', 'rich'])) {
$this->rpc('MovimTpl.fill', '#publishbrief p.embed', $this->prepareEmbed($embed));
//}
$this->rpc('MovimTpl.fill', '#publishbrief p.embed', $this->prepareEmbed($embed));
} catch(Exception $e) {
error_log($e->getMessage());
}
@ -93,6 +97,16 @@ class PublishBrief extends \Movim\Widget\Base
return $view->draw('_publishbrief_embed', true);
}
function preparePublishBrief()
{
$view = $this->tpl();
$session = Session::start();
$view->assign('url', $session->get('share_url'));
$view->assign('embed', $this->prepareEmbedDefault());
return $view->draw('_publishbrief', true);
}
function ajaxLink()
{
$view = $this->tpl();
@ -110,6 +124,5 @@ class PublishBrief extends \Movim\Widget\Base
function display()
{
$this->view->assign('embed', $this->prepareEmbedDefault());
}
}

59
app/widgets/PublishBrief/_publishbrief.tpl

@ -0,0 +1,59 @@
<br class="on_desktop"/>
<div class="block">
<ul class="list">
<li>
<span id="menu" class="primary on_mobile icon bubble active gray" onclick="MovimTpl.toggleMenu()">
<i class="zmdi zmdi-menu"></i>
</span>
<span class="primary on_desktop icon bubble gray">
<i class="zmdi zmdi-edit"></i>
</span>
<span id="button_send"
class="control icon gray active"
onclick="Publish.disableSend(); PublishBrief_ajaxPublish(MovimUtils.formToJson('brief'));">
<i class="zmdi zmdi-mail-send"></i>
</span>
<form onsubmit="return false;" name="brief">
<div>
<textarea
name="title"
id="title"
rows="1"
required
onkeyup="MovimUtils.textareaAutoheight(this);"
placeholder="{$c->__('publishbrief.placeholder')}"
type="text"></textarea>
</div>
<input
type="checkbox"
id="open"
name="open"
style="display: none;"
>
<input type="hidden"
id="embed"
name="embed"
onchange="PublishBrief_ajaxEmbedTest(this.value)"
{if="$url"}value="{$url}"{/if}
>
</form>
</li>
</ul>
<ul class="list middle">
<li>
<span class="primary icon gray bubble active privacy"
onclick="PublishBrief.togglePrivacy()">
<i class="zmdi zmdi-lock-outline"></i>
</span>
<span class="control icon active gray"
title="{$c->__('publishbrief.post')}"
onclick="MovimUtils.reload('{$c->route('publish')}')">
<i class="zmdi zmdi-plus-circle"></i>
</span>
<p class="normal embed flex">
{$embed}
</p>
</li>
</ul>
</div>

2
app/widgets/PublishBrief/_publishbrief_link.tpl

@ -14,7 +14,7 @@
<button onclick="Dialog_ajaxClear();" class="button flat">
{$c->__('button.close')}
</button>
<button onclick="PublishBrief.addUrl();" class="button flat">
<button onclick="PublishBrief.addUrl(); this.classList.add('disabled')" class="button flat">
{$c->__('button.add')}
</button>
</div>

10
app/widgets/PublishBrief/publishbrief.js

@ -35,15 +35,17 @@ var PublishBrief = {
clearEmbed: function() {
document.querySelector('input[name=embed]').value = '';
PublishBrief_ajaxClearEmbed();
},
checkEmbed: function() {
var embed = document.querySelector('input[name=embed]');
embed.onchange();
}
}
MovimWebsocket.attach(function() {
PublishBrief_ajaxClearEmbed();
PublishBrief_ajaxGet();
});
Upload.attach(function() {
var embed = document.querySelector('input[name=embed]');
embed.value = Upload.get;
embed.onchange();
PublishBrief.checkEmbed();
});

60
app/widgets/PublishBrief/publishbrief.tpl

@ -1,59 +1 @@
<header id="publishbrief" class="card shadow">
<div class="block">
<ul class="list">
<li>
<span id="menu" class="primary on_mobile icon bubble active gray" onclick="MovimTpl.toggleMenu()">
<i class="zmdi zmdi-menu"></i>
</span>
<span class="primary on_desktop icon bubble gray">
<i class="zmdi zmdi-edit"></i>
</span>
<span id="button_send"
class="control icon gray active"
onclick="Publish.disableSend(); PublishBrief_ajaxPublish(MovimUtils.formToJson('brief'));">
<i class="zmdi zmdi-mail-send"></i>
</span>
<form onsubmit="return false;" name="brief">
<div>
<textarea
name="title"
id="title"
rows="1"
required
onkeyup="MovimUtils.textareaAutoheight(this);"
placeholder="{$c->__('publishbrief.placeholder')}"
type="text"></textarea>
</div>
<input
type="checkbox"
id="open"
name="open"
style="display: none;"
>
<input type="hidden"
id="embed"
name="embed"
onchange="PublishBrief_ajaxEmbedTest(this.value)"
>
</form>
</li>
</ul>
<ul class="list middle">
<li>
<span class="primary icon gray bubble active privacy"
onclick="PublishBrief.togglePrivacy()">
<i class="zmdi zmdi-lock-outline"></i>
</span>
<span class="control icon active gray"
title="{$c->__('publishbrief.post')}"
onclick="MovimUtils.reload('{$c->route('publish')}')">
<i class="zmdi zmdi-plus-circle"></i>
</span>
<p class="normal embed flex">
{$embed}
</p>
</li>
</ul>
</div>
</header>
<header id="publishbrief" class="card shadow"></header>

2
app/widgets/Share/Share.php

@ -19,7 +19,7 @@ class Share extends \Movim\Widget\Base
&& substr($link, 0, 4) == 'http') {
$session = Session::start();
$session->set('share_url', $link);
$this->rpc('Share.redirect', $this->route('publish'));
$this->rpc('Share.redirect', $this->route('news'));
} elseif(substr($link, 0, 5) == 'xmpp:') {
$link = str_replace(['xmpp://', 'xmpp:'], '', $link);

5
app/widgets/Upload/Upload.php

@ -9,7 +9,10 @@ class Upload extends \Movim\Widget\Base
$this->addjs('upload.js');
$this->registerEvent('upload_request_handle', 'onRequested');
$this->registerEvent('upload_request_errornotacceptable', 'onErrorNotAcceptable');
header('Access-Control-Allow-Origin: *');
if(php_sapi_name() != 'cli') {
header('Access-Control-Allow-Origin: *');
}
}
function onRequested($package)

Loading…
Cancel
Save