Skip to content

Commit edfcdf1

Browse files
vpelipenkovpelipenko
committedJul 15, 2015
Merge pull request #469 from magento-webdev/PR
[WD] Bugfixes
·
2.4.81.0.0-beta
2 parents 770a753 + 9026b70 commit edfcdf1

File tree

13 files changed

+94
-64
lines changed

13 files changed

+94
-64
lines changed
 

Diff for: ‎app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
<button data-role="review-save"
5555
type="submit"
5656
data-bind="
57-
attr: {title: $t('Place order')},
57+
attr: {title: $t('Place Order')},
5858
enable: (getCode() == isChecked()),
5959
click: placeOrder,
6060
css: {disabled: !isPlaceOrderActionAllowed()}
6161
"
6262
class="action primary checkout"
6363
disabled>
64-
<span data-bind="text: $t('Place order')"></span>
64+
<span data-bind="text: $t('Place Order')"></span>
6565
</button>
6666
</div>
6767
</div>

Diff for: ‎app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
<button data-role="review-save"
3535
type="submit"
3636
data-bind="
37-
attr: {title: $t('Place order')},
37+
attr: {title: $t('Place Order')},
3838
enable: (getCode() == isChecked()),
3939
click: placeOrder,
4040
css: {disabled: !isPlaceOrderActionAllowed()}
4141
"
4242
class="action primary checkout"
4343
disabled>
44-
<span data-bind="text: $t('Place order')"></span>
44+
<span data-bind="text: $t('Place Order')"></span>
4545
</button>
4646
</div>
4747
</div>

Diff for: ‎app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html

+20-6
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,26 @@
151151
<span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
152152
</label>
153153
<div class="control">
154-
<input type="number" class="input-text cvv" name="payment[cc_cid]" value=""
155-
data-bind="attr: {id: getCode() + '_cc_cid', title: $t('Card Verification Number'), 'data-container': getCode() + '-cc-cvv', 'data-validate': JSON.stringify({'required-number':true, 'validate-cc-cvn':'#' + getCode() + '_cc_type'})},
156-
enable: true,
157-
value: creditCardVerificationNumber"/>
158-
<div class="note">
159-
<a href="#" class="action cvv" data-bind="attr: {title: $t('What is this?')}, mageInit:{'tooltip': {'content': getCvvImageHtml()}}"><span><!-- ko text: $t('What is this?')--><!-- /ko --></span></a>
154+
<input type="number"
155+
class="input-text cvv"
156+
name="payment[cc_cid]"
157+
value=""
158+
data-bind="attr: {id: getCode() + '_cc_cid',
159+
title: $t('Card Verification Number'),
160+
'data-container': getCode() + '-cc-cvv',
161+
'data-validate': JSON.stringify({'required-number':true, 'validate-cc-cvn':'#' + getCode() + '_cc_type'})},
162+
enable: true,
163+
value: creditCardVerificationNumber" />
164+
<div class="field-tooltip toggle">
165+
<span class="field-tooltip-action action-cvv"
166+
tabindex="0"
167+
data-toggle="dropdown"
168+
data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
169+
<span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
170+
</span>
171+
<div class="field-tooltip-content"
172+
data-target="dropdown"
173+
data-bind="html: getCvvImageHtml()"></div>
160174
</div>
161175
</div>
162176
</div>

Diff for: ‎app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html

+18-6
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,27 @@
9999
<span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
100100
</label>
101101
<div class="control _with-tooltip">
102-
<input type="number" autocomplete="off" class="input-text cvv" name="payment[cc_cid]" value=""
103-
data-bind="attr: {id: getCode() + '_cc_cid', title: $t('Card Verification Number'), 'data-container': getCode() + '-cc-cvv', 'data-validate': JSON.stringify({'required-number':true, 'validate-card-cvv':'#' + getCode() + '_cc_type'})},
104-
enable: isActive($parents),
105-
value: creditCardVerificationNumber"/>
102+
<input type="number"
103+
autocomplete="off"
104+
class="input-text cvv"
105+
name="payment[cc_cid]"
106+
value=""
107+
data-bind="attr: {id: getCode() + '_cc_cid',
108+
title: $t('Card Verification Number'),
109+
'data-container': getCode() + '-cc-cvv',
110+
'data-validate': JSON.stringify({'required-number':true, 'validate-card-cvv':'#' + getCode() + '_cc_type'})},
111+
enable: isActive($parents),
112+
value: creditCardVerificationNumber" />
106113
<div class="field-tooltip toggle">
107-
<span class="field-tooltip-action action-cvv" data-bind="attr: {title: $t('What is this?')}">
114+
<span class="field-tooltip-action action-cvv"
115+
tabindex="0"
116+
data-toggle="dropdown"
117+
data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
108118
<span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
109119
</span>
110-
<div class="field-tooltip-content" data-bind="html: getCvvImageHtml()"></div>
120+
<div class="field-tooltip-content"
121+
data-target="dropdown"
122+
data-bind="html: getCvvImageHtml()"></div>
111123
</div>
112124
</div>
113125
</div>

Diff for: ‎app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<div class="actions-toolbar" id="review-buttons-container">
3030
<div class="primary">
3131
<button data-role="review-save" type="submit"
32-
data-bind="attr: {title: $t('Place order')}"
32+
data-bind="attr: {title: $t('Place Order')}"
3333
class="button action primary checkout">
34-
<span data-bind="text: $t('Place order')"></span>
34+
<span data-bind="text: $t('Place Order')"></span>
3535
</button>
3636
<button type="submit" id="originalPlaceOrder" class="hidden"
3737
data-bind="click: originalPlaceOrder($parents[1])"></button>

Diff for: ‎app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
<button data-role="review-save"
5454
type="submit"
5555
data-bind="
56-
attr: {title: $t('Place order')},
56+
attr: {title: $t('Place Order')},
5757
enable: (getCode() == isChecked()),
5858
click: placeOrder,
5959
css: {disabled: !isPlaceOrderActionAllowed()}
6060
"
6161
class="action primary checkout"
6262
disabled>
63-
<span data-bind="text: $t('Place order')"></span>
63+
<span data-bind="text: $t('Place Order')"></span>
6464
</button>
6565
</div>
6666
</div>

Diff for: ‎app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html

+8-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<div class="shipping-policy-block field-tooltip" data-bind="visible: config.isEnabled">
8-
<span class="field-tooltip-action">
7+
<div class="shipping-policy-block field-tooltip"
8+
data-bind="visible: config.isEnabled">
9+
<span class="field-tooltip-action"
10+
tabindex="0"
11+
data-toggle="dropdown"
12+
data-bind="mageInit: {'dropdown':{'activeClass': '_active'}}">
913
<!-- ko text: $t('See our Shipping Policy') --><!-- /ko -->
1014
</span>
11-
<div class="field-tooltip-content">
15+
<div class="field-tooltip-content"
16+
data-target="dropdown">
1217
<span data-bind="html: config.shippingPolicyContent"></span>
1318
</div>
1419
</div>

Diff for: ‎app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html

+17-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,23 @@
55
*/
66
-->
77
<div class="field-tooltip toggle">
8-
<a class="field-tooltip-action action-help" target="_blank" data-bind="attr: {href: tooltip.link}">
9-
</a>
10-
<div class="field-tooltip-content">
8+
9+
<!-- ko if: (tooltip.link)-->
10+
<a class="field-tooltip-action action-help"
11+
target="_blank"
12+
data-toggle="dropdown"
13+
data-bind="attr: {href: tooltip.link}, mageInit: {'dropdown':{'activeClass': '_active'}}"></a>
14+
<!-- /ko -->
15+
16+
<!-- ko if: (!tooltip.link)-->
17+
<span class="field-tooltip-action action-help"
18+
tabindex="0"
19+
data-toggle="dropdown"
20+
data-bind="mageInit: {'dropdown':{'activeClass': '_active'}}"></span>
21+
<!-- /ko -->
22+
23+
<div class="field-tooltip-content"
24+
data-target="dropdown">
1125
<!-- ko text: tooltip.description --><!-- /ko -->
1226
</div>
1327
</div>

Diff for: ‎app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less

+4
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,10 @@
482482
}
483483
}
484484

485+
.ui-widget-overlay {
486+
&:extend(.abs-modal-overlay all);
487+
}
488+
485489
.overlay_magento {
486490
&:extend(.abs-modal-overlay all);
487491
z-index: 800 !important;

Diff for: ‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less

+18-13
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@
3737
& when (@media-common = true) {
3838

3939
.field-tooltip {
40+
cursor: pointer;
4041
position: absolute;
4142
right: 0;
4243
top: 1px;
4344

44-
&:hover {
45+
&._active {
4546
.css(z-index, @checkout-tooltip__hover__z-index);
46-
cursor: pointer;
47+
4748
.field-tooltip-content {
4849
display: block;
4950
}
@@ -56,19 +57,23 @@
5657

5758
.field-tooltip-action {
5859
.icon-font(
59-
@checkout-tooltip-icon__content,
60-
@_icon-font-size: @checkout-tooltip-icon__font-size,
61-
@_icon-font-text-hide: true,
62-
@_icon-font-color: @checkout-tooltip-icon__color,
63-
@_icon-font-color-hover: @checkout-tooltip-icon__hover__color,
64-
@_icon-font-color-active: false
60+
@checkout-tooltip-icon__content,
61+
@_icon-font-size: @checkout-tooltip-icon__font-size,
62+
@_icon-font-text-hide: true,
63+
@_icon-font-color: @checkout-tooltip-icon__color,
64+
@_icon-font-color-hover: @checkout-tooltip-icon__hover__color,
65+
@_icon-font-color-active: false
6566
);
67+
6668
&:focus {
67-
&:before {
68-
.css(color, @checkout-tooltip-icon__hover__color);
69-
}
70-
+ .field-tooltip-content {
71-
display: block;
69+
._keyfocus & {
70+
.css(z-index, @checkout-tooltip__hover__z-index);
71+
+ .field-tooltip-content {
72+
display: block;
73+
}
74+
&:before {
75+
.css(color, @checkout-tooltip-icon__hover__color);
76+
}
7277
}
7378
}
7479
}

Diff for: ‎app/design/frontend/Magento/blank/web/css/source/_extends.less

-12
Original file line numberDiff line numberDiff line change
@@ -1046,18 +1046,6 @@
10461046
input {
10471047
.css(margin-right, @indent__s);
10481048
width: calc(~"100% - (@{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})");
1049-
&:focus {
1050-
+ .field-tooltip {
1051-
.field-tooltip-action {
1052-
&:before {
1053-
.css(color, @checkout-tooltip-icon__hover__color);
1054-
}
1055-
}
1056-
.field-tooltip-content {
1057-
display: block;
1058-
}
1059-
}
1060-
}
10611049
}
10621050
}
10631051

Diff for: ‎app/design/frontend/Magento/luma/web/css/source/_extends.less

-12
Original file line numberDiff line numberDiff line change
@@ -1434,18 +1434,6 @@
14341434
input {
14351435
.css(margin-right, @indent__s);
14361436
width: calc(~"100% - (@{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})");
1437-
&:focus {
1438-
+ .field-tooltip {
1439-
.field-tooltip-action {
1440-
&:before {
1441-
.css(color, @checkout-tooltip-icon__hover__color);
1442-
}
1443-
}
1444-
.field-tooltip-content {
1445-
display: block;
1446-
}
1447-
}
1448-
}
14491437
}
14501438
}
14511439

Diff for: ‎lib/web/mage/dropdowns.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ define([
108108
if(options.autoclose === true) {
109109
self.reset({elems: actionElem.not(elem)});
110110
}
111-
self[elem.hasClass('active') ? 'closeDropdown' : 'openDropdown'](elem);
111+
self[elem.hasClass(options.activeClass) ? 'closeDropdown' : 'openDropdown'](elem);
112112

113113
return false;
114114
});

0 commit comments

Comments
 (0)
Please sign in to comment.