Skip to content

Commit 4a4fdaf

Browse files
authored
ENGCOM-5358: Fixed issue #21974 #23393
2 parents acfafe0 + 1aadf9d commit 4a4fdaf

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
1515
<element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
1616
<element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
17-
<element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
18-
<element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
17+
<element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
18+
<element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(6)"/>
1919
<element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
2020
</section>
2121
</sections>

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,11 @@
511511
right: 0;
512512
top: 0;
513513
}
514+
515+
.time-separator {
516+
font-size: 14px;
517+
padding-left: 5px;
518+
}
514519

515520
.tooltip-content {
516521
background: @color-very-dark-gray-black2;

lib/internal/Magento/Framework/Data/Form/Element/Time.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
namespace Magento\Framework\Data\Form\Element;
8+
9+
use Magento\Framework\Escaper;
10+
711
/**
812
* Form time element
913
*
1014
* @author Magento Core Team <[email protected]>
1115
*/
12-
namespace Magento\Framework\Data\Form\Element;
13-
14-
use Magento\Framework\Escaper;
15-
1616
class Time extends AbstractElement
1717
{
1818
/**
@@ -32,7 +32,7 @@ public function __construct(
3232
}
3333

3434
/**
35-
* @return mixed
35+
* @inheritDoc
3636
*/
3737
public function getName()
3838
{
@@ -44,7 +44,7 @@ public function getName()
4444
}
4545

4646
/**
47-
* @return string
47+
* @inheritDoc
4848
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
4949
* @SuppressWarnings(PHPMD.NPathComplexity)
5050
*/
@@ -76,7 +76,8 @@ public function getElementHtml()
7676
}
7777
$html .= '</select>' . "\n";
7878

79-
$html .= ':&nbsp;<select name="' . $this->getName() . '" style="width:80px" '
79+
$html .= '<span class="time-separator">:&nbsp;</span><select name="'
80+
. $this->getName() . '" style="width:80px" '
8081
. $this->serialize($this->getHtmlAttributes())
8182
. $this->_getUiId('minute') . '>' . "\n";
8283
for ($i = 0; $i < 60; $i++) {
@@ -86,7 +87,8 @@ public function getElementHtml()
8687
}
8788
$html .= '</select>' . "\n";
8889

89-
$html .= ':&nbsp;<select name="' . $this->getName() . '" style="width:80px" '
90+
$html .= '<span class="time-separator">:&nbsp;</span><select name="'
91+
. $this->getName() . '" style="width:80px" '
9092
. $this->serialize($this->getHtmlAttributes())
9193
. $this->_getUiId('second') . '>' . "\n";
9294
for ($i = 0; $i < 60; $i++) {

0 commit comments

Comments
 (0)