From 09a558485a5c5682c58f28bfda56378b8b04c0b3 Mon Sep 17 00:00:00 2001 From: Lucas CERDAN Date: Mon, 18 Nov 2013 17:13:45 +0100 Subject: [PATCH 1/3] New fixtures (en) (my first commit, yay! :) ) --- .../fixtures/fashion/data/category.xml | 2 +- .../fashion/langs/en/data/attribute.xml | 72 +++ .../fashion/langs/en/data/attribute_group.xml | 15 + .../fashion/langs/en/data/attributegroup.xml | 21 + .../fashion/langs/en/data/carrier.xml | 6 + .../fashion/langs/en/data/category.xml | 193 ++++++++ .../fashion/langs/en/data/feature.xml | 18 + .../fashion/langs/en/data/feature_value.xml | 66 +++ .../fashion/langs/en/data/featurevalue.xml | 66 +++ .../fixtures/fashion/langs/en/data/image.xml | 91 ++++ .../fashion/langs/en/data/manufacturer.xml | 10 + .../fashion/langs/en/data/order_message.xml | 12 + .../fashion/langs/en/data/ordermessage.xml | 7 + .../fashion/langs/en/data/product.xml | 464 ++++++++++++++++++ .../fashion/langs/en/data/profile.xml | 12 + .../fixtures/fashion/langs/en/data/scene.xml | 8 + .../fashion/langs/en/data/supplier.xml | 9 + .../fixtures/fashion/langs/en/data/tag.xml | 11 + 18 files changed, 1082 insertions(+), 1 deletion(-) create mode 100644 install-dev/fixtures/fashion/langs/en/data/attribute.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/attribute_group.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/attributegroup.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/carrier.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/category.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/feature.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/feature_value.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/featurevalue.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/image.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/manufacturer.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/order_message.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/ordermessage.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/product.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/profile.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/scene.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/supplier.xml create mode 100644 install-dev/fixtures/fashion/langs/en/data/tag.xml diff --git a/install-dev/fixtures/fashion/data/category.xml b/install-dev/fixtures/fashion/data/category.xml index b0abca3d3..82d19c03e 100644 --- a/install-dev/fixtures/fashion/data/category.xml +++ b/install-dev/fixtures/fashion/data/category.xml @@ -28,6 +28,6 @@ - + diff --git a/install-dev/fixtures/fashion/langs/en/data/attribute.xml b/install-dev/fixtures/fashion/langs/en/data/attribute.xml new file mode 100644 index 000000000..80cd9b225 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/attribute.xml @@ -0,0 +1,72 @@ + + + + S + + + M + + + L + + + One size + + + Grey + + + Taupe + + + Beige + + + White + + + Off White + + + Red + + + Black + + + Camel + + + Orange + + + Blue + + + Green + + + Yellow + + + Brown + + + 35 + + + 36 + + + 37 + + + 38 + + + 39 + + + 40 + + diff --git a/install-dev/fixtures/fashion/langs/en/data/attribute_group.xml b/install-dev/fixtures/fashion/langs/en/data/attribute_group.xml new file mode 100644 index 000000000..17c82c65f --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/attribute_group.xml @@ -0,0 +1,15 @@ + + + + Size + Size + + + Shoes Size + Size + + + Color + Color + + diff --git a/install-dev/fixtures/fashion/langs/en/data/attributegroup.xml b/install-dev/fixtures/fashion/langs/en/data/attributegroup.xml new file mode 100644 index 000000000..09da13fde --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/attributegroup.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/install-dev/fixtures/fashion/langs/en/data/carrier.xml b/install-dev/fixtures/fashion/langs/en/data/carrier.xml new file mode 100644 index 000000000..c59766e73 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/carrier.xml @@ -0,0 +1,6 @@ + + + + Delivery next day! + + diff --git a/install-dev/fixtures/fashion/langs/en/data/category.xml b/install-dev/fixtures/fashion/langs/en/data/category.xml new file mode 100644 index 000000000..3bea1380e --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/category.xml @@ -0,0 +1,193 @@ + + + + Women + + women + + + + + + Coats and Jackets + + coats-jackets + + + + + + Coats + + coats + + + + + + Jackets + + jackets + + + + + + Blazers + + blazers + + + + + + Puffer Jackets + + puffer-jackets + + + + + + Leather Jackets + + leather-jackets + + + + + + Tops + + tops + + + + + + T-shirts + + tshirts + + + + + + Tops + + top + + + + + + Blouses + + blouses + + + + + + Pants + + pants + + + + + + Skinny Cut + + skinny-cut + + + + + Straight Cut + + straight-cut + + + + + Dresses + + dresses + + + + + + Casual Dresses + + casual-dresses + + + + + + Evening Dresses + + evening-dresses + + + + + + Summer Dresses + + summer-dresses + + + + + + Accessories + + accessories + + + + + + Belts + + belts + + + + + + Hats + + hats + + + + + + Handbags + + handbags + + + + + + Shoes + + shoes + + + + + + Men + + men + + + + + diff --git a/install-dev/fixtures/fashion/langs/en/data/feature.xml b/install-dev/fixtures/fashion/langs/en/data/feature.xml new file mode 100644 index 000000000..47137f188 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/feature.xml @@ -0,0 +1,18 @@ + + + + Height + + + Width + + + Depth + + + Weight + + + Compositions + + diff --git a/install-dev/fixtures/fashion/langs/en/data/feature_value.xml b/install-dev/fixtures/fashion/langs/en/data/feature_value.xml new file mode 100644 index 000000000..cf7b3c287 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/feature_value.xml @@ -0,0 +1,66 @@ + + + + Polyester + + + Wool + + + Viscose + + + Elastane + + + Cotton + + + Silk + + + Suede + + + Straw + + + Leather + + + 2.75 in + + + 2.06 in + + + 49.2 g + + + 0.26 in + + + 1.07 in + + + 1.62 in + + + 15.5 g + + + 0.41 in (clip included) + + + 4.33 in + + + 2.76 in + + + 120g + + + 0.31 in + + diff --git a/install-dev/fixtures/fashion/langs/en/data/featurevalue.xml b/install-dev/fixtures/fashion/langs/en/data/featurevalue.xml new file mode 100644 index 000000000..7f943c0a4 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/featurevalue.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-dev/fixtures/fashion/langs/en/data/image.xml b/install-dev/fixtures/fashion/langs/en/data/image.xml new file mode 100644 index 000000000..096903bf7 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/image.xml @@ -0,0 +1,91 @@ + + + Fur Coat + Fut Coat + Textured Trench Coat + Textured Trench Coat + Slim Cut Coat + Slim Cut Coat + Quilted Jacket + Quilted Jacket + Suit Blazer + Suit Blazer + Suit Blazer + Short Blazer + Puffer Jacket + Puffer Jacket + Puffer Jacket + Leather Jacket + Leather Jacket + Leather Jacket + Leather Jacket + Leather Jacket + Leather Jacket + Leather Jacket + Short Sleeve T-shirts + Short Sleeve T-shirts + Faded Short Sleeve T-shirts + Faded Short Sleeve T-shirts + Faded Short Sleeve T-shirts + Faded Short Sleeve T-shirts + Cami Tank Top + Cami Tank Top + Cami Tank Top + Blouse + Blouse + Blouse + Leapoard Printed Blouse + Leapoard Printed Blouse + Faded Jeans + Faded Jeans + 5 Pocket Jean + 5 Pocket Jean + 5 Pocket Jean + 5 Pocket Jean + 5 Pocket Jean + Dress Gathered At The Waist + Dress Gathered At The Waist + Printed Dress + Printed Dress + Floral Dress + Floral Dress + Floral Dress + Strapless Dress + Strapless Dress + Long Evening Dress + Long Evening Dress + Short Evening Dress + Short Evening Dress + Strapless Dress + Strapless Dress + Dress with Sleeves + Dress with Sleeves + Printed Dress + Printed Dress + Printed Summer Dress + Printed Summer Dress + Printed Summer Dress + Printed Summer Dress + Long Printed Dress + Long Printed Dress + Printed Summer Dress + Printed Summer Dress + Printed Summer Dress + Printed Summer Dress + Printed Chiffon Dress + Printed Chiffon Dress + Printed Chiffon Dress + Printed Chiffon Dress + Studded Leather Belt + Studded Leather Belt + Braided Belt + Bucket Hat + Floppy Hat + Men Straw Hat + Bowling Bag + Leather Bag + Snake Skin Bag + Quilted Bag + Suede Bag + Wedge Shoe + diff --git a/install-dev/fixtures/fashion/langs/en/data/manufacturer.xml b/install-dev/fixtures/fashion/langs/en/data/manufacturer.xml new file mode 100644 index 000000000..2f09cb629 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/manufacturer.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/install-dev/fixtures/fashion/langs/en/data/order_message.xml b/install-dev/fixtures/fashion/langs/en/data/order_message.xml new file mode 100644 index 000000000..93ad3b501 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/order_message.xml @@ -0,0 +1,12 @@ + + + + Delay + Hi, + +Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery. +Please accept our apologies and rest assured that we are working hard to rectify this. + +Best regards, + + diff --git a/install-dev/fixtures/fashion/langs/en/data/ordermessage.xml b/install-dev/fixtures/fashion/langs/en/data/ordermessage.xml new file mode 100644 index 000000000..e743f5d97 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/ordermessage.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/install-dev/fixtures/fashion/langs/en/data/product.xml b/install-dev/fixtures/fashion/langs/en/data/product.xml new file mode 100644 index 000000000..0a905fbfd --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/product.xml @@ -0,0 +1,464 @@ + + + + + This stylish short sleeve faux fur coat will keep you warm this winter. The thick knit collar adds an orginal touch to this elegant coat. + fur-coat + + + + Fur Coat + In stock + + + + + This flattering fitted trench coat is the ideal piece for the season. The warm collar will keep you warm for any winter occasion. + textured-trench-coat + + + + Textured Trench Coat + In stock + + + + + A stylish double-breasted coat with a high collar. Slim cut and belted to emphasize your waist and your femininity! + slim-cut-coat + + + + Slim Cut Coat + In stock + + + + + This quilted jacket with zipper detail and built-in hood is perfect for Fall. Comfortable fit with silver sleeves and shoulders. + quilted-jacket + + + + Quilted Jacket + In stock + + + + + Suit style blazer with structured shoulders and front side gold engraved buttons. Ideal for the mid-season. + suit-blazer + + + + Suit Blazer + In stock + + + + + Short cotton blazer with black and white polka dots. Front side button closures and three quarter length sleeves. Complete the look with a delicate necklace. + short-blazer + + + + Short Blazer + In stock + + + + + Puffer jacket with treated fabric and a removable faur fux hood. Flattering fit with a belt buckle and loops. Fitting for winter fashion. + Puffer_Jacket + + + + Puffer Jacket + In stock + + + + + Biker style jacket with asymmetrical zipper front. Side pockets and zippered cuffs. + leather-jacket + + + + Leather Jacket + In stock + + + + + Zip up biker inspired leather jacket with collar. The two zippered pockets on the front gives this jacket rock style flare. + leather-jacket + + + + Leather Jacket + In stock + + + + + Biker leather jacket with padded and tie-up detailed sleeves. The structured shoulders makes this jacket super stylish. + leather-jacket + + + + Leather Jacket + In stock + + + + + Soft stretch jersey v-neck tee with short sleeves. A delightful green for a colorful summer. + short-sleeve-tshirts + + + + Short Sleeve T-shirts + In stock + + + + + Faded short sleeve t-shirt with high neckline. Soft and stretchy material for a comfortable fit. Accessorize with a straw hat and you're ready for summer! + faded-short-sleeve-tshirts + + + + Faded Short Sleeve T-shirts + In stock + + + + + Pure cotton printed top with waist elastic band for a perfect fit. The thin straps will highlight chest on a hot summer day. + Cami_Tank_Top + + + + Cami Tank Top + In stock + + + + Short sleeved blouse with feminine draped sleeve detail. + blouse + + + + Blouse + In stock + + + + + Elegant leopard print silky blouse with chiffon puffed sleeves. + leapoard_printed_blouse + + + + Leapoard Printed Blouse + In stock + + + + + 5-pocket washed denim stretchy jeans with low waist and just the right cut. + faded-jeans + + + + Faded Jeans + In stock + + + + + 5-pocket blue jean with zipper and button closure. Straight cut fit. + 5-pocket-jean + + + + 5 Pocket Jean + In stock + + + + + 5-pocket blue jean with zipper and button closure. Straight cut fit. + 5-pocket-jean + + + + 5 Pocket Jean + In stock + + + + + V-neck cut dress gathered at the waist for a flattering waistline. 3/4 sleeves and draped. + Dress_Gathered_At_The_Waist + + + + Dress gathered at the waist + In stock + + + + + 100% cotton double printed dress. Black and white striped top and orange high waisted skater skirt bottom. + printed-dress + + + + Printed Dress + In stock + + + + + Lace embroidered dress with floral detail. Tie-up spaghetti straps . + floral-dress + + + + Floral Dress + In stock + + + + + Strapless cinched waist dress with floral print. + strapless-dress + + + + Strapless Dress + In stock + + + + + Long sleeve jersey dress. Mid knee length. + long-evening-dress + + + + Long Evening Dress + In stock + + + + + Short baby doll dress with neckline bow. Detailed finishes at the bottom of the dress. + short-evening-dress + + + + Short Evening Dress + In stock + + + + + Ruffle strapless dress with floral prints and knotted blue waist belt. + strapless-dress + + + + Strapless Dress + In stock + + + + + Black evening dress with puffed sleeve accents. Leather lining on frontside of the dress. + dress-with-sleeves + + + + Dress with Sleeves + In stock + + + + + Printed evening dress with straight sleeves with black thin waist belt and ruffled linings. + printed-dress + + + + Printed Dress + In stock + + + + + Long printed dress with thin adjustable straps. V-neckline and wiring under the bust with ruffles at the bottom of the dress. + printed-summer-dress + + + + Printed Summer Dress + In stock + + + + + Long printed empire waist dress with behind the neck tie straps. + long-printed-dress + + + + Long Printed Dress + In stock + + + + + Sleeveless knee-length chiffon dress. V-neckline with elastic under the bust lining. + printed-summer-dress + + + + Printed Summer Dress + In stock + + + + + Printed chiffon knee length dress with tank straps. Deep v-neckline. + printed-chiffon-dress + + + + Printed Chiffon Dress + In stock + + + + + Brown accent studded belt with gold buckle + studded-leather-belt + + + + Studded Leather Belt + In stock + + + + + Black and gold braided leather belt + braided-belt + + + + Braided Belt + In stock + + + + + Soft felted knit bucket hat + bucket-hat + + + + Bucket Hat + In stock + + + + + Black straw floppy hat + floppy-hat + + + + Floppy Hat + In stock + + + + + Men's beige straw fedora + men-straw-hat + + + + Men Straw Hat + In stock + + + + + Red bowling style bag. Fancy lining with metal buckle strap + bowling-bag + + + + Bowling Bag + In stock + + + + + Genuine leather bag with leather handles and adjustable and removable shoulder strap. + leather-bag + + + + Leather Bag + In stock + + + + + Snake skin shoulder bag with straps and handle. Front pocket with gold flap buckle. + Snake_Skin_Bag + + + + Snake Skin Bag + In stock + + + + + Quilted leather bag with silver braided straps. Adjustable long handle and zipper on top and side pocket. + quilted-bag + + + + Quilted Bag + In stock + + + + + Suede camel colored bag with belted front flap. + Suede_Bag + + + + Suede Bag + In stock + + + + + High heeled cork wedge with cross over leather straps. + Wedge_Shoe + + + + Wedge Shoe + In stock + + + diff --git a/install-dev/fixtures/fashion/langs/en/data/profile.xml b/install-dev/fixtures/fashion/langs/en/data/profile.xml new file mode 100644 index 000000000..04e65582f --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/profile.xml @@ -0,0 +1,12 @@ + + + + Logistician + + + Translator + + + Salesman + + diff --git a/install-dev/fixtures/fashion/langs/en/data/scene.xml b/install-dev/fixtures/fashion/langs/en/data/scene.xml new file mode 100644 index 000000000..708079e52 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/scene.xml @@ -0,0 +1,8 @@ + + + + diff --git a/install-dev/fixtures/fashion/langs/en/data/supplier.xml b/install-dev/fixtures/fashion/langs/en/data/supplier.xml new file mode 100644 index 000000000..0c375e8d4 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/supplier.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/install-dev/fixtures/fashion/langs/en/data/tag.xml b/install-dev/fixtures/fashion/langs/en/data/tag.xml new file mode 100644 index 000000000..d413861a0 --- /dev/null +++ b/install-dev/fixtures/fashion/langs/en/data/tag.xml @@ -0,0 +1,11 @@ + + + + From 04bc3200809faad3b2f298ac97d695ec6355118d Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 18 Nov 2013 17:41:16 +0100 Subject: [PATCH 2/3] // Small fix --- controllers/admin/AdminModulesController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 34ca493ff..2906d1b57 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -705,7 +705,6 @@ class AdminModulesControllerCore extends AdminController $disable_link = $this->context->link->getAdminLink('AdminModules').'&module_name='.$module->name.'&enable=0&tab_module='.$module->tab; $uninstall_link = $this->context->link->getAdminLink('AdminModules').'&module_name='.$module->name.'&uninstall='.$module->name.'&tab_module='.$module->tab; $reset_link = $this->context->link->getAdminLink('AdminModules').'&module_name='.$module->name.'&reset&tab_module='.$module->tab; - $update_link = $this->context->link->getAdminLink('AdminModules').'&check_and_update='.$module->name.'&module_name='.$module->name.'&reset&tab_module='.$module->tab; $this->context->smarty->assign(array( 'module_name' => $module->name, @@ -715,7 +714,7 @@ class AdminModulesControllerCore extends AdminController 'module_disable_link' => $disable_link, 'module_uninstall_link' => $uninstall_link, 'module_reset_link' => $reset_link, - 'module_update_link' => (Module::needUpgrade($module) ? $update_link : null), + 'module_update_link' => null //TODO, 'trad_link' => $trad_link, 'module_languages' => Language::getLanguages(false), 'theme_language_dir' => _THEME_LANG_DIR_ @@ -751,7 +750,7 @@ class AdminModulesControllerCore extends AdminController // Display module configuration $header = $this->context->smarty->fetch('controllers/modules/configure.tpl'); $configuration_bar = $this->context->smarty->fetch('controllers/modules/configuration_bar.tpl'); - $this->context->smarty->assign('module_content', $header.$configuration_bar.$echo ); + $this->context->smarty->assign('module_content', $header.$echo.$configuration_bar ); } elseif ($echo === true) { From 339fb86f4b39b6a3c5de7b2235017f47ab676d28 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 18 Nov 2013 17:42:26 +0100 Subject: [PATCH 3/3] // oops --- controllers/admin/AdminModulesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 2906d1b57..94c66caa4 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -714,7 +714,7 @@ class AdminModulesControllerCore extends AdminController 'module_disable_link' => $disable_link, 'module_uninstall_link' => $uninstall_link, 'module_reset_link' => $reset_link, - 'module_update_link' => null //TODO, + 'module_update_link' => null, //TODO 'trad_link' => $trad_link, 'module_languages' => Language::getLanguages(false), 'theme_language_dir' => _THEME_LANG_DIR_