Merge pull request #494 from yhua123/patch-1

squash 3 commit for add error icon on list

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

@@ -20,7 +20,8 @@
             <th width="18%">// 'destination' | tr //</th>
             <th width="18%">// 'last_start_time' | tr //</th>
             <th width="14%">// 'activation' | tr// </th>
-            <th width="15%">// 'actions' | tr //</th>
+            <th width="10%">// 'actions' | tr //</th>
+            <th width="5%"></th>
     			 </thead>
         </table>
         </div>
@@ -39,7 +40,7 @@
                   <span ng-switch-when="1">// 'enabled' | tr //</span>
                   <span ng-switch-when="0">// 'disabled' | tr //</span>
                 </td>
-                <td width="15%">
+                <td width="10%">
                   <div class="display-inline-block" ng-switch on="//r.enabled//">
                    <a href="javascript:void(0);" ng-click="vm.confirmToTogglePolicy(r.id, 0, r.name)" title="// 'disable' | tr //"><span ng-switch-when="1" class="glyphicon glyphicon-stop color-danger"></span></a>
                    <a href="javascript:void(0);" ng-click="vm.confirmToTogglePolicy(r.id, 1, r.name)" title="// 'enable' | tr //"><span ng-switch-when="0" class="glyphicon glyphicon-play color-success"></span></a>
@@ -49,6 +50,9 @@
                   &nbsp;
                   <!--a href="javascript:void(0);"><span class="glyphicon glyphicon-trash"></span></a -->
                 </td>
+                <td width="5%">
+                  <a ng-if= "r.error_job_count > 0" title = "// 'found_error_in_replication_job' | tr: [r.error_job_count] //"><span class="glyphicon glyphicon-exclamation-sign color-danger" ></span></a>
+                </td>
               </tr>
             </tbody>
       		</table>
@@ -131,4 +135,4 @@
       </div>  
     </div>  
   </div>          
-</div>
+</div>

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

@@ -247,6 +247,7 @@ var locale_messages = {
   'inline_help_publicity_title': '<strong>Publicity of Project</strong>',
   'inline_help_publicity': 'Setting the project as public.',
   'alert_job_contains_error': 'Found errors in the current replication jobs, please check.',
+  'found_error_in_replication_job': 'Found $0 error(s).',
   'caution': 'Caution',
   'confirm_to_toggle_policy_title': 'Policy Toggle',
   'confirm_to_toggle_policy': 'Are you sure to toggle policy $0 to <strong>$1</strong> status?'

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

@@ -247,6 +247,7 @@ var locale_messages = {
   'inline_help_publicity_title': '<strong>公开项目</strong>',
   'inline_help_publicity': '设置该项目为公开。',
   'alert_job_contains_error': '当前复制任务中包含错误，请检查。',
+  'found_error_in_replication_job': '发现 $0 个错误。',
   'caution': '注意',
   'confirm_to_toggle_policy_title': '切换复制策略状态',
   'confirm_to_toggle_policy': '确认将复制策略 $0 切换为 <strong>$1</strong> 状态吗?'