From 718ed2ae2d5144a4da2c7f544869f1ecb6210405 Mon Sep 17 00:00:00 2001 From: Benjamin Perche Date: Tue, 5 Aug 2014 10:30:57 +0200 Subject: [PATCH] =?UTF-8?q?hide=20category=20if=20no=20export/import=20and?= =?UTF-8?q?=20add=20module=20category=20=09modifi=C3=A9:=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20core/lib/Thelia/Config/Resources/export.xml=20=09modif?= =?UTF-8?q?i=C3=A9:=20=20=20=20=20=20=20=20=20core/lib/Thelia/Config/Resou?= =?UTF-8?q?rces/import.xml=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20te?= =?UTF-8?q?mplates/backOffice/default/export.html=20=09modifi=C3=A9:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20templates/backOffice/default/import.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/lib/Thelia/Config/Resources/export.xml | 5 +- core/lib/Thelia/Config/Resources/import.xml | 4 + templates/backOffice/default/export.html | 186 ++++++++++---------- templates/backOffice/default/import.html | 146 +++++++-------- 4 files changed, 176 insertions(+), 165 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/export.xml b/core/lib/Thelia/Config/Resources/export.xml index c8d6152c3..901b9d193 100644 --- a/core/lib/Thelia/Config/Resources/export.xml +++ b/core/lib/Thelia/Config/Resources/export.xml @@ -17,11 +17,14 @@ Content Contenu - Orders Commandes + + Modules + Modules + diff --git a/core/lib/Thelia/Config/Resources/import.xml b/core/lib/Thelia/Config/Resources/import.xml index 4a57d7da8..7cfc1336b 100644 --- a/core/lib/Thelia/Config/Resources/import.xml +++ b/core/lib/Thelia/Config/Resources/import.xml @@ -8,6 +8,10 @@ Produits Products + + Modules + Modules + diff --git a/templates/backOffice/default/export.html b/templates/backOffice/default/export.html index 47bc6c0f8..1573f442f 100644 --- a/templates/backOffice/default/export.html +++ b/templates/backOffice/default/export.html @@ -34,103 +34,105 @@ {module_include location='tools_top'} {loop name="export-category" type="export-category" order=$category_order} - {assign category_title $TITLE} -
-
-
-
- - - - - - - - - - - - - {loop name="export-categ-list" type="export" order=$export_order category=$ID} + {ifloop rel="export-categ-list"} + {assign category_title $TITLE} +
+
+
+
+
- {admin_position_block - resource="admin.export" - access="UPDATE" - path={url path="admin/export/position/category"} - url_parameter="id" - in_place_edit_class="exportCategoryPositionChange" - position=$POSITION - id=$ID - } - {$TITLE} -
- {if $export_order == "id"} - - {elseif $export_order == "id_reverse"} - - {/if} - - {intl l="ID"} - - - {if $export_order == "alpha"} - - {elseif $export_order == "alpha_reverse"} - - {/if} - - {intl l="Name"} - - - {intl l="Description"} - - {if $export_order == "manual"} - - {elseif $export_order == "manual_reverse"} - - {/if} - - {intl l="Position"} - - - {intl l="Actions"} -
+ + - - - - - + + + + + - {/loop} - -
+ {admin_position_block + resource="admin.export" + access="UPDATE" + path={url path="admin/export/position/category"} + url_parameter="id" + in_place_edit_class="exportCategoryPositionChange" + position=$POSITION + id=$ID + } + {$TITLE} +
- {$ID} - - {$TITLE} - - {$DESCRIPTION nofilter} - - {admin_position_block - resource="admin.export" - access="UPDATE" - path={url path="admin/export/position"} - url_parameter="id" - in_place_edit_class="exportPositionChange" - position=$POSITION - id=$ID - } - -
- - - -
- 		+ {if $export_order == "id"} + + {elseif $export_order == "id_reverse"} + + {/if} + + {intl l="ID"} + + + {if $export_order == "alpha"} + + {elseif $export_order == "alpha_reverse"} + + {/if} + + {intl l="Name"} + + + {intl l="Description"} + + {if $export_order == "manual"} + + {elseif $export_order == "manual_reverse"} + + {/if} + + {intl l="Position"} + + + {intl l="Actions"} +
+ + + {loop name="export-categ-list" type="export" order=$export_order category=$ID} + + + {$ID} + + + {$TITLE} + + + {$DESCRIPTION nofilter} + + + {admin_position_block + resource="admin.export" + access="UPDATE" + path={url path="admin/export/position"} + url_parameter="id" + in_place_edit_class="exportPositionChange" + position=$POSITION + id=$ID + } + + +
+ + + +
+ + + {/loop} + + +
-
- + + {/ifloop} {/loop} {elseloop rel="export-category"} diff --git a/templates/backOffice/default/import.html b/templates/backOffice/default/import.html index 43226fc74..e4f2d01a9 100644 --- a/templates/backOffice/default/import.html +++ b/templates/backOffice/default/import.html @@ -34,82 +34,84 @@ {module_include location='tools_top'} {loop name="import-category" type="import-category" order=$category_order} - {assign category_title $TITLE} -
-
-
-
- - - - - - - - - - - - {loop name="import-categ-list" type="import" order=$import_order category=$ID} - - - - - + + + + + + {loop name="import-categ-list" type="import" order=$import_order category=$ID} + + + + + + + {/loop} + +
- {admin_position_block - resource="admin.import" - access="UPDATE" - path={url path="admin/import/position/category"} - url_parameter="id" - in_place_edit_class="importCategoryPositionChange" - position=$POSITION - id=$ID - } - {$TITLE} -
- - {intl l="ID"} - - - - {intl l="Name"} - - - - {intl l="Position"} - - - {intl l="Actions"} -
- {$ID} - - {$TITLE} - - {admin_position_block - resource="admin.import" - access="UPDATE" - path={url path="admin/import/position"} - url_parameter="id" - in_place_edit_class="importPositionChange" - position=$POSITION - id=$ID - } - -
- - + {ifloop rel="import-categ-list"} + {assign category_title $TITLE} +
+
+
+
+ + + + + - {/loop} - -
+ {admin_position_block + resource="admin.import" + access="UPDATE" + path={url path="admin/import/position/category"} + url_parameter="id" + in_place_edit_class="importCategoryPositionChange" + position=$POSITION + id=$ID + } + {$TITLE} +
+ + {intl l="ID"} - - -
+ +
+ + {intl l="Name"} + + + + {intl l="Position"} + + + {intl l="Actions"} +
+ {$ID} + + {$TITLE} + + {admin_position_block + resource="admin.import" + access="UPDATE" + path={url path="admin/import/position"} + url_parameter="id" + in_place_edit_class="importPositionChange" + position=$POSITION + id=$ID + } + +
+ + + +
+
+
-
- + + {/ifloop} {/loop} {elseloop rel="import-category"}