Merge pull request Sylius#687 from kayue/ui/improved-order-page

[WIP] Improved order details page (backend)
ThreeSixtyEu · Dec 10, 2013 · ae130ab · ae130ab
2 parents 9585b3b + ed68c9d
commit ae130ab
Show file tree

Hide file tree

Showing 4 changed files with 181 additions and 172 deletions.
diff --git a/src/Sylius/Bundle/WebBundle/Resources/assets/css/backend.css b/src/Sylius/Bundle/WebBundle/Resources/assets/css/backend.css
@@ -469,4 +469,47 @@ input[type="file"] {
 .sylius-products-table .actions {
     width: 170px;
     text-align: center;
+}
+
+/** Order. **/
+.sylius-order-content-table .picture,
+.sylius-order-content-table .quantity,
+.sylius-order-content-table .unit-price,
+.sylius-order-content-table .total {
+    width: 110px;
+    vertical-align: middle;
+}
+.sylius-order-content-table .info .name {
+    font-size: 16px;
+    text-decoration: none;
+    margin: 0 0 5px 0;
+}
+.sylius-order-content-table .info ul {
+    margin-bottom: 0;
+}
+.sylius-order-content-table .info .sku code {
+    background: #FCFCFC;
+    color: #666;
+}
+.sylius-order-content-table tr.taxes td,
+.sylius-order-content-table tr.shipping-charges td,
+.sylius-order-content-table tr.promotion-discount td {
+    vertical-align: middle;
+}
+.sylius-order-content-table tr.taxes td h5,
+.sylius-order-content-table tr.shipping-charges td h5,
+.sylius-order-content-table tr.promotion-discount td h5 {
+    margin-top: 0;
+}
+.sylius-order-content-table tr.taxes td p,
+.sylius-order-content-table tr.taxes td ul,
+.sylius-order-content-table tr.shipping-charges td p,
+.sylius-order-content-table tr.shipping-charges td ul,
+.sylius-order-content-table tr.promotion-discount td p,
+.sylius-order-content-table tr.promotion-discount td ul {
+    margin-bottom: 0;
+}
+.sylius-order-content-table span.amount {
+    min-width: 65px;
+    display: inline-block;
 }
diff --git a/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.xlf b/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.xlf
@@ -1036,7 +1036,7 @@
       </trans-unit>
       <trans-unit id="0cd9ee7a56fb7b1e6f0e5e8711861558" resname="sylius.order.show_header">
         <source>sylius.order.show_header</source>
-        <target>Order details</target>
+        <target>Order #%number%</target>
       </trans-unit>
       <trans-unit id="766bbaff24003cb2a5b08e12419bf722" resname="sylius.order.state.checkout">
         <source>sylius.order.state.checkout</source>
@@ -2206,6 +2206,10 @@
         <source>sylius.product.contain_variants</source>
         <target>Contain Variants</target>
       </trans-unit>
+      <trans-unit id="1bb55d4e07056205789d3989945fe25c" resname="sylius.order.payment">
+        <source>sylius.order.payment</source>
+        <target>Payment</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Macros/misc.html.twig b/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Macros/misc.html.twig
@@ -22,7 +22,7 @@
     {% if state is sameas('completed') %}
         {% set class = 'label-success' %}
     {% elseif state in ['checkout', 'processing', 'new'] %}
-        {% set class = 'label-info' %}
+        {% set class = 'label-primary' %}
     {% else %}
         {% set class = 'label-danger' %}
     {% endif %}