Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backend grid heads - Remove colons after To, From and In words #2267

Merged
merged 4 commits into from
Jun 30, 2022
Merged

Backend grid heads - Remove colons after To, From and In words #2267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96a1e72
Update Date.php
addison74 Jun 15, 2022
64f9fb7
Update Datetime.php
addison74 Jun 15, 2022
e63872b
Update Price.php
addison74 Jun 15, 2022
99dbfde
Update Range.php
addison74 Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ public function getHtml()
$htmlId = $this->_getHtmlId() . microtime(true);
$format = $this->getLocale()->getDateStrFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT);
$html = '<div class="range"><div class="range-line date">'
. '<span class="label">' . Mage::helper('adminhtml')->__('From').':</span>'
. '<span class="label">' . Mage::helper('adminhtml')->__('From').'</span>'
. '<input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from"'
. ' value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>'
. '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
. ' id="'.$htmlId.'_from_trig"'
. ' title="' . $this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')) . '"/>'
. '</div>';
$html.= '<div class="range-line date">'
. '<span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>'
. '<span class="label">' . Mage::helper('adminhtml')->__('To').'</span>'
. '<input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to"'
. ' value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>'
. '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@ public function getHtml()
}

$html = '<div class="range"><div class="range-line date">'
. '<span class="label">' . Mage::helper('adminhtml')->__('From').':</span>'
. '<span class="label">' . Mage::helper('adminhtml')->__('From').'</span>'
. '<input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$htmlId.'_from"'
. ' value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/>'
. '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
. ' id="'.$htmlId.'_from_trig"'
. ' title="'.$this->escapeHtml(Mage::helper('adminhtml')->__('Date selector')).'"/>'
. '</div>';
$html.= '<div class="range-line date">'
. '<span class="label">' . Mage::helper('adminhtml')->__('To').' :</span>'
. '<span class="label">' . Mage::helper('adminhtml')->__('To').'</span>'
. '<input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$htmlId.'_to"'
. ' value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/>'
. '<img src="' . Mage::getDesign()->getSkinUrl('images/grid-cal.gif') . '" alt="" class="v-middle"'
Expand Down
6 changes: 3 additions & 3 deletions app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Price.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Price
public function getHtml()
{
$html = '<div class="range">';
$html .= '<div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('From').':</span> <input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$this->_getHtmlId().'_from" value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/></div>';
$html .= '<div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('To').': </span><input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$this->_getHtmlId().'_to" value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/></div>';
$html .= '<div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('From').'</span> <input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$this->_getHtmlId().'_from" value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/></div>';
$html .= '<div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('To').'</span><input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$this->_getHtmlId().'_to" value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/></div>';
if ($this->getDisplayCurrencySelect())
$html .= '<div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('In').': </span>' . $this->_getCurrencySelectHtml() . '</div>';
$html .= '<div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('In').'</span>' . $this->_getCurrencySelectHtml() . '</div>';
$html .= '</div>';

return $html;
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Range extends Mage_Adminhtm
{
public function getHtml()
{
$html = '<div class="range"><div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('From').':</span> <input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$this->_getHtmlId().'_from" value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/></div>';
$html .= '<div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('To').': </span><input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$this->_getHtmlId().'_to" value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/></div></div>';
$html = '<div class="range"><div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('From').'</span> <input type="text" name="'.$this->_getHtmlName().'[from]" id="'.$this->_getHtmlId().'_from" value="'.$this->getEscapedValue('from').'" class="input-text no-changes"/></div>';
$html .= '<div class="range-line"><span class="label">' . Mage::helper('adminhtml')->__('To').'</span><input type="text" name="'.$this->_getHtmlName().'[to]" id="'.$this->_getHtmlId().'_to" value="'.$this->getEscapedValue('to').'" class="input-text no-changes"/></div></div>';
return $html;
}

Expand Down