From 9cb5948b1aaa0e85254fd240788d275758933de9 Mon Sep 17 00:00:00 2001
From: opi <opi@zeropi.net>
Date: Thu, 8 Oct 2015 12:56:26 +0200
Subject: [PATCH] [enh] Cleanup backup views, add backup info.

---
 src/locales/en.json               |  2 +
 src/locales/fr.json               |  2 +
 src/views/backup/backup.ms        |  4 +-
 src/views/backup/backup_create.ms | 13 +++--
 src/views/backup/backup_info.ms   | 79 +++++++++++++++++++------------
 src/views/backup/backup_list.ms   |  6 +--
 6 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 48754d2f..bc574c5e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -245,6 +245,7 @@
     "user_mailbox_quota": "Mailbox quota",
     "mailbox_quota_description": "Mailbox quota must be a size with b/k/M/G/T suffix or 0 to disable the quota.",
 
+    "backup_content": "Backup content",
     "local_archives": "Local archives",
     "storages_new": "New remote storage",
     "storages_no": "No storages.",
@@ -259,6 +260,7 @@
     "backup_create": "Create a backup",
     "restore": "Restore",
     "download": "Download",
+    "created_at": "Created at",
     "hook_data_home": "User data",
     "hook_data_home_desc": "User data located in /home/USER",
     "hook_data_mail": "Mail",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 8cecee7a..7bf83a91 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -226,6 +226,7 @@
     "user_new_mail": "nouvelle_adresse@domaine.org",
     "user_new_forward": "nouveau_transfert@domainedistant.org",
 
+    "backup_content": "Contenu de la sauvegarde",
     "local_archives": "Archives locales",
     "storages_new": "Nouveau stockage distant",
     "storages_no": "Aucun stockage.",
@@ -240,6 +241,7 @@
     "backup_create": "Créer une sauvegarde",
     "restore": "Restaurer",
     "download": "Télécharger",
+    "created_at": "Crée le",
     "hook_data_home": "Données utilisateurs",
     "hook_data_home_desc": "Les données des utilisateurs situées dans /home/USER",
     "hook_data_mail": "Mail",
diff --git a/src/views/backup/backup.ms b/src/views/backup/backup.ms
index d213fe28..c4935d37 100644
--- a/src/views/backup/backup.ms
+++ b/src/views/backup/backup.ms
@@ -1,8 +1,6 @@
-
-
 <div class="btn-breadcrumb">
     <a href="#/"><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
-    <a href="#/backup" class="btn btn-default">{{t 'backup'}}</a>
+    <a href="#/backup">{{t 'backup'}}</a>
 </div>
 
 <div class="actions-group">
diff --git a/src/views/backup/backup_create.ms b/src/views/backup/backup_create.ms
index c6ce0d52..5c8a66c0 100644
--- a/src/views/backup/backup_create.ms
+++ b/src/views/backup/backup_create.ms
@@ -1,9 +1,8 @@
-
 <div class="btn-breadcrumb">
     <a href="#/"><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
-    <a href="#/backup" class="btn btn-default">{{t 'backup'}}</a>
-    <a href="#/backup/{{storage.id}}" class="btn btn-default">{{storage.name}}</a>
-    <a href="#/backup/{{storage.id}}/create" class="btn btn-default">{{t 'backup_create'}}</a>
+    <a href="#/backup">{{t 'backup'}}</a>
+    <a href="#/backup/{{storage.id}}">{{storage.name}}</a>
+    <a href="#/backup/{{storage.id}}/create">{{t 'backup_create'}}</a>
 </div>
 
 <div class="separator"></div>
@@ -12,20 +11,20 @@
     <div class="list-group">
         {{#each hooks}}
             <label for="{{@key}}" class="list-group-item">
-                <span class="pull-right"><input type="checkbox" id="{{@key}}" name="hooks" value="{{value}}" checked></span>
+                <input type="checkbox" id="{{@key}}" name="hooks" value="{{value}}" checked class="pull-right">
                 <h2 class="list-group-item-heading">{{name}}</h2>
                 <p class="list-group-item-text">{{description}}</p>
             </label>
         {{/each}}
         {{#each apps}}
             <label for="{{id}}" class="list-group-item">
-                <span class="pull-right"><input type="checkbox" id="{{id}}" name="apps" value="{{id}}" checked></span>
+                <input type="checkbox" id="{{id}}" name="apps" value="{{id}}" checked class="pull-right">
                 <h2 class="list-group-item-heading">{{name}} <small>{{id}}</small></h2>
             </label>
         {{/each}}
     </div>
     <div class="separator"></div>
-    
+
     <!--<div class="panel panel-default">
         <div class="panel-heading">
             <h2 class="panel-title"><span class="fa-fw fa-lock"></span> {{t 'backup_optional_encryption'}}</h2>
diff --git a/src/views/backup/backup_info.ms b/src/views/backup/backup_info.ms
index 711f512d..d362a0a1 100644
--- a/src/views/backup/backup_info.ms
+++ b/src/views/backup/backup_info.ms
@@ -1,41 +1,62 @@
-
-
 <div class="btn-breadcrumb">
     <a href="#/"><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
-    <a href="#/backup" class="btn btn-default">{{t 'backup'}}</a>
-    <a href="#/backup/{{storage.id}}" class="btn btn-default">{{storage.name}}</a>
-    <a href="#/backup/{{storage.id}}/{{name}}" class="btn btn-default">{{name}}</a>
+    <a href="#/backup">{{t 'backup'}}</a>
+    <a href="#/backup/{{storage.id}}">{{storage.name}}</a>
+    <a href="#/backup/{{storage.id}}/{{name}}">{{name}}</a>
 </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>
+    </div>
+    <div class="panel-body">
+        <dl class="dl-horizontal">
+            <dt>{{t 'id'}}</dt><dd>{{ name }}</dd>
+            <dt>{{t 'created_at'}}</dt><dd>{{ created_at }}</dd>
+            <dt>{{t 'size'}}</dt><dd>{{ humanSize size}}</dd>
+            <dt>{{t 'path'}}</dt><dd>{{ path }}</dd>
+        </dl>
+    </div>
+</div>
+
+
 <form action="#/backup/{{storage.id}}/{{name}}/restore" method="POST" class="form-horizontal">
-    <div class="list-group">
-        {{#each hooks}}
-            <label for="{{@key}}" class="list-group-item">
-                <span class="pull-right"><input type="checkbox" id="{{@key}}" name="hooks" value="{{value}}" checked></span>
-                <h2 class="list-group-item-heading">{{name}}</h2>
-                <p class="list-group-item-text">{{description}}</p>
-            </label>
-        {{/each}}
-        {{#each apps}}
-            <label for="{{id}}" class="list-group-item">
-                <span class="pull-right"><input type="checkbox" id="{{id}}" name="apps" value="{{id}}" checked></span>
-                <h2 class="list-group-item-heading">{{name}} <small>{{id}}</small></h2>
-            </label>
-        {{/each}}
-        {{^items}}
-            <div class="alert alert-warning">
-                <span class="fa-exclamation-triangle"></span>
-                {{t 'archive_empty'}}
-            </div>
-        {{/items}}
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h2 class="panel-title"><span class="fa-fw fa-archive"></span>{{t 'backup_content'}}</h2>
     </div>
     {{#if items}}
-        <span class="pull-right">
-            <input type="submit" class="btn btn-danger slide back" value="{{t 'restore'}}" />
-        </span>
+    <div class="list-group">
+        {{#each hooks}}
+        <label for="{{@key}}" class="list-group-item">
+            <input type="checkbox" id="{{@key}}" name="hooks" value="{{value}}" checked class="pull-right">
+            <h2 class="list-group-item-heading">{{name}}</h2>
+            <p class="list-group-item-text">{{description}}</p>
+        </label>
+        {{/each}}
+        {{#each apps}}
+        <label for="{{id}}" class="list-group-item">
+            <input type="checkbox" id="{{id}}" name="apps" value="{{id}}" checked class="pull-right">
+            <h2 class="list-group-item-heading">{{name}} <small>{{id}}</small></h2>
+        </label>
+        {{/each}}
+        <div class="list-group-item clearfix">
+            <span class="pull-right ">
+                <input type="submit" class="btn btn-success slide back" value="{{t 'restore'}}" />
+            </span>
+        </div>
+    </div>
+    {{else}}
+    <div class="panel-body">
+        <div class="alert alert-warning">
+            <span class="fa-exclamation-triangle"></span>
+            {{t 'archive_empty'}}
+        </div>
+    </div>
     {{/if}}
+</div>
 </form>
 
 <div class="separator"></div>
@@ -57,7 +78,7 @@
         <div class="container">
             <p>{{t 'backup_archive_delete'}}</p>
             <a href="#/backup/{{storage.id}}/{{name}}/delete" class="btn btn-danger slide">
-                <span class="fa-trash"></span> {{t 'delete'}}
+                <span class="fa-trash-o"></span> {{t 'delete'}}
             </a>
         </div>
         {{#if other_storages}}
diff --git a/src/views/backup/backup_list.ms b/src/views/backup/backup_list.ms
index 0fe32215..e8777938 100644
--- a/src/views/backup/backup_list.ms
+++ b/src/views/backup/backup_list.ms
@@ -1,9 +1,7 @@
-
-
 <div class="btn-breadcrumb">
     <a href="#/"><i class="fa-home"></i><span class="sr-only">{{t 'home'}}</span></a>
-    <a href="#/backup" class="btn btn-default">{{t 'backup'}}</a>
-    <a href="#/backup/{{storage.id}}" class="btn btn-default">{{storage.name}}</a>
+    <a href="#/backup">{{t 'backup'}}</a>
+    <a href="#/backup/{{storage.id}}">{{storage.name}}</a>
 </div>
 
 <div class="actions-group">