Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-01 20:41:22 +01:00
Code Issues Projects Releases Wiki Activity

update for modal-dialog input paramater name.

Browse Source
This commit is contained in:
kunw 2016-06-22 11:26:28 +08:00
parent 2908c090b0
commit 0a0b206863
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/resources/css/index.css
View File

@ -75,8 +75,6 @@ body {
.long-line {
overflow: hidden;
width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
}
.down-table-pane {

2
static/resources/js/components/modal-dialog/modal-dialog.directive.html
View File

@ -3,7 +3,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">//vm.title//</h4>
<h4 class="modal-title">//vm.modalTitle//</h4>
</div>
<div class="modal-body">
</div>

6
static/resources/js/components/modal-dialog/modal-dialog.directive.js
View File

@ -20,8 +20,8 @@
'link': link,
'scope': {
'contentType': '@',
'title': '@',
'message': '@',
'modalTitle': '@',
'modalMessage': '@',
'action': '&',
'confirmOnly': '@'
},
@ -38,7 +38,7 @@
}
console.log('Received contentType in modal:' + ctrl.contentType);
scope.$watch('vm.message', function(current) {
scope.$watch('vm.modalMessage', function(current) {
if(current) {
switch(ctrl.contentType) {
case 'text/html':

2
static/resources/js/components/project-member/list-project-member.directive.html
View File

@ -12,7 +12,7 @@
</div>
<div class="pane">
<add-project-member ng-show="vm.isOpen" is-open="vm.isOpen" project-id="//vm.projectId//" reload='vm.search({projectId: vm.projectId, username: vm.username})'></add-project-member>
<modal-dialog title="// 'confirm_to_delete_member_title' | tr //" message="// 'confirm_to_delete_member' | tr //" action="vm.deleteProjectMember()"></modal-dialog>
<modal-dialog modal-title="// 'confirm_to_delete_member_title' | tr //" modal-message="// 'confirm_to_delete_member' | tr //" action="vm.deleteProjectMember()"></modal-dialog>
<div class="sub-pane">
<table class="table table-pane" >
<thead>

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

@ -7,7 +7,7 @@
<button class="btn btn-primary" type="button" ng-click="vm.searchReplicationPolicy()"><span class="glyphicon glyphicon-search"></span></button>
</span>
</div>
<button ng-if="!vm.isOpen" class="btn btn-success" type="button" ng-click="vm.addReplication()" data-toggle="modal" data-target="#createPolicyModal"><span class="glyphicon glyphicon-plus"></span>// 'add_new_replication' | tr //</button>
<button ng-if="!vm.isOpen" class="btn btn-success" type="button" ng-click="vm.addReplication()" data-toggle="modal" data-target="#createPolicyModal"><span class="glyphicon glyphicon-plus"></span>// 'add_new_policy' | tr //</button>
<create-policy reload="vm.retrievePolicy()" action="vm.action" modal-title="//vm.modalTitle//" policy-id="//vm.policyId//"></create-policy>
</div>
<div class="pane-split" id="upon-pane">
@ -42,7 +42,7 @@
&nbsp;
<a href="javascript:void(0);" data-toggle="modal" data-target="#createPolicyModal" ng-click="vm.editReplication(r.id)"><span class="glyphicon glyphicon-pencil"></span></a>
&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>
</tr>
</tbody>

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

@ -6,9 +6,9 @@
.module('harbor.replication')
.directive('listReplication', listReplication);
ListReplicationController.$inject = ['$scope', 'getParameterByName', '$location', 'ListReplicationPolicyService', 'ToggleReplicationPolicyService', 'ListReplicationJobService', '$window'];
ListReplicationController.$inject = ['$scope', 'getParameterByName', '$location', 'ListReplicationPolicyService', 'ToggleReplicationPolicyService', 'ListReplicationJobService', '$window', '$filter', 'trFilter'];
function ListReplicationController($scope, getParameterByName, $location, ListReplicationPolicyService, ToggleReplicationPolicyService, ListReplicationJobService, $window) {
function ListReplicationController($scope, getParameterByName, $location, ListReplicationPolicyService, ToggleReplicationPolicyService, ListReplicationJobService, $window, $filter, trFilter) {
var vm = this;
$scope.$on('$locationChangeSuccess', function() {
@ -73,13 +73,13 @@
}
function addReplication() {
vm.modalTitle = 'Create New Policy';
vm.modalTitle = $filter('tr')('add_new_policy', []);
vm.action = 'ADD_NEW';
}
function editReplication(policyId) {
vm.policyId = policyId;
vm.modalTitle = 'Edit Policy';
vm.modalTitle = $filter('tr')('edit_policy', []);
vm.action = 'EDIT';
console.log('Selected policy ID:' + vm.policyId);

2
static/resources/js/components/repository/list-repository.directive.html
View File

@ -12,7 +12,7 @@
<h3 style="margin-top: 200px;" class="text-muted">// 'no_repositories' | tr //</h3>
</div>
<div ng-if="vm.repositories.length > 0" class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
<modal-dialog action="vm.deleteImage()" content-type="text/html" title="//vm.modalTitle//" message="//vm.modalMessage//"></modal-dialog>
<modal-dialog action="vm.deleteImage()" content-type="text/html" modal-title="//vm.modalTitle//" modal-message="//vm.modalMessage//"></modal-dialog>
<div class="panel panel-default" ng-repeat="repo in vm.repositories">
<div class="panel-heading" role="tab" id="heading//$index + 1//">
<h4 class="panel-title">

2
static/resources/js/components/system-management/destination.directive.html
View File

@ -11,7 +11,7 @@
<create-destination action="//vm.action//" target-id="//vm.targetId//" reload="vm.retrieve()"></create-destination>
</div>
<div class="pane">
<modal-dialog title="// 'confirm_to_delete_destination_title' | tr //" message="// 'confirm_to_delete_destination' | tr //" action="vm.deleteDestination()"></modal-dialog>
<modal-dialog modal-title="// 'confirm_to_delete_destination_title' | tr //" modal-message="// 'confirm_to_delete_destination' | tr //" action="vm.deleteDestination()"></modal-dialog>
<div class="sub-pane">
<table class="table table-pane">
<thead>

2
static/resources/js/components/user/list-user.directive.html
View File

@ -9,7 +9,7 @@
</div>
</div>
<div class="pane project-pane">
<modal-dialog title="// 'confirm_to_delete_user_title' | tr //" message="// 'confirm_to_delete_user' | tr //" action="vm.deleteUser()"></modal-dialog>
<modal-dialog modal-title="// 'confirm_to_delete_user_title' | tr //" modal-message="// 'confirm_to_delete_user' | tr //" action="vm.deleteUser()"></modal-dialog>
<div class="sub-pane">
<table class="table">
<thead>

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

@ -136,7 +136,6 @@ var locale_messages = {
'confirm_to_delete_destination_title': 'Delete destination',
'confirm_to_delete_destination': 'Are you sure to delete the current destination?',
'replication': 'Replication',
'add_new_replication': 'New Replication',
'name': 'Name',
'description': 'Description',
'destination': 'Destination',
@ -171,5 +170,7 @@ var locale_messages = {
'harbor_intro_title': 'About Harbor',
'mail_has_been_sent': 'Resetting Email has been sent.',
'send': 'Send',
'successful_signed_up': 'Signed up successfully.'
'successful_signed_up': 'Signed up successfully.',
'add_new_policy': 'Add New Policy',
'edit_policy': 'Edit Policy'
};

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

@ -134,7 +134,6 @@ var locale_messages = {
'confirm_to_delete_destination_title': '删除目标',
'confirm_to_delete_destination': '确认删除当前目标吗？',
'replication': '复制',
'add_new_replication': '新增复制',
'name': '名称',
'description': '描述',
'destination': '目标',
@ -170,5 +169,7 @@ var locale_messages = {
'harbor_intro_title': '关于 Harbor',
'mail_has_been_sent': '重置密码邮件已发送。',
'send': '发送',
'successful_signed_up': '注册成功。'
'successful_signed_up': '注册成功。',
'add_new_policy': '新增策略',
'edit_policy': '修改策略'
};

2
views/account-settings.htm
View File

@ -4,7 +4,7 @@
<div class="section">
<h1 class="col-md-12 col-md-offset-2 main-title title-color">// 'account_setting' | tr //</h1>
<div class="col-md-12 col-md-offset-2 main-content">
<modal-dialog title="//vm.modalTitle//" message="//vm.modalMessage//" action="vm.confirm()" confirm-only="true"></modal-dialog>
<modal-dialog modal-title="//vm.modalTitle//" modal-message="//vm.modalMessage//" action="vm.confirm()" confirm-only="true"></modal-dialog>
<form name="form" class="css-form form-horizontal" novalidate>
<div class="form-group">
<label for="username" class="col-sm-3 control-label">// 'username' | tr //:</label>

2
views/forgot-password.htm
View File

@ -2,7 +2,7 @@
<div class="container container-custom">
<div class="row extend-height">
<div class="section">
<modal-dialog title="// 'forgot_password' | tr //" message="// 'mail_has_been_sent' | tr //" confirm-only="true" action="vm.confirm()"></modal-dialog>
<modal-dialog modal-title="// 'forgot_password' | tr //" modal-message="// 'mail_has_been_sent' | tr //" confirm-only="true" action="vm.confirm()"></modal-dialog>
<h1 class="col-md-12 col-md-offset-2 main-title title-color">// 'forgot_password' | tr //</h1>
<div class="row">
<div class="col-md-12 col-md-offset-2 main-content">

4
views/index.htm
View File

@ -39,9 +39,9 @@
<div class="col-md-4">
<div class="row">
<div class="down-section">
<modal-dialog title="// 'harbor_intro_title' | tr //" message='// vm.message //' content-type="text/html" confirm-only="true"></modal-dialog>
<modal-dialog modal-title="// 'harbor_intro_title' | tr //" modal-message='// vm.message //' content-type="text/html" confirm-only="true"></modal-dialog>
<h4 class="page-header underlined">// 'why_use_harbor' | tr //</h4>
<p class="page-content text-justify" style="line-height: 2.5em;">
<p class="page-content text-justify" style="line-height: 2em; height: 70%;">
// 'index_desc' | tr //
</p>
<div class="page-content pull-right">

2
views/sign-up.htm
View File

@ -2,7 +2,7 @@
<div class="container container-custom">
<div class="row extend-height">
<div class="section">
<modal-dialog title="// 'sign_up' | tr //" message="// 'successful_signed_up' | tr //" confirm-only="true" action="vm.confirm()"></modal-dialog>
<modal-dialog modal-title="// 'sign_up' | tr //" modal-message="// 'successful_signed_up' | tr //" confirm-only="true" action="vm.confirm()"></modal-dialog>
<h1 class="col-md-12 col-md-offset-2 main-title title-color">// 'sign_up' | tr //</h1>
<div class="row">
<div class="col-md-12 col-md-offset-2 main-content">