YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'unstable' into stretch-unstable

Browse source
This commit is contained in:
Alexandre Aubin 2018-06-16 00:15:45 +02:00
commit afe8c6735a
13 changed files with 46 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -6,7 +6,7 @@ This client is a part of the YunoHost projet, and can not be installed directly.
## Bug tracker
Please report issues on the [YunoHost Bugtracker](https://dev.yunohost.org/projects/yunohost/issues), no registration needed.
Please report issues on the [YunoHost Bugtracker](https://github.com/YunoHost/issues).
## Translate

16
debian/changelog vendored
View file

@ -1,3 +1,9 @@
yunohost-admin (3.0.0~beta1.2) testing; urgency=low
Merging with jessie's branches
-- Alexandre Aubin <alex.aubin@mailoo.org> Fri, 15 Jun 2018 23:23:00 +0000
yunohost-admin (3.0.0~beta1.1) testing; urgency=low
Merging with jessie's branches
@ -10,6 +16,16 @@ yunohost-admin (3.0.0~beta1) testing; urgency=low
-- Alexandre Aubin <alex.aubin@mailoo.org> Thu, 03 May 2018 03:04:45 +0000
yunohost-admin (2.7.13.2) testing; urgency=low
* [fix] Display active/inactive in service page instead of running/exited/dead
* [fix] Remove "experimental" warning for the backup
* [fix] Fix a bug in backup restore
Contributors : Bram and Aleks
-- Alexandre Aubin <alex.aubin@mailoo.org> Fri, 15 Jun 2018 20:15:00 +0000
yunohost-admin (2.7.13.1) testing; urgency=low
* [i18n] Improve French, Portuguese, Arabic, Occitan translations

6
src/js/yunohost/controllers/backup.js
View file

@ -62,7 +62,7 @@
app.post('#/backup/:storage', function (c) {
var params = c.ungroupHooks(c.params['hooks'],c.params['apps']);
var params = c.ungroupHooks(c.params['system_parts'],c.params['apps']);
c.api('/backup', function() {
store.clear('slide');
c.redirect('#/backup/'+ c.params['storage']);
@ -75,7 +75,7 @@
y18n.t('backup'),
y18n.t('confirm_restore', [c.params['archive']]),
$.proxy(function(c){
var params = c.ungroupHooks(c.params['hooks'],c.params['apps']);
var params = c.ungroupHooks(c.params['system_parts'],c.params['apps']);
params['force'] = '';
c.api('/backup/restore/'+c.params['archive'], function(data) {
store.clear('slide');
@ -134,7 +134,7 @@
};
data.other_storages = [];
data.name = c.params['archive'];
data.hooks = c.groupHooks(Object.keys(data['system']));
data.system_parts = c.groupHooks(Object.keys(data['system']));
data.items = (data['hooks']!={} || data['apps']!=[]);
c.view('backup/backup_info', data);
});

6
src/js/yunohost/controllers/services.js
View file

@ -18,7 +18,7 @@
v.name = k;
// Handlebars want booleans
v.is_loaded = (v.loaded=='enabled') ? true : false;
v.is_running = (v.status=='running') ? true : false;
v.is_running = (v.active=='active') ? true : false;
// Translate status and loaded state
v.status = y18n.t(v.status);
v.loaded = y18n.t(v.loaded);
@ -48,9 +48,9 @@
data2.service.name = c.params['service'];
// Handlebars want booleans
data2.service.is_loaded = (data.loaded=='enabled') ? true : false;
data2.service.is_running = (data.status=='running') ? true : false;
data2.service.is_running = (data.active=='active') ? true : false;
// Translate status and loaded state
data2.service.status = y18n.t(data.status);
data2.service.active = y18n.t(data.active);
data2.service.loaded = y18n.t(data.loaded);
store.clear('slide');
c.view('service/service_info', data2);

25
src/js/yunohost/helpers.js
View file

@ -359,32 +359,31 @@
return data;
},
ungroupHooks: function(hooks,apps) {
ungroupHooks: function(system_parts,apps) {
var data = {};
data['apps'] = apps || [];
data['hooks'] = hooks || [];
data['system'] = system_parts || [];
if (data['hooks'].constructor !== Array) {
data['hooks'] = [data['hooks']];
if (data['system'].constructor !== Array) {
data['system'] = [data['system']];
}
if (data['apps'].constructor !== Array) {
data['apps'] = [data['apps']];
}
if (data['hooks'].length == 0) {
data['ignore_hooks'] = '';
}
if (data['apps'].length == 0) {
data['ignore_apps'] = '';
}
// Some hook value contains multiple hooks separated by commas
var split_hooks = [];
$.each(data['hooks'], function(i, hook) {
$.each(data['system'], function(i, hook) {
split_hooks = split_hooks.concat(hook.split(','));
});
data['hooks'] = split_hooks;
data['system'] = split_hooks;
if (data['system'].length == 0) {
delete data['system'];
}
if (data['apps'].length == 0) {
delete data['apps'];
}
return data;
},

4
src/locales/en.json
View file

@ -1,5 +1,6 @@
{
"action": "Action",
"active": "Active",
"add": "Add",
"remove": "Remove",
"administration_password": "Administration password",
@ -47,7 +48,6 @@
"backup_content": "Backup content",
"backup_create": "Create a backup",
"backup_encryption_warning": "Don't forget this password, you'll need it if you want restore the archive",
"backup_experimental_warning": "Be aware that the backup feature is still experimental, and may not be fully reliable.",
"backup_new": "New backup",
"backup_optional_encryption": "Optional encryption",
"backup_optional_password": "Optional password",
@ -170,7 +170,7 @@
"installed_apps": "Installed apps",
"installing": "Installing",
"interface": "Interface",
"internal_exception": "<strong>Yunohost encountered an internal error :/</strong><br><em>Really sorry about that.<br>You should look for help on <a href=\"https://forum.yunohost.org/\">the forum</a> or <a href=\"https://chat.yunohost.org/\">the chat</a> to fix the situation, or report the bug on <a href=\"https://dev.yunohost.org/projects/yunohost/issues\">the bugtracker</a>.</em><br>The following information might be useful for the person helping you :<h3>Action</h3><pre>%s%s</pre><h3>Traceback</h3><pre>%s</pre>",
"internal_exception": "<strong>Yunohost encountered an internal error :/</strong><br><em>Really sorry about that.<br>You should look for help on <a href=\"https://forum.yunohost.org/\">the forum</a> or <a href=\"https://chat.yunohost.org/\">the chat</a> to fix the situation, or report the bug on <a href=\"https://github.com/YunoHost/issues\">the bugtracker</a>.</em><br>The following information might be useful for the person helping you :<h3>Action</h3><pre>%s%s</pre><h3>Traceback</h3><pre>%s</pre>",
"io": "I/O",
"ipv4": "IPv4",
"ipv6": "IPv6",

2
src/package.json
View file

@ -15,7 +15,7 @@
"author": "Yunohost",
"license": "AGPL-3.0",
"bugs": {
"url": "https://dev.yunohost.org/projects/yunohost"
"url": "https://github.com/YunoHost/issues"
},
"homepage": "https://github.com/YunoHost/yunohost-admin",
"devDependencies": {

4
src/views/backup/backup.ms
View file

@ -11,10 +11,6 @@
<div class="separator"></div>
<div class="alert alert-warning">{{t 'backup_experimental_warning'}}</div>
<div class="separator"></div>
<div class="list-group">
{{#each storages}}
<a href="#/backup/{{id}}" class="list-group-item slide clearfix">

6
src/views/backup/backup_create.ms
View file

@ -7,10 +7,6 @@
<div class="separator"></div>
<div class="alert alert-warning">{{t 'backup_experimental_warning'}}</div>
<div class="separator"></div>
<form action="#/backup/{{storage.id}}" method="POST" class="form-horizontal">
<div class="panel panel-default">
<div class="panel-heading">
@ -19,7 +15,7 @@
<div class="list-group">
{{#each hooks}}
<div class="list-group-item">
<input type="checkbox" id="{{@key}}" name="hooks" value="{{value}}" checked class="nice-checkbox">
<input type="checkbox" id="{{@key}}" name="system_parts" value="{{value}}" checked class="nice-checkbox">
<label for="{{@key}}" class="pull-right"><span class="sr-only">{{t 'check'}}</span></label>
<h2 class="list-group-item-heading">{{name}}</h2>
<p class="list-group-item-text">{{description}}</p>

14
src/views/backup/backup_info.ms
View file

@ -7,10 +7,6 @@
<div class="separator"></div>
<div class="alert alert-warning">{{t 'backup_experimental_warning'}}</div>
<div class="separator"></div>
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title"><span class="fa-fw fa-info-circle"></span> {{t 'infos'}}</h2>
@ -33,9 +29,9 @@
</div>
{{#if items}}
<div class="list-group">
{{#each hooks}}
{{#each system_parts}}
<div class="list-group-item">
<input type="checkbox" id="{{@key}}" name="hooks" value="{{value}}" checked class="nice-checkbox">
<input type="checkbox" id="{{@key}}" name="system_parts" value="{{value}}" checked class="nice-checkbox">
<label for="{{@key}}" class="pull-right"><span class="sr-only">{{t 'check'}}</span></label>
<h2 class="list-group-item-heading">{{name}}</h2>
<p class="list-group-item-text">{{description}}</p>
@ -43,9 +39,9 @@
{{/each}}
{{#each apps}}
<div class="list-group-item">
<input type="checkbox" id="{{id}}" name="apps" value="{{id}}" checked class="nice-checkbox">
<label for="{{id}}" class="pull-right"><span class="sr-only">{{t 'check'}}</span></label>
<h2 class="list-group-item-heading">{{name}} <small>{{id}}</small></h2>
<input type="checkbox" id="{{@key}}" name="apps" value="{{@key}}" checked class="nice-checkbox">
<label for="{{@key}}" class="pull-right"><span class="sr-only">{{t 'check'}}</span></label>
<h2 class="list-group-item-heading">{{name}} <small>{{@key}}</small></h2>
</div>
{{/each}}
<div class="list-group-item clearfix">

4
src/views/backup/backup_list.ms
View file

@ -12,10 +12,6 @@
<div class="separator"></div>
<div class="alert alert-warning">{{t 'backup_experimental_warning'}}</div>
<div class="separator"></div>
<div class="list-group">
{{#each archives}}
<a href="#/backup/{{../storage.id}}/{{name}}" class="list-group-item slide clearfix">

2
src/views/service/service_info.ms
View file

@ -39,7 +39,7 @@
<br>
{{t 'service_status'}}
<span class="text-{{#is_running}}success{{/is_running}}{{^is_running}}danger{{/is_running}}">
{{status}}
{{active}}
</span>
<br>
{{t 'started_at'}}

2
src/views/service/service_list.ms
View file

@ -13,7 +13,7 @@
<div class="list-group-item-text">
{{t 'service_status'}}
<span class="text-{{#is_running}}success{{/is_running}}{{^is_running}}danger{{/is_running}}">
{{status}}
{{active}}
</span>
<br>
{{t 'started_at'}}