From c9e883482034f6d05d0a3ca0535f488fe783eac6 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Wed, 24 Jul 2013 15:05:40 +0200 Subject: [PATCH 1/4] repl table width --- html/admin/css/dashboardView.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/html/admin/css/dashboardView.css b/html/admin/css/dashboardView.css index 2594522255..5fb98472c0 100644 --- a/html/admin/css/dashboardView.css +++ b/html/admin/css/dashboardView.css @@ -339,3 +339,7 @@ input[type="radio"]:checked + label span { .falseClass { color: red; } + +#applyReplicationTable { + width: 100% !important; +} From 14b7771b1beeaf4d12363895296f70826d0341f2 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Wed, 24 Jul 2013 16:19:54 +0200 Subject: [PATCH 2/4] added reset view button for filter + css --- html/admin/css/dashboardView.css | 4 ++++ html/admin/css/documentsView.css | 13 +++++++++++++ html/admin/js/templates/documentsView.ejs | 5 +++-- html/admin/js/views/documentsView.js | 13 +++++++++++-- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/html/admin/css/dashboardView.css b/html/admin/css/dashboardView.css index 5fb98472c0..8948cd6d81 100644 --- a/html/admin/css/dashboardView.css +++ b/html/admin/css/dashboardView.css @@ -343,3 +343,7 @@ input[type="radio"]:checked + label span { #applyReplicationTable { width: 100% !important; } + +#filterHeader input, #filterHeader select, #filterHeader button { + margin-bottom: 6px; +} diff --git a/html/admin/css/documentsView.css b/html/admin/css/documentsView.css index 2218af7472..1ba5cc0d6c 100644 --- a/html/admin/css/documentsView.css +++ b/html/admin/css/documentsView.css @@ -377,3 +377,16 @@ table.dataTable thead th { #documentsUploadDiv:hover, #documentsUpload:hover { cursor: pointer !important; } + +#filterHeader button { + float: right; + margin-left: 10px !important; +} + +#addFilterItem { + margin-left: 5px; +} + +#addFilterItem i { { + margin-bottom: 20px !important; +} diff --git a/html/admin/js/templates/documentsView.ejs b/html/admin/js/templates/documentsView.ejs index c679571d7a..4a73290f92 100644 --- a/html/admin/js/templates/documentsView.ejs +++ b/html/admin/js/templates/documentsView.ejs @@ -24,9 +24,10 @@ - - + + + diff --git a/html/admin/js/views/documentsView.js b/html/admin/js/views/documentsView.js index c7cbc165d3..7d0127178e 100644 --- a/html/admin/js/views/documentsView.js +++ b/html/admin/js/views/documentsView.js @@ -41,6 +41,7 @@ var documentsView = Backbone.View.extend({ "keyup" : "returnPressedHandler", "keydown .filterValue" : "filterValueKeydown", "click #importModal" : "showImportModal", + "click #resetView" : "resetView", "click #confirmDocImport" : "startUpload" }, @@ -78,6 +79,15 @@ var documentsView = Backbone.View.extend({ } }, + resetView: function () { + //clear all input/select - fields + $('input').val(''); + $('select').val('=='); + + this.clearTable(); + window.arangoDocumentsStore.getDocuments(this.collectionID, 1); + }, + startUpload: function () { var self = this; if (self.allowUpload === true) { @@ -99,8 +109,7 @@ var documentsView = Backbone.View.extend({ arangoHelper.arangoNotification("Upload successful"); self.hideSpinner(); self.hideImportModal(); - self.clearTable(); - window.arangoDocumentsStore.getDocuments(self.collectionID, 1); + self.resetView(); return; } } From 8e3e7ac5dcce3d4c950006d969b631fdd3939a17 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Wed, 24 Jul 2013 16:42:00 +0200 Subject: [PATCH 3/4] changed reset @ docs view --- html/admin/js/views/documentsView.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/html/admin/js/views/documentsView.js b/html/admin/js/views/documentsView.js index 7d0127178e..2c6f338fc5 100644 --- a/html/admin/js/views/documentsView.js +++ b/html/admin/js/views/documentsView.js @@ -83,6 +83,7 @@ var documentsView = Backbone.View.extend({ //clear all input/select - fields $('input').val(''); $('select').val('=='); + this.removeAllFilterItems(); this.clearTable(); window.arangoDocumentsStore.getDocuments(this.collectionID, 1); @@ -249,6 +250,16 @@ var documentsView = Backbone.View.extend({ $(button.parentElement).remove(); }, + removeAllFilterItems : function () { + var childrenLength = $('#filterHeader').children().length; + var i; + for (i = 1; i <= childrenLength; i++) { + $('#removeFilter'+i).parent().remove(); + } + this.filters = { "0" : true }; + this.filterId = 0; + }, + addDocument: function () { var collid = window.location.hash.split("/")[1]; var doctype = arangoHelper.collectionApiType(collid); From 2c0951caed86db702d7c1d48943d0b68ce011cc4 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Wed, 24 Jul 2013 16:50:46 +0200 Subject: [PATCH 4/4] changed css docs view --- html/admin/css/dashboardView.css | 3 --- html/admin/css/documentsView.css | 12 ++++++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/html/admin/css/dashboardView.css b/html/admin/css/dashboardView.css index 8948cd6d81..841a08b96f 100644 --- a/html/admin/css/dashboardView.css +++ b/html/admin/css/dashboardView.css @@ -344,6 +344,3 @@ input[type="radio"]:checked + label span { width: 100% !important; } -#filterHeader input, #filterHeader select, #filterHeader button { - margin-bottom: 6px; -} diff --git a/html/admin/css/documentsView.css b/html/admin/css/documentsView.css index 1ba5cc0d6c..ccf3d87507 100644 --- a/html/admin/css/documentsView.css +++ b/html/admin/css/documentsView.css @@ -387,6 +387,14 @@ table.dataTable thead th { margin-left: 5px; } -#addFilterItem i { { - margin-bottom: 20px !important; +#addFilterItem i { + margin-top: -5px !important; +} + +#filterHeader input, #filterHeader select, #filterHeader button { +} + +#filterHeader select { + margin-left: 10px !important; + margin-right: 10px !important; }