From e21b5ea671ba036ce1e31c3ddc80c39ac8be264f Mon Sep 17 00:00:00 2001
From: Hiroyuki Eguchi <h-eguchi@az.jp.nec.com>
Date: Sat, 28 Jan 2017 13:18:59 +0900
Subject: [PATCH] Modify fields and help messages

Fix a issue that field name is not corresponding
to help message.
---
 .../datasets/create/info/info.help.html       |  4 +--
 .../datasets/create/info/info.html            |  2 +-
 .../datasets/create/spec/spec.help.html       | 24 ++++++++---------
 .../datasets/create/spec/spec.html            |  2 +-
 .../experiments/create/spec/spec.help.html    | 16 +++---------
 .../experiments/create/spec/spec.html         |  2 +-
 .../learnings/create/info/info.help.html      |  4 +--
 .../learnings/create/info/info.html           |  4 +--
 .../learnings/create/spec/spec.help.html      | 16 +++---------
 .../create/info/info.help.html                |  6 ++---
 .../model_evaluations/create/info/info.html   |  4 +--
 .../create/spec/spec.help.html                | 22 +++++++---------
 .../models/create/info/info.help.html         |  4 +--
 .../models/create/info/info.html              |  2 +-
 .../models/create/spec/spec.help.html         | 26 ++++++++++---------
 15 files changed, 60 insertions(+), 78 deletions(-)

diff --git a/meteos_ui/static/dashboard/machine_learning/datasets/create/info/info.help.html b/meteos_ui/static/dashboard/machine_learning/datasets/create/info/info.help.html
index 466e501..edb792f 100644
--- a/meteos_ui/static/dashboard/machine_learning/datasets/create/info/info.help.html
+++ b/meteos_ui/static/dashboard/machine_learning/datasets/create/info/info.help.html
@@ -3,6 +3,6 @@
   <dd translate>An arbitrary human-readable name.</dd>
   <dt translate>Dataset Description</dt>
   <dd translate>An arbitrary human-readable description.</dd>
-  <dt translate>Template</dt>
-  <dd translate>Name or ID of dataset template.</dd>
+  <dt translate>Experiment</dt>
+  <dd translate>UUID of the experiment.</dd>
 </dl>
diff --git a/meteos_ui/static/dashboard/machine_learning/datasets/create/info/info.html b/meteos_ui/static/dashboard/machine_learning/datasets/create/info/info.html
index 6fdc3cf..8bf4a24 100644
--- a/meteos_ui/static/dashboard/machine_learning/datasets/create/info/info.html
+++ b/meteos_ui/static/dashboard/machine_learning/datasets/create/info/info.html
@@ -25,7 +25,7 @@
         <input name="dataset-experiment-id" type="text" class="form-control" id="dataset-experiment-id"
                ng-model="model.newDatasetSpec.experiment_id"
                ng-required="true"
-               placeholder="{$ 'ID of the experiment.'|translate $}">
+               placeholder="{$ 'UUID of the experiment.'|translate $}">
       </div>
     </div>
   </div>
diff --git a/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.help.html b/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.help.html
index f20f2f6..9fc4ff4 100644
--- a/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.help.html
+++ b/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.help.html
@@ -1,14 +1,14 @@
 <dl>
-  <dt translate>Spark Version</dt>
-  <dd translate> Version of Apache Spark.</dd>
-  <dt translate>Master Nodes</dt>
-  <dd translate> Number of Master Node.</dd>
-  <dt translate>Master Flavor</dt>
-  <dd translate> Flavor ID of Master Node.</dd>
-  <dt translate>Worker Nodes</dt>
-  <dd translate> Number of Worker Node.</dd>
-  <dt translate>Worker Flavor</dt>
-  <dd translate> Flavor ID of Worker Node.</dd>
-  <dt translate>Floating IP Pool</dt>
-  <dd translate> The UUID of Neutron External Network.</dd>
+  <dt translate>Method</dt>
+  <dd translate>Download : Download dataset to Internal HDFS.</br>Parse : Parse dataset and download to Internal HDFS.</br></dd>
+  <dt translate>Source Dataset URL</dt>
+  <dd translate>URL of Dataset stored Swift or Internal HDFS.</dd>
+  <dt translate>Params</dt>
+  <dd translate>Parameters when parsing dataset.</dd>
+  <dt translate>Swift Tenant</dt>
+  <dd translate>Tenant name of Swift.</dd>
+  <dt translate>Swift User Name</dt>
+  <dd translate>User name of Swift.</dd>
+  <dt translate>Swift User Password</dt>
+  <dd translate>Password of Swift User.</dd>
 </dl>
diff --git a/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.html b/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.html
index 6826812..5348277 100644
--- a/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.html
+++ b/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.html
@@ -25,7 +25,7 @@
         <input name="dataset-source-dataset-url" type="text" class="form-control" id="dataset-source-dataset-url"
                ng-model="model.newDatasetSpec.source_dataset_url"
                ng-required="true"
-               placeholder="{$ 'URL of Dataset stored Swift of Internal HDFS.'|translate $}">
+               placeholder="{$ 'URL of Dataset stored Swift or Internal HDFS.'|translate $}">
       </div>
     </div>
     <div class="col-xs-12">
diff --git a/meteos_ui/static/dashboard/machine_learning/experiments/create/spec/spec.help.html b/meteos_ui/static/dashboard/machine_learning/experiments/create/spec/spec.help.html
index f20f2f6..66e6752 100644
--- a/meteos_ui/static/dashboard/machine_learning/experiments/create/spec/spec.help.html
+++ b/meteos_ui/static/dashboard/machine_learning/experiments/create/spec/spec.help.html
@@ -1,14 +1,6 @@
 <dl>
-  <dt translate>Spark Version</dt>
-  <dd translate> Version of Apache Spark.</dd>
-  <dt translate>Master Nodes</dt>
-  <dd translate> Number of Master Node.</dd>
-  <dt translate>Master Flavor</dt>
-  <dd translate> Flavor ID of Master Node.</dd>
-  <dt translate>Worker Nodes</dt>
-  <dd translate> Number of Worker Node.</dd>
-  <dt translate>Worker Flavor</dt>
-  <dd translate> Flavor ID of Worker Node.</dd>
-  <dt translate>Floating IP Pool</dt>
-  <dd translate> The UUID of Neutron External Network.</dd>
+  <dt translate>Key Name</dt>
+  <dd translate>Keypair Name to deploy.</dd>
+  <dt translate>Neutron Management Network</dt>
+  <dd translate>The UUID of Neutron Management Network.</dd>
 </dl>
diff --git a/meteos_ui/static/dashboard/machine_learning/experiments/create/spec/spec.html b/meteos_ui/static/dashboard/machine_learning/experiments/create/spec/spec.html
index 5752284..d3f691f 100644
--- a/meteos_ui/static/dashboard/machine_learning/experiments/create/spec/spec.html
+++ b/meteos_ui/static/dashboard/machine_learning/experiments/create/spec/spec.html
@@ -9,7 +9,7 @@
         <input name="experiment-key-name" type="text" class="form-control" id="experiment-key-name"
                ng-model="model.newExperimentSpec.key_name"
                ng-required="true"
-               placeholder="{$ 'Number of Master Node.'|translate $}">
+               placeholder="{$ 'Keypair Name to deploy.'|translate $}">
       </div>
     </div>
     <div class="col-xs-12">
diff --git a/meteos_ui/static/dashboard/machine_learning/learnings/create/info/info.help.html b/meteos_ui/static/dashboard/machine_learning/learnings/create/info/info.help.html
index 86a7188..43956a5 100644
--- a/meteos_ui/static/dashboard/machine_learning/learnings/create/info/info.help.html
+++ b/meteos_ui/static/dashboard/machine_learning/learnings/create/info/info.help.html
@@ -3,6 +3,6 @@
   <dd translate>An arbitrary human-readable name.</dd>
   <dt translate>Learning Description</dt>
   <dd translate>An arbitrary human-readable description.</dd>
-  <dt translate>Template</dt>
-  <dd translate>Name or ID of learning template.</dd>
+  <dt translate>Model</dt>
+  <dd translate>UUID of prediction model which you want to predict.</dd>
 </dl>
diff --git a/meteos_ui/static/dashboard/machine_learning/learnings/create/info/info.html b/meteos_ui/static/dashboard/machine_learning/learnings/create/info/info.html
index 59146f0..9720313 100644
--- a/meteos_ui/static/dashboard/machine_learning/learnings/create/info/info.html
+++ b/meteos_ui/static/dashboard/machine_learning/learnings/create/info/info.html
@@ -19,13 +19,13 @@
     <div class="col-xs-12">
       <div class="form-group">
         <label class="control-label" for="learning-model-id">
-          <translate>Template</translate>
+          <translate>Model</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="learning-model-id" type="text" class="form-control" id="learning-model-id"
                ng-model="model.newLearningSpec.model_id"
                ng-required="true"
-               placeholder="{$ 'Name or ID of the template.'|translate $}">
+               placeholder="{$ 'UUID of prediction model which you want to predict.'|translate $}">
       </div>
     </div>
   </div>
diff --git a/meteos_ui/static/dashboard/machine_learning/learnings/create/spec/spec.help.html b/meteos_ui/static/dashboard/machine_learning/learnings/create/spec/spec.help.html
index f20f2f6..656252e 100644
--- a/meteos_ui/static/dashboard/machine_learning/learnings/create/spec/spec.help.html
+++ b/meteos_ui/static/dashboard/machine_learning/learnings/create/spec/spec.help.html
@@ -1,14 +1,6 @@
 <dl>
-  <dt translate>Spark Version</dt>
-  <dd translate> Version of Apache Spark.</dd>
-  <dt translate>Master Nodes</dt>
-  <dd translate> Number of Master Node.</dd>
-  <dt translate>Master Flavor</dt>
-  <dd translate> Flavor ID of Master Node.</dd>
-  <dt translate>Worker Nodes</dt>
-  <dd translate> Number of Worker Node.</dd>
-  <dt translate>Worker Flavor</dt>
-  <dd translate> Flavor ID of Worker Node.</dd>
-  <dt translate>Floating IP Pool</dt>
-  <dd translate> The UUID of Neutron External Network.</dd>
+  <dt translate>Method</dt>
+  <dd translate>Currently, a predict method is only supported.</dd>
+  <dt translate>Input Data</dt>
+  <dd translate>Input Data for Prediction.</dd>
 </dl>
diff --git a/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/info/info.help.html b/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/info/info.help.html
index 8132a6a..074c994 100644
--- a/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/info/info.help.html
+++ b/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/info/info.help.html
@@ -1,8 +1,6 @@
 <dl>
   <dt translate>ModelEvaluation Name</dt>
   <dd translate>An arbitrary human-readable name.</dd>
-  <dt translate>ModelEvaluation Description</dt>
-  <dd translate>An arbitrary human-readable description.</dd>
-  <dt translate>Template</dt>
-  <dd translate>Name or ID of model_evaluation template.</dd>
+  <dt translate>Model</dt>
+  <dd translate>UUID of Prediction Model which you want to evaluate.</dd>
 </dl>
diff --git a/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/info/info.html b/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/info/info.html
index cba60e7..78310fb 100644
--- a/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/info/info.html
+++ b/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/info/info.html
@@ -11,13 +11,13 @@
     <div class="col-xs-12">
       <div class="form-group">
         <label class="control-label" for="model_evaluation-model-id">
-          <translate>Template</translate>
+          <translate>Model</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="model_evaluation-model-id" type="text" class="form-control" id="model_evaluation-model-id"
                ng-model="model.newModelEvaluationSpec.model_id"
                ng-required="true"
-               placeholder="{$ 'Name or ID of Prediction Model.'|translate $}">
+               placeholder="{$ 'UUID of Prediction Model which you want to evaluate.'|translate $}">
       </div>
     </div>
   </div>
diff --git a/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/spec/spec.help.html b/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/spec/spec.help.html
index f20f2f6..b18a3a8 100644
--- a/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/spec/spec.help.html
+++ b/meteos_ui/static/dashboard/machine_learning/model_evaluations/create/spec/spec.help.html
@@ -1,14 +1,12 @@
 <dl>
-  <dt translate>Spark Version</dt>
-  <dd translate> Version of Apache Spark.</dd>
-  <dt translate>Master Nodes</dt>
-  <dd translate> Number of Master Node.</dd>
-  <dt translate>Master Flavor</dt>
-  <dd translate> Flavor ID of Master Node.</dd>
-  <dt translate>Worker Nodes</dt>
-  <dd translate> Number of Worker Node.</dd>
-  <dt translate>Worker Flavor</dt>
-  <dd translate> Flavor ID of Worker Node.</dd>
-  <dt translate>Floating IP Pool</dt>
-  <dd translate> The UUID of Neutron External Network.</dd>
+  <dt translate>Source Dataset URL</dt>
+  <dd translate>URL of Dataset stored Swift or Internal HDFS.</dd>
+  <dt translate>Dataset Format</dt>
+  <dd translate>Dataset Format (csv or libsvm or text).</dd>
+  <dt translate>Swift Tenant</dt>
+  <dd translate>Tenant name of Swift.</dd>
+  <dt translate>Swift User Name</dt>
+  <dd translate>User name of Swift.</dd>
+  <dt translate>Swift User Password</dt>
+  <dd translate>Password of Swift User.</dd>
 </dl>
diff --git a/meteos_ui/static/dashboard/machine_learning/models/create/info/info.help.html b/meteos_ui/static/dashboard/machine_learning/models/create/info/info.help.html
index af8ce56..e23a55b 100644
--- a/meteos_ui/static/dashboard/machine_learning/models/create/info/info.help.html
+++ b/meteos_ui/static/dashboard/machine_learning/models/create/info/info.help.html
@@ -3,6 +3,6 @@
   <dd translate>An arbitrary human-readable name.</dd>
   <dt translate>Model Description</dt>
   <dd translate>An arbitrary human-readable description.</dd>
-  <dt translate>Template</dt>
-  <dd translate>Name or ID of model template.</dd>
+  <dt translate>Experiment</dt>
+  <dd translate>UUID of the experiment.</dd>
 </dl>
diff --git a/meteos_ui/static/dashboard/machine_learning/models/create/info/info.html b/meteos_ui/static/dashboard/machine_learning/models/create/info/info.html
index 0dfc596..30f02c2 100644
--- a/meteos_ui/static/dashboard/machine_learning/models/create/info/info.html
+++ b/meteos_ui/static/dashboard/machine_learning/models/create/info/info.html
@@ -25,7 +25,7 @@
         <input name="model-experiment-id" type="text" class="form-control" id="model-experiment-id"
                ng-model="model.newModelSpec.experiment_id"
                ng-required="true"
-               placeholder="{$ 'ID of the experiment.'|translate $}">
+               placeholder="{$ 'UUID of the experiment.'|translate $}">
       </div>
     </div>
   </div>
diff --git a/meteos_ui/static/dashboard/machine_learning/models/create/spec/spec.help.html b/meteos_ui/static/dashboard/machine_learning/models/create/spec/spec.help.html
index f20f2f6..5945c3e 100644
--- a/meteos_ui/static/dashboard/machine_learning/models/create/spec/spec.help.html
+++ b/meteos_ui/static/dashboard/machine_learning/models/create/spec/spec.help.html
@@ -1,14 +1,16 @@
 <dl>
-  <dt translate>Spark Version</dt>
-  <dd translate> Version of Apache Spark.</dd>
-  <dt translate>Master Nodes</dt>
-  <dd translate> Number of Master Node.</dd>
-  <dt translate>Master Flavor</dt>
-  <dd translate> Flavor ID of Master Node.</dd>
-  <dt translate>Worker Nodes</dt>
-  <dd translate> Number of Worker Node.</dd>
-  <dt translate>Worker Flavor</dt>
-  <dd translate> Flavor ID of Worker Node.</dd>
-  <dt translate>Floating IP Pool</dt>
-  <dd translate> The UUID of Neutron External Network.</dd>
+  <dt translate>Model Type</dt>
+  <dd translate>Prediction Model Type.</dd>
+  <dt translate>Model Params</dt>
+  <dd translate>Parameters when creating model.</dd>
+  <dt translate>Source Dataset URL</dt>
+  <dd translate>URL of Dataset stored Swift or Internal HDFS.</dd>
+  <dt translate>Dataset Format</dt>
+  <dd translate>Dataset Format (csv or libsvm or text).</dd>
+  <dt translate>Swift Tenant</dt>
+  <dd translate>Tenant name of Swift.</dd>
+  <dt translate>Swift User Name</dt>
+  <dd translate>User name of Swift.</dd>
+  <dt translate>Swift User Password</dt>
+  <dd translate>Password of Swift User.</dd>
 </dl>