Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-05 00:37:32 +02:00
Code Issues Projects Releases Wiki Activity

updates on i18n of modal and add-project-members.

Browse Source
This commit is contained in:
kunw 2016-05-15 01:43:05 +08:00
parent 9615aa72f9
commit 49907a7992
6 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,8 @@
<div class="modal-body">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" id="btnOk">OK</button>
<button type="button" class="btn btn-default" data-dismiss="modal">// 'close' | tr //</button>
<button type="button" class="btn btn-primary" id="btnOk">// 'ok' | tr //</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->

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

@ -25,7 +25,7 @@
<form>
<div class="form-group">
<button type="button" class="btn btn-default" id="btnCancel" ng-click="vm.cancel(form)">// 'cancel' | tr //</button>
<button type="button" class="btn btn-primary" id="btnSave" ng-click="vm.save(pm)">// 'save' | tr //</button>
<button type="button" class="btn btn-primary" id="btnSave" ng-disabled="form.$invalid" ng-click="vm.save(pm)">// 'save' | tr //</button>
</div>
</form>
</div>

6
static/ng/resources/js/components/project-member/add-project-member.directive.js
View File

@ -10,7 +10,7 @@
function AddProjectMemberController($scope, roles, AddProjectMemberService) {
var vm = this;
vm.username = "";
vm.username = '';
vm.roles = roles();
vm.optRole = 1;
@ -31,7 +31,7 @@
AddProjectMemberService(vm.projectId, vm.optRole, pm.username)
.success(addProjectMemberComplete)
.error(addProjectMemberFailed);
vm.username = "";
vm.username = '';
vm.optRole = 1;
vm.reload();
}
@ -42,7 +42,7 @@
form.$setPristine();
}
vm.isOpen = false;
vm.username = "";
vm.username = '';
vm.optRole = 1;
}

8
static/ng/resources/js/services/i18n/locale_messages.js
View File

@ -448,5 +448,13 @@ var global_messages = {
'alert_delete_tag': {
'en-US': 'Delete this "$0" tag now?',
'zh-CN': '删除镜像标签 "$0" ?'
},
'close': {
'en-US': 'Close',
'zh-CN': '关闭'
},
'ok': {
'en-US': 'OK',
'zh-CN': '确认'
}
};

20
views/ng/account-settings.htm
View File

@ -67,6 +67,9 @@
<label for="oldPassword" class="col-sm-3 control-label">// 'old_password' | tr //:</label>
<div class="col-sm-7">
<input type="password" class="form-control" id="oldPassword" ng-model="user.oldPassword" ng-change="vm.reset()" name="uOldPassword" required>
<div class="error-message" ng-messages="form.uOldPassword.$error" ng-if="form.uOldPassword.$touched">
<span ng-message="required">// 'old_password_is_required' | tr //</span>
</div>
</div>
<div class="col-sm-2">
<span class="asterisk">*</span>
@ -76,6 +79,10 @@
<label for="password" class="col-sm-3 control-label">// 'new_password' | tr //:</label>
<div class="col-sm-7">
<input type="password" class="form-control" id="password" ng-model="user.password" ng-change="vm.reset()" name="uPassword" required password>
<div class="error-message" ng-messages="form.uPassword.$error" ng-if="form.uPassword.$touched">
<span ng-message="required">// 'password_is_required' | tr //</span>
<span ng-message="password">// 'password_is_invalid' | tr //</span>
</div>
<p class="help-block small-size-fonts">// 'password_desc' | tr //</p>
</div>
<div class="col-sm-2">
@ -86,6 +93,9 @@
<label for="confirmPassword" class="col-sm-3 control-label">// 'confirm_password' | tr //:</label>
<div class="col-sm-7">
<input type="password" class="form-control" id="confirmPassword" ng-model="user.confirmPassword" ng-change="vm.reset()" name="uConfirmPassword" compare-to="user.password">
<div class="error-message" ng-messages="form.uConfirmPassword.$error" ng-if="form.uConfirmPassword.$touched">
<span ng-message="compareTo">// 'password_does_not_match' | tr //</span>
</div>
</div>
<div class="col-sm-2">
<span class="asterisk">*</span>
@ -99,16 +109,6 @@
</div>
</div>
<div class="error-message">
<div ng-messages="form.uOldPassword.$error" ng-if="form.uOldPassword.$touched">
<span ng-message="required">// 'old_password_is_required' | tr //</span>
</div>
<div ng-messages="form.uPassword.$error" ng-if="form.uPassword.$touched">
<span ng-message="required">// 'new_password_is_required' | tr //</span>
<span ng-message="password">// 'new_password_is_invalid' | tr //</span>
</div>
<div ng-messages="form.uConfirmPassword.$error" ng-if="form.uConfirmPassword.$touched">
<span ng-message="compareTo">// 'password_does_not_match' | tr //</span>
</div>
<span ng-show="vm.hasError">// vm.errorMessage | tr //</span>
</div>
</form>

22
views/ng/reset-password.htm
View File

@ -9,7 +9,11 @@
<div class="form-group">
<label for="password" class="col-sm-3 control-label">// 'password' | tr //:</label>
<div class="col-sm-7">
<input type="password" class="form-control" id="password" ng-model="user.password" ng-model-options="{ updateOn: 'blur' }" ng-change="vm.reset()" name="uPassword" required password>
<input type="password" class="form-control" id="password" ng-model="user.password" ng-change="vm.reset()" name="uPassword" required password>
<div class="error-message" ng-messages="form.uPassword.$error" ng-if="form.uPassword.$touched">
<span ng-message="required">// 'password_is_required' | tr //</span>
<span ng-message="password">// 'password_is_invalid' | tr //</span>
</div>
<p class="help-block small-size-fonts">// 'password_desc' | tr //</p>
</div>
<div class="col-sm-2">
@ -19,7 +23,10 @@
<div class="form-group">
<label for="confirmPassword" class="col-sm-3 control-label">// 'confirm_password' | tr //:</label>
<div class="col-sm-7">
<input type="password" class="form-control" id="confirmPassword" ng-model="user.confirmPassword" ng-model-options="{ updateOn: 'blur' }" ng-change="vm.reset()" name="uConfirmPassword" compare-to="user.password">
<input type="password" class="form-control" id="confirmPassword" ng-model="user.confirmPassword" ng-change="vm.reset()" name="uConfirmPassword" compare-to="user.password">
<div class="error-message" ng-messages="form.uConfirmPassword.$error" ng-if="form.uConfirmPassword.$touched">
<span ng-message="compareTo">// 'password_does_not_match' | tr //</span>
</div>
</div>
<div class="col-sm-2">
<span class="asterisk">*</span>
@ -27,18 +34,11 @@
</div>
<div class="form-group">
<div class="col-md-offset-7 col-md-10">
<input type="submit" class="btn btn-default" ng-click="vm.cancel(form)" value="Cancel">
<input type="submit" class="btn btn-primary" ng-disabled="form.$invalid" ng-click="vm.resetPassword(user)" value="Save">
<input type="submit" class="btn btn-default" ng-click="vm.cancel(form)" value="// 'cancel' | tr //">
<input type="submit" class="btn btn-primary" ng-disabled="form.$invalid" ng-click="vm.resetPassword(user)" value="// 'save' | tr //">
</div>
</div>
<div class="error-message">
<div ng-messages="form.$dirty && form.uPassword.$error">
<span ng-message="required">// 'password_is_required' | tr //</span>
<span ng-message="password">// 'password_is_invalid' | tr //</span>
</div>
<div ng-messages="form.$dirty && form.uConfirmPassword.$error">
<span ng-message="compareTo">// 'password_does_not_match' | tr //</span>
</div>
<span ng-show="vm.hasError">// vm.errorMessage //</span>
</div>
</form>