数据集市统一替换为术语

atlas/js/templates/detail_page/DetailPageLayoutView_tmpl.html

@@ -34,9 +34,9 @@
             </div>
         </div>
         <div class="form-group termBox col-md-12">
-            <span class="control-label-sm-pr pull-left">数据集市:</span>
+            <span class="control-label-sm-pr pull-left">术语:</span>
             <div class="pull-left" data-id="termList">
-                <button class="btn btn-action btn-sm" title="添加数据集市" data-id="addTerm">
+                <button class="btn btn-action btn-sm" title="添加术语" data-id="addTerm">
                     <i class="fa fa-plus"> </i>
                 </button>
             </div>

atlas/js/templates/glossary/AssignTermLayoutView_tmpl.html

@@ -16,7 +16,7 @@
 -->
 {{#if isAttributeRelationView}}
 <div data-id="wizard">
-    <h3>选择数据集市</h3>
+    <h3>选择术语</h3>
     <section>
         <div id="r_glossaryTree"></div>
     </section>

atlas/js/templates/glossary/CreateEditCategoryTermLayoutView_tmpl.html

@@ -16,7 +16,7 @@
 -->
 <form name="tagDefinitionform" class="form-horizontal" data-id="categoryTermForm">
     <div class="form-group">
-        <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">数据集市名</label>
+        <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">术语名称</label>
         <div class="col-sm-10">
             <input class="form-control" data-id="name" name="name" value="{{modelJSON.name}}" placeholder="Name(required)" autofocus />
         </div>

atlas/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html

@@ -52,9 +52,9 @@
         </div>
         {{/if}} {{#if isCategoryView}}
         <div class="form-group clearfix">
-            <span class="control-label-sm-pr pull-left">数据集市:</span>
+            <span class="control-label-sm-pr pull-left">术语:</span>
             <div class="pull-left" data-id="termList">
-                <button class="btn btn-action btn-sm" title="添加数据集市" data-id="addTerm">
+                <button class="btn btn-action btn-sm" title="添加术语" data-id="addTerm">
                     <i class="fa fa-plus"> </i>
                 </button>
             </div>
@@ -65,7 +65,7 @@
                 <ul class="nav nav-tabs" data-id="tab-list">
                     <li role="entities" class="tab active"><a href="#tab-entities" aria-controls="tab-entities" role="tab" data-toggle="tab">实体</a></li>
                     <li role="classification"><a href="#tab-tagTable" aria-controls="tab-tagTable" role="tab" data-toggle="tab">数据模型</a></li>
-                    <li role="relatedTerm"><a href="#tab-relatedTerm" aria-controls="tab-relatedTerm" role="tab" data-toggle="tab">关联数据集市</a></li>
+                    <li role="relatedTerm"><a href="#tab-relatedTerm" aria-controls="tab-relatedTerm" role="tab" data-toggle="tab">关联术语</a></li>
                 </ul>
             </div>
         </div>

atlas/js/templates/glossary/GlossaryLayoutView_tmpl.html

@@ -48,14 +48,14 @@
         <div data-id='glossaryTreeView'>
             <div class="no-padding col-sm-12 term-view">
                 <div>
-                    <input type="text" class="form-control" data-id="searchTerm" placeholder="{{#if isAssignView}}搜索数据集市{{else}}搜索数据集市表, 数据集市{{/if}}">
+                    <input type="text" class="form-control" data-id="searchTerm" placeholder="{{#if isAssignView}}搜索术语{{else}}搜索术语表, 术语{{/if}}">
                 </div>
                 <div data-id="termTree" style="margin-top: 5px;padding-bottom: 25px;overflow-x: auto;overflow-y:hidden;">
                 </div>
             </div>
             <div class="col-sm-12 no-padding category-view" style="display: none;">
                 <div>
-                    <input type="text" class="form-control" data-id="searchCategory" placeholder="{{#if isAssignView}}搜索目录{{else}}搜索数据集市表，类别{{/if}}">
+                    <input type="text" class="form-control" data-id="searchCategory" placeholder="{{#if isAssignView}}搜索目录{{else}}搜索术语表，类别{{/if}}">
                 </div>
                 <div data-id="categoryTree" style="margin-top: 5px;padding-bottom: 25px;overflow-x: auto;overflow-y: hidden;">
                 </div>

atlas/js/templates/glossary/TermRelationAttributeTable_tmpl.html

@@ -17,8 +17,8 @@
 <table class="table table-hover table-quickMenu">
     <thead>
         <tr>
-            <th>{{#if relationTypeTable}}关联类型{{else}}数据集市{{/if}}</th>
-            <th>{{#if relationTypeTable}}已关联数据集市{{else}}属性{{/if}}</th>
+            <th>{{#if relationTypeTable}}关联类型{{else}}术语{{/if}}</th>
+            <th>{{#if relationTypeTable}}已关术语{{else}}属性{{/if}}</th>
             {{#if relationTypeTable}}
             <th>属性</th>{{/if}}
         </tr>

atlas/js/templates/search/SearchResultLayoutView_tmpl.html

@@ -45,7 +45,7 @@
                     </div>
                     {{#unless isGlossaryView}}
                     <div class="inline">
-                        <a href="javascript:void(0)" class="multiSelectTerm assignTerm btn btn-action btn-sm" style="display:none" title="指派数据集市" data-id="addAssignTerm"><i class="fa fa-plus"></i>&nbsp;数据集市</a>
+                        <a href="javascript:void(0)" class="multiSelectTerm assignTerm btn btn-action btn-sm" style="display:none" title="指派术语" data-id="addAssignTerm"><i class="fa fa-plus"></i>&nbsp;术语</a>
                     </div>
                     {{/unless}}
                     <div class="inline" data-id="containerCheckBox" style="display: none;">

atlas/js/views/glossary/AssignTermLayoutView.js

@@ -26,7 +26,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/AssignTermLayoutView_tmpl", "
                 selectedItem: {}
             };
             var title = "";
-            title = this.isCategoryView || this.isEntityView ? "指定数据集市给 " + (this.isCategoryView ? "Category" : "entity") : this.isAttributeRelationView ? "指定数据集市给 " + this.selectedTermAttribute : "Assign Category to term",
+            title = this.isCategoryView || this.isEntityView ? "指定术语给 " + (this.isCategoryView ? "Category" : "entity") : this.isAttributeRelationView ? "指定术语给 " + this.selectedTermAttribute : "指定类别给术语",
             this.modal = new Modal({
                 title: title,
                 content: this,

atlas/js/views/glossary/GlossaryDetailLayoutView.js

@@ -244,7 +244,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryDetailLayoutView_tmpl
                     that.getData();
                 },
                 glossaryCollection: glossary
-            }, emptyListMessage = this.isCategoryView ? "没有与此类别关联的可用数据集市" : "没有与此数据集市关联的可用类别";
+            }, emptyListMessage = this.isCategoryView ? "没有与此类别关联的可用术语" : "没有与此术语关联的可用类别";
             obj = this.isCategoryView ? _.extend(obj, {
                 categoryData: this.data,
                 associatedTerms: this.data && this.data.terms && this.data.terms.length > 0 ? this.data.terms : [],

atlas/js/views/glossary/GlossaryLayoutView.js

@@ -398,7 +398,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryLayoutView_tmpl", "ut
                 popoverOptions: {
                     content: function() {
                         var node = that.query[that.viewType], liString = "";
-                        return liString = "Glossary" == node.type ? "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Term</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除数据集市表</a></li>" : "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Term</a></li>",
+                        return liString = "Glossary" == node.type ? "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Term</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除术语表</a></li>" : "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Term</a></li>",
                         "<ul>" + liString + "</ul>";
                     }
                 }
@@ -412,7 +412,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryLayoutView_tmpl", "ut
                 popoverOptions: {
                     content: function() {
                         var node = that.query[that.viewType], liString = "";
-                        return liString = "Glossary" == node.type ? "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Category</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除数据集市表</a></li>" : "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Sub-Category</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Category</a></li>",
+                        return liString = "Glossary" == node.type ? "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Category</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除术语表</a></li>" : "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Sub-Category</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Category</a></li>",
                         "<ul>" + liString + "</ul>";
                     }
                 }

atlas/n/js/views/glossary/AssignTermLayoutView.js

@@ -26,7 +26,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/AssignTermLayoutView_tmpl", "
                 selectedItem: {}
             };
             var title = "";
-            title = this.isCategoryView || this.isEntityView ? "指定数据集市给 " + (this.isCategoryView ? "Category" : "entity") : this.isAttributeRelationView ? "指定数据集市给 " + this.selectedTermAttribute : "Assign Category to term",
+            title = this.isCategoryView || this.isEntityView ? "指定术语给 " + (this.isCategoryView ? "Category" : "entity") : this.isAttributeRelationView ? "指定术语给 " + this.selectedTermAttribute : "指定类别给术语",
             this.modal = new Modal({
                 title: title,
                 content: this,

atlas/n/js/views/glossary/GlossaryDetailLayoutView.js

@@ -258,7 +258,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryDetailLayoutView_tmpl
                     that.getData();
                 },
                 glossaryCollection: glossary
-            }, emptyListMessage = this.isCategoryView ? "没有与此类别关联的可用数据集市" : "没有与此数据集市关联的可用类别";
+            }, emptyListMessage = this.isCategoryView ? "没有与此类别关联的可用术语" : "没有与此术语关联的可用类别";
             obj = this.isCategoryView ? _.extend(obj, {
                 categoryData: this.data,
                 associatedTerms: this.data && this.data.terms && this.data.terms.length > 0 ? this.data.terms : [],

atlas/n/js/views/glossary/GlossaryLayoutView.js

@@ -372,7 +372,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryLayoutView_tmpl", "ut
                 popoverOptions: {
                     content: function() {
                         var node = that.query[that.viewType], liString = "";
-                        return liString = "Glossary" == node.type ? "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Term</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除数据集市表</a></li>" : "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Term</a></li>",
+                        return liString = "Glossary" == node.type ? "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Term</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除术语表</a></li>" : "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Term</a></li>",
                         "<ul>" + liString + "</ul>";
                     }
                 }
@@ -386,7 +386,7 @@ define([ "require", "backbone", "hbs!tmpl/glossary/GlossaryLayoutView_tmpl", "ut
                 popoverOptions: {
                     content: function() {
                         var node = that.query[that.viewType], liString = "";
-                        return liString = "Glossary" == node.type ? "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Category</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除数据集市表</a></li>" : "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Sub-Category</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Category</a></li>",
+                        return liString = "Glossary" == node.type ? "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Category</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除术语表</a></li>" : "<li data-type=" + node.type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Sub-Category</a></li><li data-type=" + node.type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Category</a></li>",
                         "<ul>" + liString + "</ul>";
                     }
                 }

atlas/n/js/views/search/tree/GlossaryTreeLayoutView.js

@@ -296,7 +296,7 @@ define([ "require", "hbs!tmpl/search/tree/GlossaryTreeLayoutView_tmpl", "utils/U
                     selector: ".termPopover",
                     content: function() {
                         var type = $(this).data("detail"), liString = "";
-                        return liString = "glossary" == type ? "<li data-type=" + type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Term</a></li><li data-type=" + type + " class='listTerm'><i class='fa fa-list-alt'></i><a href='javascript:void(0)' data-fn='onViewEdit'>View/Edit Glossary</a></li><li data-type=" + type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除数据集市表</a></li>" : "<li data-type=" + type + " class='listTerm'><i class='fa fa-list-alt'></i><a href='javascript:void(0)' data-fn='onViewEdit'>View/Edit Term</a></li><li data-type=" + type + " class='listTerm'><i class='fa fa-search'></i><a href='javascript:void(0)' data-fn='searchSelectedTerm'>Search</a></li><li data-type=" + type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Term</a></li>",
+                        return liString = "glossary" == type ? "<li data-type=" + type + " class='listTerm'><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='createSubNode'>Create Term</a></li><li data-type=" + type + " class='listTerm'><i class='fa fa-list-alt'></i><a href='javascript:void(0)' data-fn='onViewEdit'>View/Edit Glossary</a></li><li data-type=" + type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>删除术语表</a></li>" : "<li data-type=" + type + " class='listTerm'><i class='fa fa-list-alt'></i><a href='javascript:void(0)' data-fn='onViewEdit'>View/Edit Term</a></li><li data-type=" + type + " class='listTerm'><i class='fa fa-search'></i><a href='javascript:void(0)' data-fn='searchSelectedTerm'>Search</a></li><li data-type=" + type + " class='listTerm'><i class='fa fa-trash-o'></i><a href='javascript:void(0)' data-fn='deleteNode'>Delete Term</a></li>",
                         "<ul>" + liString + "</ul>";
                     }
                 }