Skip to content

Commit

Permalink
Merge pull request #147 from magento-vanilla/PR
Browse files Browse the repository at this point in the history 
[Vanilla] Sprint 14
  • Loading branch information
Momotenko,Natalia(nmomotenko) committed Mar 15, 2015
2 parents e673fcf + d313bb3 commit 689db78
Show file tree
Hide file tree
Showing 74 changed files with 532 additions and 531 deletions.
6 changes: 5 additions & 1 deletion app/code/Magento/Backend/Block/Widget/Grid/Extended.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,11 @@ protected function _prepareLayout()
$this->setChild(
'reset_filter_button',
$this->getLayout()->createBlock('Magento\Backend\Block\Widget\Button')->setData(
['label' => __('Reset Filter'), 'onclick' => $this->getJsObjectName() . '.resetFilter()']
[
'label' => __('Reset Filter'),
'onclick' => $this->getJsObjectName() . '.resetFilter()',
'class' => 'action-reset'
]
)
);
$this->setChild(
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
</div>
<div class="clear"></div>
<script id="<?php echo $block->getHtmlId() ?>-template" type="text/x-magento-template">
<div id="<%= data.id %>" class="file-row">
<span class="file-info"><%= data.name %> (<%= data.size %>)</span>
<div id="<%- data.id %>" class="file-row">
<span class="file-info"><%- data.name %> (<%- data.size %>)</span>
<div class="progressbar-container">
<div class="progressbar upload-progress" style="width: 0%;"></div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
<% if (data.items.length) { %>
<% _.each(data.items, function(value){ %>
<li class="item"
<%= data.optionData(value) %>
<%- data.optionData(value) %>
>
<a href="<%= value.url %>" class="title"><%= value.name %></a>
<span class="type"><%= value.type %></span>
<%= value.description || "" %>
<a href="<%- value.url %>" class="title"><%- value.name %></a>
<span class="type"><%- value.type %></span>
<%- value.description || "" %>
</li>
<% }); %>
<% } else { %>
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ protected function _prepareLayout()
'add_selection_button',
'Magento\Backend\Block\Widget\Button',
[
'id' => $this->getFieldId() . '_<%= data.index %>_add_button',
'id' => $this->getFieldId() . '_<%- data.index %>_add_button',
'label' => __('Add Products to Option'),
'class' => 'add add-selection'
]
Expand All @@ -162,7 +162,7 @@ protected function _prepareLayout()
'close_search_button',
'Magento\Backend\Block\Widget\Button',
[
'id' => $this->getFieldId() . '_<%= data.index %>_close_button',
'id' => $this->getFieldId() . '_<%- data.index %>_close_button',
'label' => __('Close'),
'on_click' => 'bSelection.closeSearch(event)',
'class' => 'back no-display'
Expand Down Expand Up @@ -272,12 +272,12 @@ public function getTypeSelectHtml()
'Magento\Framework\View\Element\Html\Select'
)->setData(
[
'id' => $this->getFieldId() . '_<%= data.index %>_type',
'id' => $this->getFieldId() . '_<%- data.index %>_type',
'class' => 'select select-product-option-type required-option-select',
'extra_params' => 'onchange="bOption.changeType(event)"',
]
)->setName(
$this->getFieldName() . '[<%= data.index %>][type]'
$this->getFieldName() . '[<%- data.index %>][type]'
)->setOptions(
$this->_optionTypes->toOptionArray()
);
Expand All @@ -293,9 +293,9 @@ public function getRequireSelectHtml()
$select = $this->getLayout()->createBlock(
'Magento\Framework\View\Element\Html\Select'
)->setData(
['id' => $this->getFieldId() . '_<%= data.index %>_required', 'class' => 'select']
['id' => $this->getFieldId() . '_<%- data.index %>_required', 'class' => 'select']
)->setName(
$this->getFieldName() . '[<%= data.index %>][required]'
$this->getFieldName() . '[<%- data.index %>][required]'
)->setOptions(
$this->_yesno->toOptionArray()
);
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@ public function getPriceTypeSelectHtml()
'Magento\Framework\View\Element\Html\Select'
)->setData(
[
'id' => $this->getFieldId() . '_<%= data.index %>_price_type',
'id' => $this->getFieldId() . '_<%- data.index %>_price_type',
'class' => 'select select-product-option-type required-option-select',
]
)->setName(
$this->getFieldName() . '[<%= data.parentIndex %>][<%= data.index %>][selection_price_type]'
$this->getFieldName() . '[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]'
)->setOptions(
$this->_priceType->toOptionArray()
);
Expand All @@ -155,9 +155,9 @@ public function getQtyTypeSelectHtml()
$select = $this->getLayout()->createBlock(
'Magento\Framework\View\Element\Html\Select'
)->setData(
['id' => $this->getFieldId() . '_<%= data.index %>_can_change_qty', 'class' => 'select']
['id' => $this->getFieldId() . '_<%- data.index %>_can_change_qty', 'class' => 'select']
)->setName(
$this->getFieldName() . '[<%= data.parentIndex %>][<%= data.index %>][selection_can_change_qty]'
$this->getFieldName() . '[<%- data.parentIndex %>][<%- data.index %>][selection_can_change_qty]'
)->setOptions(
$this->_yesno->toOptionArray()
);
Expand Down Expand Up @@ -195,8 +195,8 @@ public function getCheckboxScopeHtml()
{
$checkboxHtml = '';
if ($this->isUsedWebsitePrice()) {
$fieldsId = $this->getFieldId() . '_<%= data.index %>_price_scope';
$name = $this->getFieldName() . '[<%= data.parentIndex %>][<%= data.index %>][default_price_scope]';
$fieldsId = $this->getFieldId() . '_<%- data.index %>_price_scope';
$name = $this->getFieldName() . '[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]';
$class = 'bundle-option-price-scope-checkbox';
$label = __('Use Default Value');
$disabled = $this->getCanEditPrice() === false ? ' disabled="disabled"' : '';
Expand Down
52 changes: 26 additions & 26 deletions app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,65 +9,65 @@
/** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option */
?>
<script id="bundle-option-template" type="text/x-magento-template">
<div id="<?php echo $block->getFieldId() ?>_<%= data.index %>" class="option-box">
<div class="fieldset-wrapper collapsable-wrapper opened" id="<?php echo $block->getFieldId() ?>_<%= data.index %>-wrapper">
<div id="<?php echo $block->getFieldId() ?>_<%- data.index %>" class="option-box">
<div class="fieldset-wrapper collapsable-wrapper opened" id="<?php echo $block->getFieldId() ?>_<%- data.index %>-wrapper">
<div class="fieldset-wrapper-title">
<strong class="title" data-toggle="collapse" data-target="#<?php echo $block->getFieldId() ?>_<%= data.index %>-content">
<span><%= data.default_title %></span>
<strong class="title" data-toggle="collapse" data-target="#<?php echo $block->getFieldId() ?>_<%- data.index %>-content">
<span><%- data.default_title %></span>
</strong>
<div class="actions">
<?php echo $block->getOptionDeleteButtonHtml() ?>
</div>
<div data-role="draggable-handle" class="draggable-handle"></div>
</div>
<div class="fieldset-wrapper-content in collapse" id="<?php echo $block->getFieldId() ?>_<%= data.index %>-content">
<div class="fieldset-wrapper-content in collapse" id="<?php echo $block->getFieldId() ?>_<%- data.index %>-content">
<fieldset class="fieldset">
<fieldset class="fieldset-alt">
<div class="field field-option-title required">
<label class="label" for="id_<?php echo $block->getFieldName() ?>_<%= data.index %>_title">
<label class="label" for="id_<?php echo $block->getFieldName() ?>_<%- data.index %>_title">
<?php echo __('Option Title') ?>
</label>
<div class="control">
<?php if ($block->isDefaultStore()): ?>
<input class="input-text required-entry"
type="text"
name="<?php echo $block->getFieldName() ?>[<%= data.index %>][title]"
id="id_<?php echo $block->getFieldName() ?>_<%= data.index %>_title"
value="<%= data.title %>"
data-original-value="<%= data.title %>" />
name="<?php echo $block->getFieldName() ?>[<%- data.index %>][title]"
id="id_<?php echo $block->getFieldName() ?>_<%- data.index %>_title"
value="<%- data.title %>"
data-original-value="<%- data.title %>" />
<?php else: ?>
<input class="input-text required-entry"
type="text"
name="<?php echo $block->getFieldName() ?>[<%= data.index %>][default_title]"
id="id_<?php echo $block->getFieldName() ?>_<%= data.index %>_default_title"
value="<%= data.default_title %>"
data-original-value="<%= data.default_title %>" />
name="<?php echo $block->getFieldName() ?>[<%- data.index %>][default_title]"
id="id_<?php echo $block->getFieldName() ?>_<%- data.index %>_default_title"
value="<%- data.default_title %>"
data-original-value="<%- data.default_title %>" />
<?php endif; ?>
<input type="hidden"
id="<?php echo $block->getFieldId() ?>_id_<%= data.index %>"
name="<?php echo $block->getFieldName() ?>[<%= data.index %>][option_id]"
value="<%= data.option_id %>" />
id="<?php echo $block->getFieldId() ?>_id_<%- data.index %>"
name="<?php echo $block->getFieldName() ?>[<%- data.index %>][option_id]"
value="<%- data.option_id %>" />
<input type="hidden"
name="<?php echo $block->getFieldName() ?>[<%= data.index %>][delete]"
name="<?php echo $block->getFieldName() ?>[<%- data.index %>][delete]"
value=""
data-state="deleted" />
</div>
</div>
<?php if (!$block->isDefaultStore()): ?>
<div class="field field-option-store-view required">
<label class="label" for="id_<?php echo $block->getFieldName() ?>_<%= data.index %>_title_store">
<label class="label" for="id_<?php echo $block->getFieldName() ?>_<%- data.index %>_title_store">
<?php echo __('Store View Title') ?>
</label>
<div class="control">
<input class="input-text required-entry" type="text"
name="<?php echo $block->getFieldName() ?>[<%= data.index %>][title]"
id="id_<?php echo $block->getFieldName() ?>_<%= data.index %>_title_store"
value="<%= data.title %>" />
name="<?php echo $block->getFieldName() ?>[<%- data.index %>][title]"
id="id_<?php echo $block->getFieldName() ?>_<%- data.index %>_title_store"
value="<%- data.title %>" />
</div>
</div>
<?php endif; ?>
<div class="field field-option-input-type required">
<label class="label" for="<?php echo $block->getFieldId() . '_<%= data.index %>_type' ?>">
<label class="label" for="<?php echo $block->getFieldId() . '_<%- data.index %>_type' ?>">
<?php echo __('Input Type') ?>
</label>
<div class="control">
Expand All @@ -93,8 +93,8 @@
<div class="control">
<input class="input-text validate-zero-or-greater"
type="text"
name="<?php echo $block->getFieldName() ?>[<%= data.index %>][position]"
value="<%= data.position %>"
name="<?php echo $block->getFieldName() ?>[<%- data.index %>][position]"
value="<%- data.position %>"
id="field-option-position" />
</div>
</div>
Expand All @@ -107,7 +107,7 @@
</fieldset>
</div>
</div>
<div id="<?php echo $block->getFieldId() ?>_search_<%= data.index %>" class="selection-search"></div>
<div id="<?php echo $block->getFieldId() ?>_search_<%- data.index %>" class="selection-search"></div>
</div>
</script>

Expand Down
Loading

0 comments on commit 689db78

Please sign in to comment.