Skip to content

J
joshine
Commit 859fe45d by 王东红
Options

Merge branch 'master' of http://47.99.244.21:9999/root/joshine

parents 5e73d1a5 7effe964
Showing with 108 additions and 111 deletions
app/code/Amasty/AdvancedReview/view/base/web/css/source/mkcss/amreview.less
// Generating css file. Path from vendor/magento/theme-frontend-blank
//@import (reference) '../../../lib::css/source/lib/_lib.less'; // Library files
//@import (reference) '../../../lib::css/source/lib/_responsive.less'; // Global responsive
@import (reference) '../../../lib::css/source/lib/_lib.less'; // Library files
@import (reference) '../../../lib::css/source/lib/_responsive.less'; // Global responsive
@import '../_module.less';
app/design/frontend/Joshine/breeze/Magento_Catalog/layout/catalog_product_view.xml
<?xml version="1.0"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
......@@ -23,27 +23,24 @@
<argument name="add_base_attribute" xsi:type="string">itemprop="name"</argument>
</arguments>
</referenceBlock>
<move element="page.main.title" destination="box.inner1" before="-"/>
<referenceBlock name="root">
<arguments>
<argument name="add_attribute" xsi:type="string">itemscope itemtype="http://schema.org/Product"</argument>
</arguments>
</referenceBlock>
<referenceBlock name="breadcrumbs" template="Magento_Catalog::product/breadcrumbs.phtml">
<arguments>
<argument name="viewModel" xsi:type="object">Magento\Catalog\ViewModel\Product\Breadcrumbs</argument>
</arguments>
</referenceBlock>
<referenceContainer name="content">
<container name="catalog.product.view" htmlTag="div" htmlClass="product-view" before="-">
<container name="product.row" htmlTag="div" htmlClass="view-product" before="-">
<container name="product.view.row" htmlTag="div" htmlClass="row">
<container name="product.col.left" htmlTag="div" htmlClass="col-md-12 col-xs-12">
<container name="product.row.main.detail" htmlTag="div" htmlClass="main-detail col-products">
<container name="product.row.child" htmlTag="div" htmlClass="row">
<container name="product.col.media" htmlTag="div" htmlClass="col-md-6 col-sm-6 col-xs-12" before="-" />
<container name="product.col.info" htmlTag="div" htmlClass="col-md-4 col-sm-4 col-xs-12">
<container name="product.info.main" htmlTag="div" htmlClass="detail-info detail-info-product-view product-info product-info-main">
<container name="box.inner1" htmlTag="div" htmlClass="box-inner1" before="-">
<container name="product.info.price" label="Product info auxiliary container" htmlTag="div" htmlClass="product-info-price" after="product.info.review">
<container name="product.info.main" htmlTag="div" htmlClass="product-info-main" before="-">
<container name="product.info.price" label="Product info auxiliary container" htmlTag="div" htmlClass="product-info-price">
<container name="product.info.stock.sku" label="Product auxiliary info" htmlTag="div" htmlClass="product-info-stock-sku">
<container name="product.info.type" before="-"/>
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml" after="product.info.type">
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="Magento_Catalog::product/view/attribute.phtml" after="product.info.type">
<arguments>
<argument name="at_call" xsi:type="string">getSku</argument>
<argument name="at_code" xsi:type="string">sku</argument>
......@@ -53,28 +50,15 @@
</arguments>
</block>
</container>
<block class="Magento\Catalog\Block\Product\View" name="product.info.review" template="product/view/review.phtml" />
</container>
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.overview" template="product/view/attribute.phtml" group="detailed_info" after="product.info.extrahint">
<arguments>
<argument name="at_call" xsi:type="string">getShortDescription</argument>
<argument name="at_code" xsi:type="string">short_description</argument>
<argument name="css_class" xsi:type="string">overview</argument>
<argument name="at_label" translate="true" xsi:type="string">none</argument>
<argument name="title" translate="true" xsi:type="string">Overview</argument>
<argument name="add_attribute" xsi:type="string">itemprop="description"</argument>
</arguments>
</block>
<block class="Magento\Catalog\Pricing\Render" name="product.price.final" after="product-info-price">
<block class="Magento\Catalog\Block\Product\View" name="product.info.review" template="Magento_Catalog::product/view/review.phtml" after="product.info.stock.sku" />
<block class="Magento\Catalog\Pricing\Render" name="product.price.final">
<arguments>
<argument name="price_render" xsi:type="string">product.price.render.default</argument>
<argument name="price_type_code" xsi:type="string">final_price</argument>
<argument name="zone" xsi:type="string">item_view</argument>
</arguments>
</block>
</container>
<block class="Magento\Catalog\Pricing\Render" name="product.price.tier" after="product.info.price">
<arguments>
<argument name="price_render" xsi:type="string">product.price.render.default</argument>
......@@ -82,59 +66,85 @@
<argument name="zone" xsi:type="string">item_view</argument>
</arguments>
</block>
</container>
<container name="alert.urls" as="alert_urls" label="Alert Urls" after="product.price.tier"/>
<container name="box.addtocart.extrahint" htmlTag="div" htmlClass="attr-info" after="alert.urls">
<block class="Magento\Catalog\Block\Product\View" name="product.info" template="product/view/form.phtml">
<block class="Magento\Catalog\Block\Product\View" name="product.info" template="Magento_Catalog::product/view/form.phtml" after="alert.urls">
<container name="product.info.form.content" as="product_info_form_content">
<block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="product/view/addtocart.phtml"/>
<block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="Magento_Catalog::product/view/addtocart.phtml"/>
</container>
<block class="Magento\Framework\View\Element\Template" name="product.info.form.options" as="options_container">
<block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="product/view/options/wrapper.phtml">
<block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="product/view/options.phtml">
<block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="product/view/options/type/default.phtml"/>
<block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="product/view/options/type/text.phtml"/>
<block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="product/view/options/type/file.phtml"/>
<block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="product/view/options/type/select.phtml"/>
<block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="product/view/options/type/date.phtml"/>
<block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="Magento_Catalog::product/view/options/wrapper.phtml">
<block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="Magento_Catalog::product/view/options.phtml">
<block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" name="product.info.options.default" as="default" template="Magento_Catalog::product/view/options/type/default.phtml"/>
<block class="Magento\Catalog\Block\Product\View\Options\Type\Text" name="product.info.options.text" as="text" template="Magento_Catalog::product/view/options/type/text.phtml"/>
<block class="Magento\Catalog\Block\Product\View\Options\Type\File" name="product.info.options.file" as="file" template="Magento_Catalog::product/view/options/type/file.phtml"/>
<block class="Magento\Catalog\Block\Product\View\Options\Type\Select" name="product.info.options.select" as="select" template="Magento_Catalog::product/view/options/type/select.phtml"/>
<block class="Magento\Catalog\Block\Product\View\Options\Type\Date" name="product.info.options.date" as="date" template="Magento_Catalog::product/view/options/type/date.phtml"/>
</block>
<block class="Magento\Framework\View\Element\Html\Calendar" name="html_calendar" as="html_calendar" template="Magento_Theme::js/calendar.phtml"/>
</block>
<block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="product/view/options/wrapper/bottom.phtml">
<block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="product.info.addtocart" template="product/view/addtocart.phtml"/>
<block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="Magento_Catalog::product/view/options/wrapper/bottom.phtml">
<block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="product.info.addtocart" template="Magento_Catalog::product/view/addtocart.phtml"/>
</block>
</block>
</block>
<container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint">
<container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="product-social-extra product-social-links" after="product.info.overview">
<block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml"/>
<block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="product/view/mailto.phtml"/>
</container>
<container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="product-social-links">
<block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="Magento_Catalog::product/view/addto.phtml">
<block class="Magento\Catalog\Block\Product\View\AddTo\Compare" name="view.addto.compare" after="view.addto.wishlist"
template="Magento_Catalog::product/view/addto/compare.phtml" >
<arguments>
<argument name="addToCompareViewModel" xsi:type="object">Magento\Catalog\ViewModel\Product\Checker\AddToCompareAvailability</argument>
</arguments>
</block>
</block>
<block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="Magento_Catalog::product/view/mailto.phtml"/>
</container>
</container>
<container name="product.info.warpt" as="product_info_warpt" label="Alert product warpt" after="box.addtocart.extrahint">
<block class="Magento\Cms\Block\Block" name="product_page_free_shipping">
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.overview" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info" after="product.info.extrahint">
<arguments>
<argument name="block_id" xsi:type="string">product_page_free_shipping</argument>
<argument name="at_call" xsi:type="string">getShortDescription</argument>
<argument name="at_code" xsi:type="string">short_description</argument>
<argument name="css_class" xsi:type="string">overview</argument>
<argument name="at_label" xsi:type="string">none</argument>
<argument name="title" translate="true" xsi:type="string">Overview</argument>
<argument name="add_attribute" xsi:type="string">itemprop="description"</argument>
</arguments>
</block>
</container>
<container name="product.info.dels" as="product_info_dels" label="Alert product dels" after="product.info.warpt" />
</container>
<container name="product.info.media" htmlTag="div" htmlClass="product media" after="product.info.main">
<block class="Magento\Framework\View\Element\Template" name="skip_gallery_after.target" before="skip_gallery_before.wrapper" template="Magento_Theme::html/skiptarget.phtml">
<arguments>
<argument name="target_id" xsi:type="string">gallery-prev-area</argument>
</arguments>
</block>
<container name="skip_gallery_before.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
<block class="Magento\Framework\View\Element\Template" before="product.info.media.image" name="skip_gallery_before" template="Magento_Theme::html/skip.phtml">
<arguments>
<argument name="target" xsi:type="string">gallery-next-area</argument>
<argument name="label" translate="true" xsi:type="string">Skip to the end of the images gallery</argument>
</arguments>
</block>
</container>
<container name="product.col.related" htmlTag="div" htmlClass="col-md-2 col-sm-2 col-xs-12" />
<block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml">
<arguments>
<argument name="gallery_options" xsi:type="object">Magento\Catalog\Block\Product\View\GalleryOptions</argument>
<argument name="imageHelper" xsi:type="object">Magento\Catalog\Helper\Image</argument>
</arguments>
</block>
<container name="skip_gallery_after.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
<block class="Magento\Framework\View\Element\Template" after="product.info.media.image" name="skip_gallery_after" template="Magento_Theme::html/skip.phtml">
<arguments>
<argument name="target" xsi:type="string">gallery-prev-area</argument>
<argument name="label" translate="true" xsi:type="string">Skip to the beginning of the images gallery</argument>
</arguments>
</block>
</container>
<block class="Magento\Framework\View\Element\Template" name="skip_gallery_before.target" after="skip_gallery_after.wrapper" template="Magento_Theme::html/skiptarget.phtml">
<arguments>
<argument name="target_id" xsi:type="string">gallery-next-area</argument>
</arguments>
</block>
</container>
<container name="product.info.options.wrapper.common" label="Product Options" after="product.row.main.detail"/>
<block class="Magento\Catalog\Block\Product\View\Details" name="product.info.details" template="Magento_Catalog::product/view/details.phtml" after="product.info.media">
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" as="description" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info">
<arguments>
......@@ -142,24 +152,10 @@
<argument name="at_code" xsi:type="string">description</argument>
<argument name="css_class" xsi:type="string">description</argument>
<argument name="at_label" xsi:type="string">none</argument>
<argument name="title" translate="true" xsi:type="string">Description</argument>
<argument name="title" translate="true" xsi:type="string">Details</argument>
<argument name="sort_order" xsi:type="string">10</argument>
</arguments>
</block>
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sizefit" as="size_fit" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info">
<arguments>
<argument name="at_call" xsi:type="string">getSizeFit</argument>
<argument name="at_code" xsi:type="string">size_fit</argument>
<argument name="css_class" xsi:type="string">size_fit</argument>
<argument name="at_label" xsi:type="string">none</argument>
<argument name="title" translate="true" xsi:type="string"><![CDATA[Size & Fit]]></argument>
<argument name="sort_order" xsi:type="string">10</argument>
</arguments>
</block>
<block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="Magento_Catalog::product/view/attributes.phtml" group="detailed_info">
<arguments>
<argument translate="true" name="title" xsi:type="string">More Information</argument>
......@@ -174,21 +170,30 @@
</argument>
</arguments>
</block>
<block class="Magento\Catalog\Block\Product\ProductList\Upsell" name="product.upsellsliders" template="Magento_Catalog::product/list/upsell.phtml">
</referenceContainer>
<referenceContainer name="content.aside">
<block class="Magento\Catalog\Block\Product\ProductList\Related" name="catalog.product.related" template="Magento_Catalog::product/list/items.phtml">
<arguments>
<argument name="type" xsi:type="string">related</argument>
<argument name="view_model" xsi:type="object">Magento\Catalog\ViewModel\Product\Listing\PreparePostData</argument>
</arguments>
<block class="Magento\Catalog\Block\Product\ProductList\Item\Container" name="related.product.addto" as="addto">
<block class="Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare"
name="related.product.addto.compare" as="compare"
template="Magento_Catalog::product/list/addto/compare.phtml"/>
</block>
</block>
<block class="Magento\Catalog\Block\Product\ProductList\Upsell" name="product.info.upsell" template="Magento_Catalog::product/list/items.phtml">
<arguments>
<argument name="type" xsi:type="string">upsell</argument>
<argument name="view_model" xsi:type="object">Magento\Catalog\ViewModel\Product\Listing\PreparePostData</argument>
</arguments>
<block class="Magento\Catalog\Block\Product\ProductList\Item\Container" name="upsell.product.addto" as="addto">
<block class="Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare"
name="upsell.product.addto.compare" as="compare"
template="Magento_Catalog::product/list/addto/compare.phtml"/>
</block>
</block>
</container>
</container>
</container>
</container>
</referenceContainer>
<referenceBlock name="catalog.product.related" template="Magento_Catalog::product/list/itemsr.phtml" />
<referenceContainer name="content.aside">
<block class="Magento\Catalog\Block\Product\View\Additional" name="product.info.additional" as="product_additional_data"/>
</referenceContainer>
<referenceBlock name="product.info.addtocart">
......@@ -197,19 +202,11 @@
<referenceBlock name="product.info.addtocart.additional">
<block class="Magento\Catalog\Block\ShortcutButtons\InCatalog" name="addtocart.shortcut.buttons.additional"/>
</referenceBlock>
<!-- <referenceBlock name="catalog.product.related" remove="true"/>
--><referenceBlock name="product.info.upsell" remove="true"/>
<referenceBlock name="product.attributes" remove="true"/>
<move element="reviews.tab" destination="product.col.left" after="-"/>
<move element="product.info.details" destination="product.info.dels" after="-"/>
<move element="product.upsellsliders" destination="product.col.left" after="reviews.tab"/>
<move element="catalog.product.related" destination="product.col.related"/>
<move element="product.info.media" destination="product.col.media"/>
<referenceContainer name="content">
<block
class="Magento\Catalog\Block\Ui\ProductViewCounter"
name="product_viewed_counter"
template="Magento_Catalog::product/view/counter.phtml"/>
</referenceContainer>
</body>
</page>
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
......@@ -47,10 +47,10 @@
</div>
<div class="shop-by-cata" >
<a href="/shapewear/control-panties/low-waist-butt-lifter.html"><img src="/media/wysiwyg/shopbycategory/7-buttlifter.png" alt="" /></a>
<a href="/control-panties.html"><img src="/media/wysiwyg/shopbycategory/7-buttlifter.png" alt="" /></a>
</div>
<div class="shop-by-cata" >
<a href="/shapewear/corsets-waist-trainer.html"><img src="/media/wysiwyg/shopbycategory/8-waisttrainer.png" alt="" /></a>
<a href="/corsets-waist-trainer.html"><img src="/media/wysiwyg/shopbycategory/8-waisttrainer.png" alt="" /></a>
</div>
</div>
</div>
......@@ -245,16 +245,16 @@ $image = 'new_products_content_widget_grid';
<div class="top-content-home">
<div class="banner-4-cate">
<a href="/bodysuits/full-body-shaper.html" ><img src="/media/wysiwyg/BDS.jpg" alt="" /></a>
<a href="/bodysuits.html" ><img src="/media/wysiwyg/BDS.jpg" alt="" /></a>
</div>
<div class="banner-4-cate">
<a href="/shapewear/corsets-waist-trainer.html" ><img src="/media/wysiwyg/Bra_1.jpg" alt="" /></a>
<a href="/bodysuits/bra.html" ><img src="/media/wysiwyg/Bra_1.jpg" alt="" /></a>
</div>
<div class="banner-4-cate">
<a href="/shapewear/control-panties/low-waist-butt-lifter.html" ><img src="/media/wysiwyg/BT.jpg" alt="" /></a>
<a href="/control-panties.html" ><img src="/media/wysiwyg/BT.jpg" alt="" /></a>
</div>
<div class="banner-4-cate">
<a href="/shapewear/corsets-waist-trainer.html" ><img src="/media/wysiwyg/WT.jpg" alt="" /></a>
<a href="/corsets-waist-trainer.html" ><img src="/media/wysiwyg/WT.jpg" alt="" /></a>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment