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

Buttons are healthier than <a>, in particular here to avoid ugly js in the middle of the template

Browse source
This commit is contained in:
Alexandre Aubin 2019-10-16 22:45:44 +02:00
parent e054675230
commit e5ce0ac19d
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/js/yunohost/controllers/tools.js
View file

@ -122,7 +122,7 @@
var params = "?path=" + c.params["splat"][0]; var params = "?path=" + c.params["splat"][0];
var number = (c.params["number"])?c.params["number"]:50; var number = (c.params["number"])?c.params["number"]:50;
params += "&number=" + number; params += "&number=" + number;
c.api('GET', "/logs/display" + params, {}, function(log) { c.api('GET', "/logs/display" + params, {}, function(log) {
if ('metadata' in log) { if ('metadata' in log) {
if (!'env' in log.metadata && 'args' in log.metadata) { if (!'env' in log.metadata && 'args' in log.metadata) {
@ -133,10 +133,19 @@
"log": log, "log": log,
"next_number": log.logs.length == number ? number * 10:false, "next_number": log.logs.length == number ? number * 10:false,
"locale": y18n.locale "locale": y18n.locale
}, function() {
// Configure behavior for the button to share log on Yunohost (it calls display --share)
$("#share-with-yunopaste").on("click", function() {
c.api('GET', '/logs/display?path='+$(this).data('log-id')+'&share', {},
function(data) {
$('div.loader').remove();
window.open(data.url, '_blank');
});
});
}); });
}); });
}); });
// Download SSL Certificate Authority // Download SSL Certificate Authority
app.get('#/tools/ca', function (c) { app.get('#/tools/ca', function (c) {

4
src/views/tools/tools_log.ms
View file

@ -10,9 +10,9 @@
</div> </div>
<div class="actions-group"> <div class="actions-group">
<a href="javascript:void(null);" onclick="c.api('GET', '/logs/display?path={{#if log.name}}{{ log.name }}{{else}}{{ log.log_path }}{{/if}}&share', {}, function(data) { $('div.loader').remove(); window.open(data.url, '_blank'); });" class="btn btn-success"> <button id="share-with-yunopaste" class="btn btn-success" data-log-id="{{#if log.name}}{{ log.name }}{{else}}{{ log.log_path }}{{/if}}">
<span class="fa-cloud-upload"></span> {{t 'logs_share_with_yunopaste'}} <span class="fa-cloud-upload"></span> {{t 'logs_share_with_yunopaste'}}
</a> </button>
</div> </div>
<div class="separator"></div> <div class="separator"></div>