+
-
diff --git a/app/code/Mage/AdminNotification/view/adminhtml/system/messages.phtml b/app/code/Mage/AdminNotification/view/adminhtml/system/messages.phtml
new file mode 100644
index 0000000000000..cebf108bc8b3e
--- /dev/null
+++ b/app/code/Mage/AdminNotification/view/adminhtml/system/messages.phtml
@@ -0,0 +1,49 @@
+
+
+
+getLastCritical();?>
+
+
diff --git a/app/code/Mage/AdminNotification/view/adminhtml/system/messages/popup.phtml b/app/code/Mage/AdminNotification/view/adminhtml/system/messages/popup.phtml
new file mode 100644
index 0000000000000..4cb41f72c420b
--- /dev/null
+++ b/app/code/Mage/AdminNotification/view/adminhtml/system/messages/popup.phtml
@@ -0,0 +1,43 @@
+
+
+
+
+ getUnreadMessages() as $message): ?>
+
+ getText();?>
+
+
+
+
+
diff --git a/app/code/Mage/AdminNotification/view/adminhtml/system/notification.js b/app/code/Mage/AdminNotification/view/adminhtml/system/notification.js
new file mode 100644
index 0000000000000..c9da34d50563e
--- /dev/null
+++ b/app/code/Mage/AdminNotification/view/adminhtml/system/notification.js
@@ -0,0 +1,73 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/*jshint jquery:true*/
+(function ($) {
+ $.template(
+ 'systemMessageDialog',
+ '
{{html text}} '
+ );
+
+ $.widget('mage.systemMessageDialog', $.ui.dialog, {
+ options: {
+ systemMessageTemplate: 'systemMessageDialog'
+ },
+ open: function(severity) {
+ var superMethod = $.proxy(this._super, this);
+ $.ajax({
+ url: this.options.ajaxUrl,
+ type: 'GET',
+ data: {severity: severity}
+ }).done($.proxy(function(data) {
+ this.element.html(
+ $('
', {'class': "message-system-list"}).append(
+ $.tmpl(this.options.systemMessageTemplate, data)
+ )
+ ).trigger('contentUpdated');
+ superMethod();
+ }, this));
+ return this;
+ }
+ });
+
+ $(document).ready(function(){
+ $('body').on('surveyYes surveyNo', function(e, data) {
+ if (e.type == 'surveyYes') {
+ var win = window.open(data.surveyUrl, '', 'width=900,height=600,resizable=1,scrollbars=1');
+ win.focus();
+ }
+ $.ajax({
+ url: data.surveyAction,
+ type: 'post',
+ data: {decision: data.decision}
+ })
+ });
+
+ $('#system_messages .message-system-short .error').on('click', function() {
+ $('#message-system-all').systemMessageDialog('open', 1);
+ });
+ $('#system_messages .message-system-short .warning').on('click', function() {
+ $('#message-system-all').systemMessageDialog('open', 2);
+ });
+ });
+})(jQuery);
+
diff --git a/app/code/Mage/AdminNotification/view/adminhtml/toolbar_entry.js b/app/code/Mage/AdminNotification/view/adminhtml/toolbar_entry.js
new file mode 100644
index 0000000000000..56652a04d90fe
--- /dev/null
+++ b/app/code/Mage/AdminNotification/view/adminhtml/toolbar_entry.js
@@ -0,0 +1,118 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Mage
+ * @package Mage_AdminNotification
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+(function($) {
+ 'use strict';
+ $(document).ready(function() {
+ // Mark notification as read via AJAX call
+ var markNotificationAsRead = function(notificationId) {
+ var requestUrl = $('.notifications .dropdown-menu').attr('data-mark-as-read-url');
+ $.ajax({
+ url: requestUrl,
+ type: 'POST',
+ dataType: 'json',
+ data: {
+ id: notificationId
+ },
+ showLoader: false
+ });
+ };
+
+ // Remove notification from the list
+ var removeNotificationFromList = function(notificationEntry) {
+ notificationEntry.remove();
+ var notificationCount = $('.notifications').attr('data-notification-count');
+ notificationCount--;
+ $('.notifications').attr('data-notification-count', notificationCount);
+
+ if (notificationCount == 0) {
+ // Change appearance of the bubble and its behavior when the last notification is removed
+ $('.notifications .dropdown-menu').remove();
+ var notificationIcon = $('.notifications .notifications-icon');
+ notificationIcon.removeAttr('data-toggle');
+ notificationIcon.off('click.dropdown');
+ $('.notifications .notifications-icon .value').text('');
+ } else {
+ $('.notifications .notifications-icon .value').text(notificationCount);
+ // Modify caption of the 'See All' link
+ var actionElement = $('.notifications .dropdown-menu .last .action-more');
+ actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
+ }
+ };
+
+ // Show popup with notification details
+ var showNotificationDetails = function(notificationEntry) {
+ var popupElement = notificationEntry.find('.notification-dialog-content').clone();
+ var notificationId = notificationEntry.attr('data-notification-id');
+ var dialogClassSeverity = 'notification-entry-dialog';
+ if (notificationEntry.attr('data-notification-severity')) {
+ dialogClassSeverity = 'notification-entry-dialog notification-entry-dialog-critical';
+ }
+ popupElement.dialog({
+ title: popupElement.attr('data-title'),
+ minWidth: 500,
+ modal: true,
+ dialogClass: dialogClassSeverity,
+ buttons: [
+ {
+ text: popupElement.attr('data-acknowledge-caption'),
+ 'class': 'action-acknowledge primary',
+ click: function(event) {
+ markNotificationAsRead(notificationId);
+ removeNotificationFromList(notificationEntry);
+ $(this).dialog('close');
+ }
+ },
+ {
+ text: popupElement.attr('data-cancel-caption'),
+ 'class': 'action-cancel',
+ click: function(event) {
+ $(this).dialog('close');
+ }
+ }
+ ]
+ });
+ popupElement.parent().attr('aria-live','assertive');
+ popupElement.dialog('open');
+ };
+
+ // Show notification description when corresponding item is clicked
+ $('.notifications .dropdown-menu .notification-entry').on('click.showNotification', function(event) {
+ // hide notification dropdown
+ $('.notifications .notifications-icon').trigger('click.dropdown');
+ showNotificationDetails($(this));
+ event.stopPropagation();
+ });
+
+ // Remove corresponding notification from the list and mark it as read
+ $('.notifications .dropdown-menu .notification-entry .action-close').on('click.removeNotification', function(event) {
+ var notificationEntry = $(this).closest('.notification-entry')
+ var notificationId = notificationEntry.attr('data-notification-id');
+ markNotificationAsRead(notificationId);
+ removeNotificationFromList(notificationEntry);
+ event.stopPropagation();
+ });
+ });
+})(window.jQuery);
diff --git a/app/code/Mage/AdminNotification/view/adminhtml/toolbar_entry.phtml b/app/code/Mage/AdminNotification/view/adminhtml/toolbar_entry.phtml
new file mode 100644
index 0000000000000..9ddcb02645179
--- /dev/null
+++ b/app/code/Mage/AdminNotification/view/adminhtml/toolbar_entry.phtml
@@ -0,0 +1,63 @@
+
+
+getUnreadNotificationCount(); ?>
+
diff --git a/app/code/Mage/Adminhtml/Block/Api/Buttons.php b/app/code/Mage/Adminhtml/Block/Api/Buttons.php
index 1f8e478523f14..eb11dab8a66e6 100644
--- a/app/code/Mage/Adminhtml/Block/Api/Buttons.php
+++ b/app/code/Mage/Adminhtml/Block/Api/Buttons.php
@@ -42,11 +42,13 @@ protected function _prepareLayout()
'onclick' => 'window.location.reload()'
));
- $this->addChild('saveButton', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Save Role'),
+ $this->addChild('saveButton', 'Mage_Backend_Block_Widget_Button', array(
+ 'label' => Mage::helper('Mage_User_Helper_Data')->__('Save Role'),
'class' => 'save',
- 'data_attr' => array(
- 'widget-button' => array('event' => 'save', 'related' => '#role-edit-form')
+ 'data_attribute' => array(
+ 'mage-init' => array(
+ 'button' => array('event' => 'save', 'target' => '#role-edit-form')
+ )
)
));
diff --git a/app/code/Mage/Adminhtml/Block/Api/Grid/Role.php b/app/code/Mage/Adminhtml/Block/Api/Grid/Role.php
index 66f3f11a7d7eb..d891b4e7dd30e 100644
--- a/app/code/Mage/Adminhtml/Block/Api/Grid/Role.php
+++ b/app/code/Mage/Adminhtml/Block/Api/Grid/Role.php
@@ -62,7 +62,7 @@ protected function _prepareColumns()
));
$this->addColumn('role_name', array(
- 'header' =>Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Name'),
+ 'header' =>Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role'),
'index' =>'role_name'
));
diff --git a/app/code/Mage/Adminhtml/Block/Api/Role/Grid/User.php b/app/code/Mage/Adminhtml/Block/Api/Role/Grid/User.php
index f220af82959b6..b5363d8d5ec8f 100644
--- a/app/code/Mage/Adminhtml/Block/Api/Role/Grid/User.php
+++ b/app/code/Mage/Adminhtml/Block/Api/Role/Grid/User.php
@@ -47,7 +47,7 @@ protected function _construct()
protected function _addColumnFilterToCollection($column)
{
if ($column->getId() == 'in_role_users') {
- $inRoleIds = $this->_getUsers();
+ $inRoleIds = $this->getUsers();
if (empty($inRoleIds)) {
$inRoleIds = 0;
}
@@ -81,7 +81,7 @@ protected function _prepareColumns()
'header_css_class' => 'a-center',
'type' => 'checkbox',
'name' => 'in_role_users',
- 'values' => $this->_getUsers(),
+ 'values' => $this->getUsers(),
'align' => 'center',
'index' => 'user_id'
));
@@ -154,7 +154,7 @@ public function getGridUrl()
return $this->getUrl('*/*/editrolegrid', array('rid' => $roleId));
}
- protected function _getUsers($json=false)
+ public function getUsers($json=false)
{
if ( $this->getRequest()->getParam('in_role_user') != "" ) {
return $this->getRequest()->getParam('in_role_user');
diff --git a/app/code/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php b/app/code/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
index 2acc4d1ec6983..6f32f01b7663b 100644
--- a/app/code/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
+++ b/app/code/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
@@ -56,46 +56,46 @@ protected function _construct() {
//->assign('checkedResources', join(',', $selrids));
}
+ /**
+ * Get is everything allowed
+ *
+ * @return bool
+ */
public function getEverythingAllowed()
{
return in_array('all', $this->getSelectedResources());
}
- public function getResTreeJson()
+ /**
+ * Get Resource Tree
+ *
+ * @return array
+ */
+ public function getTree()
{
- $rid = Mage::app()->getRequest()->getParam('rid', false);
- $resources = Mage::getModel('Mage_Api_Model_Roles')->getResourcesTree();
-
- $rootArray = $this->_getNodeJson($resources,1);
-
- $json = Mage::helper('Mage_Core_Helper_Data')->jsonEncode(isset($rootArray['children']) ? $rootArray['children'] : array());
-
- return $json;
- }
-
- protected function _sortTree($a, $b)
- {
- return $a['sort_order']<$b['sort_order'] ? -1 : ($a['sort_order']>$b['sort_order'] ? 1 : 0);
+ $resource = Mage::getModel('Mage_Api_Model_Roles')->getResourcesTree();
+ $rootArray = $this->_mapResources($resource);
+ return $rootArray['children'];
}
-
- protected function _getNodeJson($node, $level=0)
+ /**
+ * Map resources
+ *
+ * @param $resources
+ * @return array
+ */
+ protected function _mapResources($resources)
{
$item = array();
- $selres = $this->getSelectedResources();
- if ($level != 0) {
- $item['text']= (string)$node->title;
- $item['sort_order']= isset($node->sort_order) ? (string)$node->sort_order : 0;
- $item['id'] = (string)$node->attributes()->aclpath;
+ $item['data'] = (string)$resources->title;
+ $item['sort_order']= isset($resources->sort_order) ? (string)$resources->sort_order : 0;
+ $item['attr']['data-id'] = (string)$resources->attributes()->aclpath;
- if (in_array($item['id'], $selres))
- $item['checked'] = true;
- }
- if (isset($node->children)) {
- $children = $node->children->children();
+ if (isset($resources->children)) {
+ $children = $resources->children->children();
} else {
- $children = $node->children();
+ $children = $resources->children();
}
if (empty($children)) {
return $item;
@@ -103,14 +103,10 @@ protected function _getNodeJson($node, $level=0)
if ($children) {
$item['children'] = array();
- //$item['cls'] = 'fiche-node';
foreach ($children as $child) {
- if ($child->getName()!='title' && $child->getName()!='sort_order' && $child->attributes()->module) {
- if ($level != 0) {
- $item['children'][] = $this->_getNodeJson($child, $level+1);
- } else {
- $item = $this->_getNodeJson($child, $level+1);
- }
+ if ($child->getName() != 'title' && $child->getName() != 'sort_order' && $child->attributes()->module) {
+ $item['state'] = 'open';
+ $item['children'][] = $this->_mapResources($child);
}
}
if (!empty($item['children'])) {
@@ -119,4 +115,16 @@ protected function _getNodeJson($node, $level=0)
}
return $item;
}
+
+ /**
+ * Sort tree by sort order
+ *
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+ protected function _sortTree($a, $b)
+ {
+ return $a['sort_order'] < $b['sort_order'] ? -1 : ($a['sort_order'] > $b['sort_order'] ? 1 : 0);
+ }
}
diff --git a/app/code/Mage/Adminhtml/Block/Api/User.php b/app/code/Mage/Adminhtml/Block/Api/User.php
index 54f560c56e1f0..45a74863b51c7 100644
--- a/app/code/Mage/Adminhtml/Block/Api/User.php
+++ b/app/code/Mage/Adminhtml/Block/Api/User.php
@@ -31,7 +31,7 @@
* @package Mage_Adminhtml
* @author Magento Core Team
*/
-class Mage_Adminhtml_Block_Api_User extends Mage_Adminhtml_Block_Widget_Grid_Container
+class Mage_Adminhtml_Block_Api_User extends Mage_Backend_Block_Widget_Grid_Container
{
protected function _construct()
diff --git a/app/code/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php b/app/code/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
index 3dddfc4617796..ae98311993565 100644
--- a/app/code/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
+++ b/app/code/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
@@ -41,7 +41,7 @@ protected function _construct()
protected function _addColumnFilterToCollection($column)
{
if ($column->getId() == 'assigned_user_role') {
- $userRoles = $this->_getSelectedRoles();
+ $userRoles = $this->getSelectedRoles();
if (empty($userRoles)) {
$userRoles = 0;
}
@@ -76,7 +76,7 @@ protected function _prepareColumns()
'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Assigned'),
'type' => 'radio',
'html_name' => 'roles[]',
- 'values' => $this->_getSelectedRoles(),
+ 'values' => $this->getSelectedRoles(),
'align' => 'center',
'index' => 'role_id'
));
@@ -89,7 +89,7 @@ protected function _prepareColumns()
));*/
$this->addColumn('role_name', array(
- 'header' =>Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Name'),
+ 'header' =>Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role'),
'index' =>'role_name'
));
@@ -101,7 +101,7 @@ public function getGridUrl()
return $this->getUrl('*/*/rolesGrid', array('user_id' => Mage::registry('api_user')->getUserId()));
}
- protected function _getSelectedRoles($json=false)
+ public function getSelectedRoles($json=false)
{
if ( $this->getRequest()->getParam('user_roles') != "" ) {
return $this->getRequest()->getParam('user_roles');
diff --git a/app/code/Mage/Adminhtml/Block/Api/User/Grid.php b/app/code/Mage/Adminhtml/Block/Api/User/Grid.php
deleted file mode 100644
index 0e635df67223b..0000000000000
--- a/app/code/Mage/Adminhtml/Block/Api/User/Grid.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- */
-class Mage_Adminhtml_Block_Api_User_Grid extends Mage_Adminhtml_Block_Widget_Grid
-{
-
- protected function _construct()
- {
- parent::_construct();
- $this->setId('permissionsUserGrid');
- $this->setDefaultSort('username');
- $this->setDefaultDir('asc');
- $this->setUseAjax(true);
- }
-
- protected function _prepareCollection()
- {
- $collection = Mage::getResourceModel('Mage_Api_Model_Resource_User_Collection');
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
- $this->addColumn('user_id', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('ID'),
- 'width' => 5,
- 'align' => 'right',
- 'sortable' => true,
- 'index' => 'user_id'
- ));
-
- $this->addColumn('username', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('User Name'),
- 'index' => 'username'
- ));
-
- $this->addColumn('firstname', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('First Name'),
- 'index' => 'firstname'
- ));
-
- $this->addColumn('lastname', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Last Name'),
- 'index' => 'lastname'
- ));
-
- $this->addColumn('email', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Email'),
- 'width' => 40,
- 'align' => 'left',
- 'index' => 'email'
- ));
-
- $this->addColumn('is_active', array(
- 'header' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Status'),
- 'index' => 'is_active',
- 'type' => 'options',
- 'options' => array('1' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Active'), '0' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Inactive')),
- ));
-
- return parent::_prepareColumns();
- }
-
- public function getRowUrl($row)
- {
- return $this->getUrl('*/*/edit', array('user_id' => $row->getId()));
- }
-
- public function getGridUrl()
- {
- //$uid = $this->getRequest()->getParam('user_id');
- return $this->getUrl('*/*/roleGrid', array());
- }
-
-}
diff --git a/app/code/Mage/Adminhtml/Block/Cache/Grid.php b/app/code/Mage/Adminhtml/Block/Cache/Grid.php
deleted file mode 100644
index ddf2cd2fb11c8..0000000000000
--- a/app/code/Mage/Adminhtml/Block/Cache/Grid.php
+++ /dev/null
@@ -1,172 +0,0 @@
-setId('cache_grid');
- $this->setFilterVisibility(false);
- $this->setPagerVisibility(false);
- $this->_invalidatedTypes = Mage::app()->getCacheInstance()->getInvalidatedTypes();
- }
-
- /**
- * Prepare grid collection
- */
- protected function _prepareCollection()
- {
- $collection = new Varien_Data_Collection();
- foreach (Mage::app()->getCacheInstance()->getTypes() as $type) {
- $collection->addItem($type);
- }
- $this->setCollection($collection);
- return parent::_prepareCollection();
- }
-
- /**
- * Prepare grid columns
- */
- protected function _prepareColumns()
- {
- $baseUrl = $this->getUrl();
- $this->addColumn('cache_type', array(
- 'header' => $this->__('Cache Type'),
- 'width' => '180',
- 'align' => 'left',
- 'index' => 'cache_type',
- 'sortable' => false,
- ));
-
- $this->addColumn('description', array(
- 'header' => $this->__('Description'),
- 'align' => 'left',
- 'index' => 'description',
- 'sortable' => false,
- ));
-
- $this->addColumn('tags', array(
- 'header' => $this->__('Associated Tags'),
- 'align' => 'left',
- 'index' => 'tags',
- 'width' => '180',
- 'sortable' => false,
- ));
-
- $this->addColumn('status', array(
- 'header' => $this->__('Status'),
- 'width' => '120',
- 'align' => 'left',
- 'index' => 'status',
- 'type' => 'options',
- 'options' => array(0 => $this->__('Disabled'), 1 => $this->__('Enabled')),
- 'frame_callback' => array($this, 'decorateStatus')
- ));
-
-// $this->addColumn('action',
-// array(
-// 'header' => $this->__('Action'),
-// 'width' => '100',
-// 'type' => 'action',
-// 'getter' => 'getId',
-// 'actions' => array(
-// array(
-// 'caption' => $this->__('Refresh'),
-// 'url' => array('base'=> '*/*/refresh'),
-// 'field' => 'type'
-// ),
-// ),
-// 'filter' => false,
-// 'sortable' => false,
-// 'is_system' => true,
-// ));
-
- return parent::_prepareColumns();
- }
-
- /**
- * Decorate status column values
- *
- * @return string
- */
- public function decorateStatus($value, $row, $column, $isExport)
- {
- $class = '';
- if (isset($this->_invalidatedTypes[$row->getId()])) {
- $cell = ''.$this->__('Invalidated').' '.$value.' '.$value.'
*/
-class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Front extends Mage_Adminhtml_Block_Widget_Form
+class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Front extends Mage_Backend_Block_Widget_Form
{
-
+ /**
+ * @inheritdoc
+ * @return $this
+ */
protected function _prepareForm()
{
- $model = Mage::registry('entity_attribute');
+ $attributeObject = Mage::registry('entity_attribute');
$form = new Varien_Data_Form(array('id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post'));
- $fieldset = $form->addFieldset('base_fieldset', array('legend'=>Mage::helper('Mage_Catalog_Helper_Data')->__('Frontend Properties')));
+ $yesnoSource = Mage::getModel('Mage_Backend_Model_Config_Source_Yesno')->toOptionArray();;
- $yesno = array(
- array(
- 'value' => 0,
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('No')
- ),
+ $fieldset = $form->addFieldset(
+ 'front_fieldset',
array(
- 'value' => 1,
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Yes')
- ));
-
+ 'legend'=>Mage::helper('Mage_Catalog_Helper_Data')->__('Frontend Properties'),
+ 'collapsable' => $this->getRequest()->has('popup'),
+ )
+ );
$fieldset->addField('is_searchable', 'select', array(
- 'name' => 'is_searchable',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Use in Quick Search'),
- 'title' => Mage::helper('Mage_Catalog_Helper_Data')->__('Use in Quick Search'),
- 'values' => $yesno,
+ 'name' => 'is_searchable',
+ 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Use in Quick Search'),
+ 'title' => Mage::helper('Mage_Catalog_Helper_Data')->__('Use in Quick Search'),
+ 'values' => $yesnoSource,
));
$fieldset->addField('is_visible_in_advanced_search', 'select', array(
'name' => 'is_visible_in_advanced_search',
'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Use in Advanced Search'),
'title' => Mage::helper('Mage_Catalog_Helper_Data')->__('Use in Advanced Search'),
- 'values' => $yesno,
+ 'values' => $yesnoSource,
));
$fieldset->addField('is_comparable', 'select', array(
'name' => 'is_comparable',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Comparable on the Frontend'),
- 'title' => Mage::helper('Mage_Catalog_Helper_Data')->__('Comparable on the Frontend'),
- 'values' => $yesno,
+ 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Comparable on Frontend'),
+ 'title' => Mage::helper('Mage_Catalog_Helper_Data')->__('Comparable on Frontend'),
+ 'values' => $yesnoSource,
));
-
$fieldset->addField('is_filterable', 'select', array(
'name' => 'is_filterable',
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__("Use in Layered NavigationProducts > Categories .', $this->getUrl('*/catalog_category')),
+ // @codingStandardsIgnoreEnd
));
$this->setForm($form);
}
+ /**
+ * Get parent category options
+ *
+ * @return array
+ */
+ protected function _getParentCategoryOptions()
+ {
+ $items = $this->_categoryFactory->create()
+ ->getCollection()
+ ->addAttributeToSelect('name')
+ ->addAttributeToSort('entity_id', 'ASC')
+ ->setPageSize(3)
+ ->load()
+ ->getItems();
+
+ return count($items) === 2
+ ? array($items[2]->getEntityId() => $items[2]->getName())
+ : array();
+ }
+
/**
* Category save action URL
*
@@ -80,7 +121,6 @@ public function getAfterElementHtml()
{
/** @var $coreHelper Mage_Core_Helper_Data */
$coreHelper = Mage::helper('Mage_Core_Helper_Data');
- $widgetUrl = $coreHelper->jsonEncode($this->getViewFileUrl('Mage_Catalog::js/new-category-dialog.js'));
$widgetOptions = $coreHelper->jsonEncode(array(
'suggestOptions' => array(
'source' => $this->getUrl('adminhtml/catalog_category/suggestCategories'),
@@ -93,10 +133,8 @@ public function getAfterElementHtml()
));
return <<
- head.js($widgetUrl, function () {
- jQuery(function($) { // waiting for page to load to have '#category_ids-template' available
- $('#new-category').mage('newCategoryDialog', $widgetOptions);
- });
+ jQuery(function($) { // waiting for page to load to have '#category_ids-template' available
+ $('#new-category').mage('newCategoryDialog', $widgetOptions);
});
HTML;
diff --git a/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php b/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
index cf09e5ec02da7..8cdc513df9a28 100644
--- a/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
+++ b/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
@@ -48,7 +48,7 @@ protected function _prepareLayout()
if ($alertPriceAllow) {
$accordion->addItem('price', array(
- 'title' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Price alert subscription was saved.'),
+ 'title' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('We saved the price alert subscription.'),
'content' => $this->getLayout()
->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Alerts_Price')
->toHtml() . '
*/
-class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config extends Mage_Adminhtml_Block_Widget
- implements Mage_Adminhtml_Block_Widget_Tab_Interface
+class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config
+ extends Mage_Backend_Block_Widget
+ implements Mage_Backend_Block_Widget_Tab_Interface
{
-
protected $_template = 'catalog/product/edit/super/config.phtml';
/**
@@ -117,35 +117,80 @@ protected function _prepareLayout()
));
$this->addChild('super_settings', 'Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Settings');
- if ($this->getProduct()->getId()) {
- $this->setChild('simple',
- $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple',
- 'catalog.product.edit.tab.super.config.simple')
- );
-
- $this->addChild('create_from_configurable', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Copy From Configurable'),
- 'class' => 'add',
- 'onclick' => 'superProduct.createNewProduct()'
- ));
- }
+// @todo: Remove unused code and blocks
+// if ($this->getProduct()->getId()) {
+// $this->setChild('simple',
+// $this->getLayout()->createBlock('Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple',
+// 'catalog.product.edit.tab.super.config.simple')
+// );
+//
+// $this->addChild('create_from_configurable', 'Mage_Adminhtml_Block_Widget_Button', array(
+// 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Copy From Configurable'),
+// 'class' => 'add',
+// 'onclick' => 'superProduct.createNewProduct()'
+// ));
+// }
$this->addChild(
'generate',
'Mage_Backend_Block_Widget_Button',
array(
- 'id' => 'generate-variations-button',
'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Generate Variations'),
+ 'class' => 'generate',
'data_attribute' => array(
'mage-init' => array(
'button' => array(
'event' => 'generate',
'target' => '#product-variations-matrix',
'eventData' => array(
- 'url' => $this->getUrl('*/*/variationsMatrix', array('_current' => true)),
+ 'url' => $this->getUrl('*/*/generateVariations', array('_current' => true)),
),
),
),
+ 'action' => 'generate',
+ ),
+ )
+ );
+ $this->addChild(
+ 'add_attribute',
+ 'Mage_Backend_Block_Widget_Button',
+ array(
+ 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Create New Variation Set'),
+ 'class' => 'new-variation-set',
+ 'data_attribute' => array(
+ 'mage-init' => array(
+ 'configurableAttribute' => array(
+ 'url' => $this->getUrl(
+ '*/catalog_product_attribute/new',
+ array(
+ 'store' => $this->getProduct()->getStoreId(),
+ 'product_tab' => 'variations',
+ 'popup' => 1,
+ '_query' => array(
+ 'attribute' => array(
+ 'is_global' => 1,
+ 'frontend_input' => 'select',
+ 'is_configurable' => 1
+ ),
+ )
+ )
+ )
+ )
+ )
+ ),
+ )
+ );
+ $this->addChild(
+ 'add_option',
+ 'Mage_Backend_Block_Widget_Button',
+ array(
+ 'label' => Mage::helper('Mage_Catalog_Helper_Data')->__('Add Option'),
+ 'class' => 'action- scalable add',
+ 'data_attribute' => array(
+ 'mage-init' => array(
+ 'button' => array('event' => 'add-option'),
+ ),
+ 'action' => 'add-option',
),
)
);
@@ -380,4 +425,14 @@ public function getSelectedAttributes()
? array_filter($this->_getProductType()->getUsedProductAttributes($this->getProduct()))
: array();
}
+
+ /**
+ * Get parent tab code
+ *
+ * @return string
+ */
+ public function getParentTab()
+ {
+ return 'product-details';
+ }
}
diff --git a/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Attribute.php b/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Attribute.php
index 68343b08c9d5b..651ecd92306db 100644
--- a/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Attribute.php
+++ b/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Attribute.php
@@ -32,7 +32,7 @@
* @author Magento Core Team
*/
class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Attribute
- extends Mage_Backend_Block_Template
+ extends Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config
{
/**
* Render block
diff --git a/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Matrix.php b/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Matrix.php
index bc7feea65f4be..618c10bb6e100 100644
--- a/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Matrix.php
+++ b/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Matrix.php
@@ -34,6 +34,40 @@
class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Matrix
extends Mage_Backend_Block_Template
{
+ /** @var Mage_Core_Model_App */
+ protected $_application;
+
+ /** @var Mage_Core_Model_LocaleInterface */
+ protected $_locale;
+
+ /**
+ * @param Mage_Backend_Block_Template_Context $context
+ * @param Mage_Core_Model_App $application
+ * @param Mage_Core_Model_LocaleInterface $locale
+ * @param array $data
+ */
+ public function __construct(
+ Mage_Backend_Block_Template_Context $context,
+ Mage_Core_Model_App $application,
+ Mage_Core_Model_LocaleInterface $locale,
+ array $data = array()
+ ) {
+ parent::__construct($context, $data);
+ $this->_application = $application;
+ $this->_locale = $locale;
+ }
+
+ /**
+ * Retrieve price rendered according to current locale and currency settings
+ *
+ * @param int|float $price
+ * @return string
+ */
+ public function renderPrice($price)
+ {
+ return $this->_locale->currency($this->_application->getBaseCurrencyCode())->toCurrency(sprintf('%f', $price));
+ }
+
/**
* Get configurable product type
*
@@ -63,7 +97,7 @@ public function getVariations()
{
$variationalAttributes = array();
$usedProductAttributes = $this->getAttributes();
- foreach ($usedProductAttributes as &$attribute) {
+ foreach ($usedProductAttributes as $attribute) {
$options = array();
foreach ($attribute['options'] as $valueInfo) {
foreach ($attribute['values'] as $priceData) {
@@ -80,8 +114,8 @@ public function getVariations()
'id' => $attribute['attribute_id'],
'values' => $options,
);
-
}
+
$attributesCount = count($variationalAttributes);
if ($attributesCount === 0) {
return array();
@@ -151,7 +185,6 @@ public function getAttributes()
}
}
}
-
$this->setData('attributes', $attributes);
}
return $this->getData('attributes');
@@ -232,7 +265,7 @@ public function getAttributeFrontendClass($code)
*
* @return string
*/
- protected function getImageUploadUrl()
+ public function getImageUploadUrl()
{
return $this->getUrl('*/catalog_product_gallery/upload');
}
diff --git a/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php b/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
index 97c78fda75118..57e3ad0515aa1 100644
--- a/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
+++ b/app/code/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
@@ -46,7 +46,7 @@ protected function _prepareForm()
$form = new Varien_Data_Form();
$form->setFieldNameSuffix('simple_product');
- $form->setDataObject($this->_getProduct());
+ $form->setDataObject($this->getProduct());
$fieldset = $form->addFieldset('simple_product', array(
'legend' => Mage::helper('Mage_Catalog_Helper_Data')->__('Quick simple product creation')
@@ -61,7 +61,7 @@ protected function _prepareForm()
$attributes = Mage::getModel('Mage_Catalog_Model_Product')
->setTypeId(Mage_Catalog_Model_Product_Type::TYPE_SIMPLE)
- ->setAttributeSetId($this->_getProduct()->getAttributeSetId())
+ ->setAttributeSetId($this->getProduct()->getAttributeSetId())
->getAttributes();
/* Standart attributes */
@@ -72,7 +72,7 @@ protected function _prepareForm()
&& !in_array(Mage_Catalog_Model_Product_Type::TYPE_CONFIGURABLE, $attribute->getApplyTo())
// If not used in configurable
&& !in_array($attribute->getId(),
- $this->_getProduct()->getTypeInstance()->getUsedProductAttributeIds($this->_getProduct()))
+ $this->getProduct()->getTypeInstance()->getUsedProductAttributeIds($this->getProduct()))
)
// Or in additional
|| in_array($attribute->getAttributeCode(), $attributesConfig['additional'])
@@ -95,7 +95,7 @@ protected function _prepareForm()
if (in_array($attributeCode, $attributesConfig['autogenerate'])) {
$element->setDisabled('true');
- $element->setValue($this->_getProduct()->getData($attributeCode));
+ $element->setValue($this->getProduct()->getData($attributeCode));
$element->setAfterElementHtml(
'