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

[enh] Display correctly backup dates

Browse source
This commit is contained in:
ljf 2018-12-09 20:43:48 +01:00
parent 28a0eaeb04
commit a71b6d4a88
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -136,6 +136,7 @@
data.name = c.params['archive']; data.name = c.params['archive'];
data.system_parts = c.groupHooks(Object.keys(data['system'])); data.system_parts = c.groupHooks(Object.keys(data['system']));
data.items = (data['hooks']!={} || data['apps']!=[]); data.items = (data['hooks']!={} || data['apps']!=[]);
data.locale = y18n.locale
c.view('backup/backup_info', data); c.view('backup/backup_info', data);
}); });
}); });
@ -153,6 +154,7 @@
data.archives2.unshift(info) data.archives2.unshift(info)
}); });
data.archives = data.archives2; data.archives = data.archives2;
data.locale = y18n.locale
c.view('backup/backup_list', data); c.view('backup/backup_list', data);
}); });
}); });

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

@ -14,7 +14,7 @@
<div class="panel-body"> <div class="panel-body">
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>{{t 'id'}}</dt><dd>{{ name }}</dd> <dt>{{t 'id'}}</dt><dd>{{ name }}</dd>
<dt>{{t 'created_at'}}</dt><dd>{{ created_at }}</dd> <dt>{{t 'created_at'}}</dt><dd>{{formatTime created_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}</dd>
<dt>{{t 'size'}}</dt><dd>{{ humanSize size}}</dd> <dt>{{t 'size'}}</dt><dd>{{ humanSize size}}</dd>
<dt>{{t 'path'}}</dt><dd>{{ path }}</dd> <dt>{{t 'path'}}</dt><dd>{{ path }}</dd>
</dl> </dl>

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

@ -12,11 +12,12 @@
<div class="separator"></div> <div class="separator"></div>
{{#intl locales=locale}}
<div class="list-group"> <div class="list-group">
{{#each archives}} {{#each archives}}
<a href="#/backup/{{../storage.id}}/{{name}}" class="list-group-item slide clearfix"> <a href="#/backup/{{../storage.id}}/{{name}}" class="list-group-item slide clearfix" title='{{formatTime created_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}'>
<span class="pull-right fa-chevron-right"></span> <span class="pull-right fa-chevron-right"></span>
<h2 class="list-group-item-heading">{{created_at}} <small>{{name}} ({{humanSize size}})</small></h2> <h2 class="list-group-item-heading">{{formatRelative created_at}} <small>{{name}} ({{humanSize size}})</small></h2>
<p class="list-group-item-text">{{path}}</p> <p class="list-group-item-text">{{path}}</p>
</a> </a>
{{/each}} {{/each}}
@ -28,6 +29,7 @@
{{/archives}} {{/archives}}
</div> </div>
{{/intl}}
<!--<div class="panel panel-default"> <!--<div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">