From 0e5c9c8a858caf6b8d024805d490850ec04e0545 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Fri, 10 Jan 2014 18:05:06 +0100
Subject: [PATCH] a few small corrections in the upload web interface

---
 .../frontend/js/templates/documentsView.ejs   |  4 ++--
 .../frontend/js/views/documentsView.js        | 20 +++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/js/apps/system/aardvark/frontend/js/templates/documentsView.ejs b/js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
index 803117d2d6..d7cafc5b74 100644
--- a/js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
@@ -5,7 +5,7 @@
     <!-- remove marker for docupdiv--!>
       <ul><li class="enabled"><a id="indexCollection"><span class="icon_arangodb_checklist" title="Index collection"></span></a></li></ul>
       <ul><li class="enabled"><a id="filterCollection"><span class="icon_arangodb_filter" title="Filter collection"></span></a></li></ul>
-      <ul><li class="enabled"><a id="importCollection"><span class="icon_arangodb_import" title="Upload documents"></span></a></li></ul>
+      <ul><li class="enabled"><a id="importCollection"><span class="icon_arangodb_import" title="Upload documents from JSON file"></span></a></li></ul>
     <ul>
       <li class="enabled"><a id="collectionPrev"><span class="icon_arangodb_arrowleft" title="Previous collection"></span></a></li>
       <li class="enabled"><a id="collectionNext"><span class="icon_arangodb_arrowright" title="Next collection"></span></a></li>
@@ -36,7 +36,7 @@
     <div class="queryline">
       <input id="importDocuments" name="importDocuments" type="file" accept="application/json" />
       <button id="confirmDocImport" class="btn btn-success btn-old-padding" style="float:right">
-        <img id="uploadIndicator" style="display: none;" src="img/ajax-loader.gif"/>Import
+        <img id="uploadIndicator" style="display: none;" src="img/ajax-loader.gif"/>Import JSON
       </button>
     </div>
   </div>
diff --git a/js/apps/system/aardvark/frontend/js/views/documentsView.js b/js/apps/system/aardvark/frontend/js/views/documentsView.js
index aa11eb08c2..ca087cb9ba 100644
--- a/js/apps/system/aardvark/frontend/js/views/documentsView.js
+++ b/js/apps/system/aardvark/frontend/js/views/documentsView.js
@@ -138,7 +138,7 @@
                 }
 
                 catch (e) {
-                  arangoHelper.arangoNotification("Error: "+ e);
+                  arangoHelper.arangoError("Error: " + e);
                   self.hideSpinner();
                   self.hideImportModal();
                   self.resetView();
@@ -146,8 +146,8 @@
                 }
 
                 if (data.errors === 0) {
-                  arangoHelper.arangoError("Upload successful. " + 
-                                           data.created + " document(s) imported.");
+                  arangoHelper.arangoNotification("Upload successful. " + 
+                                                  data.created + " document(s) imported.");
                 }
                 else if (data.errors !== 0) {
                   arangoHelper.arangoError("Upload failed." + 
@@ -160,30 +160,20 @@
               }
             }
             self.hideSpinner();
-            arangoHelper.arangoNotification("Upload error");
+            arangoHelper.arangoError("Upload error");
           }
         });
       }
-      else {
-        arangoHelper.arangoNotification("Unsupported filetype: " + self.file.type);
-      }
     },
 
     uploadSetup: function () {
       var self = this;
 
-      //$('#documentsUploadFile').change(function(e) {
       $('#importDocuments').change(function(e) {
         self.files = e.target.files || e.dataTransfer.files;
         self.file = self.files[0];
 
-        if (self.file.type !== 'application/json') {
-          arangoHelper.arangoNotification("Unsupported filetype: " + self.file.type);
-          self.allowUpload = false;
-        }
-        else {
-          self.allowUpload = true;
-        }
+        self.allowUpload = true;
       });
     },