From a980930e6907cccd48092300e4e07010d4ad9cc6 Mon Sep 17 00:00:00 2001
From: Benjamin Gamard <b.gamard@sismics.com>
Date: Thu, 2 Nov 2017 23:36:38 +0100
Subject: [PATCH] Closes #137: upload files without drag & drop

---
 docs-web/src/main/webapp/src/locale/en.json        |  4 +++-
 docs-web/src/main/webapp/src/locale/fr.json        |  4 +++-
 .../webapp/src/partial/docs/document.default.html  | 11 +++++++++++
 .../webapp/src/partial/docs/document.edit.html     | 14 +++++++-------
 .../src/partial/docs/document.view.content.html    | 10 ++++++++++
 5 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/docs-web/src/main/webapp/src/locale/en.json b/docs-web/src/main/webapp/src/locale/en.json
index b3c356b8..fe6ecf93 100644
--- a/docs-web/src/main/webapp/src/locale/en.json
+++ b/docs-web/src/main/webapp/src/locale/en.json
@@ -74,7 +74,8 @@
         "upload_progress": "Uploading...",
         "upload_error": "Upload error",
         "upload_error_quota": "Quota reached",
-        "drop_zone": "Drag & drop files here to upload"
+        "drop_zone": "Drag & drop files here to upload",
+        "add_files": "Add files"
       },
       "permissions": {
         "permissions": "Permissions",
@@ -114,6 +115,7 @@
       "upload_error_quota": "Quota reached",
       "quick_upload": "Quick upload",
       "drop_zone": "Drag & drop files here to upload",
+      "add_files": "Add files",
       "add_new_document": "Add to new document",
       "latest_activity": "Latest activity",
       "footer_sismics": "Crafted with <span class=\"glyphicon glyphicon-heart\"></span> by <a href=\"https://www.sismics.com\" target=\"_blank\">Sismics</a>",
diff --git a/docs-web/src/main/webapp/src/locale/fr.json b/docs-web/src/main/webapp/src/locale/fr.json
index a07c9a90..c508ff80 100644
--- a/docs-web/src/main/webapp/src/locale/fr.json
+++ b/docs-web/src/main/webapp/src/locale/fr.json
@@ -74,7 +74,8 @@
         "upload_progress": "Envoi...",
         "upload_error": "Erreur d'envoi",
         "upload_error_quota": "Quota atteint",
-        "drop_zone": "Glisser & déposer des fichiers ici pour les envoyer"
+        "drop_zone": "Glisser & déposer des fichiers ici pour les envoyer",
+        "add_files": "Ajouter des fichiers"
       },
       "permissions": {
         "permissions": "Permissions",
@@ -114,6 +115,7 @@
       "upload_error_quota": "Quota atteint",
       "quick_upload": "Envoi rapide",
       "drop_zone": "Glisser & déposer des fichiers ici pour les envoyer",
+      "add_files": "Ajouter des fichiers",
       "add_new_document": "Ajouter à un nouveau document",
       "latest_activity": "Activité récente",
       "footer_sismics": "Conçu avec <span class=\"glyphicon glyphicon-heart\"></span> par <a href=\"https://www.sismics.com\" target=\"_blank\">Sismics</a>",
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.default.html b/docs-web/src/main/webapp/src/partial/docs/document.default.html
index 5b12dc1b..3d7be06f 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.default.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.default.html
@@ -10,6 +10,7 @@
           <a ng-click="openFile(file)">
             <img class="thumbnail-file" ng-src="../api/file/{{ file.id }}/data?size=thumb" tooltip="{{ file.mimetype }} | {{ file.size | filesize }}" tooltip-placement="top" />
           </a>
+          <div class="caption btn btn-link file-name" ng-click="openFile(file)" ng-if="file.name">{{ file.name }}</div>
           <div class="caption">
             <div class="pull-left">
               <input type="checkbox" ng-model="file.checked" />
@@ -35,6 +36,16 @@
         <span class="glyphicon glyphicon-move"></span>
         {{ 'document.default.drop_zone' | translate }}
       </p>
+
+      <div class="clearfix"></div>
+      <div class="text-center">
+        <button class="btn btn-primary" ng-file-select
+                 ng-file-change="fileDropped($files, $event)"
+                 input-file-multiple="multiple"
+                 ng-multiple="true">
+          {{ 'document.default.add_files' | translate }}
+        </button>
+      </div>
     </div>
 
     <div class="btn-group" ng-show="checkedFiles().length > 0">
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.edit.html b/docs-web/src/main/webapp/src/partial/docs/document.edit.html
index b021ec2d..d60a298a 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.edit.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.edit.html
@@ -1,6 +1,13 @@
 <img src="img/loader.gif" ng-show="!document && isEdit()" />
 
 <div ng-show="document || !isEdit()">
+  <div class="row" ng-show="fileIsUploading">
+    <h4>{{ 'document.edit.uploading_files' | translate }}</h4>
+    <div class="col-md-6"><progressbar value="fileProgress" class="progress-info active"></progressbar></div>
+  </div>
+
+  <alert ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{{ alert.msg }}</alert>
+
   <form name="documentForm" class="form-horizontal">
     <div class="pull-right btn-group">
       <button type="submit" class="btn btn-primary" ng-disabled="!documentForm.$valid || fileIsUploading" ng-click="edit()">
@@ -166,11 +173,4 @@
       </div>
     </div>
   </form>
-  
-  <div class="row" ng-show="fileIsUploading">
-    <h4>{{ 'document.edit.uploading_files' | translate }}</h4>
-    <div class="col-md-6"><progressbar value="fileProgress" class="progress-info active"></progressbar></div>
-  </div>
-  
-  <alert ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{{ alert.msg }}</alert>
 </div>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
index cfd09e11..c7afc320 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
@@ -72,6 +72,16 @@
       <span class="glyphicon glyphicon-move"></span>
       {{ 'document.view.content.drop_zone' | translate }}
     </p>
+
+    <div class="clearfix"></div>
+    <div class="text-center">
+      <button class="btn btn-primary" ng-file-select
+              ng-file-change="fileDropped($files, $event)"
+              input-file-multiple="multiple"
+              ng-multiple="true">
+        {{ 'document.view.content.add_files' | translate }}
+      </button>
+    </div>
   </div>
 </div>