Merge remote-tracking branch 'hupstream/master'

static/resources/css/replication.css

@@ -54,7 +54,7 @@
   cursor: all-scroll;
 }
 #down-pane {
-  height: 530px;
+  height: 582px;
 }
 
 .sub-pane-split {

static/resources/js/components/log/advanced-search.directive.html

@@ -57,9 +57,9 @@
         
       </form>
     </div>
-    <div class="col-xs-2 col-md-2"> 
-      <form>                        
-        <div class="form-group" style="margin-top: 69%;">               
+    <div class="col-xs-2 col-md-2">
+      <form>
+        <div class="form-group" style="position: relative; top: 100px;">
           <button type="button" class="btn btn-primary" ng-click="vm.doSearch({op: vm.op})">// 'search' | tr //</button>     
         </div>
       </form>

static/resources/js/components/replication/list-replication.directive.html

@@ -126,7 +126,7 @@
       			 </thead>
           </table>
          </div>
-          <div class="table-body-container" style="height: 370px;">
+          <div class="table-body-container" style="height: 510px;">
             <table class="table table-pane">
         			 <tbody>
                 <tr ng-if="vm.replicationJobs.length == 0">
@@ -146,7 +146,8 @@
         		</table>
           </div>
         </div>
-      </div>  
+      </div>
+      <div class="col-xs-4 col-md-12 well well-sm well-custom well-split"><div class="col-md-offset-10">//vm.replicationJobs ? vm.replicationJobs.length : 0// // 'items' | tr //</div></div>    
     </div>  
   </div>          
 </div>

static/resources/js/components/replication/list-replication.directive.js

@@ -42,7 +42,7 @@
   function ListReplicationController($scope, getParameterByName, $location, ListReplicationPolicyService, ToggleReplicationPolicyService, ListReplicationJobService, $window, $filter, trFilter, jobStatus) {
     var vm = this;
     
-    vm.sectionHeight = {'min-height': '1200px'};
+    vm.sectionHeight = {'min-height': '1260px'};
       
     $scope.$on('$locationChangeSuccess', function() {
       vm.projectId = getParameterByName('project_id', $location.absUrl());

static/resources/js/services/i18n/locale_messages_en-US.js

@@ -264,7 +264,7 @@ var locale_messages = {
   'found_error_in_replication_job': 'Found $0 error(s).',
   'caution': 'Caution',
   'confirm_to_toggle_enabled_policy_title': 'Enable Policy',
-  'confirm_to_toggle_enabled_policy': 'After enabling the policy, replication jobs will be triggered to replicate all repositories under the project to the destination of the policy.  Please confirm to continue.',
+  'confirm_to_toggle_enabled_policy': 'After enabling the replication policy, all repositories under the project will be replicated to the destination registry. Please confirm to continue.',
   'confirm_to_toggle_disabled_policy_title': 'Disable Policy',
-  'confirm_to_toggle_disabled_policy': 'After disabling the policy, running replication jobs of this policy will be canceled.  Please confirm to continue.'
+  'confirm_to_toggle_disabled_policy': 'After disabling the policy, all unfinished replication jobs of this policy will be stopped and canceled. Please confirm to continue.'
 };

static/resources/js/services/i18n/locale_messages_zh-CN.js

@@ -266,7 +266,7 @@ var locale_messages = {
   'confirm_to_toggle_policy_title': '切换复制策略状态',
   'confirm_to_toggle_policy': '确认将复制策略 $0 切换为 <strong>$1</strong> 状态吗?',
   'confirm_to_toggle_enabled_policy_title': '启用策略',
-  'confirm_to_toggle_enabled_policy': '启用策略后，系统将触发复制任务来同步项目下的所有镜像仓库到策略的目标实例。请确认继续。',
+  'confirm_to_toggle_enabled_policy': '启用策略后，该项目下的所有镜像仓库将复制到目标实例。请确认继续。',
   'confirm_to_toggle_disabled_policy_title': '停用策略',
-  'confirm_to_toggle_disabled_policy': '停用策略后，属于此策略的所有复制任务将终止。请确认继续。'
+  'confirm_to_toggle_disabled_policy': '停用策略后，所有未完成的复制任务将被终止和取消。请确认继续。'
 };