Index: branches/1.0.x/elements/content_boxes.elm.tpl =================================================================== diff -u -N -r14739 -r14754 --- branches/1.0.x/elements/content_boxes.elm.tpl (.../content_boxes.elm.tpl) (revision 14739) +++ branches/1.0.x/elements/content_boxes.elm.tpl (.../content_boxes.elm.tpl) (revision 14754) @@ -1,23 +1,27 @@ - + - + - + - + - + + + + + " title="" alt="" align="" /> @@ -32,21 +36,21 @@ - + + + - - - - - + + + + + - +
- + - + - +
- + - + - + - + - +
Index: branches/1.0.x/inc/styles.css =================================================================== diff -u -N -r14708 -r14754 --- branches/1.0.x/inc/styles.css (.../styles.css) (revision 14708) +++ branches/1.0.x/inc/styles.css (.../styles.css) (revision 14754) @@ -48,10 +48,16 @@ #header .infoblock .welcome .txt { padding: 0 0 0 20px; } #header .infoblock .welcome .logged { padding-top: 5px; } #header .infoblock .welcome .txt a { font-weight: bold; } -#header .infoblock .welcome .lang .en-US { + +#header .infoblock .welcome .lang .with-icon { background: url(@templates_base@/img/lang/eng.gif) no-repeat 10px 7px; padding: 5px 10px 10px 35px; } + +#header .infoblock .welcome .lang .without-icon { + padding: 5px 10px 10px 10px; +} + #header .infoblock .welcome .txt, #header .infoblock .welcome .lang, #header .infoblock .welcome .currency, Index: branches/1.0.x/elements/header.elm.tpl =================================================================== diff -u -N -r14747 -r14754 --- branches/1.0.x/elements/header.elm.tpl (.../header.elm.tpl) (revision 14747) +++ branches/1.0.x/elements/header.elm.tpl (.../header.elm.tpl) (revision 14754) @@ -5,32 +5,50 @@
+
-
+
class="with-icon" style="background-image: url(img/lang/);"class="without-icon">
+
+
-
- USD +
-
Welcome! Please Register for an account or Index: branches/1.0.x/inc/js/jquery.scripts.js =================================================================== diff -u -N -r14600 -r14754 --- branches/1.0.x/inc/js/jquery.scripts.js (.../jquery.scripts.js) (revision 14600) +++ branches/1.0.x/inc/js/jquery.scripts.js (.../jquery.scripts.js) (revision 14754) @@ -1,71 +1,86 @@ -$(document).ready(function() -{ - $('#change-password').bind('click', function() { - $("#password-show").hide(); - $("#password-block").fadeIn(); - return false; - }); +function DBlocks() { + var $me = this; + this.selectors = ['#lang', '#currency', '#login', '#login-alt']; - $('#password').keyup(function(){ - $('#result-password').html(passwordStrength($('#password').val())).show() ; - }) + $(document).ready( + function () { + $me.init(); + } + ); +} - $("#lang").click(function() { - if ( $(this).parent().is(".plashka-sel") ) { - $(this).parent().removeClass("plashka-sel"); - $("#lang-sel").fadeOut(); +DBlocks.prototype.init = function () { + var $manager = this; + + $( this.selectors.join(', ') ).click( + function($e, $now) { + var $me = $(this), + $parent = $me.parent(); + + if ( $parent.is('.plashka-sel') ) { + $parent.removeClass('plashka-sel'); + + if ( $now === undefined || $now === false ) { + $('#' + $me.attr('id') + '-sel').fadeOut(); + } + else { + $('#' + $me.attr('id') + '-sel').hide(); + } + } + else { + $manager.hideOthers($me); + + $parent.addClass('plashka-sel'); + $('#' + $me.attr('id') + '-sel').fadeIn(); + } + + return false; } - else - { - $(this).parent().addClass("plashka-sel"); - $("#lang-sel").fadeIn(); - } - return false; - }); + ); - $("#currency").click(function() { - if ( $(this).parent().is(".plashka-sel") ) { - $(this).parent().removeClass("plashka-sel"); - $("#currency-sel").fadeOut(); + $('.icon-close').click( + function() { + $('#login,#login-alt').parent().removeClass('plashka-sel'); + $('#login-sel, #login-alt-sel').fadeOut(); + + return false; } - else - { - $(this).parent().addClass("plashka-sel"); - $("#currency-sel").fadeIn(); - } - return false; - }); + ); +} - $("#login").click(function() { - if ( $(this).parent().is(".plashka-sel") ) { - $(this).parent().removeClass("plashka-sel"); - $("#login-sel").fadeOut(); +DBlocks.prototype.hideOthers = function ($current) { + $( this.selectors.join(', ') ).not($current).each( + function () { + var $me = $(this), + $parent = $me.parent(); + + if ( $parent.is('.plashka-sel') ) { + $me.trigger('click', [true]); + } } - else - { - $(this).parent().addClass("plashka-sel"); - $("#login-sel").fadeIn(); - } - return false; - }); + ); +} - $("#login-alt").click(function() { - if ( $(this).parent().is(".plashka-sel") ) { - $(this).parent().removeClass("plashka-sel"); - $("#login-alt-sel").fadeOut(); +$(document).ready(function() +{ + $('#change-password').click( + function($e) { + $('#password-show').hide(); + $('#password-block').fadeIn(); + + return false; } - else - { - $(this).parent().addClass("plashka-sel"); - $("#login-alt-sel").fadeIn(); - } - return false; - }); + ); - $(".icon-close").click(function() { - $("#login,#login-alt").parent().removeClass("plashka-sel"); - $("#login-sel,#login-alt-sel").fadeOut(); - return false; - }); + $('#password').keyup( + function($e) { + var $password = $('#password').val(); -}); \ No newline at end of file + $('#result-password') + .html( passwordStrength($password) ) + .show(); + } + ); +}); + +new DBlocks(); \ No newline at end of file Index: branches/1.0.x/designs/default_design.des.tpl =================================================================== diff -u -N -r14747 -r14754 --- branches/1.0.x/designs/default_design.des.tpl (.../default_design.des.tpl) (revision 14747) +++ branches/1.0.x/designs/default_design.des.tpl (.../default_design.des.tpl) (revision 14754) @@ -1,78 +1,77 @@ - - - - + - + - <inp2:m_RenderElement name="page_title" default_element="default_cms_page_title" no_editing="1"/> + + + <inp2:m_RenderElement name="page_title" default_element="default_page_title" no_editing="1"/> + - - - - + + + + + + - - + - -
+ +
- + - - - + + + - +
- +
- + - +
- +
-
- +
+ - + - + - +
- +
- + - + - + \ No newline at end of file Index: branches/1.0.x/_install/theme.xml =================================================================== diff -u -N -r14600 -r14754 --- branches/1.0.x/_install/theme.xml (.../theme.xml) (revision 14600) +++ branches/1.0.x/_install/theme.xml (.../theme.xml) (revision 14754) @@ -1,6 +1,7 @@ designs/general - designs/section + designs/section + products/details designs/form thankyou \ No newline at end of file