Merge branch 'ticket-14904-achatexpressmobile' into develop

This commit is contained in:
Michael RICOIS 2017-12-11 10:25:58 +01:00
commit 0ac2323f2a
3 changed files with 25 additions and 8 deletions

View File

@ -5124,7 +5124,7 @@ body#product #best-sellers_block_product{
}
*/
#product_list li div.productQuantityAlert{
text-align: center;
/*text-align: center;*/
/*width: 250px;*/
margin: 0 !important;
padding: 5px 0 !important;

Binary file not shown.

After

Width:  |  Height:  |  Size: 983 B

View File

@ -164,6 +164,7 @@
#add_to_cart {
cursor : pointer;
padding-right : 0;
margin-left: 30%;
}
#jqibox {
background-image : -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgb(204, 204, 204)), to(rgb(255, 255, 255)));
@ -270,6 +271,20 @@
cursor : pointer;
float : left;
}
/*.close_popup {
position: absolute;
right: 60px;
top: 50px;
font-style: normal;
font-size: 20px;
color: #FFFFFF;
background: url('../themes/site_mobile/img/cross.png') no-repeat;
width: 24px;
height: 24px;
z-index: 1000;
vertical-align: middle;
text-align: center;
}*/
{/literal}</style>
</head>
<body id="product" class="singleCol">
@ -405,6 +420,7 @@
{assign var=id_image value=Product::getCover($product->id)}
<img src="{$link->getImageLink($product->link_rewrite, $product->id|cat:'-'|cat:$id_image.id_image, 'small')}" alt="{$product->name|escape:'htmlall':'UTF-8'}" />
<div class="right_element">
{if $product->quantity > 0}
{if isset($groups)}
<!-- attributes -->
<div id="attributes">
@ -424,8 +440,6 @@
</div>
{/if}
{*<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}><label for="product_reference">{l s='Reference :' mod='expresscart'} </label><span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span></p>*}
<!-- quantity wanted -->
<p id="quantity_wanted_p"{if (!$allow_oosp && $product->quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
<label>{l s='Quantity :' mod='expresscart'}</label>
@ -439,17 +453,20 @@
checkMinimalQuantity();
</script>
{/if}
{/if}
</div>
</div>
<div style="clear: both;"></div>
<div class="border-separator"></div>
<p id="add_to_cart" class="button"><input type="submit" name="Submit" value="{l s='Add to cart' mod='expresscart'}" class="exclusive" />
{if $product->quantity > 0}
<p id="add_to_cart" class="button">
<input type="submit" name="Submit" value="{l s='Add to cart' mod='expresscart'}" class="exclusive" />
</p>
{/if}
<p id="availability_statut"{if ($product->quantity <= 0 && !$product->available_later && $allow_oosp) OR ($product->quantity > 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
{*<span id="availability_label">{l s='Availability:' mod='expresscart'}</span>*}
<span id="availability_value"{if $product->quantity <= 0} class="warning_inline"{/if}>
{if $product->quantity <= 0}{if $allow_oosp}{$product->available_later}{else}{l s='This product is no longer in stock' mod='expresscart'}{/if}{else}{$product->available_now}{/if}
</span>