From ae596ebcd426770a31e376dfb0620ea7311ea39e Mon Sep 17 00:00:00 2001 From: Alexander Grosul Date: Wed, 13 Nov 2013 18:34:34 +0200 Subject: [PATCH] added transforming for mobile view and other small fixes --- themes/default-bootstrap/address.tpl | 3 ++ .../js/jquery/resonsive_utilites.js | 53 ++++++++++++++++++- themes/default-bootstrap/lang/en.php | 26 +++++---- .../blockcategories_footer.tpl | 2 +- .../modules/blockcms/blockcms.tpl | 2 +- .../blockcontactinfos/blockcontactinfos.tpl | 4 +- .../blockmyaccountfooter.tpl | 4 +- .../modules/blocksocial/blocksocial.tpl | 6 +-- 8 files changed, 79 insertions(+), 21 deletions(-) diff --git a/themes/default-bootstrap/address.tpl b/themes/default-bootstrap/address.tpl index d5996622f..d6b4fed53 100644 --- a/themes/default-bootstrap/address.tpl +++ b/themes/default-bootstrap/address.tpl @@ -242,3 +242,6 @@ $(function(){ldelim}

+ diff --git a/themes/default-bootstrap/js/jquery/resonsive_utilites.js b/themes/default-bootstrap/js/jquery/resonsive_utilites.js index 9f1c150e6..83a8c4c0b 100644 --- a/themes/default-bootstrap/js/jquery/resonsive_utilites.js +++ b/themes/default-bootstrap/js/jquery/resonsive_utilites.js @@ -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 -}); \ No newline at end of file +}); +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); \ No newline at end of file diff --git a/themes/default-bootstrap/lang/en.php b/themes/default-bootstrap/lang/en.php index 844e5c73f..11136241c 100644 --- a/themes/default-bootstrap/lang/en.php +++ b/themes/default-bootstrap/lang/en.php @@ -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'; diff --git a/themes/default-bootstrap/modules/blockcategories/blockcategories_footer.tpl b/themes/default-bootstrap/modules/blockcategories/blockcategories_footer.tpl index a40fd1df6..f3fea9d32 100644 --- a/themes/default-bootstrap/modules/blockcategories/blockcategories_footer.tpl +++ b/themes/default-bootstrap/modules/blockcategories/blockcategories_footer.tpl @@ -26,7 +26,7 @@

{l s='Categories' mod='blockcategories'}

-
+