Skip to content

Commit

Permalink
Merge pull request #718 from magento-webdev/PR-2
Browse files Browse the repository at this point in the history 
[WebDev] Bugfixes
  • Loading branch information
Korshenko, Olexii(okorshenko) committed Oct 14, 2015
2 parents 94437f2 + 1db2bf2 commit 9ae5bba
Show file tree
Hide file tree
Showing 21 changed files with 245 additions and 269 deletions.
4 changes: 3 additions & 1 deletion app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="content">
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main" name="adminhtml.catalog.product.set.edit" template="catalog/product/attribute/set/main.phtml"/>
<container name="adminhtml.catalog.product.set.edit.wrapper" htmlTag="div" htmlClass="admin__scope-old"><!-- @todo ui: remove arguments within .admin__scope-old -->
<block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main" name="adminhtml.catalog.product.set.edit" template="catalog/product/attribute/set/main.phtml"/>
</container>
</referenceContainer>
</body>
</page>
16 changes: 0 additions & 16 deletions ...figurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,6 @@
</div>
</fieldset>
</div>

<button type="button"
class="action-close"
data-role="close-panel"
title="<?= $block->escapeHtml(__('Close panel')) ?>">
<span><?= /* @escapeNotVerified */ __('Close panel') ?></span>
</button>
<div class="image-pointer"></div>
</div>
</script>

Expand Down Expand Up @@ -441,14 +433,6 @@
</div>
</fieldset>
</div>

<button type="button"
class="action-close"
data-role="close-panel"
title="<?= $block->escapeHtml(__('Close panel')) ?>">
<span><?= /* @escapeNotVerified */ __('Close panel') ?></span>
</button>
<div class="image-pointer"></div>
</div>
</script>

Expand Down
322 changes: 154 additions & 168 deletions app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
View file

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions app/code/Magento/Shipping/view/adminhtml/web/js/packages.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/

define([
'jquery',
'Magento_Ui/js/modal/modal',
'mage/translate'
], function ($, modal, $t) {
'use strict';

return function (config, element) {
config.buttons = [
{
text: $t('Print'),
'class': 'action action-primary',

/**
* Click handler
*/
click: function () {
window.location.href = this.options.url;
}
}, {
text: $t('Cancel'),
'class': 'action action-secondary',

/**
* Click handler
*/
click: function () {
this.closeModal();
}
}
];
modal(config, element);
};
});
32 changes: 0 additions & 32 deletions ...Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_bulk-images.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,16 +361,6 @@
top: 5px;
}

.image-pointer {
background: url(../Magento_Backend/images/gallery-image-panel-corner.png) no-repeat;
height: 15px;
left: 50%;
margin-left: -14px;
position: absolute;
top: -11px;
width: 28px;
}

.image-panel-controls,
.image-panel-preview {
float: left;
Expand Down Expand Up @@ -431,28 +421,6 @@
width: 100%;
}

.image-panel {
.action-close {
padding: 0;
position: absolute;
right: 29px;
top: 17px;
.lib-icon-font(
@_icon-font-content: @icon-close-mage__content,
@_icon-font: @icons-admin__font-name,
@_icon-font-size: 2rem,
@_icon-font-color: @color-brownie-vanilla,
@_icon-font-color-hover: @color-brownie-vanilla
);
span {
&:extend(.abs-visually-hidden all);
}
&:active {
padding: 0;
}
}
}

//
// Custom Multiselect
// _____________________________________________
Expand Down
3 changes: 2 additions & 1 deletion ...esign/adminhtml/Magento/backend/web/app/setup/styles/less/components/_navigation-bar.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@
// ---------------------------------------------

.nav {
.extend__clearer();
background-color: @nav__background-color;
border-bottom: 1px solid @nav__border-color;
border-top: 1px solid @nav__border-color;
.extend__clearer();
display: none;
margin-bottom: @nav-bar__indent-top;
padding: @nav-bar-dot__size @nav__indent-right 0 0;
}

Expand Down
3 changes: 3 additions & 0 deletions ...gn/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
margin-left: -(@tooltip-arrow__size / 2);
padding: 0 @tooltip-arrow__size;
}
p:last-child {
margin-bottom: 0;
}
}

// Wrapper for the tooltip content
Expand Down
3 changes: 1 addition & 2 deletions app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@
);
color: @btn-prime__color;
}
&:active,
&:focus {
&:active {
.lib-background-gradient(
@_background-gradient: true,
@_background-gradient-direction: horizontal,
Expand Down
3 changes: 3 additions & 0 deletions app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_structures.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
// * See COPYING.txt for license details.
// */

body:not([class]) {
min-width: 0;
}
.container {
display: block;
margin: 0 auto 4rem;
Expand Down
2 changes: 1 addition & 1 deletion app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
// ---------------------------------------------

@container__width: 100rem;
@container__indent: 2rem;
@container__indent: 0;

@content__indent: @indent__l;

Expand Down
10 changes: 8 additions & 2 deletions app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_readiness-check.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@
// Sizes

@readiness-check-side__width: 22rem;
@readiness-check-content__indent: 7.5rem;
@readiness-check-content__indent: 5.7rem;

//
// Common
// ---------------------------------------------

.readiness-check-item {
margin-bottom: 4rem;
min-height: 2.5rem;
.spinner {
font-size: 2.5rem;
float: left;
margin: -.4rem 0 0 1.7rem;
}
}

.readiness-check-title {
Expand Down Expand Up @@ -49,7 +55,7 @@

.readiness-check-icon {
float: left;
margin-left: 2rem;
margin-left: 1.7rem;
margin-top: .7rem;
}

Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
// Updater pages
@import '../../../updater/styles/less/pages/_common.less';
@import '../../../updater/styles/less/pages/_home.less';
@import '../../../updater/styles/less/pages/_readiness-check.less';
@import '../../../updater/styles/less/pages/_component-manager.less';
@import '../../../updater/styles/less/pages/_login.less';

Expand Down
23 changes: 0 additions & 23 deletions app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_readiness-check.less
View file

This file was deleted.

9 changes: 9 additions & 0 deletions app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,15 @@ option:empty {
}
}

//
// Service text or control. Can be used to add text or "Use Default Value" checkbox
// ---------------------------------------------

.admin__control-service {
float: left;
margin: .8rem 0 0 3rem;
}

//
// Textarea
// ---------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,20 +194,20 @@ protected function _optionToHtml($option)
{
$id = $this->getHtmlId() . '_' . $this->_escape($option['value']);

$html = '<div class="field choice"><input id="' . $id . '"';
$html = '<div class="field choice admin__field admin__field-option"><input id="' . $id . '"';
foreach ($this->getHtmlAttributes() as $attribute) {
if ($value = $this->getDataUsingMethod($attribute, $option['value'])) {
$html .= ' ' . $attribute . '="' . $value . '"';
$html .= ' ' . $attribute . '="' . $value . '" class="admin__control-checkbox"';
}
}
$html .= ' value="' .
$option['value'] .
'" />' .
' <label for="' .
$id .
'">' .
'" class="admin__field-label"><span>' .
$option['label'] .
'</label></div>' .
'</span></label></div>' .
"\n";
return $html;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/Data/Form/Element/Note.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function getElementHtml()
$html = $this->getBeforeElementHtml()
. '<div id="'
. $this->getHtmlId()
. '" class="control-value">'
. '" class="control-value admin__field-value">'
. $this->getText()
. '</div>'
. $this->getAfterElementHtml();
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function testGetElementHtml()
$this->_model->setValue('Note Text');
$html = $this->_model->getElementHtml();
$this->assertEquals(
"note_before<div id=\"note_id\" class=\"control-value\"></div>note_after",
"note_before<div id=\"note_id\" class=\"control-value admin__field-value\"></div>note_after",
$html
);
}
Expand Down
2 changes: 1 addition & 1 deletion setup/pub/styles/setup.css
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions setup/view/magento/setup/home.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@
?>

<section class="home-page-inner-wrap ng-scope">
<p class="upgrade-home-title">
<p class="setup-home-title">
Welcome to the Magento Setup Tool. Please choose a task below.
</p>

<div class="row" style="padding-left: 145px;" >
<div class="col-m-4">
<a href="" class="upgrade-home-item upgrade-home-item-component" ui-sref="root.update">
<span class="upgrade-home-item-title">Component Manager</span>
<span class="upgrade-home-item-description">I want to manage my packages and modules.</span>
<a href="" class="setup-home-item setup-home-item-component" ui-sref="root.update">
<span class="setup-home-item-title">Component Manager</span>
<span class="setup-home-item-description">I want to manage my packages and modules.</span>
</a>
</div>
<div class="col-m-4">
<a href="" class="upgrade-home-item upgrade-home-item-upgrade" ui-sref="root.upgrade">
<span class="upgrade-home-item-title">System Upgrade</span>
<span class="upgrade-home-item-description">I want to upgrade my Magento Admin version.</span>
<a href="" class="setup-home-item setup-home-item-upgrade" ui-sref="root.upgrade">
<span class="setup-home-item-title">System Upgrade</span>
<span class="setup-home-item-description">I want to upgrade my Magento Admin version.</span>
</a>
</div>
<div class="col-m-4">
<a href="" class="upgrade-home-item upgrade-home-item-configuration" ui-sref="root.system-config">
<span class="upgrade-home-item-title">System Configuration</span>
<span class="upgrade-home-item-description">I want to change my Magento system configurations.</span>
<a href="" class="setup-home-item setup-home-item-configuration" ui-sref="root.system-config">
<span class="setup-home-item-title">System Configuration</span>
<span class="setup-home-item-description">I want to change my Magento system configurations.</span>
</a>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions setup/view/magento/setup/navigation/menu.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

</head>

<div>
<nav ng-controller="navigationController" id="menu" class="nav ng-scope show"

<nav ng-controller="navigationController" id="menu" class="nav ng-scope show"
ng-hide="$state.current.noMenu || $state.current.main || $state.current.default">
<ul class="nav-bar">
<li ng-repeat="menuState in menu | filter: {type: $state.current.type}:true"
Expand All @@ -29,4 +29,4 @@
</li>
</ul>
</nav>
</div>

4 changes: 2 additions & 2 deletions setup/view/magento/setup/select-version.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
*/
?>

<h2 class="page-title">{{$state.current.header}}</h2>

<div class="nav-bar-outer-actions">

<div class="outer-actions-inner-wrap">
Expand All @@ -30,6 +28,8 @@
</div>
</div>

<h2 class="page-sub-title">{{$state.current.header}}</h2>

<div class="row form-row">
<div class="message message-spinner" ng-show="!upgradeProcessed">
<span class="spinner">
Expand Down

0 comments on commit 9ae5bba

Please sign in to comment.