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

Use buttons instead of clumsy links

Browse source
This commit is contained in:
Alexandre Aubin 2019-11-06 21:50:08 +01:00
parent 35ba9efce1
commit 3e29dbb9c3
2 changed files with 76 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/js/yunohost/controllers/diagnosis.js
View file

@ -8,8 +8,9 @@
// ********* // *********
app.get('#/diagnosis', function (c) { app.get('#/diagnosis', function (c) {
c.api('GET', '/diagnosis/show?full', {}, function(data) {
c.api('/diagnosis/show?full', function(data) { // Prepare data to be displayed ...
for (var i = 0 ; i < data.reports.length ; i++) for (var i = 0 ; i < data.reports.length ; i++)
{ {
// Convert timestamp to datetime // Convert timestamp to datetime
@ -59,37 +60,34 @@
}; };
data.reports[i].noIssues = data.reports[i].warnings + data.reports[i].errors ? false : true; data.reports[i].noIssues = data.reports[i].warnings + data.reports[i].errors ? false : true;
}; };
// Render and display the view
c.view('diagnosis/diagnosis_show', data, function() { c.view('diagnosis/diagnosis_show', data, function() {
$(".rerun-diagnosis").click(function() {
var category = $(this).attr("category"); // Configure 'rerun diagnosis' button behavior
c.api('/diagnosis/run?force', function(data) { $("button[data-action='rerun-diagnosis']").click(function() {
c.force_redirect("#/diagnosis"); var category = $(this).data("category");
}, 'POST', {"categories": [category]}); c.api('POST', '/diagnosis/run?force', {"categories": [category]}, function(data) {
c.refresh();
}); });
}); });
}, 'GET');
// Configure 'ignore' / 'unignore' buttons behavior
$("button[data-action='ignore']").click(function() {
var filter_args = $(this).data("filter-args");
c.api('POST', '/diagnosis/ignore', {'add_filter': filter_args.split(',') }, function(data) {
c.refresh();
})
}); });
diagnosis_add_ignore_filter = function(filter_args) { $("button[data-action='unignore']").click(function() {
c.api('/diagnosis/ignore', function(data) { var filter_args = $(this).data("filter-args");
store.clear('slide'); c.api('POST', '/diagnosis/ignore', {'remove_filter': filter_args.split(',') }, function(data) {
c.force_redirect("#/diagnosis"); c.refresh();
}, })
'POST', });
{'add_filter': filter_args.split(',') } });
); });
}; });
diagnosis_remove_ignore_filter = function(filter_args) {
c.api('/diagnosis/ignore', function(data) {
store.clear('slide');
c.force_redirect("#/diagnosis");
},
'POST',
{'remove_filter': filter_args.split(',') }
);
};
})(); })();

6
src/views/diagnosis/diagnosis_show.ms
View file

@ -21,7 +21,7 @@
{{#if errors}}<span class="label label-danger">{{t 'errors' errors }}</span>{{/if}} {{#if errors}}<span class="label label-danger">{{t 'errors' errors }}</span>{{/if}}
{{#if warnings}}<span class="label label-warning">{{t 'warnings' warnings }}</span>{{/if}} {{#if warnings}}<span class="label label-warning">{{t 'warnings' warnings }}</span>{{/if}}
{{#if ignored}}<span class="label label-default">{{t 'ignored' ignored }}</span>{{/if}} {{#if ignored}}<span class="label label-default">{{t 'ignored' ignored }}</span>{{/if}}
<a role="button" category="{{ id }}" class="btn btn-sm btn-info pull-right rerun-diagnosis"><span class="fa-fw fa-refresh"></span> {{t 'rerun_diagnosis'}}</a> <button class="btn btn-sm btn-info pull-right" data-action="rerun-diagnosis" data-category="{{ id }}"><span class="fa-fw fa-refresh"></span> {{t 'rerun_diagnosis'}}</button>
</div> </div>
<div class="panel-body collapse {{#if errors}}in{{/if}}" id="category-{{id}}"> <div class="panel-body collapse {{#if errors}}in{{/if}}" id="category-{{id}}">
<ul class="list-group" style="margin-bottom: 0px"> <ul class="list-group" style="margin-bottom: 0px">
@ -33,10 +33,10 @@
{{/if}} {{/if}}
{{summary}} {{summary}}
{{#if ignored}} {{#if ignored}}
<a href="javascript:void(null);" onclick="diagnosis_remove_ignore_filter('{{ filter_args }}');" role="button" class="btn btn-sm btn-default pull-right"><span class="fa-fw fa-bell"></span> {{t 'unignore'}}</a> <button class="btn btn-sm btn-default pull-right" data-action="unignore" data-filter-args="{{ filter_args }}"><span class="fa-fw fa-bell"></span> {{t 'unignore'}}</button>
{{else}} {{else}}
{{#if issue}} {{#if issue}}
<a href="javascript:void(null);" onclick="diagnosis_add_ignore_filter('{{ filter_args }}');" role="button" class="btn btn-sm btn-warning pull-right"><span class="fa-fw fa-bell-slash"></span> {{t 'ignore'}}</a> <button class="btn btn-sm btn-warning pull-right" data-action="ignore" data-filter-args="{{ filter_args }}"><span class="fa-fw fa-bell-slash"></span> {{t 'ignore'}}</button>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if details}} {{#if details}}