Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Panasonic
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
John
Panasonic
Commits
1d85dbdd
Commit
1d85dbdd
authored
Dec 19, 2016
by
John Punzalan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update CSS and display
parent
c3c5d0a6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
89 additions
and
138 deletions
+89
-138
view.phtml
...rontend/lecanal/oscar/template/catalog/product/view.phtml
+17
-73
home.phtml
...sign/frontend/lecanal/oscar/template/page/html/home.phtml
+0
-27
topmenu.phtml
...n/frontend/lecanal/oscar/template/page/html/topmenu.phtml
+35
-13
style.css
skin/frontend/lecanal/oscar/css/style.css
+32
-16
style.less
skin/frontend/lecanal/oscar/less/style.less
+5
-9
No files found.
app/design/frontend/lecanal/oscar/template/catalog/product/view.phtml
View file @
1d85dbdd
...
...
@@ -37,7 +37,7 @@
var
optionsPrice
=
new
Product
.
OptionsPrice
(
<?php
echo
$this
->
getJsonConfig
()
?>
);
</script>
<div
id=
"messages_product_view"
>
<?php
echo
$this
->
getMessagesBlock
()
->
getGroupedHtml
()
?>
</div>
<div
class=
"product-view"
>
<div
class=
"product-view
your-class-view
"
>
<div
class=
"product-essential"
>
<form
action=
"
<?php
echo
$this
->
getSubmitUrl
(
$_product
)
?>
"
method=
"post"
id=
"product_addtocart_form"
<?php
if
(
$_product
->
getOptions
())
:
?>
enctype=
"multipart/form-data"
<?php
endif
;
?>
>
<?php
echo
$this
->
getBlockHtml
(
'formkey'
)
?>
...
...
@@ -45,66 +45,24 @@
<input
type=
"hidden"
name=
"product"
value=
"
<?php
echo
$_product
->
getId
()
?>
"
/>
<input
type=
"hidden"
name=
"related_product"
id=
"related-products-field"
value=
""
/>
</div>
<div
class=
"product-img-box"
>
<?php
echo
$this
->
getChildHtml
(
'media'
)
?>
<div
class=
"col-md-7"
>
<div
class=
"image-product"
id=
"
<?=
strtolower
(
$_product
->
getSku
())
?>
"
></div>
<!-- -->
<?php
//echo $this->getChildHtml('media') ?>
</
div
>
<div
class=
"product-shop"
>
<h2>
<?php
echo
$this
->
getPriceHtml
(
$_product
)
?>
</h2>
<div
class=
"product-name"
>
<h1>
<?php
echo
$_helper
->
productAttribute
(
$_product
,
$_product
->
getName
(),
'name'
)
?>
</h1>
</div>
<?php
if
(
$_product
->
getShortDescription
())
:?>
<
div
class
="
short
-
description
">
<h2><?php echo
$this->__
('Quick Overview') ?></h2>
<div class="
std
"><?php echo
$_helper->productAttribute
(
$_product
, nl2br(
$_product->getShortDescription
()), 'short_description') ?></div>
</div>
<?php endif;?>
<!-- <div class="
size
-
guide
-
box
">-->
<!-- <span class="
guide
-
chart
-
block
"><a href="
#" class="js-info-monette-modal">--><?//= $this->__('Size Chart')?><!--</a></span>-->
<!--
</
div
>-->
<!--
--><?
php
//echo $this->getReviewsSummaryHtml($_product, false, true)?>
<?
php
echo
$this
->
getChildHtml
(
'alert_urls'
)
?>
<?php
echo
$this
->
getChildHtml
(
'product_type_data'
)
?>
<?php
echo
$this
->
getChildHtml
(
'extrahint'
)
?>
<?php
if
(
!
$this
->
hasOptions
())
:?>
<
div
class
="
add
-
to
-
box
">
<?php if(
$_product->isSaleable
()): ?>
<?php echo
$this->getChildHtml
('addtocart') ?>
<!-- --><?php //if(
$this->helper
('wishlist')->isAllow() ||
$_compareUrl
=
$this->helper
('catalog/product_compare')->getAddUrl(
$_product
)): ?>
<!-- <span class="
or
">--><?php //echo
$this->__
('OR') ?><!--</span>-->
<!-- --><?php //endif; ?>
<?php endif; ?>
<?php echo
$this->getChildHtml
('addto') ?>
</div>
<?php echo
$this->getChildHtml
('extra_buttons') ?>
<?php elseif (!
$_product->isSaleable
()): ?>
<div class="
add
-
to
-
box
">
<?php echo
$this->getChildHtml
('addto') ?>
<
div
class
="
col
-
md
-
5
">
<div class="
product
-
info
-
block
">
<div class="
product
-
ref
"><?=
$_product->getSku
(); ?></div>
<div class="
product
-
name
"><?=
$_product->getName
(); ?></div>
<div class="
product
-
short
-
detail
"><?=
$_product->getShortDescription
(); ?></div>
<div class="
product
-
description
"><?=
$_product->getDescription
(); ?></div>
<div class="
product
-
more
"></div>
<div class="
product
-
cta
">
<a href="
<?
php
echo
Mage
::
helper
(
'checkout/cart'
)
->
getAddUrl
(
$_product
);
?>
">
<button
type=
"button"
title=
"Add"
class=
"button btn btn-cart btn-custom js-addtocart no-default-bg"
><span
class=
"no-default-bg"
><span
class=
"no-default-bg"
>
Je commande
</span></span></button>
</a>
</div>
<?php endif; ?>
<?php if (
$_product->isSaleable
() &&
$this->hasOptions
()):?>
<?php echo
$this->getChildChildHtml
('container2', '', true, true) ?>
<?php endif;?>
<?php if (
$this->canEmailToFriend
()): ?>
<p class="
email
-
friend
"><a href="
<?
php
echo
$this
->
helper
(
'catalog/product'
)
->
getEmailToFriendUrl
(
$_product
)
?>
">
<?php
echo
$this
->
__
(
'Email to a Friend'
)
?>
</a></p>
<?php
endif
;
?>
<?php
echo
$this
->
getChildHtml
(
'other'
);
?>
<?php
if
(
$_product
->
isSaleable
()
&&
$this
->
hasOptions
())
:?>
<?
php
echo
$this
->
getChildChildHtml
(
'container1'
,
''
,
true
,
true
)
?>
<?php
endif
;
?>
</div>
</div>
<div
class=
"clearer"
></div>
</form>
<script
type=
"text/javascript"
>
//
<!
[
CDATA
[
...
...
@@ -158,18 +116,4 @@
//]]>
</script>
</div>
<div
class=
"product-collateral"
>
<?php
foreach
(
$this
->
getChildGroup
(
'detailed_info'
,
'getChildHtml'
)
as
$alias
=>
$html
)
:?>
<
div
class
="
box
-
collateral
<?
php
echo
"box-
{
$alias
}
"
?>
">
<?php
if
(
$title
=
$this
->
getChildData
(
$alias
,
'title'
))
:?>
<
h2
><?
php
echo
$this
->
escapeHtml
(
$title
);
?>
</h2>
<?php
endif
;
?>
<?php
echo
$html
;
?>
</div>
<?php
endforeach
;
?>
<?php
echo
$this
->
getChildHtml
(
'upsell_products'
)
?>
<?php
//Activate tags : ?>
<?
php
/*echo $this->getChildHtml('product_additional_data') */
?>
</div>
</div>
</div>
\ No newline at end of file
app/design/frontend/lecanal/oscar/template/page/html/home.phtml
View file @
1d85dbdd
<!--<div class="container">-->
<!-- -->
<?php
////950px x 385px is perfect size ?>
<!--
<
img
src
=
"--><?php //echo
$this->getSkinUrl
('images/home_banner.jpg') ?><!--"
alt
=
"--><?php //echo
$this->__
('Home Banner'); ?><!--"
class
="
home
-
banner
"/>-->
<!---->
<!-- <div class="
row
home
-
contents
">-->
<!-- <div class="
col
-
md
-
4
col
-
sm
-
6
col
-
xs
-
12
">-->
<!-- <div class="
col
-
md
-
12
col
-
sm
-
12
">-->
<!-- <img src="
--><?
php
//echo $this->getSkinUrl('images/home_collection.jpg') ?><!--" alt="--><?php //echo $this->__('Home Banner'); ?><!--" class="home-banner"/>-->
<!--
</
div
>-->
<!--
<
div
class
="
col
-
md
-
12
col
-
sm
-
12
">-->
<!-- <img src="
--><?
php
//echo $this->getSkinUrl('images/home_product_1.jpg') ?><!--" alt="--><?php //echo $this->__('Home Banner'); ?><!--" class="home-banner"/>-->
<!--
</
div
>-->
<!--
</
div
>-->
<!--
<
div
class
="
col
-
md
-
4
hidden
-
sm
hidden
-
xs
">-->
<!-- <img src="
--><?
php
//echo $this->getSkinUrl('images/home_message.jpg') ?><!--" alt="--><?php //echo $this->__('Home Banner'); ?><!--" class="home-banner"/>-->
<!--
</
div
>-->
<!--
<
div
class
="
col
-
md
-
4
col
-
sm
-
6
col
-
xs
-
12
">-->
<!-- <div class="
col
-
md
-
12
col
-
sm
-
12
">-->
<!-- <img src="
--><?
php
//echo $this->getSkinUrl('images/home_product_2.jpg') ?><!--" alt="--><?php //echo $this->__('Home Banner'); ?><!--" class="home-banner"/>-->
<!--
</
div
>-->
<!--
<
div
class
="
col
-
md
-
12
col
-
sm
-
12
">-->
<!-- <img src="
--><?
php
//echo $this->getSkinUrl('images/home_shops.jpg') ?><!--" alt="--><?php //echo $this->__('Home Banner'); ?><!--" class="home-banner"/>-->
<!--
</
div
>-->
<!--
</
div
>-->
<!--
</
div
>-->
<!--</
div
>-->
<div
class=
"your-class"
>
<div>
<div
class=
"col-md-7"
>
...
...
app/design/frontend/lecanal/oscar/template/page/html/topmenu.phtml
View file @
1d85dbdd
...
...
@@ -66,19 +66,41 @@
</h1>
</div>
<div
class=
"collapse navbar-collapse navbar-main-collapse"
>
<ul
class=
"nav navbar-nav"
>
<li>
<a
href=
"#"
class=
"product-1-link"
>
Stimulateur Fermeté Visage
</a>
</li>
<li>
<a
href=
"#"
class=
"product-2-link"
>
Soin Thermal Visage
</a>
</li>
<li>
<a
href=
"#"
class=
"product-3-link"
>
Brosse Spéciale Peaux Sensibles
</a>
</li>
</ul>
</div>
<?php
if
(
Mage
::
getBlockSingleton
(
'page/html_header'
)
->
getIsHomePage
())
:
?>
<div
class=
"collapse navbar-collapse navbar-main-collapse"
>
<ul
class=
"nav navbar-nav"
>
<li>
<a
href=
"#"
class=
"product-1-link"
>
Stimulateur Fermeté Visage
</a>
</li>
<li>
<a
href=
"#"
class=
"product-2-link"
>
Soin Thermal Visage
</a>
</li>
<li>
<a
href=
"#"
class=
"product-3-link"
>
Brosse Spéciale Peaux Sensibles
</a>
</li>
</ul>
</div>
<?php
else
:
?>
<div
class=
"collapse navbar-collapse navbar-main-collapse"
>
<ul
class=
"nav navbar-nav"
>
<li>
<?php
$product
=
Mage
::
getModel
(
'catalog/product'
)
->
loadByAttribute
(
'sku'
,
'EH-XT20'
)
?>
<a
href=
"
<?=
$product
->
getUrl
()
?>
"
class=
"product-1-link"
>
Stimulateur Fermeté Visage
</a>
</li>
<li>
<?php
$product
=
Mage
::
getModel
(
'catalog/product'
)
->
loadByAttribute
(
'sku'
,
'EH-XC10'
)
?>
<a
href=
"
<?=
$product
->
getUrl
()
?>
"
class=
"product-2-link"
>
Soin Thermal Visage
</a>
</li>
<li>
<?php
$product
=
Mage
::
getModel
(
'catalog/product'
)
->
loadByAttribute
(
'sku'
,
'EH-SA31'
)
?>
<a
href=
"
<?=
$product
->
getUrl
()
?>
"
class=
"product-3-link"
>
Brosse Spéciale Peaux Sensibles
</a>
</li>
</ul>
</div>
<?php
endif
;
?>
</nav>
</div>
...
...
skin/frontend/lecanal/oscar/css/style.css
View file @
1d85dbdd
...
...
@@ -15207,12 +15207,16 @@ a:hover {
header
[
role
=
"banner"
]
{
margin-bottom
:
0
;
}
.your-class
{
.your-class
,
.your-class-view
{
background-color
:
#f7f7f7
;
border-bottom
:
1px
solid
#c2c2c2
;
margin
:
0
-15px
;
}
.your-class
.image-product
#product-img1
{
.your-class
.image-product
#product-img1
,
.your-class-view
.image-product
#product-img1
,
.your-class
.image-product
#eh-xc10
,
.your-class-view
.image-product
#eh-xc10
{
background-image
:
url("../images/panasonic/Brosse.png")
;
height
:
100%
;
background-position
:
top
right
;
...
...
@@ -15223,7 +15227,10 @@ header[role="banner"] {
margin-top
:
-60px
;
margin-right
:
-60px
;
}
.your-class
.image-product
#product-img2
{
.your-class
.image-product
#product-img2
,
.your-class-view
.image-product
#product-img2
,
.your-class
.image-product
#eh-xt20
,
.your-class-view
.image-product
#eh-xt20
{
background-image
:
url("../images/panasonic/Stimulateur.png")
;
height
:
100%
;
background-position
:
top
right
;
...
...
@@ -15234,7 +15241,10 @@ header[role="banner"] {
padding-top
:
20px
;
margin-right
:
-85px
;
}
.your-class
.image-product
#product-img3
{
.your-class
.image-product
#product-img3
,
.your-class-view
.image-product
#product-img3
,
.your-class
.image-product
#eh-sa31
,
.your-class-view
.image-product
#eh-sa31
{
background-image
:
url("../images/panasonic/Sauna.png")
;
height
:
100%
;
background-position
:
top
right
;
...
...
@@ -15244,31 +15254,37 @@ header[role="banner"] {
background-origin
:
content-box
;
padding-top
:
90px
;
}
.your-class
.product-info-block
{
.your-class
.product-info-block
,
.your-class-view
.product-info-block
{
padding
:
70px
0
;
font-weight
:
lighter
;
min-height
:
700px
;
}
.your-class
.product-info-block
.product-ref
{
.your-class
.product-info-block
.product-ref
,
.your-class-view
.product-info-block
.product-ref
{
font-size
:
16px
;
padding
:
20px
0
;
}
.your-class
.product-info-block
.product-name
{
.your-class
.product-info-block
.product-name
,
.your-class-view
.product-info-block
.product-name
{
font-size
:
25px
;
line-height
:
25px
;
font-weight
:
300
;
}
.your-class
.product-info-block
.product-short-detail
{
.your-class
.product-info-block
.product-short-detail
,
.your-class-view
.product-info-block
.product-short-detail
{
padding
:
0
0
8px
0
;
font-size
:
19px
;
color
:
#a59481
;
font-weight
:
300
;
}
.your-class
.product-info-block
.product-description
{
.your-class
.product-info-block
.product-description
,
.your-class-view
.product-info-block
.product-description
{
padding-top
:
15px
;
width
:
50%
;
}
.your-class
.product-info-block
.product-more
{
.your-class
.product-info-block
.product-more
,
.your-class-view
.product-info-block
.product-more
{
padding
:
15px
0
;
display
:
inline-block
;
text-decoration
:
underline
;
...
...
@@ -15279,10 +15295,12 @@ header[role="banner"] {
-o-transition
:
all
300ms
linear
;
transition
:
all
300ms
linear
;
}
.your-class
.product-info-block
.product-more
:hover
{
.your-class
.product-info-block
.product-more
:hover
,
.your-class-view
.product-info-block
.product-more
:hover
{
color
:
#a59481
;
}
.your-class
.product-info-block
.product-cta
{
.your-class
.product-info-block
.product-cta
,
.your-class-view
.product-info-block
.product-cta
{
padding-top
:
15px
;
}
.follow-links
{
...
...
@@ -15460,7 +15478,8 @@ header[role="banner"] {
}
}
@media
(
max-width
:
991px
)
{
.your-class
.product-info-block
{
.your-class
.product-info-block
,
.your-class-view
.product-info-block
{
padding
:
70px
15px
;
}
}
...
...
@@ -15851,9 +15870,6 @@ aside[role=complementary] {
#royalslider-product-static
{
max-width
:
100%
;
}
.product-essential
*
:not
(
.no-default-bg
)
{
background
:
#ffffff
!important
;
}
/* END PRODUCT PAGE */
/* CHECKOUT CART */
.cart-table.data-table
,
...
...
skin/frontend/lecanal/oscar/less/style.less
View file @
1d85dbdd
...
...
@@ -240,7 +240,7 @@ header[role="banner"] {
}
.your-class {
.your-class
, .your-class-view
{
background-color: #f7f7f7;
border-bottom: 1px solid #c2c2c2;
margin: 0 -15px;
...
...
@@ -248,7 +248,7 @@ header[role="banner"] {
//width: 100vw; /* For 100% screen width */
.image-product {
&#product-img1 {
&#product-img1
, &#eh-xc10
{
background-image: url("../images/panasonic/Brosse.png");
height: 100%;
background-position: top right;
...
...
@@ -260,7 +260,7 @@ header[role="banner"] {
margin-right: -60px;
}
&#product-img2 {
&#product-img2
, &#eh-xt20
{
background-image: url("../images/panasonic/Stimulateur.png");
height: 100%;
//background-position: 100px 50px;
...
...
@@ -273,7 +273,7 @@ header[role="banner"] {
margin-right: -85px;
}
&#product-img3 {
&#product-img3
, &#eh-sa31
{
background-image: url("../images/panasonic/Sauna.png");
height: 100%;
//background-position: 50px 60px;
...
...
@@ -570,7 +570,7 @@ header[role="banner"] {
}
@media (max-width: 991px) {
.your-class {
.your-class
, .your-class-view
{
.product-info-block {
padding: 70px 15px;
}
...
...
@@ -1036,10 +1036,6 @@ aside[role=complementary] {
max-width: 100%;
}
.product-essential *:not(.no-default-bg) {
background: @background-color !important;
}
/* END PRODUCT PAGE */
/* CHECKOUT CART */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment