From 7c82af9e8567cab98309d6f4f4abe11652cf836e Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Mon, 16 May 2016 14:21:59 +0800
Subject: [PATCH] updates for pull-command prefix of HarborRegUrl of UI.

---
 controllers/ng/repository.go                                  | 3 +++
 .../js/components/repository/list-tag.directive.html          | 4 ++--
 .../js/components/repository/pull-command.directive.html      | 2 +-
 .../js/components/repository/pull-command.directive.js        | 4 +++-
 .../ng/resources/js/components/sign-in/sign-in.directive.html | 4 ++--
 views/ng/repository.htm                                       | 1 +
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/controllers/ng/repository.go b/controllers/ng/repository.go
index cb4d52de9..696def246 100644
--- a/controllers/ng/repository.go
+++ b/controllers/ng/repository.go
@@ -1,9 +1,12 @@
 package ng
 
+import "os"
+
 type RepositoryController struct {
 	BaseController
 }
 
 func (rc *RepositoryController) Get() {
+	rc.Data["HarborRegUrl"] = os.Getenv("HARBOR_REG_URL")
 	rc.Forward("Repository", "repository.htm")
 }
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 8308acc0f..d9057bcde 100644
--- a/static/ng/resources/js/components/repository/list-tag.directive.html
+++ b/static/ng/resources/js/components/repository/list-tag.directive.html
@@ -3,8 +3,8 @@
     <table class="repository-table">
       <thead>
         <th width="20%"><span class="glyphicon glyphicon-tags"></span> // 'tag' | tr //</th>
-        <th width="30%">// 'image_details' | tr //</th>
-        <th width="40%">// 'pull_command' | tr //</th>
+        <th width="10%">// 'image_details' | tr //</th>
+        <th width="60%">// 'pull_command' | tr //</th>
         <th width="10%">// 'operation' | tr //</th>
       </thead>
       <tbody>
diff --git a/static/ng/resources/js/components/repository/pull-command.directive.html b/static/ng/resources/js/components/repository/pull-command.directive.html
index 4669c1311..6a38a8d3f 100644
--- a/static/ng/resources/js/components/repository/pull-command.directive.html
+++ b/static/ng/resources/js/components/repository/pull-command.directive.html
@@ -1,7 +1,7 @@
 <form class="form-inline">
   <div class="form-group">
     <div class="input-group">
-      <input type="text" class="form-control" id="//vm.repoName//-//vm.tag//" value="docker pull //vm.repoName//://vm.tag//" readonly="readonly" size="30">
+      <input type="text" class="form-control" id="//vm.repoName//-//vm.tag//" value="docker pull //vm.harborRegUrl////vm.repoName//://vm.tag//" readonly="readonly" size="60">
       <div class="input-group-addon">
         <a href="javascript:void(0);" data-clipboard-target="//vm.repoName//-//vm.tag//"><span class="glyphicon glyphicon-duplicate" data-toggle="tooltip" data-placement="right" title="Copied!"></span></a>
       </div>
diff --git a/static/ng/resources/js/components/repository/pull-command.directive.js b/static/ng/resources/js/components/repository/pull-command.directive.js
index 68868aeb2..b7a8176f5 100644
--- a/static/ng/resources/js/components/repository/pull-command.directive.js
+++ b/static/ng/resources/js/components/repository/pull-command.directive.js
@@ -26,7 +26,9 @@
     return directive;
     
     function link(scope, element, attrs, ctrl) {
-     
+       
+      ctrl.harborRegUrl = $('#HarborRegUrl').val() + '/';
+    
       ZeroClipboard.config( { swfPath: "/static/ng/vendors/zc/v2.2.0/ZeroClipboard.swf" } );
       var clip = new ZeroClipboard(element.find('a'));
       element.find('span').tooltip({'trigger': 'click'});
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 bf78635f2..06f4d3c82 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,7 +1,7 @@
 <form name="form" class="form-horizontal css-form" ng-submit="form.$valid" novalidate>
   <div class="form-group"> 
     <div class="col-sm-offset-1 col-sm-10">
-      <input id="username"  type="text" class="form-control" placeholder="// 'username_email' | tr //" name="uPrincipal" ng-model-options="{ updateOn: 'blur' }" ng-change="vm.reset()" ng-model="user.principal" required>
+      <input id="username"  type="text" class="form-control" placeholder="// 'username_email' | tr //" name="uPrincipal" ng-change="vm.reset()" ng-model="user.principal" required>
       <div class="error-message">
         <div ng-messages="form.uPrincipal.$error" ng-if="form.uPrincipal.$touched">
           <span ng-message="required">// 'username_is_required' | tr //</span>
@@ -11,7 +11,7 @@
   </div>
   <div class="form-group">
     <div class="col-sm-offset-1 col-sm-10">
-      <input type="password" class="form-control" placeholder="// 'password' | tr //" name="uPassword" ng-model-options="{ updateOn: 'blur' }" ng-change="vm.reset()" ng-model="user.password" required>
+      <input type="password" class="form-control" placeholder="// 'password' | tr //" name="uPassword" ng-change="vm.reset()" ng-model="user.password" required>
       <div class="error-message">
         <div ng-messages="form.uPassword.$error" ng-if="form.uPassword.$touched">
           <span ng-message="required">// 'password_is_required' | tr //</span>
diff --git a/views/ng/repository.htm b/views/ng/repository.htm
index 100eec7e9..0cb55469c 100644
--- a/views/ng/repository.htm
+++ b/views/ng/repository.htm
@@ -18,6 +18,7 @@
           <retrieve-projects is-open="vm.open" selected-project="vm.selectedProject" is-project-member="vm.isProjectMember" publicity="vm.publicity"></retrieve-projects>
           <!-- Tab panes -->
   		    <div class="tab-content" ng-click="vm.closeRetrievePane()">
+          <input type="hidden" id="HarborRegUrl" value="{{.HarborRegUrl}}">
           <ng-view></ng-view>
         </div>
       </div>