diff --git a/js/apps/system/aardvark/aardvark.js b/js/apps/system/aardvark/aardvark.js index e6f6998a9a..858caa2caa 100644 --- a/js/apps/system/aardvark/aardvark.js +++ b/js/apps/system/aardvark/aardvark.js @@ -38,6 +38,19 @@ var FoxxController = require("org/arangodb/foxx").Controller, var foxxes = new (require("lib/foxxes").Foxxes)(); var docus = new (require("lib/swagger").Swagger)(); + +/** Fetch a foxx from temp folder + * + * Makes a foxx uploaded to the temp folder + * available for mounting. + */ + +controller.post("/foxxes/fetch", function (req, res) { + var content = JSON.parse(req.requestBody), + path = content.filename; + res.json(foxxes.fetch(path)); +}); + // ............................................................................. // install // ............................................................................. diff --git a/js/apps/system/aardvark/frontend/css/buttons.css b/js/apps/system/aardvark/frontend/css/buttons.css index 6cb1d442a3..d830f91402 100644 --- a/js/apps/system/aardvark/frontend/css/buttons.css +++ b/js/apps/system/aardvark/frontend/css/buttons.css @@ -13,3 +13,9 @@ position: relative; } +a.headerButton { + margin-top: -2px; + margin-left: 5px; + margin-right: 5px; + min-height: 23px; +} diff --git a/js/apps/system/aardvark/frontend/css/documentsView.css b/js/apps/system/aardvark/frontend/css/documentsView.css index 97d6112df1..d8cd1d928c 100644 --- a/js/apps/system/aardvark/frontend/css/documentsView.css +++ b/js/apps/system/aardvark/frontend/css/documentsView.css @@ -45,13 +45,13 @@ margin-bottom: -10px; } -#filterHeader, #importHeader, .arangoDropdownIn, #indexHeaderContent { +#filterHeader, .arangoDropdownIn, #indexHeaderContent { margin-left: 5px; margin-right: 5px; background-color: white; } -#filterHeader, #importHeader, .arangoDropdownIn { +#filterHeader, .arangoDropdownIn { padding-top: 10px; padding-left: 10px; padding-right: 10px; @@ -59,10 +59,6 @@ position:relative; } -#importHeader input { - line-height: 0px !important; - margin-top: 5px;margin-bottom: -5px; -} #confirmDocImport { margin-right: 0px; diff --git a/js/apps/system/aardvark/frontend/css/dropdowns.css b/js/apps/system/aardvark/frontend/css/dropdowns.css new file mode 100644 index 0000000000..28155e3b75 --- /dev/null +++ b/js/apps/system/aardvark/frontend/css/dropdowns.css @@ -0,0 +1,16 @@ +.dropdownImport { + margin-left: 5px; + margin-right: 5px; + background-color: white; + padding-top: 10px; + padding-left: 10px; + padding-right: 10px; + padding-bottom: 5px; + position:relative; +} + +.dropdownImport input { + line-height: 0px !important; + margin-top: 5px; + margin-bottom: -5px; +} diff --git a/js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs b/js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs index f1cde33151..820a52dc71 100644 --- a/js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs @@ -7,7 +7,12 @@ -
-