Skip to content

Commit

Permalink
Merge pull request #502 from magento-webdev/PR
Browse files Browse the repository at this point in the history 
[WebDev] Bugfixes
  • Loading branch information
Momotenko,Natalia(nmomotenko) committed Aug 4, 2015
2 parents 7a69a27 + 3e65d18 commit 973bbf9
Show file tree
Hide file tree
Showing 22 changed files with 1,191 additions and 1,125 deletions.
14 changes: 5 additions & 9 deletions app/code/Magento/Backend/Block/Menu.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,15 +456,11 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])

$id = $this->getJsId($menuItem->getId());
$subMenu = $this->_addSubMenu($menuItem, $level, $limit, $id);
if (count($menu) > 1 || $level != 1 || $menuItem->getUrl() !== '#') {
$output .= '<li ' . $this->getUiId($menuItem->getId())
. ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass($menuItem, $level)
. ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
. '" role="menu-item">' . $this->_renderAnchor($menuItem, $level) . $subMenu . '</li>';
} else {
$output .= $subMenu;
}

$anchor = $this->_renderAnchor($menuItem, $level);
$output .= '<li ' . $this->getUiId($menuItem->getId())
. ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass($menuItem, $level)
. ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
. '" role="menu-item">' . $anchor . $subMenu . '</li>';
$itemPosition++;
}

Expand Down
67 changes: 39 additions & 28 deletions .../view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,55 @@
/* @var $block \Magento\Framework\View\Element\Template */
?>
<div id="<?php echo $block->getNameInLayout() ?>" style="display: none" data-role="dialog" data-id="affected-attribute-set-selector">
<form action="">

<form action="" class="affected-attribute-set">
<div class="messages">
<div class="message message-notice notice">
<div><?php echo __("Product template comprising all selected configurable attributes need to be in order to save generated variations.") ?></div>
<div>
<?php echo __("Product template comprising all selected configurable attributes need to be in order to save generated variations.") ?>
</div>
</div>
<div class="message message-error error" style="display: none"></div>
</div>
<div class="admin__scope-old">
<fieldset class="fieldset">
<div class="field" id="affected-attribute-set-current-container" data-role="container" data-id="current-attribute-set">
<div class="control">
<input type="radio" id="affected-attribute-set-current" name="affected-attribute-set" value="current" checked="checked" />
<label class="label" for="affected-attribute-set-current">
<span><?php echo __('Add configurable attributes to the current set ("<span data-role="name-container">%1</span>")', $block->getLayout()->getBlock('product_edit')->getAttributeSetName())?></span>
</label>
</div>
<fieldset class="admin__fieldset">
<div class="admin__field" id="affected-attribute-set-current-container" data-role="container" data-id="current-attribute-set">
<div class="admin__field admin__field-option">
<input type="radio"
id="affected-attribute-set-current"
name="affected-attribute-set"
value="current"
checked="checked"
class="admin__control-radio"/>
<label class="admin__field-label" for="affected-attribute-set-current">
<span><?php echo __('Add configurable attributes to the current set ("<span data-role="name-container">%1</span>")', $block->getLayout()->getBlock('product_edit')->getAttributeSetName()) ?></span>
</label>
</div>
</div>

<div class="field" id="affected-attribute-set-new-container">
<div class="control">
<input type="radio" id="affected-attribute-set-new" name="affected-attribute-set" value="new" />
<label class="label" for="affected-attribute-set-new">
<span><?php echo __('Add configurable attributes to the new set based on current')?></span>
</label>
</div>
<div class="admin__field admin__field-option" id="affected-attribute-set-new-container">
<div class="control">
<input type="radio"
id="affected-attribute-set-new"
name="affected-attribute-set"
value="new"
class="admin__control-radio"/>
<label class="admin__field-label" for="affected-attribute-set-new">
<span><?php echo __('Add configurable attributes to the new set based on current')?></span>
</label>
</div>
</div>

<div class="field required" id="affected-attribute-set-new-name-container" style="display: none">
<label class="label" for="new-attribute-set-name">
<span><?php echo __('New product template name')?></span>
</label>
<div class="admin__field _required" id="affected-attribute-set-new-name-container" style="display: none">
<label class="admin__field-label" for="new-attribute-set-name">
<span><?php echo __('New product template name')?></span>
</label>

<div class="control">
<input id="new-attribute-set-name" name="new-attribute-set-name" type="text" class="input-text required-entry validate-no-html-tags" />
</div>
<div class="admin__field-control">
<input id="new-attribute-set-name"
name="new-attribute-set-name"
type="text"
class="admin__control-text required-entry validate-no-html-tags"/>
</div>
</fieldset>
</div>
</div>
</fieldset>
</form>
</div>
2 changes: 1 addition & 1 deletion app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ require([
renderPaths: function(paths, fieldId) {
var field = $(fieldId);
if (field) {
field.down('div').update(this.parsePath(paths, '<span class="path-delimiter">&nbsp;-&gt;&nbsp;</span>', '<br />'));
field.down('div').down('div').update(this.parsePath(paths, '<span class="path-delimiter">&nbsp;-&gt;&nbsp;</span>', '<br />'));
}
},

Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
<update handle="multishipping_checkout"/>
<head>
<title>Success Page</title>
</head>
Expand Down
8 changes: 8 additions & 0 deletions app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,14 @@
z-index: @menu-overlay__z-index;
}

// Hide submenu group section title for only one group in submenu
.submenu-group-title {
.column:only-child .level-1:only-child > &,
.submenu-title ~ ul > .level-1:only-child > & {
display: none;
}
}

//
// Tablets
// _____________________________________________
Expand Down
3 changes: 0 additions & 3 deletions ...nhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@
border: 0;
margin: 0;
padding: 0;
.actions {
display: none;
}
}
.fieldset-wrapper-content {
padding-bottom: @collapsible-title__padding-bottom;
Expand Down
1 change: 1 addition & 0 deletions app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@import 'module/components/_navigation-bar.less'; // Navigation Bar
@import 'module/components/_grid.less'; // Grid styles
@import 'module/components/_currency-addon.less'; // Currency Addon Styles
@import 'module/components/_attributes_template_popup.less'; // Choose Affected Product Template popup

// Main Steps
@import 'module/steps/_select-attributes.less';
Expand Down
13 changes: 13 additions & 0 deletions ...ento_ConfigurableProduct/web/css/source/module/components/_attributes_template_popup.less
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// /**
// * Copyright © 2015 Magento. All rights reserved.
// * See COPYING.txt for license details.
// */

.affected-attribute-set {
.admin__fieldset {
margin: @indent__base 0 0 @indent__l;
.admin__field {
&:extend(.abs-field-rows all);
}
}
}
15 changes: 10 additions & 5 deletions app/design/adminhtml/Magento/backend/Magento_Shipping/web/css/source/_module.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
margin: 0 0 @indent__s;
}
.admin__control-select {
width: 13rem;
&.measures {
width: 9rem;
}
Expand Down Expand Up @@ -82,18 +81,24 @@
}
}
}
.col-total-weight {
.admin__control-text {
margin: 0 0 .5rem;
.admin__control-table {
input {
line-height: 2.2rem;
width: 8rem;
}
}
.col-total-weight,
.col-custom {
white-space: nowrap;
}
.col-qty-edit {
.admin__control-text {
&:extend(.abs-control-qty all);
}
}
.col-actions {
width: 13rem;
padding-right: 1.5rem;
white-space: nowrap;
.action-delete {
padding-top: 0;
}
Expand Down
4 changes: 4 additions & 0 deletions app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,8 @@
}
}
}
.action-menu {
max-height: 45rem;
overflow-y: auto;
}
}
6 changes: 6 additions & 0 deletions app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,12 @@

.magento_content {
height: auto !important;
.buttons-set {
margin: 0 0 15px;
button {
margin-right: 4px;
}
}
}

.magento_buttons {
Expand Down
46 changes: 5 additions & 41 deletions app/design/adminhtml/Magento/backend/web/css/styles-old.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2668,14 +2668,6 @@ input.no-display,

// Content

.field-store_default_content .buttons-set {
margin-bottom: 9px;
}

.field-store_default_content .buttons-set button {
margin-right: 4px;
}

.field-store_0_content_use input[type="checkbox"] {
margin-right: 8px;
position: relative;
Expand All @@ -2701,10 +2693,6 @@ input.no-display,
padding-bottom: 10px;
}

.cms-hierarchy .buttons-set {
margin-bottom: 10px;
}

.cms-hierarchy .cms-hierarchy-tree {
width: 48.93617020799999%;
float: left;
Expand Down Expand Up @@ -2748,34 +2736,12 @@ input.no-display,
margin-top: 6px;
}

//
// CMS -> Static Blocks
// --------------------------------------


#buttonsblock_content.buttons-set {
margin-bottom: 9px;
}

#buttonsblock_content.buttons-set button {
margin-right: 4px;
}

//
// CMS -> Manage Content
// --------------------------------------


// Content

.cms-manage-content-actions .buttons-set {
margin-bottom: 9px;
}

.cms-manage-content-actions .buttons-set button {
margin-right: 4px;
}

.cms-manage-content-actions textarea {
width: 100%;
}
Expand Down Expand Up @@ -4394,13 +4360,11 @@ input.no-display,
}
}

[class^=' newsletter-'] {
.admin__scope-old {
.buttons-set {
margin: 0 0 15px;
button {
margin-right: 4px;
}
.admin__scope-old {
.buttons-set {
margin: 0 0 15px;
button {
margin-right: 4px;
}
}
}
Expand Down
Loading

0 comments on commit 973bbf9

Please sign in to comment.