Service user help text on Deploy page fixed (#904)

Author: digitalfishpond

i18n/messages-en.xtb

@@ -421,6 +421,7 @@
 	<translation id="6940138063760813849" key="MSG_NAMESPACE_CREATE_DIALOG_SUBTITLE" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="Create namespace dialog subtitle. Appears right below the title.">The new namespace will be added to the cluster.</translation>
 	<translation id="5623245574838401357" key="MSG_NAMESPACE_CREATE_DIALOG_LEARN_MORE_ACTION" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="The text is used as a 'Learn more' link text in the namespace creation dialog">Learn more</translation>
 	<translation id="714354688258835139" key="MSG_NAMESPACE_CREATE_DIALOG_USER_HELP" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="User help text for the input of the 'Namespace' data.">A namespace with the specified name will be added to the cluster.</translation>
+	<translation id="4303314106798187730" key="MSG_DEPLOY_SETTINGS_PORT_MAPPINGS_USER_HELP" source="/home/denis/Projects/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;port mappings&quot; input on the deploy from settings page.">Optionally, an internal or external Service can be defined to map an incoming Port to a target Port seen by the container.</translation>
 	<translation id="7594899852613234459" key="MSG_NAMESPACE_NOT_SELECTED" source="/usr/local/google/home/bryk/src/github.com/dashboard/.tmp/serve/app-dev.js" desc="Text for dropdown item that indicates that no namespace was selected">all namespaces</translation>
 	<translation id="5514950065159777148" key="MSG_NAMESPACE_LIST_LABEL" source="/usr/local/google/home/bryk/src/github.com/dashboard/.tmp/serve/app-dev.js" desc="Label atop a list of namespaces">namespaces</translation>
 	<translation id="6614318628162175225" key="MSG_PORT_MAPPINGS_PORT_NEGATIVE_WARNING" source="/usr/local/google/home/bryk/src/github.com/dashboard/.tmp/serve/app-dev.js" desc="This warning appears when the user specifies a negative port number in the port mappings section on the deploy page.">Port must be greater than 0</translation>

i18n/messages-ja.xtb

@@ -128,7 +128,7 @@
 	<translation id="8622983950087317798" key="MSG_SERVICE_DETAIL_NAMESPACE_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Namespace' for the service namespace in the details part (left) of the service details view.">ネームスペース</translation>
 	<translation id="923795681861681704" key="MSG_SERVICE_DETAIL_LABEL_SELECTOR_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Label selector' for the service's label selector in the details part (left) of the service details view.">ラベルセレクター</translation>
 	<translation id="5668446644812094754" key="MSG_SERVICE_DETAIL_LABELS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Labels' for the service labels in the details part (left) of the service details view.">ラベル</translation>
-	<translation id="1483678895179795219" key="MSG_SERVICE_DETAIL_TYPE_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Type' for the service type in the details part (left) of the service details view.">種別</translation>
+	<translation id="1483678895179795219" key="MSG_SERVICE_DETAIL_TYPE_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Type' for the service type in the details part (left) of the service details view.">種類</translation>
 	<translation id="3345086067441164496" key="MSG_SERVICE_DETAIL_CONNECTION_SUBTITLE" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Subtitle 'Connection' at the top of the column about network connectivity (right) at the service detail view.">接続情報</translation>
 	<translation id="6864041232530892176" key="MSG_SERVICE_DETAIL_CLUSTER_IP_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Cluster IP' for the service IP in the cluster, appears in the connectivity part (right) of the service details view.">クラスター IP</translation>
 	<translation id="807395060665311082" key="MSG_SERVICE_DETAIL_INTERNAL_ENDPOINTS_LABEL" source="/home/mirchev/go_workspace/src/github.com/kubernetes/dashboard/.tmp/serve/app-dev.js" desc="Label 'Internal endpoints' for the internal endpoints of the service, appears in the connectivity part (right) of the service details view.">内部エンドポイント</translation>
@@ -417,6 +417,10 @@
 	<translation id="4234081832725459634" key="MSG_NODE_DETAIL_EXTERNAL_ID_LABEL" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="Label 'External ID' for the node external ID displayed on its details page.">外部 ID</translation>
 	<translation id="7078533799786587727" key="MSG_NODE_DETAIL_CAPACITY_LABEL" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="Label 'Capacity' for the node capacity displayed on its details page.">容量</translation>
 	<translation id="2519350225093502159" key="MSG_NODE_DETAIL_CAPACITY_VALUE" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="Value for node 'Capacity' displayed on its details page."><ph name="CPU_CAPACITY" /> コア, <ph name="MEMORY_CAPACITY" />B</translation>
+    <translation id="6940138063760813849" key="MSG_NAMESPACE_CREATE_DIALOG_SUBTITLE" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="Create namespace dialog subtitle. Appears right below the title.">The new namespace will be added to the cluster.</translation>
+	<translation id="5623245574838401357" key="MSG_NAMESPACE_CREATE_DIALOG_LEARN_MORE_ACTION" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="The text is used as a 'Learn more' link text in the namespace creation dialog">Learn more</translation>
+	<translation id="714354688258835139" key="MSG_NAMESPACE_CREATE_DIALOG_USER_HELP" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="User help text for the input of the 'Namespace' data.">A namespace with the specified name will be added to the cluster.</translation>
+	<translation id="4303314106798187730" key="MSG_DEPLOY_SETTINGS_PORT_MAPPINGS_USER_HELP" source="/home/denis/Projects/dashboard/.tmp/serve/app-dev.js" desc="User help for the &quot;port mappings&quot; input on the deploy from settings page.">Optionally, an internal or external Service can be defined to map an incoming Port to a target Port seen by the container.</translation>
 	<translation id="6940138063760813849" key="MSG_NAMESPACE_CREATE_DIALOG_SUBTITLE" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="Create namespace dialog subtitle. Appears right below the title.">新規ネームスペースをクラスターに追加します。</translation>
 	<translation id="5623245574838401357" key="MSG_NAMESPACE_CREATE_DIALOG_LEARN_MORE_ACTION" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="The text is used as a 'Learn more' link text in the namespace creation dialog">もっと知る</translation>
 	<translation id="714354688258835139" key="MSG_NAMESPACE_CREATE_DIALOG_USER_HELP" source="/home/maciaszczykm/workspace/dashboard/.tmp/serve/app-dev.js" desc="User help text for the input of the 'Namespace' data.">指定した名前のネームスペースをクラスターに追加します。</translation>

src/app/frontend/deploy/deployfromsettings.scss

@@ -33,3 +33,10 @@ md-progress-linear {
   margin-bottom: $baseline-grid;
   margin-top: $baseline-grid;
 }
+
+.kd-help-section {
+  & kd-port-mappings {
+    margin-bottom: 0;
+    margin-top: 0;
+  }
+}

src/app/frontend/deploy/deployfromsettings_controller.js

@@ -473,7 +473,7 @@ const i18n = {
   /** @export {string} @desc User help for the "port mappings" input on the deploy from settings
      page. */
   MSG_DEPLOY_SETTINGS_PORT_MAPPINGS_USER_HELP: goog.getMsg(
-      `Ports are optional. If specified, a Service will be created mapping the Port (incoming) to a target Port seen by the container.`),
+      `Optionally, an internal or external Service can be defined to map an incoming Port to a target Port seen by the container.`),
 
   /** @export {string} @desc User help, tells the user what the DNS name of his deployed service (on
      the deploy page) is going to be. The actual name will follow, so this text must end with a

src/app/frontend/deploy/portmappings.html

@@ -14,17 +14,17 @@
 limitations under the License.
 -->
 
-<md-input-container class="md-block">
+<md-input-container class="md-block kd-deploy-input-row ">
   <label>{{::ctrl.i18n.MSG_PORT_MAPPINGS_SERVICE_LABEL}}</label>
 <md-select ng-model="ctrl.serviceType" ng-change="ctrl.changeServiceType()" required>
-  <md-option ng-repeat="serviceType in ctrl.serviceTypes" ng-value="serviceType">
+  <md-option ng-repeat="serviceType in ctrl.serviceTypes" ng-value="serviceType" class="md-block">
     {{serviceType.label}}
   </md-option>
 </md-select>
 </md-input-container>
 <div ng-repeat="portMapping in ctrl.portMappings">
   <ng-form name="portMappingForm" layout="row">
-    <md-input-container flex="50" class="kd-deploy-input-row">
+    <md-input-container flex="50">
       <label>{{::ctrl.i18n.MSG_PORT_MAPPINGS_PORT_LABEL}}</label>
       <input ng-model="portMapping.port" ng-change="ctrl.checkPortMapping(portMappingForm, $index)"
              type="number" min="1" max="65535" name="port" ng-required="ctrl.isFirst($index)">
@@ -36,7 +36,7 @@
       </ng-messages>
     </md-input-container>
     <div flex="5"></div>
-    <md-input-container flex="50" class="kd-deploy-input-row">
+    <md-input-container flex="50">
       <label>{{::ctrl.i18n.MSG_PORT_MAPPINGS_TARGET_PORT_LABEL}}</label>
       <input ng-model="portMapping.targetPort"
              ng-change="ctrl.checkPortMapping(portMappingForm, $index)"
@@ -49,7 +49,7 @@
       </ng-messages>
     </md-input-container>
     <div flex="5"></div>
-    <md-input-container flex="none" class="kd-deploy-input-row">
+    <md-input-container flex="none">
       <label>{{::ctrl.i18n.MSG_PORT_MAPPINGS_PROTOCOL_LABEL}}</label>
       <md-select ng-model="portMapping.protocol" name="protocol" is-external="ctrl.isExternal"
                  required kd-valid-protocol>