From d1b2ed88adeef28941c6cfa6b8044a441fd1b6cd Mon Sep 17 00:00:00 2001
From: sThiebaut
Date: Wed, 14 Dec 2011 09:18:25 +0000
Subject: [PATCH] // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11197 b9a71923-0436-4b27-9f14-aed3839534dd
---
themes/default/address.tpl | 2 +-
themes/default/authentication.tpl | 2 +-
themes/default/breadcrumb.tpl | 2 +-
themes/default/css/global.css | 26 ++++++++++++++++++++++++--
4 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/themes/default/address.tpl b/themes/default/address.tpl
index 0eab96187..c023ac20c 100644
--- a/themes/default/address.tpl
+++ b/themes/default/address.tpl
@@ -248,6 +248,7 @@ $(function(){ldelim}
+ {l s='You must register at least one phone number'} *
@@ -256,7 +257,6 @@ $(function(){ldelim}
- {l s='You must register at least one phone number'} *
diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index 254003cb4..2165a20fd 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -506,6 +506,7 @@ $(function(){ldelim}
+ {l s='You must register at least one phone number'}
@@ -513,7 +514,6 @@ $(function(){ldelim}
- {l s='You must register at least one phone number'}
diff --git a/themes/default/breadcrumb.tpl b/themes/default/breadcrumb.tpl
index 91e75bd7d..bc1296d25 100644
--- a/themes/default/breadcrumb.tpl
+++ b/themes/default/breadcrumb.tpl
@@ -27,7 +27,7 @@
{if isset($smarty.capture.path)}{assign var='path' value=$smarty.capture.path}{/if}
-
{l s='Home'}
+

{if isset($path) AND $path}
id_category == 1}style="display:none;"{/if}>{$navigationPipe|escape:html:'UTF-8'}
{if !$path|strpos:'span'}
diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index 01431836e..f3ce557b5 100644
--- a/themes/default/css/global.css
+++ b/themes/default/css/global.css
@@ -338,6 +338,8 @@ ul.footer_links li .icon {
.sortPagiBar #nb_item {border:1px solid #ccc}
/* pagination ********************************************************************************** */
+form.pagination {display:none;}
+
div.pagination {
margin:10px 0;
text-align: center
@@ -515,6 +517,10 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
font-size:12px
}
.breadcrumb .navigation-pipe {margin:0 3px 0 5px}
+.breadcrumb img {
+ position:relative;
+ top:5px
+}
/* ************************************************************************************************
@@ -549,10 +555,11 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
#footer li {padding:7px 0}
#footer li a {color:#fff}
-#footer .myaccount {padding: 15px 10px;}
+#footer .myaccount {padding: 15px 10px}
#footer .myaccount h4 {
padding:0 0 10px 0;
background:none;
+ text-shadow:none
}
#footer .myaccount .favoriteproducts img,
#footer .myaccount .lnk_wishlist img {display:none}
@@ -590,7 +597,7 @@ ul.idTabs li {
#more_info_sheets ol,
#more_info_sheets dl {margin-left:20px}
-.block_hidden_only_for_screen {display:none;}
+.block_hidden_only_for_screen {display:none}
/* ************************************************************************************************
@@ -844,8 +851,14 @@ table#cart_summary .cart_total_price td.cart_voucher {
color:#666
}
+#orderopc #login_form_content label {
+ display:block;
+ margin:0 0 10px 0
+}
+
#create-account_form #email_create,
#login_form #email,
+#login_form #login_email,
#login_form #passwd {
padding:0 5px;
height:20px;
@@ -866,6 +879,15 @@ table#cart_summary .cart_total_price td.cart_voucher {
}
.lost_password a {color:#666}
+#orderopc .lost_password {
+ display:block;
+ float:none;
+ margin:5px 0 10px;
+ width:auto;
+ font-size:11px;
+ color:#666
+}
+
#ordermsg p {padding-bottom:0}
#ordermsg p.txt {
float:left;