AMBARI-3629 Cleanup dialog for unable to delete host when no heartbeat. (ababiichuk)

ambari-web/app/messages.js

@@ -1302,13 +1302,14 @@ Em.I18n.translations = {
   'hosts.decommission.popup.body':'Are you sure?',
   'hosts.decommission.popup.header':'Confirmation',
   'hosts.delete.popup.body':'Are you sure you want to delete host <i>{0}</i>?',
-  'hosts.delete.popup.body.msg1':'This will remove the host from Ambari\'s management. Ambari will ignore any communications from this host.',
-  'hosts.delete.popup.body.msg2':'Installed bits of service components will not be removed from the system. Individual service components should not be restarted later to join the cluster. This will introduce inconsistencies in monitoring data.',
-  'hosts.delete.popup.body.msg3':'Nagios service should be restarted for alerts and notifications to work properly. ZooKeeper service should be restarted if any ZooKeeper components are removed. Go to the <i>Services</i> page to restart services.',
+  'hosts.delete.popup.body.msg1':'By removing this host, Ambari will ignore future communications from this host. Software packages will not be removed from the host. The components on the host should not be restarted. If you wish to readd this host to the cluster, be sure to clean the host.',
+  'hosts.delete.popup.body.msg2':'After deleting this host, Nagios should be restarted to remove this host from Nagios monitoring. Go to the <i>Services</i> page to restart Nagios.',
+  'hosts.delete.popup.body.msg3':'If this host was hosting a Zookeeper Server, the Zookeeper Service should be restarted. Go to the <i>Services</i> page.',
   'hosts.delete.popup.body.msg4':'<b>WARNING!</b> Delete the last <i>{0}</i> component[s] in the cluster?</br>Deleting the last components in the cluster could result in permanent loss of service data.',
+  'hosts.delete.popup.body.msg.unknownComponents':'This host does not appear to be online and Ambari communication with the Agent has been lost.',
   'hosts.delete.popup.header':'Confirmation',
   'hosts.delete.popup.title':'Delete Host',
-  'hosts.delete.popup.unknownComponents':'Components with unknown status:',
+  'hosts.delete.popup.unknownComponents':'The following components have unknown status:',
   'hosts.cant.do.popup.title':'Unable to Delete Host',
   'hosts.cant.do.popup.masterList.body':'Host cannot be deleted with the master components installed',
   'hosts.cant.do.popup.masterList.body.end':'The master components on this host must to be stopped and moved to a different host to be able to delete this host',

ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs

@@ -15,17 +15,25 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-
-<p><i class="icon-warning-sign"></i> {{{deletePopupBody}}}</p>
 {{#if unknownComponents}}
-  <div class="alert">
-  {{t hosts.delete.popup.unknownComponents}}<br />
-    <i>{{unknownComponents}}</i>
+  {{t hosts.delete.popup.unknownComponents}}
+  <br /><br />
+  <div class='row-fluid'>
+    <div class='tinyoffset span10'>
+      <i>{{unknownComponents}}</i>
+    </div>
   </div>
+  <br />
 {{/if}}
-<p>{{t hosts.delete.popup.body.msg1}}</p>
-<p>{{t hosts.delete.popup.body.msg2}}</p>
-<p><span class="label label-important">{{t common.important}}</span> {{t hosts.delete.popup.body.msg3}}</p>
+<p><i class="icon-warning-sign"></i> {{{deletePopupBody}}}</p>
+<div class='alert'><strong>{{t common.important}}:</strong>
+  {{#if unknownComponents}}
+    {{t hosts.delete.popup.body.msg.unknownComponents}}
+  {{/if}}
+  {{t hosts.delete.popup.body.msg1}}
+</div>
+<div class='alert'><strong>{{t common.important}}:</strong> {{t hosts.delete.popup.body.msg2}}</div>
+<div class='alert'><strong>{{t common.important}}:</strong> {{t hosts.delete.popup.body.msg3}}</div>
 {{#if lastComponent}}
   <div class="alert-error row-fluid">
       <div class='tinyspan tinyoffset'>{{view Ember.Checkbox checkedBinding="enablePrimary"}}</div>