From 914a03a19c1ad1021f64e5f2f1bb74ac0bd858ef Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 31 Aug 2013 07:12:59 +0100
Subject: [PATCH] tidy dialogs

---
 Netdisco/share/views/ajax/device/details.tt |  8 ++++----
 Netdisco/share/views/ajax/device/ports.tt   | 13 +++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Netdisco/share/views/ajax/device/details.tt b/Netdisco/share/views/ajax/device/details.tt
index 0959b430..95cd4b0b 100644
--- a/Netdisco/share/views/ajax/device/details.tt
+++ b/Netdisco/share/views/ajax/device/details.tt
@@ -108,15 +108,15 @@
         <button class="btn btn-danger btn-small pull-right"
           data-toggle="modal" data-target="#deleteConfirm" type="button">Delete</button>
 
-        <div id="deleteConfirm" class="nd_modal modal hide fade" tabindex="-1"
-          role="dialog" aria-labelledby="deleteConfirmLabel" aria-hidden="true">
+        <div id="nd_devdel" class="nd_modal modal hide fade" tabindex="-1"
+          role="dialog" aria-labelledby="nd_devdel_label" aria-hidden="true">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
-            <h3 id="deleteConfirmLabel">Confirm Delete: [% d.dns || d.ip | html_entity %]</h3>
+            <h3 id="nd_devdel_label">Confirm Delete: [% d.dns || d.ip | html_entity %]</h3>
           </div>
           <div class="modal-body">
             <ul>
-              <li>This action is not reversible</li>
+              <li>This action is immediate and not reversible</li>
               <li>All associated Nodes will be removed from the database</li>
             </ul>
             <p>Log message:</p>
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 2535b640..5476cfe3 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -276,17 +276,14 @@
 
 [% IF user_can_port_control %]
 <div id="nd_portlog" class="nd_modal nd_deep-horizon modal hide fade" tabindex="-1"
-  role="dialog" aria-labelledby="nd_portlog_label" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
-    <h3 id="nd_portlog_label">Log Message</h3>
-  </div>
+    role="dialog" aria-hidden="true">
   <div class="modal-body">
-    <p>Log message:</p>
-    <textarea id="nd_portlog_log" class="input-block-level" rows="2" data-form="delete" name="log"></textarea>
+    <textarea id="nd_portlog_log" class="input-block-level" rows="2" name="log"
+      placeholder="Enter a log message"></textarea>
   </div>
   <div class="modal-footer">
-    <button id="nd_portlog_submit" class="btn btn-success" data-dismiss="modal" aria-hidden="true">Submit</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
+    <button id="nd_portlog_submit" class="btn btn-info" data-dismiss="modal">Continue</button>
   </div>
 </div>
 [% END %]