Closes #137: upload files without drag & drop

This commit is contained in:
Benjamin Gamard 2017-11-02 23:36:38 +01:00
parent 1b4eb70d8d
commit a980930e69
5 changed files with 34 additions and 9 deletions

View File

@ -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>",

View File

@ -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>",

View File

@ -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">

View File

@ -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>

View File

@ -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>