dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Small display fixes

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13181 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-02-09 15:07:52 +00:00
parent 2e9dcf6e80
commit 5f95dda75d
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/functions.php
+3 -3
View File
@@ -30,7 +30,7 @@ require_once(dirname(__FILE__).'/../images.inc.php');
function bindDatepicker($id, $time)
{
if ($time)
echo '
echo '
var dateObj = new Date();
var hours = dateObj.getHours();
var mins = dateObj.getMinutes();
@@ -42,7 +42,7 @@ function bindDatepicker($id, $time)
echo '
$(function() {
$("#'.$id.'").datepicker({
$("#'.Tools::htmlentitiesUTF8($id).'").datepicker({
prevText:"",
nextText:"",
dateFormat:"yy-mm-dd"'.($time ? '+time' : '').'});
@@ -62,7 +62,7 @@ function includeDatepicker($id, $time = false)
echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/jquery-ui-1.8.10.custom.min.js"></script>';
$iso = Db::getInstance()->getValue('SELECT iso_code FROM '._DB_PREFIX_.'lang WHERE `id_lang` = '.(int)Context::getContext()->language->id);
if ($iso != 'en')
echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/i18n/jquery.ui.datepicker-'.$iso.'.js"></script>';
echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/i18n/jquery.ui.datepicker-'.Tools::htmlentitiesUTF8($iso).'.js"></script>';
echo '<script type="text/javascript">';
if (is_array($id))
foreach ($id as $id2)
admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
+2 -2
View File
@@ -1,10 +1,10 @@
<tr id="product_rule_group_{$product_rule_group_id}_tr">
<td style="vertical-align:top">
<td style="vertical-align:center;padding-right:10px">
<a href="javascript:removeProductRuleGroup({$product_rule_group_id});">
<img src="../img/admin/disabled.gif" alt="{l s='Remove'}" title="{l s='Remove'}" />
</a>
</td>
<td>
<td style="padding-bottom:15px">
<input type="hidden" name="product_rule_group[]" value="{$product_rule_group_id}" />
{l s='The cart must contain at least'}
<input type="text" name="product_rule_group_{$product_rule_group_id}_quantity" value="{$product_rule_group_quantity|intval}" style="width:30px" />
modules/blockcart/blockcart.css
+7
View File
@@ -94,3 +94,10 @@
width:26px;
background:url(img/icon/pict_add_cart.png) no-repeat 0 0
}
#cart_block table#vouchers {
clear: both;
width:100%
}
#cart_block table#vouchers tr td{
padding: 2px;
}
modules/blockcart/blockcart.tpl
+1 -1
View File
@@ -103,7 +103,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
<td class="price">-{if $discount.value_real != '!'}{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}{/if}</td>
<td class="delete"><a href="{$link->getPageLink("$order_process.php", true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" width="11" height="13" class="icon" /></a></td>
<td class="delete"><a href="{$link->getPageLink('$order_process.php', true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" class="icon" /></a></td>
</tr>
{/foreach}
</tbody>