Merge pull request #1619 from spadgett/remove-delete-dc-warning

Merged by openshift-bot

Author: OpenShift Bot

app/views/modals/delete-resource.html

@@ -6,6 +6,10 @@ <h1>Are you sure you want to delete the {{typeDisplayName || (kind | humanizeKin
         '<strong>{{displayName ? displayName : resourceName}}</strong>'?</h1>
 
       <p>
+        <span ng-if="kind === 'DeploymentConfig'">
+          This will delete the deployment config, all rollout history, and any running pods.
+        </span>
+
         <span ng-if="kind === 'Deployment'">
           This will delete the deployment, all rollout history, and any running pods.
         </span>
@@ -42,14 +46,6 @@ <h1>Are you sure you want to delete the {{typeDisplayName || (kind | humanizeKin
         </p>
       </div>
 
-      <div ng-if="kind === 'DeploymentConfig'">
-        <strong>Note:</strong> None of the deployments created by this deployment config will be deleted.
-
-        To delete the deployment config and all of its deployments, you can run the command
-        <pre class="code prettyprint mar-top-md">oc delete dc {{resourceName}} -n {{projectName}}</pre>
-        Learn more about the <a href="command-line">command line tools</a>.
-      </div>
-
       <!--
         If this is a deployment config or replication controller with associated HPAs, prompt to
         delete the HPAs as well.

dist/scripts/templates.js

@@ -10487,6 +10487,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"modal-body\">\n" +
     "<h1>Are you sure you want to delete the {{typeDisplayName || (kind | humanizeKind)}} '<strong>{{displayName ? displayName : resourceName}}</strong>'?</h1>\n" +
     "<p>\n" +
+    "<span ng-if=\"kind === 'DeploymentConfig'\">\n" +
+    "This will delete the deployment config, all rollout history, and any running pods.\n" +
+    "</span>\n" +
     "<span ng-if=\"kind === 'Deployment'\">\n" +
     "This will delete the deployment, all rollout history, and any running pods.\n" +
     "</span>\n" +
@@ -10508,11 +10511,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<input ng-model=\"confirmName\" id=\"resource-to-delete\" type=\"text\" class=\"form-control input-lg\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\" autofocus>\n" +
     "</p>\n" +
     "</div>\n" +
-    "<div ng-if=\"kind === 'DeploymentConfig'\">\n" +
-    "<strong>Note:</strong> None of the deployments created by this deployment config will be deleted. To delete the deployment config and all of its deployments, you can run the command\n" +
-    "<pre class=\"code prettyprint mar-top-md\">oc delete dc {{resourceName}} -n {{projectName}}</pre>\n" +
-    "Learn more about the <a href=\"command-line\">command line tools</a>.\n" +
-    "</div>\n" +
     "\n" +
     "<div ng-if=\"hpaList.length > 0\">\n" +
     "<p>\n" +