diff --git a/static/ng/resources/css/index.css b/static/ng/resources/css/index.css
index 41607d8c4..4be0d985e 100644
--- a/static/ng/resources/css/index.css
+++ b/static/ng/resources/css/index.css
@@ -16,7 +16,7 @@ body {
padding: 15px 15px 15px;
margin: 20px 0 20px 0;
background-color: #FFFFFF;
- height: 257px;
+ height: 277px;
}
.up-section h4 label {
diff --git a/static/ng/resources/css/sign-up.css b/static/ng/resources/css/sign-up.css
index 1096db173..15f5e96fd 100644
--- a/static/ng/resources/css/sign-up.css
+++ b/static/ng/resources/css/sign-up.css
@@ -34,11 +34,9 @@
font-size: 14pt;
}
-.css-form input .ng-valid .ng-submitted {
- border-color: black;
-}
-.css-form input .ng-invalid .ng-submitted {
+
+.css-form input.ng-invalid.ng-dirty {
border-color: red;
}
diff --git a/static/ng/resources/js/components/project-member/add-project-member.directive.js b/static/ng/resources/js/components/project-member/add-project-member.directive.js
index a22819e35..e29f2e08e 100644
--- a/static/ng/resources/js/components/project-member/add-project-member.directive.js
+++ b/static/ng/resources/js/components/project-member/add-project-member.directive.js
@@ -28,7 +28,7 @@
function save(pm) {
if(pm && angular.isDefined(pm.username)) {
- AddProjectMemberService(vm.projectId, vm.optRole, vm.username)
+ AddProjectMemberService(vm.projectId, vm.optRole, pm.username)
.success(addProjectMemberComplete)
.error(addProjectMemberFailed);
vm.username = "";
diff --git a/static/ng/resources/js/components/project/add-project.directive.html b/static/ng/resources/js/components/project/add-project.directive.html
index 6368f3e11..c2e3ed77d 100644
--- a/static/ng/resources/js/components/project/add-project.directive.html
+++ b/static/ng/resources/js/components/project/add-project.directive.html
@@ -5,10 +5,10 @@
-
+
Project name is required.
-
// vm.errorMessage //
+
// vm.errorMessage | tr //
diff --git a/static/ng/resources/js/components/project/add-project.directive.js b/static/ng/resources/js/components/project/add-project.directive.js
index 91698fea7..bbc2bab1e 100644
--- a/static/ng/resources/js/components/project/add-project.directive.js
+++ b/static/ng/resources/js/components/project/add-project.directive.js
@@ -34,7 +34,6 @@
}
function addProjectSuccess(data, status) {
- vm.isOpen = false;
vm.projectName = "";
vm.isPublic = false;
$scope.$emit('addedSuccess', true);
@@ -43,7 +42,11 @@
function addProjectFailed(data, status) {
if(status === 409) {
vm.hasError = true;
- vm.errorMessage = 'Project already exists.';
+ vm.errorMessage = 'project_already_exist';
+ }
+ if(status == 500) {
+ vm.hasError = true;
+ vm.errorMessage = 'project_name_is_invalid';
}
console.log('Failed to add project:' + status);
}
diff --git a/static/ng/resources/js/components/repository/list-repository.directive.js b/static/ng/resources/js/components/repository/list-repository.directive.js
index e2f21233b..a2d4eb3f6 100644
--- a/static/ng/resources/js/components/repository/list-repository.directive.js
+++ b/static/ng/resources/js/components/repository/list-repository.directive.js
@@ -5,9 +5,9 @@
.module('harbor.repository')
.directive('listRepository', listRepository);
- ListRepositoryController.$inject = ['$scope', 'ListRepositoryService', 'DeleteRepositoryService', 'nameFilter', '$routeParams'];
+ ListRepositoryController.$inject = ['$scope', 'ListRepositoryService', 'DeleteRepositoryService', '$routeParams', '$filter', 'trFilter'];
- function ListRepositoryController($scope, ListRepositoryService, DeleteRepositoryService, nameFilter, $routeParams) {
+ function ListRepositoryController($scope, ListRepositoryService, DeleteRepositoryService, $routeParams, $filter, trFilter) {
var vm = this;
vm.filterInput = "";
@@ -58,10 +58,8 @@
function deleteByRepo(repoName) {
vm.repoName = repoName;
vm.tag = '';
- vm.modalTitle = 'Delete repository - ' + repoName;
- vm.modalMessage = 'After deleting the associated tags with the repository will be deleted together.
' +
- 'And the corresponding image will be removed from the system.
' +
- '
Delete this "' + repoName + '" repository now?';
+ vm.modalTitle = $filter('tr')('alert_delete_repo_title', [repoName]);
+ vm.modalMessage = $filter('tr')('alert_delete_repo', [repoName]);
}
function deleteImage() {
diff --git a/static/ng/resources/js/components/repository/list-tag.directive.html b/static/ng/resources/js/components/repository/list-tag.directive.html
index 0951c6304..8308acc0f 100644
--- a/static/ng/resources/js/components/repository/list-tag.directive.html
+++ b/static/ng/resources/js/components/repository/list-tag.directive.html
@@ -2,10 +2,10 @@
- Tag |
- Image Details |
- Pull Command |
- Operation |
+ // 'tag' | tr // |
+ // 'image_details' | tr // |
+ // 'pull_command' | tr // |
+ // 'operation' | tr // |
diff --git a/static/ng/resources/js/components/repository/list-tag.directive.js b/static/ng/resources/js/components/repository/list-tag.directive.js
index 2ce35cb72..0ee834fab 100644
--- a/static/ng/resources/js/components/repository/list-tag.directive.js
+++ b/static/ng/resources/js/components/repository/list-tag.directive.js
@@ -6,9 +6,9 @@
.module('harbor.repository')
.directive('listTag', listTag);
- ListTagController.$inject = ['$scope', 'ListTagService'];
+ ListTagController.$inject = ['$scope', 'ListTagService', '$filter', 'trFilter'];
- function ListTagController($scope, ListTagService) {
+ function ListTagController($scope, ListTagService, $filter, trFilter) {
var vm = this;
vm.tags = [];
@@ -37,15 +37,13 @@
function deleteByTag(e) {
$scope.$emit('tag', e.tag);
$scope.$emit('repoName', e.repoName);
- $scope.$emit('modalTitle', 'Delete tag - ' + e.tag);
+ $scope.$emit('modalTitle', $filter('tr')('alert_delete_tag_title', [e.tag]));
var message;
if(vm.tags.length == 1) {
- message = 'After deleting the associated repository with the tag will be deleted together,
' +
- 'because a repository contains at least one tag. And the corresponding image will be removed from the system.
' +
- '
Delete this "' + e.tag + '" tag now?';
+ message = $filter('tr')('alert_delete_last_tag', [e.tag]);
}else {
- message = 'Delete this "' + e.tag + '" tag now?';
+ message = $filter('tr')('alert_delete_tag', [e.tag]);
}
$scope.$emit('modalMessage', message);
diff --git a/static/ng/resources/js/components/sign-in/sign-in.directive.html b/static/ng/resources/js/components/sign-in/sign-in.directive.html
index a1a173899..bccb5bb9f 100644
--- a/static/ng/resources/js/components/sign-in/sign-in.directive.html
+++ b/static/ng/resources/js/components/sign-in/sign-in.directive.html
@@ -1,9 +1,9 @@
-