diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-modules.sass b/admin-dev/themes/default/scss/admin-theme/_admin-modules.sass index 6c4ae423e..b39bd074b 100644 --- a/admin-dev/themes/default/scss/admin-theme/_admin-modules.sass +++ b/admin-dev/themes/default/scss/admin-theme/_admin-modules.sass @@ -66,6 +66,7 @@ @include box-shadow(rgba(0,0,0,0.2) 0 1px 3px inset) border: solid 1px #ccc background-color: #eee + cursor: n-resize .module_col_icon display: table-cell width: 50px diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl index 0a3e720e2..34ea84c6d 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl @@ -27,11 +27,11 @@ {block name="label"} {if $input['type'] == 'modules'} -
+
{elseif $input['type'] == 'group_discount_category'} -
+
{$smarty.block.parent}
{else} @@ -39,10 +39,9 @@ {/if} {/block} - {block name="field"} {if $input['type'] == 'group_discount_category'} -
+
@@ -46,58 +48,7 @@ -
-
{l s='Configuration' mod='dashgoals'}
-
- - - - - - - - - - - - {foreach $goals_months as $month} - - - - - - - - {/foreach} - -
- - {$goals_year} - - {l s='Traffic' mod='dashgoals'}{l s='Conversion Rate' mod='dashgoals'}{l s='Average Cart Value' mod='dashgoals'}{l s='Sales' mod='dashgoals'}
- {$month.label} - -
- -
- 		-
- - % -
- 		-
- {$currency->iso_code|escape} - -
- 		-
- -
-
+ {include file='./config.tpl'}
diff --git a/modules/dashproducts/dashproducts.php b/modules/dashproducts/dashproducts.php index 748d4c210..35a714ef0 100644 --- a/modules/dashproducts/dashproducts.php +++ b/modules/dashproducts/dashproducts.php @@ -178,7 +178,7 @@ class Dashproducts extends Module '.Shop::addSqlRestriction(false, 'o').' GROUP BY product_id ORDER BY total DESC - LIMIT '.(int)Confiuration::get('DASHPRODUCT_NBR_SHOW_BEST_SELLER', 10)); + LIMIT '.(int)Configuration::get('DASHPRODUCT_NBR_SHOW_BEST_SELLER', 10)); $body = array(); foreach ($products as $product) diff --git a/modules/dashproducts/logo.gif b/modules/dashproducts/logo.gif new file mode 100644 index 000000000..b69fb2c82 Binary files /dev/null and b/modules/dashproducts/logo.gif differ diff --git a/modules/dashtrends/logo.gif b/modules/dashtrends/logo.gif new file mode 100644 index 000000000..f7d5d7d30 Binary files /dev/null and b/modules/dashtrends/logo.gif differ diff --git a/themes/default-bootstrap/address.tpl b/themes/default-bootstrap/address.tpl index dca74b6b7..d5996622f 100644 --- a/themes/default-bootstrap/address.tpl +++ b/themes/default-bootstrap/address.tpl @@ -114,9 +114,11 @@ $(function(){ldelim} {/if} {if $field_name eq 'firstname'}
+ -
+
+ {/if} {if $field_name eq 'lastname'}
diff --git a/themes/default-bootstrap/authentication.tpl b/themes/default-bootstrap/authentication.tpl index 1c1d89f81..43718b690 100644 --- a/themes/default-bootstrap/authentication.tpl +++ b/themes/default-bootstrap/authentication.tpl @@ -211,9 +211,8 @@ $(document).ready(function() {
-
+
-
{foreach from=$genders key=k item=gender}
- +

diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl index b613e749b..3caaf49c9 100644 --- a/themes/default-bootstrap/header.tpl +++ b/themes/default-bootstrap/header.tpl @@ -69,11 +69,16 @@ {/foreach} {/if} + + {$HOOK_HEADER} @@ -117,7 +122,7 @@

{/if} {/foreach} -
    +
      {foreach from=$languages key=k item=language name="languages"}
    • {if $language.iso_code != $lang_iso} @@ -159,12 +164,12 @@
      - {l s='Currency' mod='blockcurrencies'} : + {l s='Currency' mod='blockcurrencies'} : {foreach from=$currencies key=k item=f_currency} {if $cookie->id_currency == $f_currency.id_currency}{$f_currency.iso_code}{/if} {/foreach}
      -
        +
          {foreach from=$currencies key=k item=f_currency}
        • id_currency == $f_currency.id_currency}class="selected"{/if}> {$f_currency.name} @@ -184,7 +189,7 @@
{$HOOK_TOP} diff --git a/themes/default-bootstrap/history.tpl b/themes/default-bootstrap/history.tpl index 309f686af..30a8ac5c0 100644 --- a/themes/default-bootstrap/history.tpl +++ b/themes/default-bootstrap/history.tpl @@ -39,7 +39,7 @@ {l s='Order reference'} {l s='Date'} {l s='Total price'} - {l s='Payment: '} + {l s='Payment'} {l s='Status'} {l s='Invoice'}   @@ -55,14 +55,14 @@ {dateFormat date=$order.date_add full=0} {displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false} {$order.payment|escape:'htmlall':'UTF-8'} - {if isset($order.order_state)}{$order.order_state|escape:'htmlall':'UTF-8'}{/if} + {if isset($order.order_state)}{$order.order_state|escape:'htmlall':'UTF-8'}{/if} {if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true} {l s='PDF'} {else}-{/if} - {l s='details'} + {l s='Details'} {if isset($opc) && $opc} {else} diff --git a/themes/default-bootstrap/js/jquery/resonsive_utilites.js b/themes/default-bootstrap/js/jquery/resonsive_utilites.js new file mode 100644 index 000000000..faace1003 --- /dev/null +++ b/themes/default-bootstrap/js/jquery/resonsive_utilites.js @@ -0,0 +1,45 @@ +/*********************************************************** TMMenuDropDown **********************************/ +function tmDropDown (elementType, elementClick, elementSlide, activeClass){ + elementType = elementType; // special if hidden element isn't next (like for cart block here) + elementClick = elementClick; // element to click + elementSlide = elementSlide; // element to show/hide + activeClass = activeClass; // active class for "element to click" + + + //show/hide elements + $(elementClick).on('click touchstart', function(){ + if (elementType != 'cart') + var subUl = $(this).next(elementSlide); + else + var subUl = $(this).parents('#header').find(elementSlide); + if(subUl.is(':hidden')) { + subUl.slideDown(), + $(this).addClass(activeClass) + } + else { + subUl.slideUp(), + $(this).removeClass(activeClass) + } + $(elementClick).not(this).next(elementSlide).slideUp(), + $(elementClick).not(this).removeClass(activeClass); + return false + }), + + //enable clicks on showed elements + $(elementSlide).on('click touchstart', function(e){ + e.stopPropagation(); + }); + + // hide showed elements on document click + $(document).on('click touchstart', function(){ + if (elementType != 'cart') + var elementHide = $(elementClick).next(elementSlide); + else + var elementHide = $(elementClick).parents('#header').find(elementSlide); + $(elementHide).slideUp(); + }) +}; +$(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 +}); diff --git a/themes/default-bootstrap/js/order-opc.js b/themes/default-bootstrap/js/order-opc.js index e8eeccc26..4ae9b7c16 100644 --- a/themes/default-bootstrap/js/order-opc.js +++ b/themes/default-bootstrap/js/order-opc.js @@ -441,6 +441,7 @@ $(function() { updateState(); updateNeedIDNumber(); updateZipCode(); + $("select.form-control,input[type='checkbox'],input[type='radio']").uniform(); }); $('#opc_guestCheckout').click(function() { $('.is_customer_param').hide(); @@ -452,6 +453,7 @@ $(function() { updateState(); updateNeedIDNumber(); updateZipCode(); + $("select.form-control,input[type='checkbox']").uniform(); }); } else if (isGuest) @@ -667,7 +669,7 @@ $(function() { $('#submitAccount').show(); } }); - + $("select.form-control,input[type='checkbox']").uniform(); }); function bindCheckbox() @@ -683,6 +685,7 @@ function bindCheckbox() } else $('#opc_invoice_address').slideUp('slow'); + $("select.form-control,input[type='checkbox']").uniform(); } function bindInputs() @@ -718,6 +721,7 @@ function bindInputs() $('#opc_delivery_methods-overlay').fadeOut('slow'); } }); + $("select.form-control,input[type='checkbox']").uniform(); }); // Recyclable checkbox @@ -736,6 +740,7 @@ function bindInputs() if ($('#gift').is(':checked')) $('#gift_div').show(); + else $('#gift_div').hide(); @@ -748,6 +753,7 @@ function bindInputs() $('#cgv').click(function() { updatePaymentMethodsDisplay(); }); + $("select.form-control,input[type='checkbox']").uniform(); } function multishippingMode(it) @@ -854,6 +860,7 @@ function multishippingMode(it) } }); } + $("select.form-control,input[type='checkbox']").uniform(); } $(document).ready(function() { @@ -867,4 +874,5 @@ $(document).ready(function() { } if (typeof(open_multishipping_fancybox) !== 'undefined' && open_multishipping_fancybox) $('#link_multishipping_form').click(); + $("select.form-control,input[type='checkbox']").uniform(); }); \ No newline at end of file diff --git a/themes/default-bootstrap/js/products-comparison.js b/themes/default-bootstrap/js/products-comparison.js index 3a9118cff..f3735fe30 100644 --- a/themes/default-bootstrap/js/products-comparison.js +++ b/themes/default-bootstrap/js/products-comparison.js @@ -23,14 +23,15 @@ * International Registered Trademark & Property of PrestaShop SA */ -$('document').ready(function(){ - reloadProductComparison(); -}); - reloadProductComparison = function() { + $('input:checkbox.comparator').each(function() { + var checkedCheckbox = $(this); + if (checkedCheckbox.is(':checked')) + checkedCheckbox.parent().addClass('checked'); + }); $('a.cmp_remove').click(function(){ - var idProduct = $(this).attr('rel').replace('ajax_id_product_', ''); + var idProduct = $(this).prop('rel').replace('ajax_id_product_', ''); $.ajax({ url: 'index.php?controller=products-comparison&ajax=1&action=remove&id_product=' + idProduct, @@ -41,14 +42,12 @@ reloadProductComparison = function() { } }); }); - $('input:checkbox.comparator').click(function(){ - - var idProduct = $(this).attr('value').replace('comparator_item_', ''); + var totalValueNow = parseInt($('.bt_compare').next('.compare_product_count').val()); + var idProduct = $(this).prop('value').replace('comparator_item_', ''); var checkbox = $(this); - if(checkbox.is(':checked')) -{ + { $.ajax({ url: 'index.php?controller=products-comparison&ajax=1&action=add&id_product=' + idProduct, async: true, @@ -56,12 +55,19 @@ reloadProductComparison = function() { success: function(data){ if (data === '0') { - checkbox.attr('checked', false); + checkbox.prop('checked', false); alert(max_item); } + else { + checkbox.prop('checked', true), + checkbox.parent().addClass('checked'), + totalVal = totalValueNow +1, + $('.bt_compare').next('.compare_product_count').val(totalVal), + totalValue(totalVal) + } }, error: function(){ - checkbox.attr('checked', false); + checkbox.prop('checked', false); } }); } @@ -73,12 +79,20 @@ reloadProductComparison = function() { cache: false, success: function(data){ if (data === '0') - checkbox.attr('checked', true); - }, + + checkbox.prop('checked', true); + checkbox.parent().removeClass('checked'); + totalVal = totalValueNow -1; + $('.bt_compare').next('.compare_product_count').val(totalVal), + totalValue(totalVal) + }, error: function(){ - checkbox.attr('checked', true); + checkbox.prop('checked', true); } }); } }); } +function totalValue(value) { + $('.bt_compare').find('.total-compare-val').html(value); +} \ No newline at end of file diff --git a/themes/default-bootstrap/js/tools/respond.min.js b/themes/default-bootstrap/js/tools/respond.min.js new file mode 100644 index 000000000..e3dc2c0d6 --- /dev/null +++ b/themes/default-bootstrap/js/tools/respond.min.js @@ -0,0 +1,6 @@ +/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */ +/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */ +window.matchMedia=window.matchMedia||function(a){"use strict";var c,d=a.documentElement,e=d.firstElementChild||d.firstChild,f=a.createElement("body"),g=a.createElement("div");return g.id="mq-test-1",g.style.cssText="position:absolute;top:-100em",f.style.background="none",f.appendChild(g),function(a){return g.innerHTML='­',d.insertBefore(f,e),c=42===g.offsetWidth,d.removeChild(f),{matches:c,media:a}}}(document); + +/*! Respond.js v1.3.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs */ +(function(a){"use strict";function x(){u(!0)}var b={};if(a.respond=b,b.update=function(){},b.mediaQueriesSupported=a.matchMedia&&a.matchMedia("only all").matches,!b.mediaQueriesSupported){var q,r,t,c=a.document,d=c.documentElement,e=[],f=[],g=[],h={},i=30,j=c.getElementsByTagName("head")[0]||d,k=c.getElementsByTagName("base")[0],l=j.getElementsByTagName("link"),m=[],n=function(){for(var b=0;l.length>b;b++){var c=l[b],d=c.href,e=c.media,f=c.rel&&"stylesheet"===c.rel.toLowerCase();d&&f&&!h[d]&&(c.styleSheet&&c.styleSheet.rawCssText?(p(c.styleSheet.rawCssText,d,e),h[d]=!0):(!/^([a-zA-Z:]*\/\/)/.test(d)&&!k||d.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&m.push({href:d,media:e}))}o()},o=function(){if(m.length){var b=m.shift();v(b.href,function(c){p(c,b.href,b.media),h[b.href]=!0,a.setTimeout(function(){o()},0)})}},p=function(a,b,c){var d=a.match(/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi),g=d&&d.length||0;b=b.substring(0,b.lastIndexOf("/"));var h=function(a){return a.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+b+"$2$3")},i=!g&&c;b.length&&(b+="/"),i&&(g=1);for(var j=0;g>j;j++){var k,l,m,n;i?(k=c,f.push(h(a))):(k=d[j].match(/@media *([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1,f.push(RegExp.$2&&h(RegExp.$2))),m=k.split(","),n=m.length;for(var o=0;n>o;o++)l=m[o],e.push({media:l.split("(")[0].match(/(only\s+)?([a-zA-Z]+)\s?/)&&RegExp.$2||"all",rules:f.length-1,hasquery:l.indexOf("(")>-1,minw:l.match(/\(\s*min\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:l.match(/\(\s*max\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},s=function(){var a,b=c.createElement("div"),e=c.body,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",e||(e=f=c.createElement("body"),e.style.background="none"),e.appendChild(b),d.insertBefore(e,d.firstChild),a=b.offsetWidth,f?d.removeChild(e):e.removeChild(b),a=t=parseFloat(a)},u=function(b){var h="clientWidth",k=d[h],m="CSS1Compat"===c.compatMode&&k||c.body[h]||k,n={},o=l[l.length-1],p=(new Date).getTime();if(b&&q&&i>p-q)return a.clearTimeout(r),r=a.setTimeout(u,i),void 0;q=p;for(var v in e)if(e.hasOwnProperty(v)){var w=e[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?t||s():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?t||s():1)),w.hasquery&&(z&&A||!(z||m>=x)||!(A||y>=m))||(n[w.media]||(n[w.media]=[]),n[w.media].push(f[w.rules]))}for(var C in g)g.hasOwnProperty(C)&&g[C]&&g[C].parentNode===j&&j.removeChild(g[C]);for(var D in n)if(n.hasOwnProperty(D)){var E=c.createElement("style"),F=n[D].join("\n");E.type="text/css",E.media=D,j.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(c.createTextNode(F)),g.push(E)}},v=function(a,b){var c=w();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))},w=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}();n(),b.update=n,a.addEventListener?a.addEventListener("resize",x,!1):a.attachEvent&&a.attachEvent("onresize",x)}})(this); diff --git a/themes/default-bootstrap/lang/en.php b/themes/default-bootstrap/lang/en.php index 44a53e460..b4b26a22c 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'] = 'Login'; +$_LANG['order-opc-new-account_99dea78007133396a7b8ed70578ac6ae'] = 'Sign in'; $_LANG['order-opc-new-account_766d4aaf3e045538be23f9a9e17a1593'] = 'Instant checkout'; $_LANG['order-opc-new-account_ce8ae9da5b7cd6c3df2929543a9af92d'] = 'Email'; $_LANG['order-opc-new-account_b78a3223503896721cca1303f776159b'] = 'Title'; diff --git a/themes/default-bootstrap/manufacturer-list.tpl b/themes/default-bootstrap/manufacturer-list.tpl index cd5a3a66d..bdd996d7f 100644 --- a/themes/default-bootstrap/manufacturer-list.tpl +++ b/themes/default-bootstrap/manufacturer-list.tpl @@ -46,8 +46,8 @@ {if $nbManufacturers > 0}
-