From 9a6529d6f79a29052589794da33fa4eca549c1ee Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 6 Sep 2020 21:23:17 +0200
Subject: [PATCH] Small rework of backup view + add backup download button

---
 src/js/yunohost/controllers/backup.js | 14 ++++++-----
 src/views/backup/backup_info.ms       | 34 ++++++++-------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/js/yunohost/controllers/backup.js b/src/js/yunohost/controllers/backup.js
index 42a5d455..0d2eab44 100644
--- a/src/js/yunohost/controllers/backup.js
+++ b/src/js/yunohost/controllers/backup.js
@@ -102,19 +102,21 @@
             data.locale = y18n.locale;
             c.view('backup/backup_info', data, function() {
 
-                // Configure buttons "select all" and "select none"
-
-                // Remove active style from buttons
-                $(".select_all-none input").click(function(){ $(this).toggleClass("active"); });
                 // Select all checkbox in this panel
-                $(".select_all").click(function(){
+                $('button[data-action="select_all"]').on('click', function() {
                   $(this).parents(".panel").children(".list-group").find("input").prop("checked", true);
                 });
+
                 // Deselect all checkbox in this panel
-                $(".select_none").click(function(){
+                $('button[data-action="select_none"]').on('click', function() {
                   $(this).parents(".panel").children(".list-group").find("input").prop("checked", false);
                 });
 
+                $('button[data-action="download"]').on('click', function() {
+                    var archive = $(this).data('archive');
+                    window.open('https://' + store.get('url') +  '/backup/download/'+archive, '_blank');
+                });
+
                 // Delete button
                 $('button[data-action="delete"]').on('click', function() {
                     var storage = $(this).data('storage');
diff --git a/src/views/backup/backup_info.ms b/src/views/backup/backup_info.ms
index 117558a7..92b9dbaf 100644
--- a/src/views/backup/backup_info.ms
+++ b/src/views/backup/backup_info.ms
@@ -9,7 +9,13 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h2 class="panel-title"><span class="fa-fw fa-info-circle"></span> {{t 'infos'}}</h2>
+        <h2 class="panel-title" style="display: inline-block;"><span class="fa-fw fa-info-circle"></span> {{t 'infos'}}</h2>
+        <button class="btn btn-sm btn-success pull-right" data-action="download" data-storage="{{storage.id}}" data-archive="{{name}}">
+            <span class="fa-download"></span> {{t 'download'}}
+        </button>
+        <button class="btn btn-sm btn-danger slide pull-right" data-action="delete" data-storage="{{storage.id}}" data-archive="{{name}}">
+            <span class="fa-trash-o"></span> {{t 'delete'}}
+        </button>
     </div>
     <div class="panel-body">
         <dl class="dl-horizontal">
@@ -25,14 +31,12 @@
 <form action="#/backup/{{storage.id}}/{{name}}/restore" method="POST" class="form-horizontal">
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h2 class="panel-title">
+        <h2 class="panel-title" style="display: inline-block;">
           <span class="fa-fw fa-archive"></span>
           {{t 'backup_content'}}
-          <span class="select_all-none pull-right">
-            <input type="button" role="select_all" class="btn btn-default slide back select_all" value="{{t 'select_all'}}" />
-            <input type="button" role="select_none" class="btn btn-default slide back select_none" value="{{t 'select_none'}}" />
-          </span>
         </h2>
+        <button type="button" data-action="select_all" class="btn btn-sm btn-default pull-right">{{t 'select_all'}}</button>
+        <button type="button" data-action="select_none" class="btn btn-sm btn-default pull-right">{{t 'select_none'}}</button>
     </div>
     {{#if items}}
     <div class="list-group">
@@ -73,21 +77,3 @@
     {{/if}}
 </div>
 </form>
-
-<div class="separator"></div>
-
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <h2 class="panel-title">
-            <span class="fa-fw fa-wrench"></span> {{t 'operations'}}
-        </h2>
-    </div>
-    <div class="panel-body">
-        <div class="container">
-            <p>{{t 'backup_archive_delete'}}</p>
-            <button class="btn btn-danger slide" data-action="delete" data-storage="{{storage.id}}" data-archive="{{name}}">
-                <span class="fa-trash-o"></span> {{t 'delete'}}
-            </button>
-        </div>
-    </div>
-</div>