atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kbh...@apache.org
Subject [2/3] atlas git commit: ATLAS-1905 : Search UI is confusing to user
Date Fri, 22 Sep 2017 13:19:30 GMT
ATLAS-1905 : Search UI is confusing to user

Signed-off-by: kevalbhatt <kbhatt@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/6d9a0e64
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/6d9a0e64
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/6d9a0e64

Branch: refs/heads/branch-0.8
Commit: 6d9a0e648ef5b76d9d5bed7ca27e19989343d558
Parents: 23ae0d0
Author: pratik pandey <pratik.pandey@freestoneinfotech.com>
Authored: Fri Sep 22 13:05:50 2017 +0530
Committer: kevalbhatt <kbhatt@apache.org>
Committed: Fri Sep 22 18:48:53 2017 +0530

----------------------------------------------------------------------
 .../public/js/templates/search/SearchLayoutView_tmpl.html        | 4 ++--
 dashboardv2/public/js/views/search/SearchLayoutView.js           | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/6d9a0e64/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html b/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
index 9aa6e8d..db38533 100644
--- a/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
@@ -56,8 +56,8 @@
                 </div>
             </div>
             <div class="srchType">
-                <span class="srchTitle">Search By Query</span>
-                <input type="text" class="form-control" data-id="searchInput" placeholder="Search
using a query string: e.g. sales_fact" style="margin: 5px 0px;">
+                <span class="srchTitle searchText">Search By Text</span>
+                <input type="text" class="form-control" data-id="searchInput" placeholder="Search
by text" style="margin: 5px 0px;">
             </div>
         </div>
         <button class="btn btn-action" data-id="clearSearch">Clear</button>

http://git-wip-us.apache.org/repos/asf/atlas/blob/6d9a0e64/dashboardv2/public/js/views/search/SearchLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js b/dashboardv2/public/js/views/search/SearchLayoutView.js
index 6b839cd..4fbeaaf 100644
--- a/dashboardv2/public/js/views/search/SearchLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchLayoutView.js
@@ -541,6 +541,8 @@ define(['require',
                     this.$('.temFilter').removeClass('col-sm-10');
                     this.$('.basicSaveSearch').hide();
                     this.$('.advanceSaveSearch').show();
+                    this.$('.searchText').text('Search By Query');
+                    this.ui.searchInput.attr("placeholder", 'Search By Query eg. where name="sales_fact"');
                 } else {
                     this.$('.temFilter').addClass('col-sm-10');
                     this.$('.temFilter').removeClass('col-sm-12');
@@ -550,6 +552,8 @@ define(['require',
                     this.$('.advanceSaveSearch').hide();
                     this.dsl = false;
                     this.type = "basic";
+                    this.$('.searchText').text('Search By Text');
+                    this.ui.searchInput.attr("placeholder", "Search By Text");
                 }
                 if (paramObj && this.type == "basic") {
                     this.query[this.type].attributes = paramObj.attributes ? paramObj.attributes
: null;


Mime
View raw message