antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-fidelite' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-06 15:53:52 +02:00
commit 79c1381705
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
themes/site/css/style.css
View File

@ -1352,7 +1352,8 @@ var, address {
font-size: 13px;
margin: 5px;
padding: 5px 0px;
padding-left: 40px;
/* padding-left: 40px; */
padding-left: 25px;
border-bottom: 1px solid #CAC7BF;
clear: both;
}
@ -1363,7 +1364,8 @@ var, address {
font-size: 13px;
margin: 5px;
padding: 5px 0px;
padding-left: 40px;
/* padding-left: 40px; */
padding-left: 25px;
border-bottom: 1px solid #CAC7BF;
}
.economy {
@ -1373,7 +1375,8 @@ var, address {
font-size: 13px;
margin: 5px;
padding: 5px 0px;
padding-left: 40px;
/* padding-left: 40px; */
padding-left: 25px;
border-bottom: 1px solid #CAC7BF;
}
.text_block2 {

3
themes/site_mobile/css/style.css
View File

@ -4477,6 +4477,9 @@ body#index .jqibuttons span.gradient{
#cookiescontent { padding: 10px; font-size: 12px; }
/** Module loyalty **/
#order p#loyalty {
text-align: center;
}
.exclusive.loyalty-transform {
background: #504c89;
color: #fff;

12
themes/site_mobile/modules/loyalty/loyalty.tpl
View File

@ -29,7 +29,7 @@
<h1 class="title"><span>{l s='My loyalty points' mod='loyalty'}</span></h1>
{if $displayorders}
{if $nb_orders}
<div class="block-center" id="block-history">
{if $displayorders && count($displayorders)}
<table id="order-list" class="std">
@ -69,7 +69,7 @@
{/if}
</div>
<div id="pagination" class="pagination">
{if $nbpagination < $displayorders|@count}
{if $nbpagination < $nb_orders|@count}
<ul class="pagination">
{if $page != 1}
{assign var='p_previous' value=$page-1}
@ -87,7 +87,7 @@
{section name=pagination start=$page-1 loop=$page+2 step=1}
{if $page == $smarty.section.pagination.index}
<li class="current"><span>{$page|escape:'htmlall':'UTF-8'}</span></li>
{elseif $smarty.section.pagination.index > 0 && $orders|@count+$nbpagination > ($smarty.section.pagination.index)*($nbpagination)}
{elseif $smarty.section.pagination.index > 0 && $nb_orders|@count+$nbpagination > ($smarty.section.pagination.index)*($nbpagination)}
<li><a href="{$pagination_link}?p={$smarty.section.pagination.index}&n={$nbpagination}">{$smarty.section.pagination.index|escape:'htmlall':'UTF-8'}</a></li>
{/if}
{/section}
@ -97,7 +97,7 @@
{/if}
<li><a href="{$pagination_link}?p={$max_page}&n={$nbpagination}">{$max_page}</a></li>
{/if}
{if $displayorders|@count > $page * $nbpagination}
{if $nb_orders|@count > $page * $nbpagination}
{assign var='p_next' value=$page+1}
<li id="pagination_next"><a href="{$pagination_link}?p={$p_next}&n={$nbpagination}">&nbsp;&raquo;</a></li>
{else}
@ -105,7 +105,7 @@
{/if}
</ul>
{/if}
{if $displayorders|@count > 10}
{*if $displayorders|@count > 10}
<form action="{$pagination_link}" method="get" class="pagination">
<p>
<input type="submit" class="button_mini" value="{l s='OK'}" />
@ -120,7 +120,7 @@
<input type="hidden" name="p" value="1" />
</p>
</form>
{/if}
{/if*}
</div>
<br />