Permalink
Browse files

Merge branch 'master' of github.com:sunsnow/thebis_20120419

  • Loading branch information...
2 parents be431c0 + cf021f1 commit c367ff25e7671b13d28d8e01319113f0702e002f @sunsnow committed May 23, 2012
@@ -12,7 +12,7 @@
<fields>
<active translate="label comment">
<label>Module Inschakelen</label>
- <comment><![CDATA[<iframe src="/idealcheckout/ideal_info.php" height="400" width="280" scrolling="no" frameborder="0"></iframe>]]></comment>
+ <comment><![CDATA[<iframe src="/magento/idealcheckout/ideal_info.php" height="400" width="280" scrolling="no" frameborder="0"></iframe>]]></comment>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_yesno</source_model>
<sort_order>1</sort_order>
@@ -93,8 +93,8 @@ Default layout, loads most of the pages
<!-- <block type="checkout/multishipping_link" name="checkout.cart.methods.multishipping" template="checkout/multishipping/link.phtml"/> -->
</block>
- <block type="checkout/cart_coupon" name="checkout.cart.coupon" as="coupon" template="checkout/cart/coupon.phtml"/>
- <!-- <block type="checkout/cart_shipping" name="checkout.cart.shipping" as="shipping" template="checkout/cart/shipping.phtml"/> -->
+ <!-- <block type="checkout/cart_coupon" name="checkout.cart.coupon" as="coupon" template="checkout/cart/coupon.phtml"/> -->
+ <!-- <block type="checkout/cart_shipping" name="checkout.cart.shipping" as="shipping" template="checkout/cart/shipping.phtml"/> -->
<reference name="right">
<block type="checkout/cart_crosssell" name="checkout.cart.crosssell" as="crosssell" template="checkout/cart/crosssell.phtml"/>
</reference>
@@ -28,9 +28,9 @@
<?php elseif ($_accounts = $this->getAccounts()): ?>
<?php if (count($_accounts) == 1): ?>
<?php if ($this->getMethod()->getPayWithinXDays() > 0): ?>
- <?php echo $this->__('Please transfer the money within %s days to the following bank account', $this->getMethod()->getPayWithinXDays()); ?>:
+ <?php echo $this->__('U kunt het bedrag overmaken op:', $this->getMethod()->getPayWithinXDays()); ?>:
<?php else: ?>
- <?php echo $this->__('Please transfer the money to the following bank account'); ?>:
+ <?php echo $this->__('U kunt het bedrag overmaken op:'); ?>:
<?php endif; ?>
<?php else: ?>
<?php if ($this->getMethod()->getPayWithinXDays() > 0): ?>
@@ -63,13 +63,14 @@
</tbody>
</table>
<?php if (($_iban = $_account->getIban()) && ($_bic = $_account->getBic())): ?>
- <p><?php echo $this->__('For international transfers please use also following data') ?>:</p>
+ <p><?php echo $this->__('Gebruik de volgende gegevens bij internationale betalingen:') ?></p>
<table>
<tbody>
<tr><td><label><?php echo $this->__('IBAN') ?></label>: </td><td><?php echo $_iban ?></td></tr>
<tr><td><label><?php echo $this->__('BIC') ?></label>: </td><td><?php echo $_bic ?></td></tr>
</tbody>
</table>
+ <p><?php echo $this->__('Wij verwerken uw bestelling zodra het bedrag op onze rekening is ontvangen.'); ?></p>
<?php endif; ?>
<?php endforeach; ?>
<?php if ($_customText = $this->getMethod()->getCustomText()): ?>
@@ -30,17 +30,16 @@
<div class="page-title">
<h1><?php echo $this->__('Uw winkelwagen is leeg') ?></h1>
</div>
- <div class="cart-empty">
+ <div class="cart-empty" style="height:200px;">
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <p><?php echo $this->__('Uw winkelwagen is leeg') ?></p>
- <p><?php echo $this->__('Klik <a href="%s">hier</a> om verder te gaan met winkelen.', $this->getContinueShoppingUrl()) ?></p>
+ <p style="float:left;"><?php echo $this->__('Klik <a href="%s">hier</a> om verder te gaan met winkelen.', $this->getContinueShoppingUrl()) ?></p>
</div>
</div>
<style type="text/css">
#col-main-winkelwagen #kochten_ook{
- border:none;
+ display:none;
}
</style>
@@ -216,12 +216,13 @@ legend {
#header #header_top_left .logo {
float:left;
- width:388px;
- height:96px;
- margin:30px 0 0 -89px;
+ width:595px;
+ height:216px;
+ margin:0 0 0 -122px;
background-image: url('../img/logo_thebis.png');
background-repeat:no-repeat;
cursor:pointer;
+ overflow:hidden;
}
#header #header_top_right {
@@ -1119,43 +1120,45 @@ display:none;
overflow:hidden;
}
- #product_info_container .box-collateral .std p {
+ #product_info_container .box-collateral .std p {
margin-bottom: 10px;
line-height; 14px;
- }
+ }
- #product_info_container .box-collateral .std a:link,
+ #product_info_container .box-collateral .std a:link,
#product_info_container .box-collateral .std a:visited {
color:#071d25;
text-decoration:none;
- }
+ }
- #product_info_container .box-collateral .std a:hover {
+ #product_info_container .box-collateral .std a:hover {
color:#1d789a;
text-decoration:none;
- }
+ }
- #product_info_container .product-view .box-collateral.box-additional {
+ #product_info_container .product-view .box-collateral.box-additional {
float:left;
+ width:400px;
overflow:hidden;
- line-height: 24px;
+ line-height:24px;
+ clear:both;
}
- #product_info_container .product-view .product-collateral .box-additional #product-attribute-specs-table.data-table {
+ #product_info_container .product-view .product-collateral .box-additional #product-attribute-specs-table.data-table {
margin-bottom: 10px;
width:405px;
- }
+ }
- #product_info_container .product-view .product-collateral .box-additional #product-attribute-specs-table.data-table a:link,
- #product_info_container .product-view .product-collateral .box-additional #product-attribute-specs-table.data-table a:visited {
+ #product_info_container .product-view .product-collateral .box-additional #product-attribute-specs-table.data-table a:link,
+ #product_info_container .product-view .product-collateral .box-additional #product-attribute-specs-table.data-table a:visited {
color:#071d25;
text-decoration:underline;
- }
+ }
- #product_info_container .product-view .product-collateral .box-additional #product-attribute-specs-table.data-table a:hover {
+ #product_info_container .product-view .product-collateral .box-additional #product-attribute-specs-table.data-table a:hover {
color:#1d789a;
text-decoration:none;
- }
+ }
#product_info_container .product-view .product-collateral #product_bottom {
width:420px;
@@ -1418,6 +1421,7 @@ display:none;
}
#product_info_container #product-options-wrapper dt label {
+ float:left;
display:block;
width:668px;
font-size:12px;
@@ -1428,13 +1432,22 @@ display:none;
}
#product_info_container #product-options-wrapper dd {
+ float:left;
margin-left:19px;
margin-bottom:15px;
}
#product_info_container #product-options-wrapper dd .input-box {
+ float:left;
font-size:12px;
margin-left:3px;
+ margin-bottom:10px;
+ width:500px;
+ }
+
+ #product_info_container #product-options-wrapper dd .qty-holder {
+ float:right;
+ margin-top:-7px;
}
#product_info_container #product-options-wrapper dd .input-box .price-notice,
@@ -1443,10 +1456,6 @@ display:none;
font-weight:bold;
}
- #product_info_container #product-options-wrapper dd .input-box {
- margin-bottom:10px;
- }
-
#product_info_container #product-options-wrapper dd .qty-holder label {
float:left;
font-size:12px;
@@ -1477,6 +1486,7 @@ display:none;
}
#product_info_container #product-options-wrapper dl{
+ float:left;
border-bottom:1px solid #badfef;
}
@@ -4471,6 +4481,11 @@ body.sales-order-print table#my-orders-table tbody .nobr {
padding-right:30px;
}
+.order-information table#checkout-review-table th.a-right{
+ text-align:right;
+ padding-right:30px;
+}
+
.order-information table#checkout-review-table td h3{
color:#15566f;
text-align:left;
@@ -4497,7 +4512,7 @@ body.sales-order-print table#my-orders-table tbody .nobr {
#my_account_container ol.one-step-checkout #one-step-checkout-form .order-information li.payment-method .onestepcheckout-payment-methods dl dd div#payment_block_bankpayment ul {
float:left;
width:367px;
- height:200px;
+ height:240px;
border:1px solid #BBE0EF;
margin-top:20px;
margin-right:20px;
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c367ff2

Please sign in to comment.