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

added transforming for mobile view and other small fixes

Browse Source
This commit is contained in:
Alexander Grosul
2013-11-13 18:34:34 +02:00
parent 115c368a89
commit ae596ebcd4
8 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/address.tpl
+3
View File
@@ -242,3 +242,6 @@ $(function(){ldelim}
</p>
</form>
</div>
<ul class="footer_links clearfix">
<li><a class="btn btn-defaul button button-small" href="{$link->getPageLink('addresses', true)|escape:'html'}"><span><i class="icon-chevron-left"></i> {l s='Back to your addresses'}</span></a></li>
</ul>
themes/default-bootstrap/js/jquery/resonsive_utilites.js
Vendored
+52 -1
View File
@@ -43,4 +43,55 @@ function tmDropDown (elementType, elementClick, elementSlide, activeClass){
$(document).ready(function(){
tmDropDown ('', '#header .current', 'ul.toogle_content', 'active'); // all of this should be defined or left empty brackets
//tmDropDown ('cart', 'li#shopping_cart > a', '#cart_block', 'active'); // all of this should be defined or left empty brackets
});
});
var responsiveflag = false;
// TOGGLE FOOTER
function accordionFooter(status){
if(status == 'enable'){
$('#footer .footer-block h4').on('click', function(){
$(this).toggleClass('active').parent().find('.toggle-footer').stop().slideToggle('medium');
})
$('#footer').addClass('accordion').find('.toggle-footer').slideUp('fast');
}else{
$('.footer-block h4').removeClass('active').off().parent().find('.toggle-footer').removeAttr('style').slideDown('fast');
$('#footer').removeClass('accordion');
}
}
// TOGGLE COLUMNS
function accordion(status){
leftColumnBlocks = $('#left_column');
if(status == 'enable'){
$('#left_column').remove();
$(leftColumnBlocks).insertAfter('#center_column').find('#categories_block_left ul.toggle_content').slideToggle('fast'); // replace left column under content
$('#right_column .title_block, #left_column .title_block, #left_column #newsletter_block_left').on('click', function(){
$(this).toggleClass('active').parent().find('.block_content').stop().slideToggle('medium');
})
$('#right_column, #left_column').addClass('accordion').find('.block_content').slideUp('fast');
}else{
$('#left_column').remove();
$(leftColumnBlocks).insertBefore('#center_column'); // replace left column before content
$('#right_column .title_block, #left_column .title_block').removeClass('active').off().parent().find('.block_content').removeAttr('style').slideDown('fast');
$('#left_column, #right_column').removeClass('accordion');
}
}
function resposiveResize(){
if ($(document).width() <= 767 && responsiveflag == false){
accordion('enable'),
accordionFooter('enable'),
responsiveflag = true
}
else if ($(document).width() >= 768){
accordion('disable'),
accordionFooter('disable'),
responsiveflag = false
}
}
$(document).ready(resposiveResize);
$(window).resize(resposiveResize);
themes/default-bootstrap/lang/en.php
+15 -11
View File
@@ -202,7 +202,7 @@ $_LANG['order-follow_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['order-opc-new-account_936ccdb97115e9f35a11d35e3d5b5cad'] = 'Click here';
$_LANG['order-opc-new-account_b357b524e740bc85b9790a0712d84a30'] = 'Email address';
$_LANG['order-opc-new-account_01a569ddc6cf67ddec2a683f0a5f5956'] = 'Forgot your password?';
$_LANG['order-opc-new-account_99dea78007133396a7b8ed70578ac6ae'] = 'Sign in';
$_LANG['order-opc-new-account_99dea78007133396a7b8ed70578ac6ae'] = 'Login';
$_LANG['order-opc-new-account_766d4aaf3e045538be23f9a9e17a1593'] = 'Instant checkout';
$_LANG['order-opc-new-account_ce8ae9da5b7cd6c3df2929543a9af92d'] = 'Email';
$_LANG['order-opc-new-account_b78a3223503896721cca1303f776159b'] = 'Title';
@@ -249,8 +249,8 @@ $_LANG['order-payment_f4e8b53a114e5a17d051ab84d326cae5'] = 'Total shipping';
$_LANG['order-payment_ada0f55ef37f4928c5cd970f378c15e8'] = 'Total vouchers';
$_LANG['order-payment_598a4c4d56197cc1f6bca50b20aa484a'] = 'Total tax';
$_LANG['order-payment_a82868319826fb092b73968e661b5b38'] = 'Vouchers';
$_LANG['order-payment_1ac6ee29e9e68fb71bad91c1d34348cc'] = '%s:';
$_LANG['order-payment_1021f02536dc46ab3b07c269949e4de7'] = 'Text #%s:';
$_LANG['order-payment_1ac6ee29e9e68fb71bad91c1d34348cc'] = '%s';
$_LANG['order-payment_1021f02536dc46ab3b07c269949e4de7'] = 'Text #%s';
$_LANG['order-payment_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
$_LANG['order-payment_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
$_LANG['order-payment_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
@@ -268,7 +268,7 @@ $_LANG['order-payment_66c4c5112f455a19afde47829df363fa'] = 'Total';
$_LANG['order-return_63d5049791d9d79d86e9a108b0a999ca'] = 'Reference';
$_LANG['order-return_deb10517653c255364175796ace3553f'] = 'Product';
$_LANG['order-return_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantity';
$_LANG['order-return_1ac6ee29e9e68fb71bad91c1d34348cc'] = '%s:';
$_LANG['order-return_1ac6ee29e9e68fb71bad91c1d34348cc'] = '%s';
$_LANG['order-slip_446faa7da2d42ba4ffeda73cb119dd91'] = 'Date issued';
$_LANG['order-slip_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
$_LANG['order-slip_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
@@ -296,8 +296,8 @@ $_LANG['product_0557fa923dcee4d0f86b1409f5c2167f'] = 'Back';
$_LANG['product_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['product_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
$_LANG['product_ea4788705e6873b424c65e91c2846b19'] = 'Cancel';
$_LANG['product_3dd42bfc8345e82c43b4a40a3426ec49'] = 'Reference:';
$_LANG['product_3d0d1f906e27800531e054a3b6787b7c'] = 'Quantity:';
$_LANG['product_3dd42bfc8345e82c43b4a40a3426ec49'] = 'Reference';
$_LANG['product_3d0d1f906e27800531e054a3b6787b7c'] = 'Quantity';
$_LANG['product_887ee91702c962a70b87cbef07bbcaec'] = 'tax excl.';
$_LANG['product_e2e79605fc9450ec17957cf0e910f5c6'] = 'tax incl.';
$_LANG['product_fe3838c7c11aa406dd956566e17360d5'] = 'per';
@@ -329,12 +329,11 @@ $_LANG['shopping-cart_8faf99e02e4d0ccb4dd933404f87a4ea'] = 'Total (tax excl.)';
$_LANG['shopping-cart_a82868319826fb092b73968e661b5b38'] = 'Vouchers';
$_LANG['shopping-cart_e0aa021e21dddbd6d8cecec71e9cf564'] = 'OK';
$_LANG['shopping-cart_2fb3b950fd7711136f7f251ae5fbdbdc'] = 'Text #';
$_LANG['shopping-cart_853ae90f0351324bd73ea615e6487517'] = ':';
$_LANG['shopping-cart_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
$_LANG['shopping-cart_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
$_LANG['shopping-cart_601d8c4b9f72fc1862013c19b677a499'] = 'Invoice address';
$_LANG['shopping-cart_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
$_LANG['shopping-cart_e78b6f4eb3be046f4d25c07ce54954d4'] = 'Ref:';
$_LANG['shopping-cart_e78b6f4eb3be046f4d25c07ce54954d4'] = 'Ref';
$_LANG['shopping-cart_f8f5730f2ee46b88120ff192190fb7cd'] = 'Voucher';
$_LANG['shopping-cart_94966d90747b97d1f0f206c98a8b1ac3'] = 'Send';
$_LANG['sitemap_0e1e874dde345d19583102a9fd63fb7e'] = 'Manufacturers';
@@ -354,7 +353,7 @@ $_LANG['store_infos_c33b138a163847cdb6caeeb7c9a126b4'] = 'Friday';
$_LANG['store_infos_8b7051187b9191cdcdae6ed5a10e5adc'] = 'Saturday';
$_LANG['store_infos_9d1a0949c39e66a0cd65240bc0ac9177'] = 'Sunday';
$_LANG['stores_34c869c542dee932ef8cd96d2f91cae6'] = 'Our store(s)!';
$_LANG['stores_673ae02fffb72f0fe68a66f096a01347'] = 'Phone:';
$_LANG['stores_673ae02fffb72f0fe68a66f096a01347'] = 'Phone';
$_LANG['stores_13348442cc6a27032d2b4aa28b75a5d3'] = 'Search';
$_LANG['stores_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['stores_dd7bf230fde8d4836917806aff6a6b27'] = 'Address';
@@ -396,7 +395,6 @@ $_LANG['category-product-sort_fcebe56087b9373f15514831184fa572'] = 'In stock';
$_LANG['order-detail-product-li_63d5049791d9d79d86e9a108b0a999ca'] = 'Reference';
$_LANG['order-detail-product-li_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantity';
$_LANG['order-detail-product-li_6c957f72dc8cdacc75762f2cbdcdfaf2'] = 'Unit price';
$_LANG['order-detail-product-li_853ae90f0351324bd73ea615e6487517'] = ':';
$_LANG['order-opc-address_dd7bf230fde8d4836917806aff6a6b27'] = 'Address';
$_LANG['order-opc-address_601d8c4b9f72fc1862013c19b677a499'] = 'Invoice address';
$_LANG['order-opc-address_b15e1100a6196acba01ef7aaa5b2a9e5'] = 'Add a new address';
@@ -414,4 +412,10 @@ $_LANG['product-desc-features_4351cfebe4b61d8aa5efa1d020710005'] = 'View';
$_LANG['product-desc-features_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
$_LANG['product-prices_fe3838c7c11aa406dd956566e17360d5'] = 'per';
$_LANG['product-quantity-discount_f5bf48aa40cad7891eb709fcf1fde128'] = 'Product';
$_LANG['shopping-cart-gift-line_e78b6f4eb3be046f4d25c07ce54954d4'] = 'Ref:';
$_LANG['shopping-cart-gift-line_e78b6f4eb3be046f4d25c07ce54954d4'] = 'Ref';
$_LANG['manufacturer-list_df25de42c84837baf5fa15049a8bc764'] = 'View';
$_LANG['product-list_69d08bd5f8cf4e228930935c3f13e42f'] = 'In stock';
$_LANG['product-sort_df25de42c84837baf5fa15049a8bc764'] = 'View';
$_LANG['product_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantity';
$_LANG['stores_8c2857a9ad1d8f31659e35e904e20fa6'] = 'Logo';
$_LANG['supplier-list_df25de42c84837baf5fa15049a8bc764'] = 'View';
themes/default-bootstrap/modules/blockcategories/blockcategories_footer.tpl
+1 -1
View File
@@ -26,7 +26,7 @@
<!-- Block categories module -->
<section class="blockcategories_footer footer-block col-xs-12 col-sm-2">
<h4>{l s='Categories' mod='blockcategories'}</h4>
<div class="category_footer">
<div class="category_footer toggle-footer">
<div class="list">
<ul class="tree {if $isDhtml}dhtml{/if}">
themes/default-bootstrap/modules/blockcms/blockcms.tpl
+1 -1
View File
@@ -48,7 +48,7 @@
<!-- MODULE Block footer -->
<section class="footer-block col-xs-12 col-sm-2" id="block_various_links_footer">
<h4>{l s='Information' mod='blockcms'}</h4>
<ul>
<ul class="toggle-footer">
{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')|escape:'html'}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
<li class="{if $PS_CATALOG_MODE}first_{/if}item"><a href="{$link->getPageLink('new-products')|escape:'html'}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>
{if !$PS_CATALOG_MODE}<li class="item"><a href="{$link->getPageLink('best-sales')|escape:'html'}" title="{l s='Top sellers' mod='blockcms'}">{l s='Top sellers' mod='blockcms'}</a></li>{/if}
themes/default-bootstrap/modules/blockcontactinfos/blockcontactinfos.tpl
+2 -2
View File
@@ -28,11 +28,11 @@
<section id="block_contact_infos" class="footer-block col-xs-12 col-sm-4">
<div>
<h4>{l s='Store Information' mod='blockcontactinfos'}</h4>
<ul>
<ul class="toggle-footer">
{if $blockcontactinfos_company != ''}<li><i class="icon-map-marker"></i>{$blockcontactinfos_company|escape:'htmlall':'UTF-8'}{if $blockcontactinfos_address != ''}, {$blockcontactinfos_address|escape:'htmlall':'UTF-8'}{/if}</li>{/if}
{if $blockcontactinfos_phone != ''}<li><i class="icon-phone"></i>{l s='Call us now toll free:' mod='blockcontactinfos'} <span>{$blockcontactinfos_phone|escape:'htmlall':'UTF-8'}</span></li>{/if}
{if $blockcontactinfos_email != ''}<li><i class="icon-envelope-alt"></i>{l s='Email:' mod='blockcontactinfos'} <span>{mailto address=$blockcontactinfos_email|escape:'htmlall':'UTF-8' encode="hex"}</span></li>{/if}
<li><i class="icon-skype"></i>{l s='Skype:' mod='blockcontactinfos'} <span></span></li>
<!--li><i class="icon-skype"></i>{l s='Skype:' mod='blockcontactinfos'} <span></span></li-->
</ul>
</div>
</section>
themes/default-bootstrap/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
+2 -2
View File
@@ -26,7 +26,7 @@
<!-- Block myaccount module -->
<section class="footer-block col-xs-12 col-sm-4">
<h4><a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></h4>
<div class="block_content">
<div class="block_content toggle-footer">
<ul class="bullet">
<li><a href="{$link->getPageLink('history', true)|escape:'html'}" title="{l s='List of my orders' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My orders' mod='blockmyaccountfooter'}</a></li>
{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow', true)|escape:'html'}" title="{l s='List of my merchandise returns' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My merchandise returns' mod='blockmyaccountfooter'}</a></li>{/if}
@@ -35,7 +35,7 @@
<li><a href="{$link->getPageLink('identity', true)|escape:'html'}" title="{l s='Manage my personal information' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My personal info' mod='blockmyaccountfooter'}</a></li>
{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)|escape:'html'}" title="{l s='List of my vouchers' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My vouchers' mod='blockmyaccountfooter'}</a></li>{/if}
{$HOOK_BLOCK_MY_ACCOUNT}
<li><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Sign out' mod='blockmyaccountfooter'}" rel="nofollow">{l s='Sign out' mod='blockmyaccountfooter'}</a></li>
{if $logged}<li><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Sign out' mod='blockmyaccountfooter'}" rel="nofollow">{l s='Sign out' mod='blockmyaccountfooter'}</a></li>{/if}
</ul>
</div>
</section>
themes/default-bootstrap/modules/blocksocial/blocksocial.tpl
+3 -3
View File
@@ -26,9 +26,9 @@
<section id="social_block">
<ul>
{if $facebook_url != ''}<li class="facebook"><a href="{$facebook_url|escape:html:'UTF-8'}"><span>{l s='Facebook' mod='blocksocial'}</span></a></li>{/if}
{if $twitter_url != ''}<li class="twitter"><a href="{$twitter_url|escape:html:'UTF-8'}"><span>{l s='Twitter' mod='blocksocial'}</span></a></li>{/if}
{if $rss_url != ''}<li class="rss"><a href="{$rss_url|escape:html:'UTF-8'}"><span>{l s='RSS' mod='blocksocial'}</span></a></li>{/if}
{if $facebook_url != ''}<li class="facebook"><a target="_blank" href="{$facebook_url|escape:html:'UTF-8'}"><span>{l s='Facebook' mod='blocksocial'}</span></a></li>{/if}
{if $twitter_url != ''}<li class="twitter"><a target="_blank" href="{$twitter_url|escape:html:'UTF-8'}"><span>{l s='Twitter' mod='blocksocial'}</span></a></li>{/if}
{if $rss_url != ''}<li class="rss"><a target="_blank" href="{$rss_url|escape:html:'UTF-8'}"><span>{l s='RSS' mod='blocksocial'}</span></a></li>{/if}
</ul>
<h4>{l s='Follow us:' mod='blocksocial'}</h4>
</section>