atlas/js/templates/search/SearchResultLayoutView_tmpl.html

@@ -106,7 +106,7 @@
                                 <input type="text" class="form-control number-input" data-id="gotoPage" placeholder="目标页面" />
                                 <span class="input-group-btn">
                                     <button class="btn btn-default" type="button" data-id="gotoPagebtn" title="跳转至" disabled="disabled">
-                                        Go!
+                                        跳转
                                     </button>
                                 </span>
                             </div>

atlas/js/utils/Enums.js

@@ -189,7 +189,7 @@ define([ "require", "backbone" ], function(require) {
         __classificationNames: "分类",
         __createdBy: "创建者",
         __customAttributes: "用户自定义属性",
-        __guid: "Guid",
+        __guid: "标识符",
         __isIncomplete: "未完成",
         __labels: "标签",
         __modificationTimestamp: "最终修改时间",
@@ -198,7 +198,8 @@ define([ "require", "backbone" ], function(require) {
         __state: "状态",
         __entityStatus: "实体状态",
         __timestamp: "创建时间戳",
-        __typeName: "类型名称"
+        __typeName: "类型名称",
+        __pendingTasks: "待完成的任务",
     }, Enums.__isIncomplete = {
         0: "false",
         1: "true"

atlas/js/utils/Helper.js

@@ -97,7 +97,7 @@ define([ "require", "utils/Utils", "d3", "marionette", "jquery-ui" ], function(r
         dropdownWithSearch.prototype.render = function() {
             var $rendered = Dropdown.prototype.render.call(this), dropdownCssClass = this.options.get("dropdownCssClass");
             dropdownCssClass && $rendered.addClass(dropdownCssClass);
-            var placeholder = this.options.get("placeholderForSearch") || "", $search = $('<span class="select2-search select2-search--dropdown"><div class="clearfix"><div class="col-md-10 no-padding" style="width: calc(100% - 30px);"><input class="select2-search__field" placeholder="' + placeholder + '" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" /></div><div class="col-md-2 no-padding" style="width: 30px;"><button type="button" style="padding: 3px 6px;margin: 0px 4px;" class="btn btn-action btn-sm filter " title="Type Filter"><i class="fa fa-filter"></i></button></div></div></span>');
+            var placeholder = this.options.get("placeholderForSearch") || "", $search = $('<span class="select2-search select2-search--dropdown"><div class="clearfix"><div class="col-md-10 no-padding" style="width: calc(100% - 30px);"><input class="select2-search__field" placeholder="' + placeholder + '" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" /></div><div class="col-md-2 no-padding" style="width: 30px;"><button type="button" style="padding: 3px 6px;margin: 0px 4px;" class="btn btn-action btn-sm filter " title="类型搜索"><i class="fa fa-filter"></i></button></div></div></span>');
             if (!this.options.options.getFilterBox) throw "In order to render the filter options adapter needed getFilterBox function";
             var $Filter = $('<ul class="type-filter-ul"></ul>');
             return this.$Filter = $Filter, this.$Filter.append(this.options.options.getFilterBox()), 

atlas/js/utils/Messages.js

@@ -35,7 +35,7 @@ define([ "require" ], function(require) {
             removeCategoryfromTerm: "移除类别分配"
         },
         getAbbreviationMsg: function(abbrev, type) {
-            var msg = abbrev ? "s were" : " was";
+            var msg = '';
             return msg + this[type];
         }
     };

atlas/js/utils/Utils.js

@@ -613,7 +613,7 @@ define([ "require", "utils/Globals", "pnotify", "utils/Messages", "utils/Enums",
             case "recentQueries": return "最近操作语句";
             case "startTime": return "开始时间";
             case "hostName": return "主机名";
-
+            case "__pendingTasks": return "待完成的任务";
             default: return name;
         }
 

atlas/js/views/search/SearchLayoutView.js

@@ -329,7 +329,7 @@ define([ "require", "backbone", "hbs!tmpl/search/SearchLayoutView_tmpl", "utils/
             }), _.each(_.uniq(serviceArr), function(service) {
                 serviceStr += '<li><div class="pretty p-switch p-fill"><input type="checkbox" class="pull-left" data-value="' + service + '" value="" ' + (_.contains(that.selectedFilter[that.type], service) ? "checked" : "") + '/><div class="state p-primary"><label>' + service.toUpperCase() + "</label></div></div></li>";
             });
-            var templt = serviceStr + '<hr class="hr-filter"/><div class="text-right"><div class="divider"></div><button class="btn btn-action btn-sm filterDone">Done</button></div>';
+            var templt = serviceStr + '<hr class="hr-filter"/><div class="text-right"><div class="divider"></div><button class="btn btn-action btn-sm filterDone">确认</button></div>';
             return templt;
         },
         renderTypeTagList: function(options) {
@@ -498,11 +498,12 @@ define([ "require", "backbone", "hbs!tmpl/search/SearchLayoutView_tmpl", "utils/
             var paramObj = Utils.getUrlState.getQueryParams();
             paramObj && this.type == paramObj.searchType && this.updateQueryObject(paramObj),
             e.currentTarget.checked ? (this.type = "dsl", this.dsl = !0, this.$(".typeFilterBtn,.tagBox,.termBox,.basicSaveSearch").hide(),
-            this.$(".typeFilter").addClass("col-sm-12"), this.$(".typeFilter").removeClass("col-sm-10"),
+            // this.$(".typeFilter").addClass("col-sm-12"), this.$(".typeFilter").removeClass("col-sm-10"),
+            this.$(".typeFilter").addClass("col-sm-12"), this.$(".typeFilter").removeClass("col-sm-12"),
                 // this.$(".advanceSaveSearch").show(), this.$(".searchText").text("Search By Query"),
                 this.$(".advanceSaveSearch").show(), this.$(".searchText").text("根据查询搜索"),
                 // this.ui.searchInput.attr("placeholder", 'Search By Query eg. where name="sales_fact"')) : (this.$(".typeFilter").addClass("col-sm-10"),
-                this.ui.searchInput.attr("placeholder", '根据查询搜索，例如：where name="sales_fact"')) : (this.$(".typeFilter").addClass("col-sm-10"),
+                this.ui.searchInput.attr("placeholder", '根据查询搜索，例如：where name="sales_fact"')) : (this.$(".typeFilter").addClass("col-sm-12"),
             this.$(".typeFilter").removeClass("col-sm-12"), this.$(".typeFilterBtn,.tagBox,.termBox,.basicSaveSearch").show(),
             this.$(".advanceSaveSearch").hide(), this.dsl = !1, this.type = "basic", this.$(".searchText").text("根据语句搜索"),
             this.ui.searchInput.attr("placeholder", "根据语句搜索")), Utils.getUrlState.isSearchTab() && Utils.setUrl({

atlas/js/views/search/SearchResultLayoutView.js

@@ -717,7 +717,7 @@ define([ "require", "backbone", "table-dragger", "hbs!tmpl/search/SearchResultLa
                     glossaryCollection: glossaryCollection
                 });
             }) : Utils.notifyInfo({
-                content: "There are no available terms"
+                content: "没有可供选择的术语"
             });
         },
         onClickAddTermBtn: function(e) {

atlas/js/views/tag/AddTagModalView.js

@@ -54,7 +54,7 @@ define([ "require", "hbs!tmpl/tag/AddTagModalView_tmpl", "views/tag/AddTimezoneI
             this.commonCollection = new VTagList(), this.tagModel ? this.collection = new Backbone.Collection(this.tagModel.validityPeriods) : this.collection = new Backbone.Collection(), 
             this.tagCollection = options.collection;
             var that = this, modalObj = {
-                title: "Add Classification",
+                title: "添加分类",
                 content: this,
                 okText: "新增",
                 cancelText: "取消",