From 77bdec498c6b7529ebcd2e76005f329d9c92c3bf Mon Sep 17 00:00:00 2001
From: Firmlyzhu <firmlyzhu@163.com>
Date: Tue, 2 Apr 2019 17:15:38 +0800
Subject: [PATCH] update oss mount on create job page

---
 web/templates/batch/batch_create.html | 43 ++++++++++++++++-----------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/web/templates/batch/batch_create.html b/web/templates/batch/batch_create.html
index 469f560..eb7238f 100644
--- a/web/templates/batch/batch_create.html
+++ b/web/templates/batch/batch_create.html
@@ -130,17 +130,26 @@
         var table = $("#storage_mapping_" + obj.id)[0];
         var new_mapping = table.insertRow();
         new_mapping.id = "mapping_" + task_number + "_" + mapping_number;
-        var local_dir = new_mapping.insertCell();
-        var remote_dir = new_mapping.insertCell();
-        var source = new_mapping.insertCell();
+        var provider = new_mapping.insertCell();
+        var bucket_name = new_mapping.insertCell();
+        var accessKey = new_mapping.insertCell();
+        var secretKey = new_mapping.insertCell();
+        var endpoint = new_mapping.insertCell();
+        var mountpath = new_mapping.insertCell();
         var remove = new_mapping.insertCell();
-        local_dir.innerHTML = '<input type="text" class="form-control" name="mappingLocalDir_' + task_number + '_' + mapping_number + '" id="mapping_local_dir_'
-                             + task_number + '_' + mapping_number + '" />';
-        remote_dir.innerHTML = '<input type="text" class="form-control" name="mappingRemoteDir_' + task_number + '_' + mapping_number + '" id="mapping_remote_dir_'
-                             + task_number + '_' + mapping_number + '" />';
-        source.innerHTML = '<select class="form-control" name="mappingSource_' + task_number + '_' + mapping_number + '" id="mapping_source_'
+        bucket_name.innerHTML = '<input type="text" class="form-control" name="mappingBucketName_' + task_number + '_' + mapping_number + '" id="mapping_bucketname_'
+                             + task_number + '_' + mapping_number + '" required/>';
+        accessKey.innerHTML = '<input type="text" class="form-control" name="mappingAccessKey_' + task_number + '_' + mapping_number + '" id="mapping_accessKey_'
+                             + task_number + '_' + mapping_number + '" required/>';
+        secretKey.innerHTML = '<input type="text" class="form-control" name="mappingSecretKey_' + task_number + '_' + mapping_number + '" id="mapping_secretKey_'
+                             + task_number + '_' + mapping_number + '" required/>';
+        endpoint.innerHTML = 'http://<input type="text" class="form-control" name="mappingEndpoint_' + task_number + '_' + mapping_number + '" id="mapping_endpoint_'
+                             + task_number + '_' + mapping_number + '" required/>';
+        mountpath.innerHTML = '<input type="text" class="form-control" name="mappingMountpath_' + task_number + '_' + mapping_number + '" id="mapping_mountpath_'
+                             + task_number + '_' + mapping_number + '" required/>';
+        provider.innerHTML = '<select class="form-control" name="mappingProvider_' + task_number + '_' + mapping_number + '" id="mapping_provider_'
                           + task_number + '_' + mapping_number + '">'
-                          +'<option>Aliyun</option><option>AWS</option></select>';
+                          +'<option>Aliyun</option></select>';
         remove.innerHTML = '<div class="box-tool pull-left"><button type="button" id="' + task_number + '_' + mapping_number +'" onclick="removeMapping(this)" class="btn btn-xs btn-danger">'
                           +'Remove</button></div>';
     }
@@ -324,18 +333,18 @@
            +'</div>'
            +'</div>'
            +'<div class="form-group">'
-           +'<span>'
-           +'<label class="col-sm-2 contril-label">Exteranl Storage Mapping</label>'
-           +'<table class="table table-bordered" id="storage_mapping_' + task_number + '" style="display:inline;">'
+           +'<label class="col-sm-2 control-label">Object Storage Mapping<br/>'
+           +'<button type="button" id="' + task_number + '" class="btn btn-primary btn-xs" title="add an external storage mapping" onclick="addMapping(this)">'
+           +'Add<i class="fa fa-plus"></i></button></label>'
+           +'<div class="col-sm-10"><table class="table table-bordered" id="storage_mapping_' + task_number + '">'
            +'<thead>'
-           +'<tr><td><button type="button" id="' + task_number + '" class="btn btn-primary btn-xs" title="add an external storage mapping" onclick="addMapping(this)">'
-           +'<i class="fa fa-plus"></i></button></td></tr>'
-           +'<tr><th style="width:217px">Local Dir</th><th style="width:217px">Remote Dir</th><th style="width:217px">source</th><th style="width:217px">Operation</th></tr>'
+           +'<tr><th>Provider</th><th>Bucket Name</th><th>AccessKey ID</th><th>AccessKey Secret</th><th>Endpoint</th><th>Mount Path</th><th>Remove</th></tr>'
            +'</thead>'
            +'<tbody>'
            +'</tbody>'
-           +'</table>'
-           +'</span></div><div class="box-tools pull-right"><button type="button" id="' + task_number + '" onclick="unfoldTask(this)" class="btn btn-primary">Confirm</button></div>'
+           +'</table></div>'
+           +'</div>'
+           +'<div class="box-tools pull-right"><button type="button" id="' + task_number + '" onclick="unfoldTask(this)" class="btn btn-primary">Confirm</button></div>'
            +'</div></div></div>'
       $(task_html).appendTo("#accordion");
     }