Merge pull request #1145 from mirumee/standard-naming-convension-templates

Standardize naming convensions in templates

36 files changed, 2 insertions, 17 deletions

diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html
deleted file mode 100644
index eceeaf41..00000000
--- a/templates/admin/base_site.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "admin/base.html" %}
-
-{% block title %}{{ title }} | Saleor{% endblock %}
-
-{% block branding %}
-<h1 id="site-name"><a href="{% url 'admin:index' %}">Saleor Admin</a></h1>
-{% endblock %}
-
-{% block nav-global %}{% endblock %}
-
-{% block extrahead %}
-    {% load selectable_tags %}
-    {% include_ui_theme %}
-    {% include_jquery_libs %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/dashboard/category/modal_confirm_delete.html b/templates/dashboard/category/modal/confirm_delete.html
index 43e80d12..43e80d12 100644
--- a/templates/dashboard/category/modal_confirm_delete.html
+++ b/templates/dashboard/category/modal/confirm_delete.html
diff --git a/templates/dashboard/category/modal_edit.html b/templates/dashboard/category/modal/edit.html
index 6329d838..6329d838 100644
--- a/templates/dashboard/category/modal_edit.html
+++ b/templates/dashboard/category/modal/edit.html
diff --git a/templates/dashboard/discount/sale_form.html b/templates/dashboard/discount/sale/form.html
index 3421684e..3421684e 100644
--- a/templates/dashboard/discount/sale_form.html
+++ b/templates/dashboard/discount/sale/form.html
diff --git a/templates/dashboard/discount/sale_list.html b/templates/dashboard/discount/sale/list.html
index c5fdb2bd..c5fdb2bd 100644
--- a/templates/dashboard/discount/sale_list.html
+++ b/templates/dashboard/discount/sale/list.html
diff --git a/templates/dashboard/discount/sale_modal_confirm_delete.html b/templates/dashboard/discount/sale/modal/confirm_delete.html
index d07e418f..d07e418f 100644
--- a/templates/dashboard/discount/sale_modal_confirm_delete.html
+++ b/templates/dashboard/discount/sale/modal/confirm_delete.html
diff --git a/templates/dashboard/discount/voucher_form.html b/templates/dashboard/discount/voucher/form.html
index a5640085..a5640085 100644
--- a/templates/dashboard/discount/voucher_form.html
+++ b/templates/dashboard/discount/voucher/form.html
diff --git a/templates/dashboard/discount/voucher_list.html b/templates/dashboard/discount/voucher/list.html
index 5385fd69..5385fd69 100644
--- a/templates/dashboard/discount/voucher_list.html
+++ b/templates/dashboard/discount/voucher/list.html
diff --git a/templates/dashboard/discount/voucher_modal_confirm_delete.html b/templates/dashboard/discount/voucher/modal/confirm_delete.html
index b874678f..b874678f 100644
--- a/templates/dashboard/discount/voucher_modal_confirm_delete.html
+++ b/templates/dashboard/discount/voucher/modal/confirm_delete.html
diff --git a/templates/dashboard/group/modal_group_confirm_delete.html b/templates/dashboard/group/modal/confirm_delete.html
index 25556b90..25556b90 100644
--- a/templates/dashboard/group/modal_group_confirm_delete.html
+++ b/templates/dashboard/group/modal/confirm_delete.html
diff --git a/templates/dashboard/order/modal_add_note.html b/templates/dashboard/order/modal/add_note.html
index 2bf88a65..2bf88a65 100644
--- a/templates/dashboard/order/modal_add_note.html
+++ b/templates/dashboard/order/modal/add_note.html
diff --git a/templates/dashboard/order/modal_cancel_delivery_group.html b/templates/dashboard/order/modal/cancel_delivery_group.html
index b648def6..b648def6 100644
--- a/templates/dashboard/order/modal_cancel_delivery_group.html
+++ b/templates/dashboard/order/modal/cancel_delivery_group.html
diff --git a/templates/dashboard/order/modal_cancel_line.html b/templates/dashboard/order/modal/cancel_line.html
index c5a16ce3..c5a16ce3 100644
--- a/templates/dashboard/order/modal_cancel_line.html
+++ b/templates/dashboard/order/modal/cancel_line.html
diff --git a/templates/dashboard/order/modal_cancel_order.html b/templates/dashboard/order/modal/cancel_order.html
index 7af43913..7af43913 100644
--- a/templates/dashboard/order/modal_cancel_order.html
+++ b/templates/dashboard/order/modal/cancel_order.html
diff --git a/templates/dashboard/order/modal_capture.html b/templates/dashboard/order/modal/capture.html
index 9b45b6c7..9b45b6c7 100644
--- a/templates/dashboard/order/modal_capture.html
+++ b/templates/dashboard/order/modal/capture.html
diff --git a/templates/dashboard/order/modal_change_quantity.html b/templates/dashboard/order/modal/change_quantity.html
index 399032e0..399032e0 100644
--- a/templates/dashboard/order/modal_change_quantity.html
+++ b/templates/dashboard/order/modal/change_quantity.html
diff --git a/templates/dashboard/order/modal_order_remove_voucher.html b/templates/dashboard/order/modal/order_remove_voucher.html
index 111aab18..111aab18 100644
--- a/templates/dashboard/order/modal_order_remove_voucher.html
+++ b/templates/dashboard/order/modal/order_remove_voucher.html
diff --git a/templates/dashboard/order/modal_refund.html b/templates/dashboard/order/modal/refund.html
index 130e680a..130e680a 100644
--- a/templates/dashboard/order/modal_refund.html
+++ b/templates/dashboard/order/modal/refund.html
diff --git a/templates/dashboard/order/modal_release.html b/templates/dashboard/order/modal/release.html
index 3d6cec23..3d6cec23 100644
--- a/templates/dashboard/order/modal_release.html
+++ b/templates/dashboard/order/modal/release.html
diff --git a/templates/dashboard/order/modal_ship_delivery_group.html b/templates/dashboard/order/modal/ship_delivery_group.html
index 471d675d..471d675d 100644
--- a/templates/dashboard/order/modal_ship_delivery_group.html
+++ b/templates/dashboard/order/modal/ship_delivery_group.html
diff --git a/templates/dashboard/order/modal_split_order_line.html b/templates/dashboard/order/modal/split_order_line.html
index 803eb0bb..803eb0bb 100644
--- a/templates/dashboard/order/modal_split_order_line.html
+++ b/templates/dashboard/order/modal/split_order_line.html
diff --git a/templates/dashboard/product/modal_confirm_delete.html b/templates/dashboard/product/modal/confirm_delete.html
index 6528f9ab..6528f9ab 100644
--- a/templates/dashboard/product/modal_confirm_delete.html
+++ b/templates/dashboard/product/modal/confirm_delete.html
diff --git a/templates/dashboard/product/product_attribute/modal_confirm_delete.html b/templates/dashboard/product/product_attribute/modal/confirm_delete.html
index 4e8b512c..4e8b512c 100644
--- a/templates/dashboard/product/product_attribute/modal_confirm_delete.html
+++ b/templates/dashboard/product/product_attribute/modal/confirm_delete.html
diff --git a/templates/dashboard/product/product_class/modal_confirm_delete.html b/templates/dashboard/product/product_class/modal/confirm_delete.html
index 1d70810c..1d70810c 100644
--- a/templates/dashboard/product/product_class/modal_confirm_delete.html
+++ b/templates/dashboard/product/product_class/modal/confirm_delete.html
diff --git a/templates/dashboard/product/product_image/modal_confirm_delete.html b/templates/dashboard/product/product_image/modal/confirm_delete.html
index 22317087..22317087 100644
--- a/templates/dashboard/product/product_image/modal_confirm_delete.html
+++ b/templates/dashboard/product/product_image/modal/confirm_delete.html
diff --git a/templates/dashboard/product/product_variant/modal_confirm_delete.html b/templates/dashboard/product/product_variant/modal/confirm_delete.html
index 9a876f69..9a876f69 100644
--- a/templates/dashboard/product/product_variant/modal_confirm_delete.html
+++ b/templates/dashboard/product/product_variant/modal/confirm_delete.html
diff --git a/templates/dashboard/product/product_variant/modal_select_images.html b/templates/dashboard/product/product_variant/modal/select_images.html
index 058f6c3e..058f6c3e 100644
--- a/templates/dashboard/product/product_variant/modal_select_images.html
+++ b/templates/dashboard/product/product_variant/modal/select_images.html
diff --git a/templates/dashboard/product/stock/modal_confirm_delete.html b/templates/dashboard/product/stock/modal/confirm_delete.html
index a97fa799..a97fa799 100644
--- a/templates/dashboard/product/stock/modal_confirm_delete.html
+++ b/templates/dashboard/product/stock/modal/confirm_delete.html
diff --git a/templates/dashboard/product/stock_location/modal_confirm_delete.html b/templates/dashboard/product/stock_location/modal/confirm_delete.html
index 0288e889..0288e889 100644
--- a/templates/dashboard/product/stock_location/modal_confirm_delete.html
+++ b/templates/dashboard/product/stock_location/modal/confirm_delete.html
diff --git a/templates/dashboard/shipping/method_detail.html b/templates/dashboard/shipping/detail.html
index 27a335a5..27a335a5 100644
--- a/templates/dashboard/shipping/method_detail.html
+++ b/templates/dashboard/shipping/detail.html
diff --git a/templates/dashboard/shipping/method_form.html b/templates/dashboard/shipping/form.html
index 4e66ab18..4e66ab18 100644
--- a/templates/dashboard/shipping/method_form.html
+++ b/templates/dashboard/shipping/form.html
diff --git a/templates/dashboard/shipping/method_list.html b/templates/dashboard/shipping/list.html
index 3fc565fb..3fc565fb 100644
--- a/templates/dashboard/shipping/method_list.html
+++ b/templates/dashboard/shipping/list.html
diff --git a/templates/dashboard/shipping/modal_confirm_delete.html b/templates/dashboard/shipping/modal/confirm_delete.html
index c2c6d212..c2c6d212 100644
--- a/templates/dashboard/shipping/modal_confirm_delete.html
+++ b/templates/dashboard/shipping/modal/confirm_delete.html
diff --git a/templates/order/order-details.html b/templates/order/_ordered_items_table.html
index 27f8a008..27f8a008 100644
--- a/templates/order/order-details.html
+++ b/templates/order/_ordered_items_table.html
diff --git a/templates/order/details.html b/templates/order/details.html
index 16949c4d..8cf5c05a 100644
--- a/templates/order/details.html
+++ b/templates/order/details.html
@@ -50,7 +50,7 @@
                     </a>
                 {% endif %}
             {% endif %}
-            {% include "order/order-details.html" %}
+            {% include "order/_ordered_items_table.html" %}
         </div>
     </div>
 {% endblock content %}
diff --git a/templates/order/payment.html b/templates/order/payment.html
index 99c94a00..b18ab885 100644
--- a/templates/order/payment.html
+++ b/templates/order/payment.html
@@ -83,7 +83,7 @@
                         {% endif %}
                 {% endif %}
             {% endif %}
-            {% include 'order/order-details.html' %}
+            {% include 'order/_ordered_items_table.html' %}
         </div>
     </div>
 {% endblock content %}