more fixes

Author: joni2back

dist/angular-filemanager.min.css

@@ -166,6 +166,7 @@ textarea.code {
   padding: 0;
   padding: 10px 0;
   border: none;
+  background: none;
 }
 
 .table-files .selected,
@@ -235,25 +236,20 @@ textarea.code {
   margin: 3px 0;
 }
 
-.upload-dragover .main{
-  background-color: #EEEEEE;
+.upload-dragover .main {
+  opacity: .4;
 }
 
-.upload-dragover .main:before {
+.upload-dragover:before {
   content: "\e198";
   position: absolute;
   left: 50%;
   top: 50%;
   transform: translate(-50%, -50%);
   z-index: 100;
-  color: rgba(150, 150, 150, 0.9);
-  font-size: 80px;
+  color: #2196F3;
+  font-size: 8em;
   font-family: 'Glyphicons Halflings';
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
 }
 
 .upload-list {

dist/angular-filemanager.min.js

@@ -310,8 +310,7 @@
 
         $scope.addForUpload = function($files) {
             $scope.uploadFileList = $scope.uploadFileList.concat($files);
-
-            $scope.modal('uploadfile', false);
+            $scope.modal('uploadfile');
         };
 
         $scope.removeFromUpload = function(index) {
@@ -322,7 +321,6 @@
             $scope.apiMiddleware.upload($scope.uploadFileList, $scope.fileNavigator.currentPath).then(function() {
                 $scope.fileNavigator.refresh();
                 $scope.uploadFileList = [];
-
                 $scope.modal('uploadfile', true);
             }, function(data) {
                 var errorMsg = data.result && data.result.error || $translate.instant('error_uploading_files');

src/css/main.css

@@ -133,15 +133,13 @@
                 Upload.upload({
                     url: apiUrl,
                     data: data
-                }).then(function (response) {
-                    self.deferredHandler(response.data, deferred);
-                }, function (response) {
-                    if (response.status > 0) {
-                        self.deferredHandler(data, deferred, 'Unknown error uploading files (' + response.status + ')');
-                    }
+                }).then(function (data) {
+                    self.deferredHandler(data, deferred);
+                }, function (data) {
+                    self.deferredHandler(data, deferred, 'Unknown error uploading files');
                 }, function (evt) {
-                    self.progress = Math.min(100, parseInt(100.0 * evt.loaded / evt.total));
-                })['finally'](function(){
+                    self.progress = Math.min(100, parseInt(100.0 * evt.loaded / evt.total)) - 1;
+                })['finally'](function() {
                     self.inprocess = false;
                     self.progress = 0;
                 });

src/js/controllers/main.js

@@ -273,30 +273,35 @@ <h4 class="modal-title">{{'new_folder' | translate}}</h4>
               <h4 class="modal-title">{{"upload_files" | translate}}</h4>
             </div>
             <div class="modal-body">
-              <label class="radio">{{"files_will_uploaded_to" | translate}} <b>/{{fileNavigator.currentPath.join('/')}}</b></label>
-              <button class="btn btn-default btn-block" ngf-select="$parent.addForUpload($files)" ngf-multiple="true">{{"select_files" | translate}}</button>
+              <label class="radio">
+                {{"files_will_uploaded_to" | translate}} 
+                <b>/{{fileNavigator.currentPath.join('/')}}</b>
+              </label>
+              <button class="btn btn-default btn-block" ngf-select="$parent.addForUpload($files)" ngf-multiple="true">
+                {{"select_files" | translate}}
+              </button>
 
               <div class="upload-list">
                 <ul class="list-group">
                   <li class="list-group-item" ng-repeat="(index, uploadFile) in $parent.uploadFileList">
-                    <button class="btn btn-sm btn-danger pull-right" ng-click="$parent.removeFromUpload(index)"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span><span class="sr-only">{{"remove" | translate}}</span></button>
+                    <button class="btn btn-sm btn-danger pull-right" ng-click="$parent.removeFromUpload(index)">
+                        &times;
+                    </button>
                     <h5 class="list-group-item-heading">{{uploadFile.name}}</h5>
                     <p class="list-group-item-text">{{uploadFile.size | humanReadableFileSize}}</p>
                   </li>
                 </ul>
-
                 <div ng-show="apiMiddleware.apiHandler.inprocess">
                   <em>{{"uploading" | translate}}... {{apiMiddleware.apiHandler.progress}}%</em>
-
-                  <div class="progress">
-                    <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="{{apiMiddleware.apiHandler.progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{apiMiddleware.apiHandler.progress}}%"></div>
+                  <div class="progress mb0">
+                    <div class="progress-bar active" role="progressbar" aria-valuenow="{{apiMiddleware.apiHandler.progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{apiMiddleware.apiHandler.progress}}%"></div>
                   </div>
                 </div>
               </div>
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
             </div>
             <div class="modal-footer">
-              <div ng-show="!apiMiddleware.apiHandler.inprocess">
+              <div>
                   <button type="button" class="btn btn-default" data-dismiss="modal">{{"cancel" | translate}}</button>
                   <button type="submit" class="btn btn-primary" ng-disabled="!$parent.uploadFileList.length || apiMiddleware.apiHandler.inprocess">{{'upload' | translate}}</button>
               </div>