Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-03 09:09:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #494 from yhua123/patch-1

Browse Source 
squash 3 commit for add error icon on list
This commit is contained in:
kun wang 2016-07-07 16:41:14 +08:00 committed by GitHub
commit 1dfae7aa5b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static/resources/js/components/replication/list-replication.directive.html
View File

@ -20,7 +20,8 @@
<th width="18%">// 'destination' | tr //</th> <th width="18%">// 'destination' | tr //</th>
<th width="18%">// 'last_start_time' | tr //</th> <th width="18%">// 'last_start_time' | tr //</th>
<th width="14%">// 'activation' | 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> </thead>
</table> </table>
</div> </div>
@ -39,7 +40,7 @@
<span ng-switch-when="1">// 'enabled' | tr //</span> <span ng-switch-when="1">// 'enabled' | tr //</span>
<span ng-switch-when="0">// 'disabled' | tr //</span> <span ng-switch-when="0">// 'disabled' | tr //</span>
</td> </td>
<td width="15%"> <td width="10%">
<div class="display-inline-block" ng-switch on="//r.enabled//"> <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, 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> <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; &nbsp;
<!--a href="javascript:void(0);"><span class="glyphicon glyphicon-trash"></span></a --> <!--a href="javascript:void(0);"><span class="glyphicon glyphicon-trash"></span></a -->
</td> </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> </tr>
</tbody> </tbody>
</table> </table>

1
static/resources/js/services/i18n/locale_messages_en-US.js
View File

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

1
static/resources/js/services/i18n/locale_messages_zh-CN.js
View File

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