From 72a2cdfd751d867cb5039ebcf1999e10eb4175f7 Mon Sep 17 00:00:00 2001 From: franck Date: Sat, 21 Sep 2013 16:51:51 +0200 Subject: [PATCH] Ajaxified product modification tabs --- .../Thelia/Config/Resources/routing/admin.xml | 30 ++- .../Controller/Admin/ProductController.php | 57 +++++- .../product-attributes-tab.html | 28 ++- .../product-general-tab.html | 10 +- .../product-related-tab.html} | 157 +++++++++++++- .../default/assets/less/thelia/thelia.less | 13 +- templates/admin/default/categories.html | 4 +- .../default/includes/inner-form-toolbar.html | 29 +-- .../default/product-attributes-edit.html | 0 templates/admin/default/product-edit.html | 193 ++++-------------- 10 files changed, 329 insertions(+), 192 deletions(-) rename templates/admin/default/{includes => ajax}/product-attributes-tab.html (91%) rename templates/admin/default/{includes => ajax}/product-general-tab.html (91%) rename templates/admin/default/{includes/product-content-tab.html => ajax/product-related-tab.html} (66%) delete mode 100644 templates/admin/default/product-attributes-edit.html diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index f35d9a545..7eacde1cd 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -150,22 +150,32 @@ Thelia\Controller\Admin\ProductController::updatePositionAction - - + + Thelia\Controller\Admin\ProductController::loadGeneralAjaxTabAction + + + + + + Thelia\Controller\Admin\ProductController::loadRelatedAjaxTabAction + + + + Thelia\Controller\Admin\ProductController::addRelatedContentAction - + Thelia\Controller\Admin\ProductController::deleteRelatedContentAction - + Thelia\Controller\Admin\ProductController::getAvailableRelatedContentAction xml|json - + Thelia\Controller\Admin\ProductController::addAccessoryAction @@ -180,11 +190,16 @@ xml|json - + Thelia\Controller\Admin\ProductController::updateAccessoryPositionAction - + + + + Thelia\Controller\Admin\ProductController::loadAttributesAjaxTabAction + + Thelia\Controller\Admin\ProductController::setProductTemplateAction @@ -195,6 +210,7 @@ + Thelia\Controller\Admin\FolderController::indexAction diff --git a/core/lib/Thelia/Controller/Admin/ProductController.php b/core/lib/Thelia/Controller/Admin/ProductController.php index c36ebcec1..12ad3510d 100644 --- a/core/lib/Thelia/Controller/Admin/ProductController.php +++ b/core/lib/Thelia/Controller/Admin/ProductController.php @@ -77,6 +77,61 @@ class ProductController extends AbstractCrudController ); } + /** + * General ajax tab loading + */ + public function loadGeneralAjaxTabAction() { + + // Load the object + $object = $this->getExistingObject(); + + if ($object != null) { + + // Hydrate the form abd pass it to the parser + $changeForm = $this->hydrateObjectForm($object); + + // Pass it to the parser + $this->getParserContext()->addForm($changeForm); + + return $this->render( + 'ajax/product-general-tab', + array( + 'product_id' => $this->getRequest()->get('product_id', 0), + ) + ); + } + + $this->redirectToListTemplate(); + } + + /** + * Attributes ajax tab loading + */ + public function loadAttributesAjaxTabAction() { + + return $this->render( + 'ajax/product-attributes-tab', + array( + 'product_id' => $this->getRequest()->get('product_id', 0), + ) + ); + } + + /** + * Related information ajax tab loading + */ + public function loadRelatedAjaxTabAction() { + + return $this->render( + 'ajax/product-related-tab', + array( + 'product_id' => $this->getRequest()->get('product_id', 0), + 'folder_id' => $this->getRequest()->get('folder_id', 0), + 'accessory_category_id'=> $this->getRequest()->get('accessory_category_id', 0) + ) + ); + } + protected function getCreationForm() { return new ProductCreationForm($this->getRequest()); @@ -468,7 +523,7 @@ class ProductController extends AbstractCrudController $position = $this->getRequest()->get('position', null); - $event = new UpdatePositionEvent($mode, $position); + $event = new UpdatePositionEvent($this->getRequest()->get('accessory_id', null), $mode, $position); $this->dispatch(TheliaEvents::PRODUCT_UPDATE_ACCESSORY_POSITION, $event); } diff --git a/templates/admin/default/includes/product-attributes-tab.html b/templates/admin/default/ajax/product-attributes-tab.html similarity index 91% rename from templates/admin/default/includes/product-attributes-tab.html rename to templates/admin/default/ajax/product-attributes-tab.html index b245e22ec..2cccbfadf 100644 --- a/templates/admin/default/includes/product-attributes-tab.html +++ b/templates/admin/default/ajax/product-attributes-tab.html @@ -1,7 +1,9 @@ +{loop name="product_edit" type="product" visible="*" id=$product_id backend_context="1" lang=$edit_language_id}
+

{* <---- FIXME Lame ! *}
@@ -54,11 +56,12 @@ {include - file="includes/inner-form-toolbar.html" - hide_submit_buttons=false - close_url="{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" - } + file = "includes/inner-form-toolbar.html" + hide_submit_buttons = false + page_url = "{url path='/admin/products/update' product_id=$ID}" + close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" + } {* -- Begin attributes management ------------------------------- *} @@ -181,11 +184,24 @@ {elseloop rel="product_template"}
-

{* bouuuuuh ! *} +

{* <---- FIXME Lame ! *}
{intl l="This product is not attached to any product template. If you want to use features or attributes on this product, please select the proper template. You can define product templates in the Configuration section."}
{/elseloop} -
\ No newline at end of file +
+{/loop} + + diff --git a/templates/admin/default/includes/product-general-tab.html b/templates/admin/default/ajax/product-general-tab.html similarity index 91% rename from templates/admin/default/includes/product-general-tab.html rename to templates/admin/default/ajax/product-general-tab.html index 3eb2d6fe0..8f6cdc20a 100644 --- a/templates/admin/default/includes/product-general-tab.html +++ b/templates/admin/default/ajax/product-general-tab.html @@ -1,9 +1,16 @@ +{loop name="product_edit" type="product" visible="*" id=$product_id backend_context="1" lang=$edit_language_id}
{form name="thelia.admin.product.modification"} - {include file="includes/inner-form-toolbar.html" close_url="{url path='/admin/products' product_id=$product_id}"} + {include + file = "includes/inner-form-toolbar.html" + hide_submit_buttons = false + + page_url = "{url path='/admin/products/update' product_id=$ID}" + close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" + } {* Be sure to get the product ID, even if the form could not be validated *} @@ -104,3 +111,4 @@ {/form}
+{/loop} \ No newline at end of file diff --git a/templates/admin/default/includes/product-content-tab.html b/templates/admin/default/ajax/product-related-tab.html similarity index 66% rename from templates/admin/default/includes/product-content-tab.html rename to templates/admin/default/ajax/product-related-tab.html index e17517930..8d705e9ae 100644 --- a/templates/admin/default/includes/product-content-tab.html +++ b/templates/admin/default/ajax/product-related-tab.html @@ -1,22 +1,25 @@ +{loop name="product_edit" type="product" visible="*" id=$product_id backend_context="1" lang=$edit_language_id}
{include - file="includes/inner-form-toolbar.html" - hide_submit_buttons=true - close_url="{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" + file = "includes/inner-form-toolbar.html" + hide_submit_buttons = true + + page_url = "{url path='/admin/products/update' product_id=$ID}" + close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" } {* -- Begin related content management -- *}
-
+

{intl l='Related content'}

{intl l='You can attach here some content to this product'}

- + {ifloop rel="folders"}
@@ -120,7 +123,7 @@

{intl l='Define here this product\'s accessories'}

- + {ifloop rel="categories"}
@@ -190,7 +193,7 @@ {admin_position_block permission="admin.products.edit" - path={url path='/admin/products/update-accessory-position' product_id=$ID} + path={url path='/admin/product/update-accessory-position' product_id=$product_id current_tab="related"} url_parameter="accessory_id" in_place_edit_class="accessoryPositionChange" position=$POSITION @@ -237,7 +240,7 @@ - + {/capture} {include @@ -247,7 +250,7 @@ dialog_title = {intl l="Remove related content"} dialog_message = {intl l="Do you really want to remove this related content from the product ?"} - form_action = {url path='/admin/products/related-content/delete'} + form_action = {url path='/admin/products/content/delete'} form_content = {$smarty.capture.delete_content_dialog nofilter} } @@ -258,7 +261,7 @@ - + {/capture} {include @@ -270,4 +273,136 @@ form_action = {url path='/admin/products/accessory/delete'} form_content = {$smarty.capture.delete_accessory_dialog nofilter} -} \ No newline at end of file +} + + +{/loop} \ No newline at end of file diff --git a/templates/admin/default/assets/less/thelia/thelia.less b/templates/admin/default/assets/less/thelia/thelia.less index 822130a5c..7de53f5aa 100644 --- a/templates/admin/default/assets/less/thelia/thelia.less +++ b/templates/admin/default/assets/less/thelia/thelia.less @@ -226,6 +226,14 @@ } } +.tab-content { + // Center loading indicator + .loading { + margin: 8em auto; + text-align: center; + } +} + // The overall form container .form-container { @@ -275,5 +283,8 @@ .loading{ background: url("@{imgDir}/ajax-loader.gif") no-repeat; height: 30px; - width: 30px; + display: inline-block; + line-height: 30px; + padding-left: 40px; + width: auto; } \ No newline at end of file diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html index 68e84014f..2c53d71dc 100755 --- a/templates/admin/default/categories.html +++ b/templates/admin/default/categories.html @@ -256,7 +256,7 @@ } -   + {intl l="Actions"} @@ -303,7 +303,7 @@ } - +
{loop type="auth" name="can_change" roles="ADMIN" permissions="admin.product.edit"} diff --git a/templates/admin/default/includes/inner-form-toolbar.html b/templates/admin/default/includes/inner-form-toolbar.html index 39da9fce7..f0ddeb924 100755 --- a/templates/admin/default/includes/inner-form-toolbar.html +++ b/templates/admin/default/includes/inner-form-toolbar.html @@ -1,18 +1,21 @@ +{* +A toolbar displayed in forms, to display language change flags, submit and close buttons. + +Parameters: + + - hide_submit_buttons: true / false. If true, only the close button will be deplayed. + - page_url: the current page URL. Dafault id $current_url. Used to switchedition anguage. + - close_url: no default. URL displayed when close button is clicked. If empty, the close button is not displayed. +*} +
{* Display the top form toolbar, with edition flags, and save buttons *} - {* When creating a new object, only default language is displayed *} - {if $action == 'create'} - {$default_only = 1} - {else} - {$default_only = 0} - {/if} -
    - {loop name="lang_list" type="lang" default_only={$default_only}} + {loop name="lang_list" type="lang"}
  • - + {intl l=$TITLE}
    • @@ -22,11 +25,11 @@
    {if $hide_submit_buttons != true} - - + + {/if} {if ! empty($close_url)} - {intl l='Close'} + {intl l='Close'} {/if}
    -
+
\ No newline at end of file diff --git a/templates/admin/default/product-attributes-edit.html b/templates/admin/default/product-attributes-edit.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/templates/admin/default/product-edit.html b/templates/admin/default/product-edit.html index f1384148b..5c0f89c79 100644 --- a/templates/admin/default/product-edit.html +++ b/templates/admin/default/product-edit.html @@ -6,6 +6,7 @@ {block name="main-content"}
+
{include file="includes/catalog-breadcrumb.html" editing_category="false" editing_product="true"} @@ -40,41 +41,56 @@
-
- - {include file="includes/product-general-tab.html"} - +
+
{intl l="Please wait, loading"}
-
- - {include file="includes/product-attributes-tab.html"} - +
+
{intl l="Please wait, loading"}
-
- - {include file="includes/product-content-tab.html"} - + -
+
+
{intl l="Please wait, loading"}
-
+
+
{intl l="Please wait, loading"}
-
+
+
{intl l="Please wait, loading"}
@@ -116,137 +132,14 @@ {/block} \ No newline at end of file