YunoHost-Apps/movim_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/movim_ynh.git synced 2024-09-03 19:46:19 +02:00
Code Issues Activity Actions

update to movim 0.9b-20150907

Browse source
This commit is contained in:
src386 2015-09-07 15:06:10 +02:00
parent 602dfca24c
commit 55026b7402
15 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -7,12 +7,12 @@ Warning: BETA.
You need a valid SSL certificate to use Movim, auto-signed is not allowed.
Current Movim version : 0.9 git2015-09-03
Current Movim version : 0.9 git2015-09-07
**Changelog**
0.9b 2015-0
- Update to Movim 0.9 git2015-09-03
- Update to Movim 0.9 git2015-09-07
- Add notes in README about public pods & whitelisting
- script/install now check if path is empty.
- script/remove now delete /etc/php/fpm/pool.d/movim.conf (fix #8).

1
TODO
View file

@ -1,3 +1,4 @@
- Check if Yes and yes are both working
- Sysvinit script syslog
- Log to /var/log/movim/
- Movim must start AFTER mysql

2
scripts/remove
View file

@ -19,7 +19,7 @@ sudo userdel movim
sudo rm -rf /var/www/movim
domain=$(sudo yunohost app setting movim domain)
sudo rm -f /etc/nginx/conf.d/$domain.d/movim.conf
udo rm etc/php5/fpm/pool.d/movim.conf
sudo rm etc/php5/fpm/pool.d/movim.conf
# Restarting services
sudo service nginx reload

2
sources/app/models/config/Config.php
View file

@ -31,7 +31,7 @@ class Config extends Model {
"loglevel" :
{"type":"string", "size":16, "mandatory":true },
"timezone" :
{"type":"string", "size":16, "mandatory":true },
{"type":"string", "size":32, "mandatory":true },
"xmppwhitelist" :
{"type":"text" },
"info" :

4
sources/app/views/page.tpl
View file

@ -11,8 +11,8 @@
<meta name="theme-color" content="#1C1D5B" />
<link rel="shortcut icon" href="<?php $this->linkFile('img/favicon.ico');?>" />
<link rel="stylesheet" href="<?php echo BASE_URI; ?>app/assets/js/leaflet.css" />
<script src="<?php echo BASE_URI; ?>app/assets/js/leaflet.js"></script>
<!--<link rel="stylesheet" href="<?php echo BASE_URI; ?>app/assets/js/leaflet.css" />
<script src="<?php echo BASE_URI; ?>app/assets/js/leaflet.js"></script>-->
<script src="<?php echo BASE_URI; ?>app/assets/js/favico.js"></script>
<!-- OTR -->

2
sources/app/widgets/Blog/blog.tpl
View file

@ -103,7 +103,7 @@
<ul class="middle divided spaced">
{if="isset($attachements.links)"}
{loop="$attachements.links"}
{if="substr($value.href, 0, 5) != 'xmpp:'"}
{if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
<li>
<span class="icon">
<img src="http://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/>

8
sources/app/widgets/Group/Group.php
View file

@ -196,10 +196,6 @@ class Group extends WidgetBase
$view->assign('node', $node);
$html .= $view->draw('_group_publish', true);
$header = $this->prepareHeader($server, $node);
Header::fill($header);
RPC::call('MovimTpl.fill', '#group_widget.'.stringToUri($server.'_'.$node), $html);
RPC::call('Group.enableVideos');
}
@ -282,14 +278,14 @@ class Group extends WidgetBase
->request();
}
function ajaxGetSubscriptions($server, $node)
function ajaxGetSubscriptions($server, $node, $notify = true)
{
if(!$this->validateServerNode($server, $node)) return;
$r = new GetSubscriptions;
$r->setTo($server)
->setNode($node)
->setSync()
->setNotify($notify)
->request();
}

2
sources/app/widgets/Group/_group_header.tpl
View file

@ -54,7 +54,7 @@
<li onclick="Group_ajaxGetConfig('{$item->server}', '{$item->node}')">
<span>{$c->__('group.configuration')}</span>
</li>
<li onclick="Group_ajaxGetSubscriptions('{$item->server}', '{$item->node}')">
<li onclick="Group_ajaxGetSubscriptions('{$item->server}', '{$item->node}', true)">
<span>{$c->__('group.subscriptions')}</span>
</li>
<li onclick="Group_ajaxDelete('{$item->server}', '{$item->node}')">

6
sources/app/widgets/Group/_group_posts.tpl
View file

@ -20,11 +20,13 @@
<span class="icon bubble color {$value->node|stringToColor}">{$value->node|firstLetterCapitalize}</span>
{/if}
<h2>
<a href="{$c->route('news', $value->nodeid)}">
{if="$value->title != null"}
{$value->title}
{else}
{$c->__('post.default_title')}
{/if}
</a>
</h2>
<p>
{if="$value->getContact()->getTrueName() != ''"}
@ -47,7 +49,7 @@
<ul class="thin">
{if="isset($attachements.links)"}
{loop="$attachements.links"}
{if="substr($value.href, 0, 5) != 'xmpp:'"}
{if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
<li>
<span class="icon small"><img src="http://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/></span>
<a href="{$value.href}" class="alternate" target="_blank">
@ -110,7 +112,9 @@
{/if}
<span class="info">{$value->published|strtotime|prepareDate}</span>
<span>
<a href="{$c->route('contact', $value->getContact()->jid)}">
{$value->getContact()->getTrueName()}
</a>
</span>
<p class="all">
{$value->content}

2
sources/app/widgets/Groups/groups.js
View file

@ -10,7 +10,7 @@ var Groups = {
Group_ajaxGetItems(this.dataset.server, this.dataset.node);
Group_ajaxGetMetadata(this.dataset.server, this.dataset.node);
Group_ajaxGetAffiliations(this.dataset.server, this.dataset.node);
//Group_ajaxGetSubscriptions(this.dataset.server, this.dataset.node);
Group_ajaxGetSubscriptions(this.dataset.server, this.dataset.node, false);
Groups.reset(items);
movim_add_class(this, 'active');
}

2
sources/app/widgets/Login/login.js
View file

@ -23,7 +23,7 @@ var Login = {
Login.rememberSession(localStorage.username);
// A fallback security
setTimeout("MovimWebsocket.unregister()", 7000);
setTimeout("MovimWebsocket.unregister()", 20000);
}
},

3
sources/app/widgets/Notifs/notifs.css
View file

@ -8,7 +8,7 @@
margin-right: 0.5em;
border-radius: 1em;
}
/*
#notifs_widget.groupshown li:not(:first-child){
display: none;
}
@ -24,3 +24,4 @@
content: "\f2c0";
display: inline-block;
}
*/

2
sources/app/widgets/Post/_post.tpl
View file

@ -68,7 +68,7 @@
<ul class="middle divided spaced">
{if="isset($attachements.links)"}
{loop="$attachements.links"}
{if="substr($value.href, 0, 5) != 'xmpp:'"}
{if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
<li>
<span class="icon">
<img src="http://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/>

1
sources/themes/material/css/list.css
View file

@ -13,6 +13,7 @@ ul li {
}
ul > a {
max-width: 100%;
display: block;
}

11
sources/themes/material/css/style.css
View file

@ -152,12 +152,14 @@ body > nav.active {
width: 45rem;
}
@media screen and (min-width: 1024px) {
body > div.dialog:not(:empty) ~ main,
body > div.dialog:not(:empty) ~ nav,
body > nav.active + main {
opacity: 0.5;
pointer-events: none;
}
}
body > nav li { /* Little hack for the navbar */
overflow: hidden;
@ -227,6 +229,7 @@ main {
background-color: white;
-webkit-transition: opacity 0.3s ease-in-out;
transition: opacity 0.3s ease-in-out;
transform: translateZ(0);
}
nav + main {
@ -708,6 +711,7 @@ main section > div:first-child:nth-last-child(2) ~ div .actions.fixed > div:last
width: 40rem;
pointer-events: none;
transition: opacity 0.2s ease, bottom 0.4s ease;
transform: translateX(0);
}
.snackbar p,
@ -877,6 +881,7 @@ dl dd {
.spinner:before,
.spinner:after {
transition: top .3s ease-in-out;
transform: translateX(0);
content: '';
position: absolute;
left: calc(50% - 3.5rem);
@ -890,8 +895,8 @@ dl dd {
}
.spinner.on:before {
animation: spinner 1s linear infinite;
-webkit-animation: spinner 1s linear infinite;
animation: 1s spinner infinite linear;
-webkit-animation: 1s spinner 1s infinite linear;
}
.spinner:before {
@ -916,10 +921,12 @@ dl dd {
}
@keyframes spinner {
from { transform: rotate(0deg); }
to {transform: rotate(360deg);}
}
@-webkit-keyframes spinner {
from { transform: rotate(0deg); }
to {-webkit-transform: rotate(360deg);}
}