Adminhtml: improved info for order sent status

app/design/adminhtml/default/default/template/sales/order/view/info.phtml

@@ -12,21 +12,16 @@
 <?php
 $orderAdminDate = $this->formatDate($_order->getCreatedAtDate(), 'medium', true);
 $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium', true);
+$emailSentInfo  = $_order->getEmailSent() ? Mage::helper('sales')->__('Sent') : Mage::helper('sales')->__('Not sent');
 ?>
 <div class="box-left">
     <!--Order Information-->
     <div class="entry-edit">
-        <?php if ($_order->getEmailSent()):
-            $_email = Mage::helper('sales')->__('the order confirmation email was sent');
-        else:
-            $_email = Mage::helper('sales')->__('the order confirmation email is not sent');
-        endif; ?>
         <div class="entry-edit-head">
         <?php if ($this->getNoUseOrderLink()): ?>
-            <h4 class="icon-head head-account" data-copy-text="<?php echo $_order->getRealOrderId() ?>"><?php echo Mage::helper('sales')->__('Order # %s', $this->escapeHtml($_order->getRealOrderId())) ?> (<?php echo $_email ?>)</h4>
+            <h4 class="icon-head head-account" data-copy-text="<?php echo $_order->getRealOrderId() ?>"><?php echo Mage::helper('sales')->__('Order # %s', $this->escapeHtml($_order->getRealOrderId())) ?></h4>
         <?php else: ?>
             <a href="<?php echo $this->getViewUrl($_order->getId()) ?>"><?php echo Mage::helper('sales')->__('Order # %s', $this->escapeHtml($_order->getRealOrderId())) ?></a>
-            <strong>(<?php echo $_email ?>)</strong>
         <?php endif ?>
         </div>
         <div class="fieldset">
@@ -45,6 +40,10 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
                 <td class="label"><label><?php echo Mage::helper('sales')->__('Order Status') ?></label></td>
                 <td class="value"><strong><span id="order_status"><?php echo $_order->getStatusLabel() ?></span></strong></td>
             </tr>
+            <tr>
+                <td class="label"><label><?php echo Mage::helper('sales')->__('Order Confirmation') ?></label></td>
+                <td class="value"><strong><?php echo $emailSentInfo ?></strong></td>
+            </tr>
             <tr>
                 <td class="label"><label><?php echo Mage::helper('sales')->__('Purchased From') ?></label></td>
                 <td class="value"><strong><?php echo $this->getOrderStoreName(); ?></strong></td>
@@ -68,7 +67,7 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
             <?php if($_order->getRemoteIp() && $this->shouldDisplayCustomerIp()): ?>
             <tr>
                 <td class="label"><label><?php echo Mage::helper('sales')->__('Placed from IP') ?></label></td>
-                <td class="value"><strong><?php echo $this->escapeHtml($_order->getRemoteIp()); echo ($_order->getXForwardedFor())?' (' . $this->escapeHtml($_order->getXForwardedFor()) . ')':''; ?></strong></td>
+                <td class="value"><strong><?php echo $this->escapeHtml($_order->getRemoteIp()) . (($_order->getXForwardedFor()) ? ' (' . $this->escapeHtml($_order->getXForwardedFor()) . ')' : ''); ?></strong></td>
             </tr>
             <?php endif ?>
             <?php if($_order->getGlobalCurrencyCode() != $_order->getBaseCurrencyCode()): ?>
@@ -100,7 +99,7 @@ $orderStoreDate = $this->formatDate($_order->getCreatedAtStoreDate(), 'medium',
                 <tr>
                     <td class="label"><label><?php echo Mage::helper('sales')->__('Customer Name') ?></label></td>
                     <td class="value">
-                    <?php if ($_customerUrl=$this->getCustomerViewUrl()) : ?>
+                    <?php if ($_customerUrl = $this->getCustomerViewUrl()) : ?>
                         <a href="<?php echo $_customerUrl ?>" target="_blank"><strong><?php echo $this->escapeHtml($_order->getCustomerName()) ?></strong></a>
                     <?php else: ?>
                         <strong><?php echo $this->escapeHtml($_order->getCustomerName()) ?></strong>

app/locale/en_US/Mage_Sales.csv

@@ -885,3 +885,6 @@
 "the order confirmation email was sent","the order confirmation email was sent"
 "the shipment email is not sent","the shipment email is not sent"
 "the shipment email was sent","the shipment email was sent"
+"Order Confirmation","Order Confirmation"
+"Sent","Sent"
+"Not sent","Not sent"

skin/adminhtml/default/default/boxes.css

@@ -226,10 +226,16 @@ tr.dynamic-grid input.input-text { width:154px; }
     cursor: pointer;
     width: 12px;
     height: 12px;
-    margin: 2px 0 0 2px;
+    margin-left: 4px;
 }
 
-.entry-edit-head .icon-copy { width: 11px; height: 11px; margin: 0 0 0 5px; filter: hue-rotate(0) brightness(0) contrast(1) saturate(0) invert(1); }
+.entry-edit-head .icon-copy {
+    width: 11px;
+    height: 11px;
+    margin: 5px 0;
+    filter: hue-rotate(0) brightness(0) contrast(1) saturate(0) invert(1);
+    float: right;
+}
 
 .icon-copy-copied { background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 30 30"><path d="M26.98 5.99a1 1 0 0 0-.687.303L11 21.586l-6.293-6.293a1 1 0 1 0-1.414 1.414l7 7a1 1 0 0 0 1.414 0l16-16a1 1 0 0 0-.727-1.717z"/></svg>'); }
 

skin/adminhtml/default/openmage/scss/override.scss

@@ -192,6 +192,7 @@ small {
       height: 16px;
       margin: 8px 0 0 5px;
       filter: revert;
+      float: right;
     }
   }