diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon index 4346ae4df6c..44fb700b8e4 100644 --- a/.phpstan.dist.baseline.neon +++ b/.phpstan.dist.baseline.neon @@ -7684,163 +7684,163 @@ parameters: rawMessage: 'Call to an undefined method Mage_Core_Block_Abstract::_getUsers().' identifier: method.notFound count: 1 - path: app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml + path: app/design/adminhtml/base/default/template/api/role_users_grid_js.phtml - rawMessage: 'Call to an undefined method Mage_Core_Block_Abstract::_getSelectedRoles().' identifier: method.notFound count: 1 - path: app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml + path: app/design/adminhtml/base/default/template/api/user_roles_grid_js.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 2 - path: app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml + path: app/design/adminhtml/base/default/template/catalog/product/edit/price/group.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 2 - path: app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml + path: app/design/adminhtml/base/default/template/catalog/product/edit/price/tier.phtml - rawMessage: 'Parameter #2 $store of method Mage_Core_Helper_Data::currencyByStore() expects int|Mage_Core_Model_Store|null, true given.' identifier: argument.type count: 1 - path: app/design/adminhtml/default/default/template/catalog/product/price.phtml + path: app/design/adminhtml/base/default/template/catalog/product/price.phtml - rawMessage: 'Call to an undefined method Mage_GiftMessage_Block_Message_Helper::prepareAsIs().' identifier: method.notFound count: 2 - path: app/design/adminhtml/default/default/template/giftmessage/helper.phtml + path: app/design/adminhtml/base/default/template/giftmessage/helper.phtml - rawMessage: 'Parameter #1 $value of method Mage_GiftMessage_Block_Message_Helper::setScriptIncluded() expects string, true given.' identifier: argument.type count: 1 - path: app/design/adminhtml/default/default/template/giftmessage/helper.phtml + path: app/design/adminhtml/base/default/template/giftmessage/helper.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 2 - path: app/design/adminhtml/default/default/template/notification/toolbar.phtml + path: app/design/adminhtml/base/default/template/notification/toolbar.phtml - rawMessage: PHPDoc tag @var with type Mage_Core_Block_Template is not subtype of type Mage_Oauth_Block_Authorize. identifier: varTag.type count: 1 - path: app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml + path: app/design/adminhtml/base/default/template/oauth/authorize/reject.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/default/template/page/header.phtml + path: app/design/adminhtml/base/default/template/page/header.phtml - rawMessage: 'Call to an undefined method Mage_Core_Block_Abstract::_getUsers().' identifier: method.notFound count: 1 - path: app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml + path: app/design/adminhtml/base/default/template/permissions/role_users_grid_js.phtml - rawMessage: 'Call to an undefined method Mage_Core_Block_Abstract::_getSelectedRoles().' identifier: method.notFound count: 1 - path: app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml + path: app/design/adminhtml/base/default/template/permissions/user_roles_grid_js.phtml - rawMessage: 'Comparison operation ">" between int<1, max> and 0 is always true.' identifier: greater.alwaysTrue count: 1 - path: app/design/adminhtml/default/default/template/report/grid.phtml + path: app/design/adminhtml/base/default/template/report/grid.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml + path: app/design/adminhtml/base/default/template/sales/order/create/items/grid.phtml - rawMessage: 'Method Mage_Adminhtml_Block_Sales_Order_Create_Abstract::formatPrice() invoked with 3 parameters, 1 required.' identifier: arguments.count count: 18 - path: app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml + path: app/design/adminhtml/base/default/template/sales/order/create/items/grid.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml + path: app/design/adminhtml/base/default/template/sales/order/shipment/packaging/popup.phtml - rawMessage: Negated boolean expression is always true. identifier: booleanNot.alwaysTrue count: 2 - path: app/design/adminhtml/default/default/template/system/store/tree.phtml + path: app/design/adminhtml/base/default/template/system/store/tree.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/default/template/tax/notifications.phtml + path: app/design/adminhtml/base/default/template/tax/notifications.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/default/template/weee/renderer/tax.phtml + path: app/design/adminhtml/base/default/template/weee/renderer/tax.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 2 - path: app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml + path: app/design/adminhtml/base/default/template/widget/breadcrumbs.phtml - rawMessage: 'Method Mage_Adminhtml_Block_Widget_Grid::getEmptyCellColspan() invoked with 1 parameter, 0 required.' identifier: arguments.count count: 1 - path: app/design/adminhtml/default/default/template/widget/grid.phtml + path: app/design/adminhtml/base/default/template/widget/grid.phtml - rawMessage: 'Method Mage_Adminhtml_Block_Widget_Grid::getMultipleRowColumns() invoked with 1 parameter, 0 required.' identifier: arguments.count count: 1 - path: app/design/adminhtml/default/default/template/widget/grid.phtml + path: app/design/adminhtml/base/default/template/widget/grid.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/default/template/widget/grid/serializer.phtml + path: app/design/adminhtml/base/default/template/widget/grid/serializer.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/default/template/widget/tabs.phtml + path: app/design/adminhtml/base/default/template/widget/tabs.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/default/template/widget/tabshoriz.phtml + path: app/design/adminhtml/base/default/template/widget/tabshoriz.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/default/template/widget/tabsleft.phtml + path: app/design/adminhtml/base/default/template/widget/tabsleft.phtml - rawMessage: 'Construct empty() is not allowed. Use more strict comparison.' identifier: empty.notAllowed count: 1 - path: app/design/adminhtml/default/openmage/template/page/header.phtml + path: app/design/adminhtml/openmage/default/template/page/header.phtml - rawMessage: 'Method Mage_Catalog_Block_Product_Abstract::getTierPrices() invoked with 2 parameters, 0-1 required.' diff --git a/.phpstan.dist.neon b/.phpstan.dist.neon index 89dca4e0225..17a08d34fac 100644 --- a/.phpstan.dist.neon +++ b/.phpstan.dist.neon @@ -76,33 +76,33 @@ parameters: # @todo add classes to widgets message: '#^Variable \$this might not be defined\.$#' paths: - - app/design/adminhtml/default/default/template/api/usernroles.phtml - - app/design/adminhtml/default/default/template/dashboard/searches.phtml - - app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml - - app/design/adminhtml/default/default/template/empty.phtml - - app/design/adminhtml/default/default/template/overlay_popup.phtml - - app/design/adminhtml/default/default/template/popup.phtml - - app/design/adminhtml/default/default/template/promo/form.phtml - - app/design/adminhtml/default/default/template/rating/stars/detailed.phtml - - app/design/adminhtml/default/default/template/review/add.phtml - - app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml - - app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml - - app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/due.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/item.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/main.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml - - app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml - - app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml - - app/design/adminhtml/default/default/template/system/info.phtml - - app/design/adminhtml/default/default/template/tax/class/page/edit.phtml - - app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml - - app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml + - app/design/adminhtml/base/default/template/api/usernroles.phtml + - app/design/adminhtml/base/default/template/dashboard/searches.phtml + - app/design/adminhtml/base/default/template/dashboard/store/switcher.phtml + - app/design/adminhtml/base/default/template/empty.phtml + - app/design/adminhtml/base/default/template/overlay_popup.phtml + - app/design/adminhtml/base/default/template/popup.phtml + - app/design/adminhtml/base/default/template/promo/form.phtml + - app/design/adminhtml/base/default/template/rating/stars/detailed.phtml + - app/design/adminhtml/base/default/template/review/add.phtml + - app/design/adminhtml/base/default/template/sales/billing/agreement/form.phtml + - app/design/adminhtml/base/default/template/sales/items/renderer/default.phtml + - app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/configurable.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/discount.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/due.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/footer.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/grand.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/item.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/main.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/paid.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/refunded.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/shipping.phtml + - app/design/adminhtml/base/default/template/sales/order/totals/subtotal.phtml + - app/design/adminhtml/base/default/template/sales/order/view/tracking.phtml + - app/design/adminhtml/base/default/template/system/info.phtml + - app/design/adminhtml/base/default/template/tax/class/page/edit.phtml + - app/design/adminhtml/base/default/template/tax/toolbar/class/save.phtml + - app/design/adminhtml/base/default/template/tax/toolbar/rule/save.phtml - # tmp strict rule identifier: empty.notAllowed diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php index 1315b4aaafb..d302c19977c 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Action.php +++ b/app/code/core/Mage/Adminhtml/Controller/Action.php @@ -145,15 +145,15 @@ public function preDispatch() { // get legacy theme choice form backend config if (Mage::getStoreConfigFlag('admin/design/use_legacy_theme')) { - $theme = Mage::getConfig()->getNode('stores/admin/design/theme/default'); + $package = Mage::getConfig()->getNode('stores/admin/design/package/name'); } else { - $theme = Mage::getConfig()->getNode('stores/admin/design/theme/openmage'); + $package = Mage::getConfig()->getNode('stores/admin/design/package/openmage'); } Mage::getDesign() ->setArea($this->_currentArea) - ->setPackageName((string) Mage::getConfig()->getNode('stores/admin/design/package/name')) - ->setTheme((string) $theme); + ->setPackageName((string) $package) + ->setTheme((string) Mage::getConfig()->getNode('stores/admin/design/theme/default')); foreach (['layout', 'template', 'skin', 'locale'] as $type) { if ($value = (string) Mage::getConfig()->getNode("stores/admin/design/theme/{$type}")) { Mage::getDesign()->setTheme($type, $value); diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml index 4307ff1e209..d1d7a04f80d 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -224,10 +224,10 @@ default + openmage default - openmage diff --git a/app/code/core/Mage/Core/Model/Design/Fallback.php b/app/code/core/Mage/Core/Model/Design/Fallback.php index d3c05f7f270..35a331e9281 100644 --- a/app/code/core/Mage/Core/Model/Design/Fallback.php +++ b/app/code/core/Mage/Core/Model/Design/Fallback.php @@ -84,12 +84,35 @@ public function getFallbackScheme($area, $package, $theme) $cacheKey = $area . '/' . $package . '/' . $theme; if (!isset($this->_cachedSchemes[$cacheKey])) { + + // First, we have to check if theme exists + $path = $area . DS . $package . DS . $theme; + $fallback = !is_dir(Mage::getBaseDir('design') . DS . $path); + if ($fallback) { + // Fallback to default theme. + $theme = (string) Mage::getConfig()->getNode('stores/admin/design/theme/default'); + } + if ($this->_isInheritanceDefined($area, $package, $theme)) { $scheme = $this->_getFallbackScheme($area, $package, $theme); } else { $scheme = $this->_getLegacyFallbackScheme(); } + if ($fallback) { + /** + * When the originally requested theme does not exist, we build the inheritance + * chain for the configured fallback theme instead. The first element of + * $scheme represents the empty top element. + * We keep that element at the beginning and explicitly insert the effective + * theme as the second element, so that its files are checked immediately + * after the current (parent) but before any further fallbacks. This preserves a + * predictable and explicit order in the fallback chain. + */ + $first = array_shift($scheme); + $scheme = array_merge([$first], [['_package' => $package, '_theme' => $theme]], $scheme); + } + $this->_cachedSchemes[$cacheKey] = $scheme; } diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php index 5d86fa2397c..c3077a17133 100644 --- a/app/code/core/Mage/Core/Model/Layout/Update.php +++ b/app/code/core/Mage/Core/Model/Layout/Update.php @@ -437,6 +437,7 @@ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null $layoutXml = null; $elementClass = $this->getElementClass(); $updatesRoot = Mage::app()->getConfig()->getNode($area . '/layout/updates'); + $updatesRoot = $this->addFallbackThemesLayoutUpdates($updatesRoot); Mage::dispatchEvent('core_layout_update_updates_get_after', ['updates' => $updatesRoot]); $updates = $updatesRoot->asArray(); $themeUpdates = Mage::getSingleton('core/design_config')->getNode("$area/$package/$theme/layout/updates"); @@ -483,4 +484,49 @@ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null return simplexml_load_string('' . $layoutStr . '', $elementClass); } + + /** + * Add layout files added via theme.xml to layout updates + * for all themes that are parents of this theme. + */ + public function addFallbackThemesLayoutUpdates(Mage_Core_Model_Config_Element $updates): Mage_Core_Model_Config_Element + { + /* @var Mage_Core_Model_Design_Package $designPackage */ + $designPackage = Mage::getSingleton('core/design_package'); + /* @var Mage_Core_Model_Design_Fallback $fallbackModel */ + $fallbackModel = Mage::getModel('core/design_fallback'); + + $fallbacks = array_reverse($fallbackModel->getFallbackScheme( + $designPackage->getArea(), + $designPackage->getPackageName(), + $designPackage->getTheme('layout'), + )); + + foreach ($fallbacks as $fallback) { + if (!isset($fallback['_package'], $fallback['_theme'])) { + continue; + } + + $fallbackPackage = $fallback['_package']; + $fallbackTheme = $fallback['_theme']; + + $themeUpdateGroups = Mage::getSingleton('core/design_config')->getNode("{$designPackage->getArea()}/$fallbackPackage/$fallbackTheme/layout/updates"); + + if (!$themeUpdateGroups) { + continue; + } + + foreach ($themeUpdateGroups as $themeUpdateGroup) { + foreach ($themeUpdateGroup->asArray() as $key => $themeUpdate) { + if (!isset($themeUpdate['file']) || !is_string($themeUpdate['file'])) { + continue; + } + + $updates->addChild($key)->addChild('file', $themeUpdate['file']); + } + } + } + + return $updates; + } } diff --git a/app/code/core/Mage/Core/data/core_setup/data-upgrade-1.6.0.11-1.6.0.12.php b/app/code/core/Mage/Core/data/core_setup/data-upgrade-1.6.0.11-1.6.0.12.php new file mode 100644 index 00000000000..8112e05bd81 --- /dev/null +++ b/app/code/core/Mage/Core/data/core_setup/data-upgrade-1.6.0.11-1.6.0.12.php @@ -0,0 +1,16 @@ +startSetup(); + +Mage::app()->getCacheInstance()->flush(); + +$installer->endSetup(); diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml index 146f60f73de..df9c15ffcee 100644 --- a/app/code/core/Mage/Core/etc/config.xml +++ b/app/code/core/Mage/Core/etc/config.xml @@ -10,7 +10,7 @@ - 1.6.0.11 + 1.6.0.12 diff --git a/app/design/adminhtml/base/default/etc/theme.xml b/app/design/adminhtml/base/default/etc/theme.xml new file mode 100644 index 00000000000..9fe35015861 --- /dev/null +++ b/app/design/adminhtml/base/default/etc/theme.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/design/adminhtml/default/default/layout/admin.xml b/app/design/adminhtml/base/default/layout/admin.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/admin.xml rename to app/design/adminhtml/base/default/layout/admin.xml diff --git a/app/design/adminhtml/default/default/layout/adminnotification.xml b/app/design/adminhtml/base/default/layout/adminnotification.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/adminnotification.xml rename to app/design/adminhtml/base/default/layout/adminnotification.xml diff --git a/app/design/adminhtml/default/default/layout/api2.xml b/app/design/adminhtml/base/default/layout/api2.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/api2.xml rename to app/design/adminhtml/base/default/layout/api2.xml diff --git a/app/design/adminhtml/default/default/layout/authorizenet.xml b/app/design/adminhtml/base/default/layout/authorizenet.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/authorizenet.xml rename to app/design/adminhtml/base/default/layout/authorizenet.xml diff --git a/app/design/adminhtml/default/default/layout/bundle.xml b/app/design/adminhtml/base/default/layout/bundle.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/bundle.xml rename to app/design/adminhtml/base/default/layout/bundle.xml diff --git a/app/design/adminhtml/default/default/layout/captcha.xml b/app/design/adminhtml/base/default/layout/captcha.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/captcha.xml rename to app/design/adminhtml/base/default/layout/captcha.xml diff --git a/app/design/adminhtml/default/default/layout/catalog.xml b/app/design/adminhtml/base/default/layout/catalog.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/catalog.xml rename to app/design/adminhtml/base/default/layout/catalog.xml diff --git a/app/design/adminhtml/default/default/layout/centinel.xml b/app/design/adminhtml/base/default/layout/centinel.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/centinel.xml rename to app/design/adminhtml/base/default/layout/centinel.xml diff --git a/app/design/adminhtml/default/default/layout/cms.xml b/app/design/adminhtml/base/default/layout/cms.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/cms.xml rename to app/design/adminhtml/base/default/layout/cms.xml diff --git a/app/design/adminhtml/default/default/layout/csp.xml b/app/design/adminhtml/base/default/layout/csp.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/csp.xml rename to app/design/adminhtml/base/default/layout/csp.xml diff --git a/app/design/adminhtml/default/default/layout/currencysymbol.xml b/app/design/adminhtml/base/default/layout/currencysymbol.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/currencysymbol.xml rename to app/design/adminhtml/base/default/layout/currencysymbol.xml diff --git a/app/design/adminhtml/default/default/layout/customer.xml b/app/design/adminhtml/base/default/layout/customer.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/customer.xml rename to app/design/adminhtml/base/default/layout/customer.xml diff --git a/app/design/adminhtml/default/default/layout/dataflow.xml b/app/design/adminhtml/base/default/layout/dataflow.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/dataflow.xml rename to app/design/adminhtml/base/default/layout/dataflow.xml diff --git a/app/design/adminhtml/default/default/layout/downloadable.xml b/app/design/adminhtml/base/default/layout/downloadable.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/downloadable.xml rename to app/design/adminhtml/base/default/layout/downloadable.xml diff --git a/app/design/adminhtml/default/default/layout/giftmessage.xml b/app/design/adminhtml/base/default/layout/giftmessage.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/giftmessage.xml rename to app/design/adminhtml/base/default/layout/giftmessage.xml diff --git a/app/design/adminhtml/default/default/layout/importexport.xml b/app/design/adminhtml/base/default/layout/importexport.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/importexport.xml rename to app/design/adminhtml/base/default/layout/importexport.xml diff --git a/app/design/adminhtml/default/default/layout/index.xml b/app/design/adminhtml/base/default/layout/index.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/index.xml rename to app/design/adminhtml/base/default/layout/index.xml diff --git a/app/design/adminhtml/default/default/layout/main.xml b/app/design/adminhtml/base/default/layout/main.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/main.xml rename to app/design/adminhtml/base/default/layout/main.xml diff --git a/app/design/adminhtml/default/default/layout/newsletter.xml b/app/design/adminhtml/base/default/layout/newsletter.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/newsletter.xml rename to app/design/adminhtml/base/default/layout/newsletter.xml diff --git a/app/design/adminhtml/default/default/layout/oauth.xml b/app/design/adminhtml/base/default/layout/oauth.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/oauth.xml rename to app/design/adminhtml/base/default/layout/oauth.xml diff --git a/app/design/adminhtml/default/default/layout/promo.xml b/app/design/adminhtml/base/default/layout/promo.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/promo.xml rename to app/design/adminhtml/base/default/layout/promo.xml diff --git a/app/design/adminhtml/default/default/layout/report.xml b/app/design/adminhtml/base/default/layout/report.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/report.xml rename to app/design/adminhtml/base/default/layout/report.xml diff --git a/app/design/adminhtml/default/default/layout/rss.xml b/app/design/adminhtml/base/default/layout/rss.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/rss.xml rename to app/design/adminhtml/base/default/layout/rss.xml diff --git a/app/design/adminhtml/default/default/layout/sales.xml b/app/design/adminhtml/base/default/layout/sales.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/sales.xml rename to app/design/adminhtml/base/default/layout/sales.xml diff --git a/app/design/adminhtml/default/default/layout/search.xml b/app/design/adminhtml/base/default/layout/search.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/search.xml rename to app/design/adminhtml/base/default/layout/search.xml diff --git a/app/design/adminhtml/default/default/layout/tag.xml b/app/design/adminhtml/base/default/layout/tag.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/tag.xml rename to app/design/adminhtml/base/default/layout/tag.xml diff --git a/app/design/adminhtml/default/default/layout/tax.xml b/app/design/adminhtml/base/default/layout/tax.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/tax.xml rename to app/design/adminhtml/base/default/layout/tax.xml diff --git a/app/design/adminhtml/default/default/layout/widget.xml b/app/design/adminhtml/base/default/layout/widget.xml similarity index 100% rename from app/design/adminhtml/default/default/layout/widget.xml rename to app/design/adminhtml/base/default/layout/widget.xml diff --git a/app/design/adminhtml/default/default/locale/en_US/translate.csv b/app/design/adminhtml/base/default/locale/en_US/translate.csv similarity index 100% rename from app/design/adminhtml/default/default/locale/en_US/translate.csv rename to app/design/adminhtml/base/default/locale/en_US/translate.csv diff --git a/app/design/adminhtml/default/default/template/access_denied.phtml b/app/design/adminhtml/base/default/template/access_denied.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/access_denied.phtml rename to app/design/adminhtml/base/default/template/access_denied.phtml diff --git a/app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml b/app/design/adminhtml/base/default/template/api/role_users_grid_js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml rename to app/design/adminhtml/base/default/template/api/role_users_grid_js.phtml diff --git a/app/design/adminhtml/default/default/template/api/roleinfo.phtml b/app/design/adminhtml/base/default/template/api/roleinfo.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/roleinfo.phtml rename to app/design/adminhtml/base/default/template/api/roleinfo.phtml diff --git a/app/design/adminhtml/default/default/template/api/roles.phtml b/app/design/adminhtml/base/default/template/api/roles.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/roles.phtml rename to app/design/adminhtml/base/default/template/api/roles.phtml diff --git a/app/design/adminhtml/default/default/template/api/rolesedit.phtml b/app/design/adminhtml/base/default/template/api/rolesedit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/rolesedit.phtml rename to app/design/adminhtml/base/default/template/api/rolesedit.phtml diff --git a/app/design/adminhtml/default/default/template/api/rolesusers.phtml b/app/design/adminhtml/base/default/template/api/rolesusers.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/rolesusers.phtml rename to app/design/adminhtml/base/default/template/api/rolesusers.phtml diff --git a/app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml b/app/design/adminhtml/base/default/template/api/user_roles_grid_js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml rename to app/design/adminhtml/base/default/template/api/user_roles_grid_js.phtml diff --git a/app/design/adminhtml/default/default/template/api/userinfo.phtml b/app/design/adminhtml/base/default/template/api/userinfo.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/userinfo.phtml rename to app/design/adminhtml/base/default/template/api/userinfo.phtml diff --git a/app/design/adminhtml/default/default/template/api/usernroles.phtml b/app/design/adminhtml/base/default/template/api/usernroles.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/usernroles.phtml rename to app/design/adminhtml/base/default/template/api/usernroles.phtml diff --git a/app/design/adminhtml/default/default/template/api/userroles.phtml b/app/design/adminhtml/base/default/template/api/userroles.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/userroles.phtml rename to app/design/adminhtml/base/default/template/api/userroles.phtml diff --git a/app/design/adminhtml/default/default/template/api/users.phtml b/app/design/adminhtml/base/default/template/api/users.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api/users.phtml rename to app/design/adminhtml/base/default/template/api/users.phtml diff --git a/app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml b/app/design/adminhtml/base/default/template/api2/attribute/buttons.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api2/attribute/buttons.phtml rename to app/design/adminhtml/base/default/template/api2/attribute/buttons.phtml diff --git a/app/design/adminhtml/default/default/template/api2/attribute/resource.phtml b/app/design/adminhtml/base/default/template/api2/attribute/resource.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api2/attribute/resource.phtml rename to app/design/adminhtml/base/default/template/api2/attribute/resource.phtml diff --git a/app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml b/app/design/adminhtml/base/default/template/api2/permissions/user/edit/tab/roles/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml rename to app/design/adminhtml/base/default/template/api2/permissions/user/edit/tab/roles/js.phtml diff --git a/app/design/adminhtml/default/default/template/api2/role/buttons.phtml b/app/design/adminhtml/base/default/template/api2/role/buttons.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api2/role/buttons.phtml rename to app/design/adminhtml/base/default/template/api2/role/buttons.phtml diff --git a/app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml b/app/design/adminhtml/base/default/template/api2/role/users_grid_js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml rename to app/design/adminhtml/base/default/template/api2/role/users_grid_js.phtml diff --git a/app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml b/app/design/adminhtml/base/default/template/authorizenet/directpost/iframe.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/authorizenet/directpost/iframe.phtml rename to app/design/adminhtml/base/default/template/authorizenet/directpost/iframe.phtml diff --git a/app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml b/app/design/adminhtml/base/default/template/authorizenet/directpost/info.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml rename to app/design/adminhtml/base/default/template/authorizenet/directpost/info.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/bundle.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/bundle.phtml rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/bundle.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/checkbox.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/multi.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/multi.phtml rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/multi.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/radio.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/radio.phtml rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/radio.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml b/app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/select.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/product/composite/fieldset/options/type/select.phtml rename to app/design/adminhtml/base/default/template/bundle/product/composite/fieldset/options/type/select.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml b/app/design/adminhtml/base/default/template/bundle/product/edit/bundle.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml rename to app/design/adminhtml/base/default/template/bundle/product/edit/bundle.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml b/app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml rename to app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml b/app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option/search.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/search.phtml rename to app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option/search.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml b/app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option/selection.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml rename to app/design/adminhtml/base/default/template/bundle/product/edit/bundle/option/selection.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/creditmemo/create/items/renderer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml rename to app/design/adminhtml/base/default/template/bundle/sales/creditmemo/create/items/renderer.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/creditmemo/view/items/renderer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml rename to app/design/adminhtml/base/default/template/bundle/sales/creditmemo/view/items/renderer.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/invoice/create/items/renderer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml rename to app/design/adminhtml/base/default/template/bundle/sales/invoice/create/items/renderer.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/invoice/view/items/renderer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml rename to app/design/adminhtml/base/default/template/bundle/sales/invoice/view/items/renderer.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/order/view/items/renderer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml rename to app/design/adminhtml/base/default/template/bundle/sales/order/view/items/renderer.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/shipment/create/items/renderer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/sales/shipment/create/items/renderer.phtml rename to app/design/adminhtml/base/default/template/bundle/sales/shipment/create/items/renderer.phtml diff --git a/app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml b/app/design/adminhtml/base/default/template/bundle/sales/shipment/view/items/renderer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/bundle/sales/shipment/view/items/renderer.phtml rename to app/design/adminhtml/base/default/template/bundle/sales/shipment/view/items/renderer.phtml diff --git a/app/design/adminhtml/default/default/template/captcha/zend.phtml b/app/design/adminhtml/base/default/template/captcha/zend.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/captcha/zend.phtml rename to app/design/adminhtml/base/default/template/captcha/zend.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml b/app/design/adminhtml/base/default/template/catalog/category/checkboxes/tree.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/category/checkboxes/tree.phtml rename to app/design/adminhtml/base/default/template/catalog/category/checkboxes/tree.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit.phtml b/app/design/adminhtml/base/default/template/catalog/category/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/category/edit.phtml rename to app/design/adminhtml/base/default/template/catalog/category/edit.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml b/app/design/adminhtml/base/default/template/catalog/category/edit/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/category/edit/form.phtml rename to app/design/adminhtml/base/default/template/catalog/category/edit/form.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/category/tree.phtml b/app/design/adminhtml/base/default/template/catalog/category/tree.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/category/tree.phtml rename to app/design/adminhtml/base/default/template/catalog/category/tree.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml b/app/design/adminhtml/base/default/template/catalog/category/widget/tree.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml rename to app/design/adminhtml/base/default/template/catalog/category/widget/tree.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml b/app/design/adminhtml/base/default/template/catalog/form/renderer/fieldset/element.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/form/renderer/fieldset/element.phtml rename to app/design/adminhtml/base/default/template/catalog/form/renderer/fieldset/element.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product.phtml b/app/design/adminhtml/base/default/template/catalog/product.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product.phtml rename to app/design/adminhtml/base/default/template/catalog/product.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/attribute/js.phtml rename to app/design/adminhtml/base/default/template/catalog/product/attribute/js.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/new/created.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/attribute/new/created.phtml rename to app/design/adminhtml/base/default/template/catalog/product/attribute/new/created.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/options.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml rename to app/design/adminhtml/base/default/template/catalog/product/attribute/options.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/main.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/main.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/main/tree/attribute.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/attribute.phtml rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/main/tree/attribute.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/main/tree/group.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/main/tree/group.phtml rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/main/tree/group.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/add.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/add.phtml rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/add.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml b/app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/main.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/attribute/set/toolbar/main.phtml rename to app/design/adminhtml/base/default/template/catalog/product/attribute/set/toolbar/main.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/configure.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/configure.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/configurable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/configurable.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/configurable.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/grouped.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/grouped.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/js.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/js.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/date.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/date.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/date.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/default.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/default.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/file.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/file.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/file.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/select.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/select.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/select.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/text.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/options/type/text.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/options/type/text.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml b/app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/qty.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/qty.phtml rename to app/design/adminhtml/base/default/template/catalog/product/composite/fieldset/qty.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/created.phtml b/app/design/adminhtml/base/default/template/catalog/product/created.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/created.phtml rename to app/design/adminhtml/base/default/template/catalog/product/created.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/action/attribute.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/action/attribute.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/action/attribute.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/action/inventory.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/action/inventory.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/action/inventory.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/action/websites.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/action/websites.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/action/websites.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/categories.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/categories.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/options.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/options.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/option.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/option.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/type/date.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/type/date.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/type/file.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/type/file.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/type/file.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/type/select.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/type/select.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/options/type/text.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/options/type/text.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/price/group.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/price/group.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/price/tier.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/price/tier.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/serializer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/serializer.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/serializer.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/super/config.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/super/config.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/super/config.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml b/app/design/adminhtml/base/default/template/catalog/product/edit/websites.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/edit/websites.phtml rename to app/design/adminhtml/base/default/template/catalog/product/edit/websites.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml b/app/design/adminhtml/base/default/template/catalog/product/helper/gallery.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml rename to app/design/adminhtml/base/default/template/catalog/product/helper/gallery.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/js.phtml b/app/design/adminhtml/base/default/template/catalog/product/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/js.phtml rename to app/design/adminhtml/base/default/template/catalog/product/js.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/price.phtml b/app/design/adminhtml/base/default/template/catalog/product/price.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/price.phtml rename to app/design/adminhtml/base/default/template/catalog/product/price.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml b/app/design/adminhtml/base/default/template/catalog/product/tab/alert.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/tab/alert.phtml rename to app/design/adminhtml/base/default/template/catalog/product/tab/alert.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml b/app/design/adminhtml/base/default/template/catalog/product/tab/inventory.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/tab/inventory.phtml rename to app/design/adminhtml/base/default/template/catalog/product/tab/inventory.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml b/app/design/adminhtml/base/default/template/catalog/product/widget/chooser/container.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/product/widget/chooser/container.phtml rename to app/design/adminhtml/base/default/template/catalog/product/widget/chooser/container.phtml diff --git a/app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml b/app/design/adminhtml/base/default/template/catalog/wysiwyg/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/catalog/wysiwyg/js.phtml rename to app/design/adminhtml/base/default/template/catalog/wysiwyg/js.phtml diff --git a/app/design/adminhtml/default/default/template/centinel/authentication/complete.phtml b/app/design/adminhtml/base/default/template/centinel/authentication/complete.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/centinel/authentication/complete.phtml rename to app/design/adminhtml/base/default/template/centinel/authentication/complete.phtml diff --git a/app/design/adminhtml/default/default/template/centinel/authentication/start.phtml b/app/design/adminhtml/base/default/template/centinel/authentication/start.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/centinel/authentication/start.phtml rename to app/design/adminhtml/base/default/template/centinel/authentication/start.phtml diff --git a/app/design/adminhtml/default/default/template/centinel/validation/form.phtml b/app/design/adminhtml/base/default/template/centinel/validation/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/centinel/validation/form.phtml rename to app/design/adminhtml/base/default/template/centinel/validation/form.phtml diff --git a/app/design/adminhtml/default/default/template/cms/browser/content.phtml b/app/design/adminhtml/base/default/template/cms/browser/content.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/cms/browser/content.phtml rename to app/design/adminhtml/base/default/template/cms/browser/content.phtml diff --git a/app/design/adminhtml/default/default/template/cms/browser/content/files.phtml b/app/design/adminhtml/base/default/template/cms/browser/content/files.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/cms/browser/content/files.phtml rename to app/design/adminhtml/base/default/template/cms/browser/content/files.phtml diff --git a/app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml b/app/design/adminhtml/base/default/template/cms/browser/content/newfolder.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/cms/browser/content/newfolder.phtml rename to app/design/adminhtml/base/default/template/cms/browser/content/newfolder.phtml diff --git a/app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml b/app/design/adminhtml/base/default/template/cms/browser/content/uploader.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml rename to app/design/adminhtml/base/default/template/cms/browser/content/uploader.phtml diff --git a/app/design/adminhtml/default/default/template/cms/browser/js.phtml b/app/design/adminhtml/base/default/template/cms/browser/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/cms/browser/js.phtml rename to app/design/adminhtml/base/default/template/cms/browser/js.phtml diff --git a/app/design/adminhtml/default/default/template/cms/browser/tree.phtml b/app/design/adminhtml/base/default/template/cms/browser/tree.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/cms/browser/tree.phtml rename to app/design/adminhtml/base/default/template/cms/browser/tree.phtml diff --git a/app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml b/app/design/adminhtml/base/default/template/cms/page/edit/form/renderer/content.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/cms/page/edit/form/renderer/content.phtml rename to app/design/adminhtml/base/default/template/cms/page/edit/form/renderer/content.phtml diff --git a/app/design/adminhtml/default/default/template/coming.phtml b/app/design/adminhtml/base/default/template/coming.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/coming.phtml rename to app/design/adminhtml/base/default/template/coming.phtml diff --git a/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml b/app/design/adminhtml/base/default/template/currencysymbol/grid.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/currencysymbol/grid.phtml rename to app/design/adminhtml/base/default/template/currencysymbol/grid.phtml diff --git a/app/design/adminhtml/default/default/template/customer/edit/js.phtml b/app/design/adminhtml/base/default/template/customer/edit/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/edit/js.phtml rename to app/design/adminhtml/base/default/template/customer/edit/js.phtml diff --git a/app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml b/app/design/adminhtml/base/default/template/customer/edit/tab/account/form/renderer/group.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/edit/tab/account/form/renderer/group.phtml rename to app/design/adminhtml/base/default/template/customer/edit/tab/account/form/renderer/group.phtml diff --git a/app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml b/app/design/adminhtml/base/default/template/customer/edit/tab/view/grid/item.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/edit/tab/view/grid/item.phtml rename to app/design/adminhtml/base/default/template/customer/edit/tab/view/grid/item.phtml diff --git a/app/design/adminhtml/default/default/template/customer/online.phtml b/app/design/adminhtml/base/default/template/customer/online.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/online.phtml rename to app/design/adminhtml/base/default/template/customer/online.phtml diff --git a/app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml b/app/design/adminhtml/base/default/template/customer/sales/order/create/address/form/renderer/vat.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/sales/order/create/address/form/renderer/vat.phtml rename to app/design/adminhtml/base/default/template/customer/sales/order/create/address/form/renderer/vat.phtml diff --git a/app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml b/app/design/adminhtml/base/default/template/customer/system/config/validatevat.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml rename to app/design/adminhtml/base/default/template/customer/system/config/validatevat.phtml diff --git a/app/design/adminhtml/default/default/template/customer/tab/addresses.phtml b/app/design/adminhtml/base/default/template/customer/tab/addresses.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/tab/addresses.phtml rename to app/design/adminhtml/base/default/template/customer/tab/addresses.phtml diff --git a/app/design/adminhtml/default/default/template/customer/tab/cart.phtml b/app/design/adminhtml/base/default/template/customer/tab/cart.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/tab/cart.phtml rename to app/design/adminhtml/base/default/template/customer/tab/cart.phtml diff --git a/app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml b/app/design/adminhtml/base/default/template/customer/tab/newsletter.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/tab/newsletter.phtml rename to app/design/adminhtml/base/default/template/customer/tab/newsletter.phtml diff --git a/app/design/adminhtml/default/default/template/customer/tab/view.phtml b/app/design/adminhtml/base/default/template/customer/tab/view.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/tab/view.phtml rename to app/design/adminhtml/base/default/template/customer/tab/view.phtml diff --git a/app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml b/app/design/adminhtml/base/default/template/customer/tab/view/sales.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/tab/view/sales.phtml rename to app/design/adminhtml/base/default/template/customer/tab/view/sales.phtml diff --git a/app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml b/app/design/adminhtml/base/default/template/customer/tab/wishlist.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml rename to app/design/adminhtml/base/default/template/customer/tab/wishlist.phtml diff --git a/app/design/adminhtml/default/default/template/dashboard/graph.phtml b/app/design/adminhtml/base/default/template/dashboard/graph.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/dashboard/graph.phtml rename to app/design/adminhtml/base/default/template/dashboard/graph.phtml diff --git a/app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml b/app/design/adminhtml/base/default/template/dashboard/graph/disabled.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/dashboard/graph/disabled.phtml rename to app/design/adminhtml/base/default/template/dashboard/graph/disabled.phtml diff --git a/app/design/adminhtml/default/default/template/dashboard/grid.phtml b/app/design/adminhtml/base/default/template/dashboard/grid.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/dashboard/grid.phtml rename to app/design/adminhtml/base/default/template/dashboard/grid.phtml diff --git a/app/design/adminhtml/default/default/template/dashboard/index.phtml b/app/design/adminhtml/base/default/template/dashboard/index.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/dashboard/index.phtml rename to app/design/adminhtml/base/default/template/dashboard/index.phtml diff --git a/app/design/adminhtml/default/default/template/dashboard/salebar.phtml b/app/design/adminhtml/base/default/template/dashboard/salebar.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/dashboard/salebar.phtml rename to app/design/adminhtml/base/default/template/dashboard/salebar.phtml diff --git a/app/design/adminhtml/default/default/template/dashboard/searches.phtml b/app/design/adminhtml/base/default/template/dashboard/searches.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/dashboard/searches.phtml rename to app/design/adminhtml/base/default/template/dashboard/searches.phtml diff --git a/app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml b/app/design/adminhtml/base/default/template/dashboard/store/switcher.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml rename to app/design/adminhtml/base/default/template/dashboard/store/switcher.phtml diff --git a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml b/app/design/adminhtml/base/default/template/dashboard/totalbar.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/dashboard/totalbar.phtml rename to app/design/adminhtml/base/default/template/dashboard/totalbar.phtml diff --git a/app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml b/app/design/adminhtml/base/default/template/directory/js/optional_zip_countries.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/directory/js/optional_zip_countries.phtml rename to app/design/adminhtml/base/default/template/directory/js/optional_zip_countries.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/product/composite/fieldset/downloadable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/product/composite/fieldset/downloadable.phtml rename to app/design/adminhtml/base/default/template/downloadable/product/composite/fieldset/downloadable.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml rename to app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml b/app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable/links.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml rename to app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable/links.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml b/app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable/samples.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml rename to app/design/adminhtml/base/default/template/downloadable/product/edit/downloadable/samples.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml rename to app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/creditmemo/name.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml rename to app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/invoice/name.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/name.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/sales/items/column/downloadable/name.phtml rename to app/design/adminhtml/base/default/template/downloadable/sales/items/column/downloadable/name.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml rename to app/design/adminhtml/base/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml rename to app/design/adminhtml/base/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml rename to app/design/adminhtml/base/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml rename to app/design/adminhtml/base/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml diff --git a/app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml b/app/design/adminhtml/base/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml rename to app/design/adminhtml/base/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml diff --git a/app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml b/app/design/adminhtml/base/default/template/eav/attribute/edit/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/eav/attribute/edit/js.phtml rename to app/design/adminhtml/base/default/template/eav/attribute/edit/js.phtml diff --git a/app/design/adminhtml/default/default/template/eav/attribute/options.phtml b/app/design/adminhtml/base/default/template/eav/attribute/options.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/eav/attribute/options.phtml rename to app/design/adminhtml/base/default/template/eav/attribute/options.phtml diff --git a/app/design/adminhtml/default/default/template/email/order/items.phtml b/app/design/adminhtml/base/default/template/email/order/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/email/order/items.phtml rename to app/design/adminhtml/base/default/template/email/order/items.phtml diff --git a/app/design/adminhtml/default/default/template/empty.phtml b/app/design/adminhtml/base/default/template/empty.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/empty.phtml rename to app/design/adminhtml/base/default/template/empty.phtml diff --git a/app/design/adminhtml/default/default/template/forgotpassword.phtml b/app/design/adminhtml/base/default/template/forgotpassword.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/forgotpassword.phtml rename to app/design/adminhtml/base/default/template/forgotpassword.phtml diff --git a/app/design/adminhtml/default/default/template/formkey.phtml b/app/design/adminhtml/base/default/template/formkey.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/formkey.phtml rename to app/design/adminhtml/base/default/template/formkey.phtml diff --git a/app/design/adminhtml/default/default/template/giftmessage/form.phtml b/app/design/adminhtml/base/default/template/giftmessage/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/giftmessage/form.phtml rename to app/design/adminhtml/base/default/template/giftmessage/form.phtml diff --git a/app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml b/app/design/adminhtml/base/default/template/giftmessage/giftoptionsform.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/giftmessage/giftoptionsform.phtml rename to app/design/adminhtml/base/default/template/giftmessage/giftoptionsform.phtml diff --git a/app/design/adminhtml/default/default/template/giftmessage/helper.phtml b/app/design/adminhtml/base/default/template/giftmessage/helper.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/giftmessage/helper.phtml rename to app/design/adminhtml/base/default/template/giftmessage/helper.phtml diff --git a/app/design/adminhtml/default/default/template/giftmessage/popup.phtml b/app/design/adminhtml/base/default/template/giftmessage/popup.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/giftmessage/popup.phtml rename to app/design/adminhtml/base/default/template/giftmessage/popup.phtml diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml b/app/design/adminhtml/base/default/template/giftmessage/sales/order/create/giftoptions.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/giftmessage/sales/order/create/giftoptions.phtml rename to app/design/adminhtml/base/default/template/giftmessage/sales/order/create/giftoptions.phtml diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml b/app/design/adminhtml/base/default/template/giftmessage/sales/order/create/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/giftmessage/sales/order/create/items.phtml rename to app/design/adminhtml/base/default/template/giftmessage/sales/order/create/items.phtml diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml b/app/design/adminhtml/base/default/template/giftmessage/sales/order/view/giftoptions.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/giftmessage/sales/order/view/giftoptions.phtml rename to app/design/adminhtml/base/default/template/giftmessage/sales/order/view/giftoptions.phtml diff --git a/app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml b/app/design/adminhtml/base/default/template/giftmessage/sales/order/view/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/giftmessage/sales/order/view/items.phtml rename to app/design/adminhtml/base/default/template/giftmessage/sales/order/view/items.phtml diff --git a/app/design/adminhtml/default/default/template/importexport/busy.phtml b/app/design/adminhtml/base/default/template/importexport/busy.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/importexport/busy.phtml rename to app/design/adminhtml/base/default/template/importexport/busy.phtml diff --git a/app/design/adminhtml/default/default/template/importexport/export/form/after.phtml b/app/design/adminhtml/base/default/template/importexport/export/form/after.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/importexport/export/form/after.phtml rename to app/design/adminhtml/base/default/template/importexport/export/form/after.phtml diff --git a/app/design/adminhtml/default/default/template/importexport/export/form/before.phtml b/app/design/adminhtml/base/default/template/importexport/export/form/before.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/importexport/export/form/before.phtml rename to app/design/adminhtml/base/default/template/importexport/export/form/before.phtml diff --git a/app/design/adminhtml/default/default/template/importexport/import/form/after.phtml b/app/design/adminhtml/base/default/template/importexport/import/form/after.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/importexport/import/form/after.phtml rename to app/design/adminhtml/base/default/template/importexport/import/form/after.phtml diff --git a/app/design/adminhtml/default/default/template/importexport/import/form/before.phtml b/app/design/adminhtml/base/default/template/importexport/import/form/before.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/importexport/import/form/before.phtml rename to app/design/adminhtml/base/default/template/importexport/import/form/before.phtml diff --git a/app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml b/app/design/adminhtml/base/default/template/importexport/import/frame/result.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/importexport/import/frame/result.phtml rename to app/design/adminhtml/base/default/template/importexport/import/frame/result.phtml diff --git a/app/design/adminhtml/default/default/template/index/notifications.phtml b/app/design/adminhtml/base/default/template/index/notifications.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/index/notifications.phtml rename to app/design/adminhtml/base/default/template/index/notifications.phtml diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/base/default/template/login.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/login.phtml rename to app/design/adminhtml/base/default/template/login.phtml diff --git a/app/design/adminhtml/default/default/template/media/uploader.phtml b/app/design/adminhtml/base/default/template/media/uploader.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/media/uploader.phtml rename to app/design/adminhtml/base/default/template/media/uploader.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml b/app/design/adminhtml/base/default/template/newsletter/preview/iframeswitcher.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml rename to app/design/adminhtml/base/default/template/newsletter/preview/iframeswitcher.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/preview/store.phtml b/app/design/adminhtml/base/default/template/newsletter/preview/store.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/preview/store.phtml rename to app/design/adminhtml/base/default/template/newsletter/preview/store.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/problem/list.phtml b/app/design/adminhtml/base/default/template/newsletter/problem/list.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/problem/list.phtml rename to app/design/adminhtml/base/default/template/newsletter/problem/list.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml b/app/design/adminhtml/base/default/template/newsletter/queue/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/queue/edit.phtml rename to app/design/adminhtml/base/default/template/newsletter/queue/edit.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/list.phtml b/app/design/adminhtml/base/default/template/newsletter/queue/list.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/queue/list.phtml rename to app/design/adminhtml/base/default/template/newsletter/queue/list.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml b/app/design/adminhtml/base/default/template/newsletter/queue/preview.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/queue/preview.phtml rename to app/design/adminhtml/base/default/template/newsletter/queue/preview.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml b/app/design/adminhtml/base/default/template/newsletter/subscriber/list.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml rename to app/design/adminhtml/base/default/template/newsletter/subscriber/list.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/template/edit.phtml b/app/design/adminhtml/base/default/template/newsletter/template/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/template/edit.phtml rename to app/design/adminhtml/base/default/template/newsletter/template/edit.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/template/list.phtml b/app/design/adminhtml/base/default/template/newsletter/template/list.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/template/list.phtml rename to app/design/adminhtml/base/default/template/newsletter/template/list.phtml diff --git a/app/design/adminhtml/default/default/template/newsletter/template/preview.phtml b/app/design/adminhtml/base/default/template/newsletter/template/preview.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/newsletter/template/preview.phtml rename to app/design/adminhtml/base/default/template/newsletter/template/preview.phtml diff --git a/app/design/adminhtml/default/default/template/notification/baseurl.phtml b/app/design/adminhtml/base/default/template/notification/baseurl.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/notification/baseurl.phtml rename to app/design/adminhtml/base/default/template/notification/baseurl.phtml diff --git a/app/design/adminhtml/default/default/template/notification/curl.phtml b/app/design/adminhtml/base/default/template/notification/curl.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/notification/curl.phtml rename to app/design/adminhtml/base/default/template/notification/curl.phtml diff --git a/app/design/adminhtml/default/default/template/notification/formkey.phtml b/app/design/adminhtml/base/default/template/notification/formkey.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/notification/formkey.phtml rename to app/design/adminhtml/base/default/template/notification/formkey.phtml diff --git a/app/design/adminhtml/default/default/template/notification/security.phtml b/app/design/adminhtml/base/default/template/notification/security.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/notification/security.phtml rename to app/design/adminhtml/base/default/template/notification/security.phtml diff --git a/app/design/adminhtml/default/default/template/notification/toolbar.phtml b/app/design/adminhtml/base/default/template/notification/toolbar.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/notification/toolbar.phtml rename to app/design/adminhtml/base/default/template/notification/toolbar.phtml diff --git a/app/design/adminhtml/default/default/template/notification/window.phtml b/app/design/adminhtml/base/default/template/notification/window.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/notification/window.phtml rename to app/design/adminhtml/base/default/template/notification/window.phtml diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/button-simple.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml rename to app/design/adminhtml/base/default/template/oauth/authorize/button-simple.phtml diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/button.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/oauth/authorize/button.phtml rename to app/design/adminhtml/base/default/template/oauth/authorize/button.phtml diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/confirm-simple.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml rename to app/design/adminhtml/base/default/template/oauth/authorize/confirm-simple.phtml diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/confirm.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/oauth/authorize/confirm.phtml rename to app/design/adminhtml/base/default/template/oauth/authorize/confirm.phtml diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/form/login-simple.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml rename to app/design/adminhtml/base/default/template/oauth/authorize/form/login-simple.phtml diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/form/login.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml rename to app/design/adminhtml/base/default/template/oauth/authorize/form/login.phtml diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/head-simple.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml rename to app/design/adminhtml/base/default/template/oauth/authorize/head-simple.phtml diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/reject-simple.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml rename to app/design/adminhtml/base/default/template/oauth/authorize/reject-simple.phtml diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml b/app/design/adminhtml/base/default/template/oauth/authorize/reject.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/oauth/authorize/reject.phtml rename to app/design/adminhtml/base/default/template/oauth/authorize/reject.phtml diff --git a/app/design/adminhtml/default/default/template/overlay_popup.phtml b/app/design/adminhtml/base/default/template/overlay_popup.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/overlay_popup.phtml rename to app/design/adminhtml/base/default/template/overlay_popup.phtml diff --git a/app/design/adminhtml/default/default/template/page.phtml b/app/design/adminhtml/base/default/template/page.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/page.phtml rename to app/design/adminhtml/base/default/template/page.phtml diff --git a/app/design/adminhtml/default/default/template/page/footer.phtml b/app/design/adminhtml/base/default/template/page/footer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/page/footer.phtml rename to app/design/adminhtml/base/default/template/page/footer.phtml diff --git a/app/design/adminhtml/default/default/template/page/head.phtml b/app/design/adminhtml/base/default/template/page/head.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/page/head.phtml rename to app/design/adminhtml/base/default/template/page/head.phtml diff --git a/app/design/adminhtml/default/default/template/page/header.phtml b/app/design/adminhtml/base/default/template/page/header.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/page/header.phtml rename to app/design/adminhtml/base/default/template/page/header.phtml diff --git a/app/design/adminhtml/default/default/template/page/js/calendar.phtml b/app/design/adminhtml/base/default/template/page/js/calendar.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/page/js/calendar.phtml rename to app/design/adminhtml/base/default/template/page/js/calendar.phtml diff --git a/app/design/adminhtml/default/default/template/page/js/translate.phtml b/app/design/adminhtml/base/default/template/page/js/translate.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/page/js/translate.phtml rename to app/design/adminhtml/base/default/template/page/js/translate.phtml diff --git a/app/design/adminhtml/default/default/template/page/menu.phtml b/app/design/adminhtml/base/default/template/page/menu.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/page/menu.phtml rename to app/design/adminhtml/base/default/template/page/menu.phtml diff --git a/app/design/adminhtml/default/default/template/page/notices.phtml b/app/design/adminhtml/base/default/template/page/notices.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/page/notices.phtml rename to app/design/adminhtml/base/default/template/page/notices.phtml diff --git a/app/design/adminhtml/default/default/template/paygate/form/cc.phtml b/app/design/adminhtml/base/default/template/paygate/form/cc.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paygate/form/cc.phtml rename to app/design/adminhtml/base/default/template/paygate/form/cc.phtml diff --git a/app/design/adminhtml/default/default/template/paygate/info/cc.phtml b/app/design/adminhtml/base/default/template/paygate/info/cc.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paygate/info/cc.phtml rename to app/design/adminhtml/base/default/template/paygate/info/cc.phtml diff --git a/app/design/adminhtml/default/default/template/paygate/info/pdf.phtml b/app/design/adminhtml/base/default/template/paygate/info/pdf.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paygate/info/pdf.phtml rename to app/design/adminhtml/base/default/template/paygate/info/pdf.phtml diff --git a/app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml b/app/design/adminhtml/base/default/template/payment/form/banktransfer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml rename to app/design/adminhtml/base/default/template/payment/form/banktransfer.phtml diff --git a/app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml b/app/design/adminhtml/base/default/template/payment/form/cashondelivery.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml rename to app/design/adminhtml/base/default/template/payment/form/cashondelivery.phtml diff --git a/app/design/adminhtml/default/default/template/payment/form/cc.phtml b/app/design/adminhtml/base/default/template/payment/form/cc.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/form/cc.phtml rename to app/design/adminhtml/base/default/template/payment/form/cc.phtml diff --git a/app/design/adminhtml/default/default/template/payment/form/ccsave.phtml b/app/design/adminhtml/base/default/template/payment/form/ccsave.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/form/ccsave.phtml rename to app/design/adminhtml/base/default/template/payment/form/ccsave.phtml diff --git a/app/design/adminhtml/default/default/template/payment/form/checkmo.phtml b/app/design/adminhtml/base/default/template/payment/form/checkmo.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/form/checkmo.phtml rename to app/design/adminhtml/base/default/template/payment/form/checkmo.phtml diff --git a/app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml b/app/design/adminhtml/base/default/template/payment/form/purchaseorder.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml rename to app/design/adminhtml/base/default/template/payment/form/purchaseorder.phtml diff --git a/app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml b/app/design/adminhtml/base/default/template/payment/info/banktransfer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/info/banktransfer.phtml rename to app/design/adminhtml/base/default/template/payment/info/banktransfer.phtml diff --git a/app/design/adminhtml/default/default/template/payment/info/checkmo.phtml b/app/design/adminhtml/base/default/template/payment/info/checkmo.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/info/checkmo.phtml rename to app/design/adminhtml/base/default/template/payment/info/checkmo.phtml diff --git a/app/design/adminhtml/default/default/template/payment/info/default.phtml b/app/design/adminhtml/base/default/template/payment/info/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/info/default.phtml rename to app/design/adminhtml/base/default/template/payment/info/default.phtml diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml b/app/design/adminhtml/base/default/template/payment/info/pdf/checkmo.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/info/pdf/checkmo.phtml rename to app/design/adminhtml/base/default/template/payment/info/pdf/checkmo.phtml diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml b/app/design/adminhtml/base/default/template/payment/info/pdf/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/info/pdf/default.phtml rename to app/design/adminhtml/base/default/template/payment/info/pdf/default.phtml diff --git a/app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml b/app/design/adminhtml/base/default/template/payment/info/pdf/purchaseorder.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/info/pdf/purchaseorder.phtml rename to app/design/adminhtml/base/default/template/payment/info/pdf/purchaseorder.phtml diff --git a/app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml b/app/design/adminhtml/base/default/template/payment/info/purchaseorder.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml rename to app/design/adminhtml/base/default/template/payment/info/purchaseorder.phtml diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/api_wizard.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml rename to app/design/adminhtml/base/default/template/paypal/system/config/api_wizard.phtml diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/bml_api_wizard.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml rename to app/design/adminhtml/base/default/template/paypal/system/config/bml_api_wizard.phtml diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/fieldset/global.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paypal/system/config/fieldset/global.phtml rename to app/design/adminhtml/base/default/template/paypal/system/config/fieldset/global.phtml diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/fieldset/hint.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paypal/system/config/fieldset/hint.phtml rename to app/design/adminhtml/base/default/template/paypal/system/config/fieldset/hint.phtml diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/fieldset/store.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paypal/system/config/fieldset/store.phtml rename to app/design/adminhtml/base/default/template/paypal/system/config/fieldset/store.phtml diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/payflowlink/advanced.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/advanced.phtml rename to app/design/adminhtml/base/default/template/paypal/system/config/payflowlink/advanced.phtml diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml b/app/design/adminhtml/base/default/template/paypal/system/config/payflowlink/info.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/paypal/system/config/payflowlink/info.phtml rename to app/design/adminhtml/base/default/template/paypal/system/config/payflowlink/info.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml b/app/design/adminhtml/base/default/template/permissions/role_users_grid_js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml rename to app/design/adminhtml/base/default/template/permissions/role_users_grid_js.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/roleinfo.phtml b/app/design/adminhtml/base/default/template/permissions/roleinfo.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/roleinfo.phtml rename to app/design/adminhtml/base/default/template/permissions/roleinfo.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/roles.phtml b/app/design/adminhtml/base/default/template/permissions/roles.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/roles.phtml rename to app/design/adminhtml/base/default/template/permissions/roles.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/rolesedit.phtml b/app/design/adminhtml/base/default/template/permissions/rolesedit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/rolesedit.phtml rename to app/design/adminhtml/base/default/template/permissions/rolesedit.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml b/app/design/adminhtml/base/default/template/permissions/rolesusers.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/rolesusers.phtml rename to app/design/adminhtml/base/default/template/permissions/rolesusers.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml b/app/design/adminhtml/base/default/template/permissions/user_roles_grid_js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml rename to app/design/adminhtml/base/default/template/permissions/user_roles_grid_js.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/userinfo.phtml b/app/design/adminhtml/base/default/template/permissions/userinfo.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/userinfo.phtml rename to app/design/adminhtml/base/default/template/permissions/userinfo.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/usernroles.phtml b/app/design/adminhtml/base/default/template/permissions/usernroles.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/usernroles.phtml rename to app/design/adminhtml/base/default/template/permissions/usernroles.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/userroles.phtml b/app/design/adminhtml/base/default/template/permissions/userroles.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/userroles.phtml rename to app/design/adminhtml/base/default/template/permissions/userroles.phtml diff --git a/app/design/adminhtml/default/default/template/permissions/users.phtml b/app/design/adminhtml/base/default/template/permissions/users.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/permissions/users.phtml rename to app/design/adminhtml/base/default/template/permissions/users.phtml diff --git a/app/design/adminhtml/default/default/template/popup.phtml b/app/design/adminhtml/base/default/template/popup.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/popup.phtml rename to app/design/adminhtml/base/default/template/popup.phtml diff --git a/app/design/adminhtml/default/default/template/promo/fieldset.phtml b/app/design/adminhtml/base/default/template/promo/fieldset.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/promo/fieldset.phtml rename to app/design/adminhtml/base/default/template/promo/fieldset.phtml diff --git a/app/design/adminhtml/default/default/template/promo/form.phtml b/app/design/adminhtml/base/default/template/promo/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/promo/form.phtml rename to app/design/adminhtml/base/default/template/promo/form.phtml diff --git a/app/design/adminhtml/default/default/template/promo/js.phtml b/app/design/adminhtml/base/default/template/promo/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/promo/js.phtml rename to app/design/adminhtml/base/default/template/promo/js.phtml diff --git a/app/design/adminhtml/default/default/template/promo/salesrulejs.phtml b/app/design/adminhtml/base/default/template/promo/salesrulejs.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/promo/salesrulejs.phtml rename to app/design/adminhtml/base/default/template/promo/salesrulejs.phtml diff --git a/app/design/adminhtml/default/default/template/rating/detailed.phtml b/app/design/adminhtml/base/default/template/rating/detailed.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/rating/detailed.phtml rename to app/design/adminhtml/base/default/template/rating/detailed.phtml diff --git a/app/design/adminhtml/default/default/template/rating/options.phtml b/app/design/adminhtml/base/default/template/rating/options.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/rating/options.phtml rename to app/design/adminhtml/base/default/template/rating/options.phtml diff --git a/app/design/adminhtml/default/default/template/rating/stars/detailed.phtml b/app/design/adminhtml/base/default/template/rating/stars/detailed.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/rating/stars/detailed.phtml rename to app/design/adminhtml/base/default/template/rating/stars/detailed.phtml diff --git a/app/design/adminhtml/default/default/template/rating/stars/summary.phtml b/app/design/adminhtml/base/default/template/rating/stars/summary.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/rating/stars/summary.phtml rename to app/design/adminhtml/base/default/template/rating/stars/summary.phtml diff --git a/app/design/adminhtml/default/default/template/report/grid.phtml b/app/design/adminhtml/base/default/template/report/grid.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/report/grid.phtml rename to app/design/adminhtml/base/default/template/report/grid.phtml diff --git a/app/design/adminhtml/default/default/template/report/grid/container.phtml b/app/design/adminhtml/base/default/template/report/grid/container.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/report/grid/container.phtml rename to app/design/adminhtml/base/default/template/report/grid/container.phtml diff --git a/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml b/app/design/adminhtml/base/default/template/report/refresh/statistics.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/report/refresh/statistics.phtml rename to app/design/adminhtml/base/default/template/report/refresh/statistics.phtml diff --git a/app/design/adminhtml/default/default/template/report/store/switcher.phtml b/app/design/adminhtml/base/default/template/report/store/switcher.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/report/store/switcher.phtml rename to app/design/adminhtml/base/default/template/report/store/switcher.phtml diff --git a/app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml b/app/design/adminhtml/base/default/template/report/store/switcher/enhanced.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/report/store/switcher/enhanced.phtml rename to app/design/adminhtml/base/default/template/report/store/switcher/enhanced.phtml diff --git a/app/design/adminhtml/default/default/template/report/wishlist.phtml b/app/design/adminhtml/base/default/template/report/wishlist.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/report/wishlist.phtml rename to app/design/adminhtml/base/default/template/report/wishlist.phtml diff --git a/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml b/app/design/adminhtml/base/default/template/resetforgottenpassword.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/resetforgottenpassword.phtml rename to app/design/adminhtml/base/default/template/resetforgottenpassword.phtml diff --git a/app/design/adminhtml/default/default/template/review/add.phtml b/app/design/adminhtml/base/default/template/review/add.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/review/add.phtml rename to app/design/adminhtml/base/default/template/review/add.phtml diff --git a/app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml b/app/design/adminhtml/base/default/template/sales/billing/agreement/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml rename to app/design/adminhtml/base/default/template/sales/billing/agreement/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml b/app/design/adminhtml/base/default/template/sales/billing/agreement/view/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/billing/agreement/view/form.phtml rename to app/design/adminhtml/base/default/template/sales/billing/agreement/view/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml b/app/design/adminhtml/base/default/template/sales/billing/agreement/view/tab/info.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/billing/agreement/view/tab/info.phtml rename to app/design/adminhtml/base/default/template/sales/billing/agreement/view/tab/info.phtml diff --git a/app/design/adminhtml/default/default/template/sales/items/column/name.phtml b/app/design/adminhtml/base/default/template/sales/items/column/name.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/items/column/name.phtml rename to app/design/adminhtml/base/default/template/sales/items/column/name.phtml diff --git a/app/design/adminhtml/default/default/template/sales/items/column/qty.phtml b/app/design/adminhtml/base/default/template/sales/items/column/qty.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/items/column/qty.phtml rename to app/design/adminhtml/base/default/template/sales/items/column/qty.phtml diff --git a/app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/items/renderer/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml rename to app/design/adminhtml/base/default/template/sales/items/renderer/default.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/address/form.phtml b/app/design/adminhtml/base/default/template/sales/order/address/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/address/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/address/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/comments/view.phtml b/app/design/adminhtml/base/default/template/sales/order/comments/view.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/comments/view.phtml rename to app/design/adminhtml/base/default/template/sales/order/comments/view.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml b/app/design/adminhtml/base/default/template/sales/order/create/abstract.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/abstract.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/abstract.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/billing/method/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/billing/method/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/billing/method/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/comment.phtml b/app/design/adminhtml/base/default/template/sales/order/create/comment.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/comment.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/comment.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/coupons/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/coupons/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/coupons/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/data.phtml b/app/design/adminhtml/base/default/template/sales/order/create/data.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/data.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/data.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml b/app/design/adminhtml/base/default/template/sales/order/create/form/account.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/form/account.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/form/account.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml b/app/design/adminhtml/base/default/template/sales/order/create/form/address.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/form/address.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml b/app/design/adminhtml/base/default/template/sales/order/create/giftmessage.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/giftmessage.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/giftmessage.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items.phtml b/app/design/adminhtml/base/default/template/sales/order/create/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/items.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/items.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml b/app/design/adminhtml/base/default/template/sales/order/create/items/grid.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/items/grid.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/js.phtml b/app/design/adminhtml/base/default/template/sales/order/create/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/js.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/js.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/newsletter/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/newsletter/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/newsletter/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml b/app/design/adminhtml/base/default/template/sales/order/create/shipping/method/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/shipping/method/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/shipping/method/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml b/app/design/adminhtml/base/default/template/sales/order/create/sidebar.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/sidebar.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/sidebar.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml b/app/design/adminhtml/base/default/template/sales/order/create/sidebar/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/sidebar/items.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/sidebar/items.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml b/app/design/adminhtml/base/default/template/sales/order/create/store/select.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/store/select.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/store/select.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/totals.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/totals.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/totals/default.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/totals/default.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/grandtotal.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/totals/grandtotal.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/totals/grandtotal.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/shipping.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/totals/shipping.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/totals/shipping.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/subtotal.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/totals/subtotal.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/totals/subtotal.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml b/app/design/adminhtml/base/default/template/sales/order/create/totals/tax.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml rename to app/design/adminhtml/base/default/template/sales/order/create/totals/tax.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items.phtml rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items/renderer/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/items/renderer/default.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/create/totals/adjustments.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/create/totals/adjustments.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/view/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/view/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/view/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items.phtml rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items/renderer/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml rename to app/design/adminhtml/base/default/template/sales/order/creditmemo/view/items/renderer/default.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml b/app/design/adminhtml/base/default/template/sales/order/giftoptions.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/giftoptions.phtml rename to app/design/adminhtml/base/default/template/sales/order/giftoptions.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/items.phtml rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/items.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/items/renderer/configurable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/items/renderer/configurable.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/items/renderer/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/items/renderer/default.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/create/tracking.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/invoice/create/tracking.phtml rename to app/design/adminhtml/base/default/template/sales/order/invoice/create/tracking.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/view/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/invoice/view/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/invoice/view/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/view/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/invoice/view/items.phtml rename to app/design/adminhtml/base/default/template/sales/order/invoice/view/items.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/view/items/renderer/configurable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml rename to app/design/adminhtml/base/default/template/sales/order/invoice/view/items/renderer/configurable.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/invoice/view/items/renderer/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml rename to app/design/adminhtml/base/default/template/sales/order/invoice/view/items/renderer/default.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/items.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/configurable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/configurable.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/default.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/create/tracking.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/create/tracking.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/create/tracking.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/packaging/grid.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/packaging/grid.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/packaging/packed.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/packaging/packed.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/packaging/popup.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/packaging/popup.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/tracking/info.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/tracking/info.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/tracking/info.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/items.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/items.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/items/renderer/configurable.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/configurable.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/items/renderer/configurable.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/items/renderer/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/items/renderer/default.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/items/renderer/default.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml b/app/design/adminhtml/base/default/template/sales/order/shipment/view/tracking.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml rename to app/design/adminhtml/base/default/template/sales/order/shipment/view/tracking.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml b/app/design/adminhtml/base/default/template/sales/order/totalbar.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totalbar.phtml rename to app/design/adminhtml/base/default/template/sales/order/totalbar.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals.phtml b/app/design/adminhtml/base/default/template/sales/order/totals.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/discount.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/discount.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/due.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/due.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/due.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/due.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/footer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/footer.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/grand.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/grand.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/item.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/item.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/item.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/item.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/main.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/main.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/main.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/main.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/paid.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/paid.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/refunded.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/refunded.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/shipping.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/shipping.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/subtotal.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/subtotal.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml b/app/design/adminhtml/base/default/template/sales/order/totals/tax.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml rename to app/design/adminhtml/base/default/template/sales/order/totals/tax.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/view/form.phtml b/app/design/adminhtml/base/default/template/sales/order/view/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/view/form.phtml rename to app/design/adminhtml/base/default/template/sales/order/view/form.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml b/app/design/adminhtml/base/default/template/sales/order/view/giftmessage.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/view/giftmessage.phtml rename to app/design/adminhtml/base/default/template/sales/order/view/giftmessage.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/view/history.phtml b/app/design/adminhtml/base/default/template/sales/order/view/history.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/view/history.phtml rename to app/design/adminhtml/base/default/template/sales/order/view/history.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/view/info.phtml b/app/design/adminhtml/base/default/template/sales/order/view/info.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/view/info.phtml rename to app/design/adminhtml/base/default/template/sales/order/view/info.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items.phtml b/app/design/adminhtml/base/default/template/sales/order/view/items.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/view/items.phtml rename to app/design/adminhtml/base/default/template/sales/order/view/items.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml b/app/design/adminhtml/base/default/template/sales/order/view/items/renderer/default.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml rename to app/design/adminhtml/base/default/template/sales/order/view/items/renderer/default.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml b/app/design/adminhtml/base/default/template/sales/order/view/tab/history.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/view/tab/history.phtml rename to app/design/adminhtml/base/default/template/sales/order/view/tab/history.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml b/app/design/adminhtml/base/default/template/sales/order/view/tab/info.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml rename to app/design/adminhtml/base/default/template/sales/order/view/tab/info.phtml diff --git a/app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml b/app/design/adminhtml/base/default/template/sales/order/view/tracking.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml rename to app/design/adminhtml/base/default/template/sales/order/view/tracking.phtml diff --git a/app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml b/app/design/adminhtml/base/default/template/sales/payment/form/billing/agreement.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/payment/form/billing/agreement.phtml rename to app/design/adminhtml/base/default/template/sales/payment/form/billing/agreement.phtml diff --git a/app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml b/app/design/adminhtml/base/default/template/sales/recurring/profile/view.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/recurring/profile/view.phtml rename to app/design/adminhtml/base/default/template/sales/recurring/profile/view.phtml diff --git a/app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml b/app/design/adminhtml/base/default/template/sales/recurring/profile/view/info.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/recurring/profile/view/info.phtml rename to app/design/adminhtml/base/default/template/sales/recurring/profile/view/info.phtml diff --git a/app/design/adminhtml/default/default/template/sales/transactions/detail.phtml b/app/design/adminhtml/base/default/template/sales/transactions/detail.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/sales/transactions/detail.phtml rename to app/design/adminhtml/base/default/template/sales/transactions/detail.phtml diff --git a/app/design/adminhtml/default/default/template/store/switcher.phtml b/app/design/adminhtml/base/default/template/store/switcher.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/store/switcher.phtml rename to app/design/adminhtml/base/default/template/store/switcher.phtml diff --git a/app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml b/app/design/adminhtml/base/default/template/store/switcher/enhanced.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/store/switcher/enhanced.phtml rename to app/design/adminhtml/base/default/template/store/switcher/enhanced.phtml diff --git a/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml b/app/design/adminhtml/base/default/template/store/switcher/form/renderer/fieldset.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset.phtml rename to app/design/adminhtml/base/default/template/store/switcher/form/renderer/fieldset.phtml diff --git a/app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml b/app/design/adminhtml/base/default/template/store/switcher/form/renderer/fieldset/element.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/store/switcher/form/renderer/fieldset/element.phtml rename to app/design/adminhtml/base/default/template/store/switcher/form/renderer/fieldset/element.phtml diff --git a/app/design/adminhtml/default/default/template/system/autocomplete.phtml b/app/design/adminhtml/base/default/template/system/autocomplete.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/autocomplete.phtml rename to app/design/adminhtml/base/default/template/system/autocomplete.phtml diff --git a/app/design/adminhtml/default/default/template/system/cache/additional.phtml b/app/design/adminhtml/base/default/template/system/cache/additional.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/cache/additional.phtml rename to app/design/adminhtml/base/default/template/system/cache/additional.phtml diff --git a/app/design/adminhtml/default/default/template/system/cache/edit.phtml b/app/design/adminhtml/base/default/template/system/cache/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/cache/edit.phtml rename to app/design/adminhtml/base/default/template/system/cache/edit.phtml diff --git a/app/design/adminhtml/default/default/template/system/cache/notifications.phtml b/app/design/adminhtml/base/default/template/system/cache/notifications.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/cache/notifications.phtml rename to app/design/adminhtml/base/default/template/system/cache/notifications.phtml diff --git a/app/design/adminhtml/default/default/template/system/config/edit.phtml b/app/design/adminhtml/base/default/template/system/config/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/config/edit.phtml rename to app/design/adminhtml/base/default/template/system/config/edit.phtml diff --git a/app/design/adminhtml/default/default/template/system/config/form/field/array.phtml b/app/design/adminhtml/base/default/template/system/config/form/field/array.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/config/form/field/array.phtml rename to app/design/adminhtml/base/default/template/system/config/form/field/array.phtml diff --git a/app/design/adminhtml/default/default/template/system/config/form/field/csp.phtml b/app/design/adminhtml/base/default/template/system/config/form/field/csp.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/config/form/field/csp.phtml rename to app/design/adminhtml/base/default/template/system/config/form/field/csp.phtml diff --git a/app/design/adminhtml/default/default/template/system/config/js.phtml b/app/design/adminhtml/base/default/template/system/config/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/config/js.phtml rename to app/design/adminhtml/base/default/template/system/config/js.phtml diff --git a/app/design/adminhtml/default/default/template/system/config/switcher.phtml b/app/design/adminhtml/base/default/template/system/config/switcher.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/config/switcher.phtml rename to app/design/adminhtml/base/default/template/system/config/switcher.phtml diff --git a/app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml b/app/design/adminhtml/base/default/template/system/config/system/storage/media/synchronize.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml rename to app/design/adminhtml/base/default/template/system/config/system/storage/media/synchronize.phtml diff --git a/app/design/adminhtml/default/default/template/system/config/tabs.phtml b/app/design/adminhtml/base/default/template/system/config/tabs.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/config/tabs.phtml rename to app/design/adminhtml/base/default/template/system/config/tabs.phtml diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/process.phtml b/app/design/adminhtml/base/default/template/system/convert/profile/process.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/convert/profile/process.phtml rename to app/design/adminhtml/base/default/template/system/convert/profile/process.phtml diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/run.phtml b/app/design/adminhtml/base/default/template/system/convert/profile/run.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/convert/profile/run.phtml rename to app/design/adminhtml/base/default/template/system/convert/profile/run.phtml diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml b/app/design/adminhtml/base/default/template/system/convert/profile/upload.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml rename to app/design/adminhtml/base/default/template/system/convert/profile/upload.phtml diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml b/app/design/adminhtml/base/default/template/system/convert/profile/wizard.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml rename to app/design/adminhtml/base/default/template/system/convert/profile/wizard.phtml diff --git a/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml b/app/design/adminhtml/base/default/template/system/currency/rate/matrix.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml rename to app/design/adminhtml/base/default/template/system/currency/rate/matrix.phtml diff --git a/app/design/adminhtml/default/default/template/system/currency/rate/services.phtml b/app/design/adminhtml/base/default/template/system/currency/rate/services.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/currency/rate/services.phtml rename to app/design/adminhtml/base/default/template/system/currency/rate/services.phtml diff --git a/app/design/adminhtml/default/default/template/system/currency/rates.phtml b/app/design/adminhtml/base/default/template/system/currency/rates.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/currency/rates.phtml rename to app/design/adminhtml/base/default/template/system/currency/rates.phtml diff --git a/app/design/adminhtml/default/default/template/system/design/edit.phtml b/app/design/adminhtml/base/default/template/system/design/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/design/edit.phtml rename to app/design/adminhtml/base/default/template/system/design/edit.phtml diff --git a/app/design/adminhtml/default/default/template/system/design/index.phtml b/app/design/adminhtml/base/default/template/system/design/index.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/design/index.phtml rename to app/design/adminhtml/base/default/template/system/design/index.phtml diff --git a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml b/app/design/adminhtml/base/default/template/system/email/template/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/email/template/edit.phtml rename to app/design/adminhtml/base/default/template/system/email/template/edit.phtml diff --git a/app/design/adminhtml/default/default/template/system/email/template/list.phtml b/app/design/adminhtml/base/default/template/system/email/template/list.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/email/template/list.phtml rename to app/design/adminhtml/base/default/template/system/email/template/list.phtml diff --git a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml b/app/design/adminhtml/base/default/template/system/email/template/preview.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/email/template/preview.phtml rename to app/design/adminhtml/base/default/template/system/email/template/preview.phtml diff --git a/app/design/adminhtml/default/default/template/system/info.phtml b/app/design/adminhtml/base/default/template/system/info.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/info.phtml rename to app/design/adminhtml/base/default/template/system/info.phtml diff --git a/app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml b/app/design/adminhtml/base/default/template/system/shipping/applicable_country.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/shipping/applicable_country.phtml rename to app/design/adminhtml/base/default/template/system/shipping/applicable_country.phtml diff --git a/app/design/adminhtml/default/default/template/system/shipping/ups.phtml b/app/design/adminhtml/base/default/template/system/shipping/ups.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/shipping/ups.phtml rename to app/design/adminhtml/base/default/template/system/shipping/ups.phtml diff --git a/app/design/adminhtml/default/default/template/system/store/cell.phtml b/app/design/adminhtml/base/default/template/system/store/cell.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/store/cell.phtml rename to app/design/adminhtml/base/default/template/system/store/cell.phtml diff --git a/app/design/adminhtml/default/default/template/system/store/container.phtml b/app/design/adminhtml/base/default/template/system/store/container.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/store/container.phtml rename to app/design/adminhtml/base/default/template/system/store/container.phtml diff --git a/app/design/adminhtml/default/default/template/system/store/tree.phtml b/app/design/adminhtml/base/default/template/system/store/tree.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/store/tree.phtml rename to app/design/adminhtml/base/default/template/system/store/tree.phtml diff --git a/app/design/adminhtml/default/default/template/system/variable/js.phtml b/app/design/adminhtml/base/default/template/system/variable/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/system/variable/js.phtml rename to app/design/adminhtml/base/default/template/system/variable/js.phtml diff --git a/app/design/adminhtml/default/default/template/tag/edit/container.phtml b/app/design/adminhtml/base/default/template/tag/edit/container.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tag/edit/container.phtml rename to app/design/adminhtml/base/default/template/tag/edit/container.phtml diff --git a/app/design/adminhtml/default/default/template/tag/index.phtml b/app/design/adminhtml/base/default/template/tag/index.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tag/index.phtml rename to app/design/adminhtml/base/default/template/tag/index.phtml diff --git a/app/design/adminhtml/default/default/template/tax/class/page/edit.phtml b/app/design/adminhtml/base/default/template/tax/class/page/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/class/page/edit.phtml rename to app/design/adminhtml/base/default/template/tax/class/page/edit.phtml diff --git a/app/design/adminhtml/default/default/template/tax/importExport.phtml b/app/design/adminhtml/base/default/template/tax/importExport.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/importExport.phtml rename to app/design/adminhtml/base/default/template/tax/importExport.phtml diff --git a/app/design/adminhtml/default/default/template/tax/notifications.phtml b/app/design/adminhtml/base/default/template/tax/notifications.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/notifications.phtml rename to app/design/adminhtml/base/default/template/tax/notifications.phtml diff --git a/app/design/adminhtml/default/default/template/tax/rate/form.phtml b/app/design/adminhtml/base/default/template/tax/rate/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/rate/form.phtml rename to app/design/adminhtml/base/default/template/tax/rate/form.phtml diff --git a/app/design/adminhtml/default/default/template/tax/rate/title.phtml b/app/design/adminhtml/base/default/template/tax/rate/title.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/rate/title.phtml rename to app/design/adminhtml/base/default/template/tax/rate/title.phtml diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/class/add.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/toolbar/class/add.phtml rename to app/design/adminhtml/base/default/template/tax/toolbar/class/add.phtml diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/class/save.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml rename to app/design/adminhtml/base/default/template/tax/toolbar/class/save.phtml diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/rate/add.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml rename to app/design/adminhtml/base/default/template/tax/toolbar/rate/add.phtml diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/rate/save.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml rename to app/design/adminhtml/base/default/template/tax/toolbar/rate/save.phtml diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/rule/add.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/toolbar/rule/add.phtml rename to app/design/adminhtml/base/default/template/tax/toolbar/rule/add.phtml diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml b/app/design/adminhtml/base/default/template/tax/toolbar/rule/save.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml rename to app/design/adminhtml/base/default/template/tax/toolbar/rule/save.phtml diff --git a/app/design/adminhtml/default/default/template/urlrewrite/categories.phtml b/app/design/adminhtml/base/default/template/urlrewrite/categories.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/urlrewrite/categories.phtml rename to app/design/adminhtml/base/default/template/urlrewrite/categories.phtml diff --git a/app/design/adminhtml/default/default/template/urlrewrite/edit.phtml b/app/design/adminhtml/base/default/template/urlrewrite/edit.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/urlrewrite/edit.phtml rename to app/design/adminhtml/base/default/template/urlrewrite/edit.phtml diff --git a/app/design/adminhtml/default/default/template/urlrewrite/selector.phtml b/app/design/adminhtml/base/default/template/urlrewrite/selector.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/urlrewrite/selector.phtml rename to app/design/adminhtml/base/default/template/urlrewrite/selector.phtml diff --git a/app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml b/app/design/adminhtml/base/default/template/usa/dhl/unitofmeasure.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/usa/dhl/unitofmeasure.phtml rename to app/design/adminhtml/base/default/template/usa/dhl/unitofmeasure.phtml diff --git a/app/design/adminhtml/default/default/template/weee/renderer/tax.phtml b/app/design/adminhtml/base/default/template/weee/renderer/tax.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/weee/renderer/tax.phtml rename to app/design/adminhtml/base/default/template/weee/renderer/tax.phtml diff --git a/app/design/adminhtml/default/default/template/widget/accordion.phtml b/app/design/adminhtml/base/default/template/widget/accordion.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/accordion.phtml rename to app/design/adminhtml/base/default/template/widget/accordion.phtml diff --git a/app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml b/app/design/adminhtml/base/default/template/widget/breadcrumbs.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml rename to app/design/adminhtml/base/default/template/widget/breadcrumbs.phtml diff --git a/app/design/adminhtml/default/default/template/widget/form.phtml b/app/design/adminhtml/base/default/template/widget/form.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/form.phtml rename to app/design/adminhtml/base/default/template/widget/form.phtml diff --git a/app/design/adminhtml/default/default/template/widget/form/container.phtml b/app/design/adminhtml/base/default/template/widget/form/container.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/form/container.phtml rename to app/design/adminhtml/base/default/template/widget/form/container.phtml diff --git a/app/design/adminhtml/default/default/template/widget/form/element.phtml b/app/design/adminhtml/base/default/template/widget/form/element.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/form/element.phtml rename to app/design/adminhtml/base/default/template/widget/form/element.phtml diff --git a/app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml b/app/design/adminhtml/base/default/template/widget/form/element/gallery.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/form/element/gallery.phtml rename to app/design/adminhtml/base/default/template/widget/form/element/gallery.phtml diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml b/app/design/adminhtml/base/default/template/widget/form/renderer/element.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/form/renderer/element.phtml rename to app/design/adminhtml/base/default/template/widget/form/renderer/element.phtml diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml b/app/design/adminhtml/base/default/template/widget/form/renderer/fieldset.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/form/renderer/fieldset.phtml rename to app/design/adminhtml/base/default/template/widget/form/renderer/fieldset.phtml diff --git a/app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml b/app/design/adminhtml/base/default/template/widget/form/renderer/fieldset/element.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/form/renderer/fieldset/element.phtml rename to app/design/adminhtml/base/default/template/widget/form/renderer/fieldset/element.phtml diff --git a/app/design/adminhtml/default/default/template/widget/grid.phtml b/app/design/adminhtml/base/default/template/widget/grid.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/grid.phtml rename to app/design/adminhtml/base/default/template/widget/grid.phtml diff --git a/app/design/adminhtml/default/default/template/widget/grid/container.phtml b/app/design/adminhtml/base/default/template/widget/grid/container.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/grid/container.phtml rename to app/design/adminhtml/base/default/template/widget/grid/container.phtml diff --git a/app/design/adminhtml/default/default/template/widget/grid/massaction.phtml b/app/design/adminhtml/base/default/template/widget/grid/massaction.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/grid/massaction.phtml rename to app/design/adminhtml/base/default/template/widget/grid/massaction.phtml diff --git a/app/design/adminhtml/default/default/template/widget/grid/serializer.phtml b/app/design/adminhtml/base/default/template/widget/grid/serializer.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/grid/serializer.phtml rename to app/design/adminhtml/base/default/template/widget/grid/serializer.phtml diff --git a/app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml b/app/design/adminhtml/base/default/template/widget/instance/edit/layout.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml rename to app/design/adminhtml/base/default/template/widget/instance/edit/layout.phtml diff --git a/app/design/adminhtml/default/default/template/widget/instance/js.phtml b/app/design/adminhtml/base/default/template/widget/instance/js.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/instance/js.phtml rename to app/design/adminhtml/base/default/template/widget/instance/js.phtml diff --git a/app/design/adminhtml/default/default/template/widget/tabs.phtml b/app/design/adminhtml/base/default/template/widget/tabs.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/tabs.phtml rename to app/design/adminhtml/base/default/template/widget/tabs.phtml diff --git a/app/design/adminhtml/default/default/template/widget/tabshoriz.phtml b/app/design/adminhtml/base/default/template/widget/tabshoriz.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/tabshoriz.phtml rename to app/design/adminhtml/base/default/template/widget/tabshoriz.phtml diff --git a/app/design/adminhtml/default/default/template/widget/tabsleft.phtml b/app/design/adminhtml/base/default/template/widget/tabsleft.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/tabsleft.phtml rename to app/design/adminhtml/base/default/template/widget/tabsleft.phtml diff --git a/app/design/adminhtml/default/default/template/widget/view/container.phtml b/app/design/adminhtml/base/default/template/widget/view/container.phtml similarity index 100% rename from app/design/adminhtml/default/default/template/widget/view/container.phtml rename to app/design/adminhtml/base/default/template/widget/view/container.phtml diff --git a/app/design/adminhtml/default/default/etc/theme.xml b/app/design/adminhtml/default/default/etc/theme.xml index edac8f1400e..b38f8fb22b0 100644 --- a/app/design/adminhtml/default/default/etc/theme.xml +++ b/app/design/adminhtml/default/default/etc/theme.xml @@ -1,12 +1,19 @@ - - + base/default + \ No newline at end of file diff --git a/app/design/adminhtml/openmage/default/etc/theme.xml b/app/design/adminhtml/openmage/default/etc/theme.xml new file mode 100644 index 00000000000..dff371da863 --- /dev/null +++ b/app/design/adminhtml/openmage/default/etc/theme.xml @@ -0,0 +1,26 @@ + + + + default/default + + + + openmage.xml + + + + \ No newline at end of file diff --git a/app/design/adminhtml/default/openmage/layout/local.xml b/app/design/adminhtml/openmage/default/layout/openmage.xml similarity index 100% rename from app/design/adminhtml/default/openmage/layout/local.xml rename to app/design/adminhtml/openmage/default/layout/openmage.xml diff --git a/app/design/adminhtml/default/openmage/template/eav/attribute/options.phtml b/app/design/adminhtml/openmage/default/template/eav/attribute/options.phtml similarity index 100% rename from app/design/adminhtml/default/openmage/template/eav/attribute/options.phtml rename to app/design/adminhtml/openmage/default/template/eav/attribute/options.phtml diff --git a/app/design/adminhtml/default/openmage/template/forgotpassword.phtml b/app/design/adminhtml/openmage/default/template/forgotpassword.phtml similarity index 100% rename from app/design/adminhtml/default/openmage/template/forgotpassword.phtml rename to app/design/adminhtml/openmage/default/template/forgotpassword.phtml diff --git a/app/design/adminhtml/default/openmage/template/login.phtml b/app/design/adminhtml/openmage/default/template/login.phtml similarity index 100% rename from app/design/adminhtml/default/openmage/template/login.phtml rename to app/design/adminhtml/openmage/default/template/login.phtml diff --git a/app/design/adminhtml/default/openmage/template/page/header.phtml b/app/design/adminhtml/openmage/default/template/page/header.phtml similarity index 100% rename from app/design/adminhtml/default/openmage/template/page/header.phtml rename to app/design/adminhtml/openmage/default/template/page/header.phtml diff --git a/app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml b/app/design/adminhtml/openmage/default/template/resetforgottenpassword.phtml similarity index 100% rename from app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml rename to app/design/adminhtml/openmage/default/template/resetforgottenpassword.phtml diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/base/default/boxes.css similarity index 100% rename from skin/adminhtml/default/default/boxes.css rename to skin/adminhtml/base/default/boxes.css diff --git a/skin/adminhtml/default/default/custom.css b/skin/adminhtml/base/default/custom.css similarity index 100% rename from skin/adminhtml/default/default/custom.css rename to skin/adminhtml/base/default/custom.css diff --git a/skin/adminhtml/default/default/favicon.ico b/skin/adminhtml/base/default/favicon.ico similarity index 100% rename from skin/adminhtml/default/default/favicon.ico rename to skin/adminhtml/base/default/favicon.ico diff --git a/skin/adminhtml/default/default/images/accordion_close.gif b/skin/adminhtml/base/default/images/accordion_close.gif similarity index 100% rename from skin/adminhtml/default/default/images/accordion_close.gif rename to skin/adminhtml/base/default/images/accordion_close.gif diff --git a/skin/adminhtml/default/default/images/accordion_close.png b/skin/adminhtml/base/default/images/accordion_close.png similarity index 100% rename from skin/adminhtml/default/default/images/accordion_close.png rename to skin/adminhtml/base/default/images/accordion_close.png diff --git a/skin/adminhtml/default/default/images/accordion_open.gif b/skin/adminhtml/base/default/images/accordion_open.gif similarity index 100% rename from skin/adminhtml/default/default/images/accordion_open.gif rename to skin/adminhtml/base/default/images/accordion_open.gif diff --git a/skin/adminhtml/default/default/images/accordion_open.png b/skin/adminhtml/base/default/images/accordion_open.png similarity index 100% rename from skin/adminhtml/default/default/images/accordion_open.png rename to skin/adminhtml/base/default/images/accordion_open.png diff --git a/skin/adminhtml/default/default/images/add_btn_icon-disabled.gif b/skin/adminhtml/base/default/images/add_btn_icon-disabled.gif similarity index 100% rename from skin/adminhtml/default/default/images/add_btn_icon-disabled.gif rename to skin/adminhtml/base/default/images/add_btn_icon-disabled.gif diff --git a/skin/adminhtml/default/default/images/add_btn_icon.gif b/skin/adminhtml/base/default/images/add_btn_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/add_btn_icon.gif rename to skin/adminhtml/base/default/images/add_btn_icon.gif diff --git a/skin/adminhtml/default/default/images/address_list_li.gif b/skin/adminhtml/base/default/images/address_list_li.gif similarity index 100% rename from skin/adminhtml/default/default/images/address_list_li.gif rename to skin/adminhtml/base/default/images/address_list_li.gif diff --git a/skin/adminhtml/default/default/images/address_list_on_arrow.gif b/skin/adminhtml/base/default/images/address_list_on_arrow.gif similarity index 100% rename from skin/adminhtml/default/default/images/address_list_on_arrow.gif rename to skin/adminhtml/base/default/images/address_list_on_arrow.gif diff --git a/skin/adminhtml/default/default/images/address_list_over_arrow.gif b/skin/adminhtml/base/default/images/address_list_over_arrow.gif similarity index 100% rename from skin/adminhtml/default/default/images/address_list_over_arrow.gif rename to skin/adminhtml/base/default/images/address_list_over_arrow.gif diff --git a/skin/adminhtml/default/default/images/address_list_over_bg.gif b/skin/adminhtml/base/default/images/address_list_over_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/address_list_over_bg.gif rename to skin/adminhtml/base/default/images/address_list_over_bg.gif diff --git a/skin/adminhtml/default/default/images/ajax-loader-tr.gif b/skin/adminhtml/base/default/images/ajax-loader-tr.gif similarity index 100% rename from skin/adminhtml/default/default/images/ajax-loader-tr.gif rename to skin/adminhtml/base/default/images/ajax-loader-tr.gif diff --git a/skin/adminhtml/default/default/images/ajax-loader.gif b/skin/adminhtml/base/default/images/ajax-loader.gif similarity index 100% rename from skin/adminhtml/default/default/images/ajax-loader.gif rename to skin/adminhtml/base/default/images/ajax-loader.gif diff --git a/skin/adminhtml/default/default/images/application_view_tile.gif b/skin/adminhtml/base/default/images/application_view_tile.gif similarity index 100% rename from skin/adminhtml/default/default/images/application_view_tile.gif rename to skin/adminhtml/base/default/images/application_view_tile.gif diff --git a/skin/adminhtml/default/default/images/arrow_sort_move.gif b/skin/adminhtml/base/default/images/arrow_sort_move.gif similarity index 100% rename from skin/adminhtml/default/default/images/arrow_sort_move.gif rename to skin/adminhtml/base/default/images/arrow_sort_move.gif diff --git a/skin/adminhtml/default/default/images/bg_collapse.gif b/skin/adminhtml/base/default/images/bg_collapse.gif similarity index 100% rename from skin/adminhtml/default/default/images/bg_collapse.gif rename to skin/adminhtml/base/default/images/bg_collapse.gif diff --git a/skin/adminhtml/default/default/images/bg_create_order_totals.gif b/skin/adminhtml/base/default/images/bg_create_order_totals.gif similarity index 100% rename from skin/adminhtml/default/default/images/bg_create_order_totals.gif rename to skin/adminhtml/base/default/images/bg_create_order_totals.gif diff --git a/skin/adminhtml/default/default/images/bg_notifications.gif b/skin/adminhtml/base/default/images/bg_notifications.gif similarity index 100% rename from skin/adminhtml/default/default/images/bg_notifications.gif rename to skin/adminhtml/base/default/images/bg_notifications.gif diff --git a/skin/adminhtml/default/default/images/bg_window_mask.png b/skin/adminhtml/base/default/images/bg_window_mask.png similarity index 100% rename from skin/adminhtml/default/default/images/bg_window_mask.png rename to skin/adminhtml/base/default/images/bg_window_mask.png diff --git a/skin/adminhtml/default/default/images/bkg_btn-close.gif b/skin/adminhtml/base/default/images/bkg_btn-close.gif similarity index 100% rename from skin/adminhtml/default/default/images/bkg_btn-close.gif rename to skin/adminhtml/base/default/images/bkg_btn-close.gif diff --git a/skin/adminhtml/default/default/images/bkg_btn-close2.gif b/skin/adminhtml/base/default/images/bkg_btn-close2.gif similarity index 100% rename from skin/adminhtml/default/default/images/bkg_btn-close2.gif rename to skin/adminhtml/base/default/images/bkg_btn-close2.gif diff --git a/skin/adminhtml/default/default/images/bkg_config-advanced.png b/skin/adminhtml/base/default/images/bkg_config-advanced.png similarity index 100% rename from skin/adminhtml/default/default/images/bkg_config-advanced.png rename to skin/adminhtml/base/default/images/bkg_config-advanced.png diff --git a/skin/adminhtml/default/default/images/bkg_config-nested.png b/skin/adminhtml/base/default/images/bkg_config-nested.png similarity index 100% rename from skin/adminhtml/default/default/images/bkg_config-nested.png rename to skin/adminhtml/base/default/images/bkg_config-nested.png diff --git a/skin/adminhtml/default/default/images/bkg_config-shaddow.png b/skin/adminhtml/base/default/images/bkg_config-shaddow.png similarity index 100% rename from skin/adminhtml/default/default/images/bkg_config-shaddow.png rename to skin/adminhtml/base/default/images/bkg_config-shaddow.png diff --git a/skin/adminhtml/default/default/images/bkg_tooltip.png b/skin/adminhtml/base/default/images/bkg_tooltip.png similarity index 100% rename from skin/adminhtml/default/default/images/bkg_tooltip.png rename to skin/adminhtml/base/default/images/bkg_tooltip.png diff --git a/skin/adminhtml/default/default/images/blank.gif b/skin/adminhtml/base/default/images/blank.gif similarity index 100% rename from skin/adminhtml/default/default/images/blank.gif rename to skin/adminhtml/base/default/images/blank.gif diff --git a/skin/adminhtml/default/default/images/box_bg.gif b/skin/adminhtml/base/default/images/box_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/box_bg.gif rename to skin/adminhtml/base/default/images/box_bg.gif diff --git a/skin/adminhtml/default/default/images/breadcrumb_bg.gif b/skin/adminhtml/base/default/images/breadcrumb_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/breadcrumb_bg.gif rename to skin/adminhtml/base/default/images/breadcrumb_bg.gif diff --git a/skin/adminhtml/default/default/images/btn_add-image_icon.gif b/skin/adminhtml/base/default/images/btn_add-image_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_add-image_icon.gif rename to skin/adminhtml/base/default/images/btn_add-image_icon.gif diff --git a/skin/adminhtml/default/default/images/btn_add-variable_icon.gif b/skin/adminhtml/base/default/images/btn_add-variable_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_add-variable_icon.gif rename to skin/adminhtml/base/default/images/btn_add-variable_icon.gif diff --git a/skin/adminhtml/default/default/images/btn_add-widget_icon.gif b/skin/adminhtml/base/default/images/btn_add-widget_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_add-widget_icon.gif rename to skin/adminhtml/base/default/images/btn_add-widget_icon.gif diff --git a/skin/adminhtml/default/default/images/btn_add-widget_icon2.gif b/skin/adminhtml/base/default/images/btn_add-widget_icon2.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_add-widget_icon2.gif rename to skin/adminhtml/base/default/images/btn_add-widget_icon2.gif diff --git a/skin/adminhtml/default/default/images/btn_back_bg.gif b/skin/adminhtml/base/default/images/btn_back_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_back_bg.gif rename to skin/adminhtml/base/default/images/btn_back_bg.gif diff --git a/skin/adminhtml/default/default/images/btn_bare_bg.gif b/skin/adminhtml/base/default/images/btn_bare_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_bare_bg.gif rename to skin/adminhtml/base/default/images/btn_bare_bg.gif diff --git a/skin/adminhtml/default/default/images/btn_bg-disabled.gif b/skin/adminhtml/base/default/images/btn_bg-disabled.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_bg-disabled.gif rename to skin/adminhtml/base/default/images/btn_bg-disabled.gif diff --git a/skin/adminhtml/default/default/images/btn_bg.gif b/skin/adminhtml/base/default/images/btn_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_bg.gif rename to skin/adminhtml/base/default/images/btn_bg.gif diff --git a/skin/adminhtml/default/default/images/btn_bg.png b/skin/adminhtml/base/default/images/btn_bg.png similarity index 100% rename from skin/adminhtml/default/default/images/btn_bg.png rename to skin/adminhtml/base/default/images/btn_bg.png diff --git a/skin/adminhtml/default/default/images/btn_cancel_bg.gif b/skin/adminhtml/base/default/images/btn_cancel_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_cancel_bg.gif rename to skin/adminhtml/base/default/images/btn_cancel_bg.gif diff --git a/skin/adminhtml/default/default/images/btn_delete_bg.gif b/skin/adminhtml/base/default/images/btn_delete_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_delete_bg.gif rename to skin/adminhtml/base/default/images/btn_delete_bg.gif diff --git a/skin/adminhtml/default/default/images/btn_go.gif b/skin/adminhtml/base/default/images/btn_go.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_go.gif rename to skin/adminhtml/base/default/images/btn_go.gif diff --git a/skin/adminhtml/default/default/images/btn_gr_bg.gif b/skin/adminhtml/base/default/images/btn_gr_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_gr_bg.gif rename to skin/adminhtml/base/default/images/btn_gr_bg.gif diff --git a/skin/adminhtml/default/default/images/btn_gr_on.gif b/skin/adminhtml/base/default/images/btn_gr_on.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_gr_on.gif rename to skin/adminhtml/base/default/images/btn_gr_on.gif diff --git a/skin/adminhtml/default/default/images/btn_gr_over.gif b/skin/adminhtml/base/default/images/btn_gr_over.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_gr_over.gif rename to skin/adminhtml/base/default/images/btn_gr_over.gif diff --git a/skin/adminhtml/default/default/images/btn_loading-icon.gif b/skin/adminhtml/base/default/images/btn_loading-icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_loading-icon.gif rename to skin/adminhtml/base/default/images/btn_loading-icon.gif diff --git a/skin/adminhtml/default/default/images/btn_login.gif b/skin/adminhtml/base/default/images/btn_login.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_login.gif rename to skin/adminhtml/base/default/images/btn_login.gif diff --git a/skin/adminhtml/default/default/images/btn_on_bg.gif b/skin/adminhtml/base/default/images/btn_on_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_on_bg.gif rename to skin/adminhtml/base/default/images/btn_on_bg.gif diff --git a/skin/adminhtml/default/default/images/btn_over_bg.gif b/skin/adminhtml/base/default/images/btn_over_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_over_bg.gif rename to skin/adminhtml/base/default/images/btn_over_bg.gif diff --git a/skin/adminhtml/default/default/images/btn_show-hide_icon.gif b/skin/adminhtml/base/default/images/btn_show-hide_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_show-hide_icon.gif rename to skin/adminhtml/base/default/images/btn_show-hide_icon.gif diff --git a/skin/adminhtml/default/default/images/btn_task_bg.gif b/skin/adminhtml/base/default/images/btn_task_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/btn_task_bg.gif rename to skin/adminhtml/base/default/images/btn_task_bg.gif diff --git a/skin/adminhtml/default/default/images/button-close.png b/skin/adminhtml/base/default/images/button-close.png similarity index 100% rename from skin/adminhtml/default/default/images/button-close.png rename to skin/adminhtml/base/default/images/button-close.png diff --git a/skin/adminhtml/default/default/images/cancel_btn_active_bg.gif b/skin/adminhtml/base/default/images/cancel_btn_active_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/cancel_btn_active_bg.gif rename to skin/adminhtml/base/default/images/cancel_btn_active_bg.gif diff --git a/skin/adminhtml/default/default/images/cancel_btn_bg.gif b/skin/adminhtml/base/default/images/cancel_btn_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/cancel_btn_bg.gif rename to skin/adminhtml/base/default/images/cancel_btn_bg.gif diff --git a/skin/adminhtml/default/default/images/cancel_btn_icon.gif b/skin/adminhtml/base/default/images/cancel_btn_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/cancel_btn_icon.gif rename to skin/adminhtml/base/default/images/cancel_btn_icon.gif diff --git a/skin/adminhtml/default/default/images/cancel_btn_over_bg.gif b/skin/adminhtml/base/default/images/cancel_btn_over_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/cancel_btn_over_bg.gif rename to skin/adminhtml/base/default/images/cancel_btn_over_bg.gif diff --git a/skin/adminhtml/default/default/images/cancel_icon.gif b/skin/adminhtml/base/default/images/cancel_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/cancel_icon.gif rename to skin/adminhtml/base/default/images/cancel_icon.gif diff --git a/skin/adminhtml/default/default/images/config_tab_dt_bg.gif b/skin/adminhtml/base/default/images/config_tab_dt_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/config_tab_dt_bg.gif rename to skin/adminhtml/base/default/images/config_tab_dt_bg.gif diff --git a/skin/adminhtml/default/default/images/dashboard-close.gif b/skin/adminhtml/base/default/images/dashboard-close.gif similarity index 100% rename from skin/adminhtml/default/default/images/dashboard-close.gif rename to skin/adminhtml/base/default/images/dashboard-close.gif diff --git a/skin/adminhtml/default/default/images/db-graph-bg.gif b/skin/adminhtml/base/default/images/db-graph-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-graph-bg.gif rename to skin/adminhtml/base/default/images/db-graph-bg.gif diff --git a/skin/adminhtml/default/default/images/db-graph-bottom-bg.gif b/skin/adminhtml/base/default/images/db-graph-bottom-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-graph-bottom-bg.gif rename to skin/adminhtml/base/default/images/db-graph-bottom-bg.gif diff --git a/skin/adminhtml/default/default/images/db-graph-line-bg.gif b/skin/adminhtml/base/default/images/db-graph-line-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-graph-line-bg.gif rename to skin/adminhtml/base/default/images/db-graph-line-bg.gif diff --git a/skin/adminhtml/default/default/images/db-graph-line2-bg.gif b/skin/adminhtml/base/default/images/db-graph-line2-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-graph-line2-bg.gif rename to skin/adminhtml/base/default/images/db-graph-line2-bg.gif diff --git a/skin/adminhtml/default/default/images/db-graph-x-bg.png b/skin/adminhtml/base/default/images/db-graph-x-bg.png similarity index 100% rename from skin/adminhtml/default/default/images/db-graph-x-bg.png rename to skin/adminhtml/base/default/images/db-graph-x-bg.png diff --git a/skin/adminhtml/default/default/images/db-header-bg.png b/skin/adminhtml/base/default/images/db-header-bg.png similarity index 100% rename from skin/adminhtml/default/default/images/db-header-bg.png rename to skin/adminhtml/base/default/images/db-header-bg.png diff --git a/skin/adminhtml/default/default/images/db-menu-bg-hov.gif b/skin/adminhtml/base/default/images/db-menu-bg-hov.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-menu-bg-hov.gif rename to skin/adminhtml/base/default/images/db-menu-bg-hov.gif diff --git a/skin/adminhtml/default/default/images/db-menu-bg-up.gif b/skin/adminhtml/base/default/images/db-menu-bg-up.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-menu-bg-up.gif rename to skin/adminhtml/base/default/images/db-menu-bg-up.gif diff --git a/skin/adminhtml/default/default/images/db-menu-bg.gif b/skin/adminhtml/base/default/images/db-menu-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-menu-bg.gif rename to skin/adminhtml/base/default/images/db-menu-bg.gif diff --git a/skin/adminhtml/default/default/images/db-menu-sep-last.gif b/skin/adminhtml/base/default/images/db-menu-sep-last.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-menu-sep-last.gif rename to skin/adminhtml/base/default/images/db-menu-sep-last.gif diff --git a/skin/adminhtml/default/default/images/db-menu-sep.gif b/skin/adminhtml/base/default/images/db-menu-sep.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-menu-sep.gif rename to skin/adminhtml/base/default/images/db-menu-sep.gif diff --git a/skin/adminhtml/default/default/images/db-menu-start.gif b/skin/adminhtml/base/default/images/db-menu-start.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-menu-start.gif rename to skin/adminhtml/base/default/images/db-menu-start.gif diff --git a/skin/adminhtml/default/default/images/db-scroll-bg.gif b/skin/adminhtml/base/default/images/db-scroll-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-scroll-bg.gif rename to skin/adminhtml/base/default/images/db-scroll-bg.gif diff --git a/skin/adminhtml/default/default/images/db-scroll-but-bot-roll.png b/skin/adminhtml/base/default/images/db-scroll-but-bot-roll.png similarity index 100% rename from skin/adminhtml/default/default/images/db-scroll-but-bot-roll.png rename to skin/adminhtml/base/default/images/db-scroll-but-bot-roll.png diff --git a/skin/adminhtml/default/default/images/db-scroll-but-bot.png b/skin/adminhtml/base/default/images/db-scroll-but-bot.png similarity index 100% rename from skin/adminhtml/default/default/images/db-scroll-but-bot.png rename to skin/adminhtml/base/default/images/db-scroll-but-bot.png diff --git a/skin/adminhtml/default/default/images/db-scroll-but-top-roll.png b/skin/adminhtml/base/default/images/db-scroll-but-top-roll.png similarity index 100% rename from skin/adminhtml/default/default/images/db-scroll-but-top-roll.png rename to skin/adminhtml/base/default/images/db-scroll-but-top-roll.png diff --git a/skin/adminhtml/default/default/images/db-scroll-but-top.png b/skin/adminhtml/base/default/images/db-scroll-but-top.png similarity index 100% rename from skin/adminhtml/default/default/images/db-scroll-but-top.png rename to skin/adminhtml/base/default/images/db-scroll-but-top.png diff --git a/skin/adminhtml/default/default/images/db-scroll-roller.png b/skin/adminhtml/base/default/images/db-scroll-roller.png similarity index 100% rename from skin/adminhtml/default/default/images/db-scroll-roller.png rename to skin/adminhtml/base/default/images/db-scroll-roller.png diff --git a/skin/adminhtml/default/default/images/db-tab-bottom-left-bg.gif b/skin/adminhtml/base/default/images/db-tab-bottom-left-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-tab-bottom-left-bg.gif rename to skin/adminhtml/base/default/images/db-tab-bottom-left-bg.gif diff --git a/skin/adminhtml/default/default/images/db-tab-bottom-mid-bg.gif b/skin/adminhtml/base/default/images/db-tab-bottom-mid-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-tab-bottom-mid-bg.gif rename to skin/adminhtml/base/default/images/db-tab-bottom-mid-bg.gif diff --git a/skin/adminhtml/default/default/images/db-tab-bottom-right-bg.gif b/skin/adminhtml/base/default/images/db-tab-bottom-right-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-tab-bottom-right-bg.gif rename to skin/adminhtml/base/default/images/db-tab-bottom-right-bg.gif diff --git a/skin/adminhtml/default/default/images/db-tab-footer.gif b/skin/adminhtml/base/default/images/db-tab-footer.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-tab-footer.gif rename to skin/adminhtml/base/default/images/db-tab-footer.gif diff --git a/skin/adminhtml/default/default/images/db-tab-header-sep.gif b/skin/adminhtml/base/default/images/db-tab-header-sep.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-tab-header-sep.gif rename to skin/adminhtml/base/default/images/db-tab-header-sep.gif diff --git a/skin/adminhtml/default/default/images/db-tab-header.gif b/skin/adminhtml/base/default/images/db-tab-header.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-tab-header.gif rename to skin/adminhtml/base/default/images/db-tab-header.gif diff --git a/skin/adminhtml/default/default/images/db-tab-left.gif b/skin/adminhtml/base/default/images/db-tab-left.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-tab-left.gif rename to skin/adminhtml/base/default/images/db-tab-left.gif diff --git a/skin/adminhtml/default/default/images/db-tab-right.gif b/skin/adminhtml/base/default/images/db-tab-right.gif similarity index 100% rename from skin/adminhtml/default/default/images/db-tab-right.gif rename to skin/adminhtml/base/default/images/db-tab-right.gif diff --git a/skin/adminhtml/default/default/images/dotted_divider_dark.gif b/skin/adminhtml/base/default/images/dotted_divider_dark.gif similarity index 100% rename from skin/adminhtml/default/default/images/dotted_divider_dark.gif rename to skin/adminhtml/base/default/images/dotted_divider_dark.gif diff --git a/skin/adminhtml/default/default/images/dotted_divider_light.gif b/skin/adminhtml/base/default/images/dotted_divider_light.gif similarity index 100% rename from skin/adminhtml/default/default/images/dotted_divider_light.gif rename to skin/adminhtml/base/default/images/dotted_divider_light.gif diff --git a/skin/adminhtml/default/default/images/edit_icon.gif b/skin/adminhtml/base/default/images/edit_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/edit_icon.gif rename to skin/adminhtml/base/default/images/edit_icon.gif diff --git a/skin/adminhtml/default/default/images/entry_edit_head_arrow_down.gif b/skin/adminhtml/base/default/images/entry_edit_head_arrow_down.gif similarity index 100% rename from skin/adminhtml/default/default/images/entry_edit_head_arrow_down.gif rename to skin/adminhtml/base/default/images/entry_edit_head_arrow_down.gif diff --git a/skin/adminhtml/default/default/images/entry_edit_head_arrow_down2.gif b/skin/adminhtml/base/default/images/entry_edit_head_arrow_down2.gif similarity index 100% rename from skin/adminhtml/default/default/images/entry_edit_head_arrow_down2.gif rename to skin/adminhtml/base/default/images/entry_edit_head_arrow_down2.gif diff --git a/skin/adminhtml/default/default/images/entry_edit_head_arrow_up.gif b/skin/adminhtml/base/default/images/entry_edit_head_arrow_up.gif similarity index 100% rename from skin/adminhtml/default/default/images/entry_edit_head_arrow_up.gif rename to skin/adminhtml/base/default/images/entry_edit_head_arrow_up.gif diff --git a/skin/adminhtml/default/default/images/entry_edit_head_bg.gif b/skin/adminhtml/base/default/images/entry_edit_head_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/entry_edit_head_bg.gif rename to skin/adminhtml/base/default/images/entry_edit_head_bg.gif diff --git a/skin/adminhtml/default/default/images/error-msg.png b/skin/adminhtml/base/default/images/error-msg.png similarity index 100% rename from skin/adminhtml/default/default/images/error-msg.png rename to skin/adminhtml/base/default/images/error-msg.png diff --git a/skin/adminhtml/default/default/images/error_msg_icon.gif b/skin/adminhtml/base/default/images/error_msg_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/error_msg_icon.gif rename to skin/adminhtml/base/default/images/error_msg_icon.gif diff --git a/skin/adminhtml/default/default/images/fam_account.gif b/skin/adminhtml/base/default/images/fam_account.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_account.gif rename to skin/adminhtml/base/default/images/fam_account.gif diff --git a/skin/adminhtml/default/default/images/fam_application_form_delete.png b/skin/adminhtml/base/default/images/fam_application_form_delete.png similarity index 100% rename from skin/adminhtml/default/default/images/fam_application_form_delete.png rename to skin/adminhtml/base/default/images/fam_application_form_delete.png diff --git a/skin/adminhtml/default/default/images/fam_application_view_tile.gif b/skin/adminhtml/base/default/images/fam_application_view_tile.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_application_view_tile.gif rename to skin/adminhtml/base/default/images/fam_application_view_tile.gif diff --git a/skin/adminhtml/default/default/images/fam_asterisk_orange.gif b/skin/adminhtml/base/default/images/fam_asterisk_orange.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_asterisk_orange.gif rename to skin/adminhtml/base/default/images/fam_asterisk_orange.gif diff --git a/skin/adminhtml/default/default/images/fam_bin.gif b/skin/adminhtml/base/default/images/fam_bin.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_bin.gif rename to skin/adminhtml/base/default/images/fam_bin.gif diff --git a/skin/adminhtml/default/default/images/fam_book_open.png b/skin/adminhtml/base/default/images/fam_book_open.png similarity index 100% rename from skin/adminhtml/default/default/images/fam_book_open.png rename to skin/adminhtml/base/default/images/fam_book_open.png diff --git a/skin/adminhtml/default/default/images/fam_bullet_disk.gif b/skin/adminhtml/base/default/images/fam_bullet_disk.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_bullet_disk.gif rename to skin/adminhtml/base/default/images/fam_bullet_disk.gif diff --git a/skin/adminhtml/default/default/images/fam_bullet_error.gif b/skin/adminhtml/base/default/images/fam_bullet_error.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_bullet_error.gif rename to skin/adminhtml/base/default/images/fam_bullet_error.gif diff --git a/skin/adminhtml/default/default/images/fam_bullet_success.gif b/skin/adminhtml/base/default/images/fam_bullet_success.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_bullet_success.gif rename to skin/adminhtml/base/default/images/fam_bullet_success.gif diff --git a/skin/adminhtml/default/default/images/fam_calendar.gif b/skin/adminhtml/base/default/images/fam_calendar.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_calendar.gif rename to skin/adminhtml/base/default/images/fam_calendar.gif diff --git a/skin/adminhtml/default/default/images/fam_cart.gif b/skin/adminhtml/base/default/images/fam_cart.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_cart.gif rename to skin/adminhtml/base/default/images/fam_cart.gif diff --git a/skin/adminhtml/default/default/images/fam_comment.gif b/skin/adminhtml/base/default/images/fam_comment.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_comment.gif rename to skin/adminhtml/base/default/images/fam_comment.gif diff --git a/skin/adminhtml/default/default/images/fam_creditcards.gif b/skin/adminhtml/base/default/images/fam_creditcards.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_creditcards.gif rename to skin/adminhtml/base/default/images/fam_creditcards.gif diff --git a/skin/adminhtml/default/default/images/fam_folder_database.gif b/skin/adminhtml/base/default/images/fam_folder_database.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_folder_database.gif rename to skin/adminhtml/base/default/images/fam_folder_database.gif diff --git a/skin/adminhtml/default/default/images/fam_folder_palette.gif b/skin/adminhtml/base/default/images/fam_folder_palette.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_folder_palette.gif rename to skin/adminhtml/base/default/images/fam_folder_palette.gif diff --git a/skin/adminhtml/default/default/images/fam_folder_table.gif b/skin/adminhtml/base/default/images/fam_folder_table.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_folder_table.gif rename to skin/adminhtml/base/default/images/fam_folder_table.gif diff --git a/skin/adminhtml/default/default/images/fam_group.gif b/skin/adminhtml/base/default/images/fam_group.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_group.gif rename to skin/adminhtml/base/default/images/fam_group.gif diff --git a/skin/adminhtml/default/default/images/fam_help.gif b/skin/adminhtml/base/default/images/fam_help.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_help.gif rename to skin/adminhtml/base/default/images/fam_help.gif diff --git a/skin/adminhtml/default/default/images/fam_house.gif b/skin/adminhtml/base/default/images/fam_house.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_house.gif rename to skin/adminhtml/base/default/images/fam_house.gif diff --git a/skin/adminhtml/default/default/images/fam_layout.gif b/skin/adminhtml/base/default/images/fam_layout.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_layout.gif rename to skin/adminhtml/base/default/images/fam_layout.gif diff --git a/skin/adminhtml/default/default/images/fam_leaf.png b/skin/adminhtml/base/default/images/fam_leaf.png similarity index 100% rename from skin/adminhtml/default/default/images/fam_leaf.png rename to skin/adminhtml/base/default/images/fam_leaf.png diff --git a/skin/adminhtml/default/default/images/fam_link.gif b/skin/adminhtml/base/default/images/fam_link.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_link.gif rename to skin/adminhtml/base/default/images/fam_link.gif diff --git a/skin/adminhtml/default/default/images/fam_lorry.gif b/skin/adminhtml/base/default/images/fam_lorry.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_lorry.gif rename to skin/adminhtml/base/default/images/fam_lorry.gif diff --git a/skin/adminhtml/default/default/images/fam_magnifier.png b/skin/adminhtml/base/default/images/fam_magnifier.png similarity index 100% rename from skin/adminhtml/default/default/images/fam_magnifier.png rename to skin/adminhtml/base/default/images/fam_magnifier.png diff --git a/skin/adminhtml/default/default/images/fam_money.gif b/skin/adminhtml/base/default/images/fam_money.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_money.gif rename to skin/adminhtml/base/default/images/fam_money.gif diff --git a/skin/adminhtml/default/default/images/fam_money_add.gif b/skin/adminhtml/base/default/images/fam_money_add.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_money_add.gif rename to skin/adminhtml/base/default/images/fam_money_add.gif diff --git a/skin/adminhtml/default/default/images/fam_monitor.gif b/skin/adminhtml/base/default/images/fam_monitor.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_monitor.gif rename to skin/adminhtml/base/default/images/fam_monitor.gif diff --git a/skin/adminhtml/default/default/images/fam_newspaper.gif b/skin/adminhtml/base/default/images/fam_newspaper.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_newspaper.gif rename to skin/adminhtml/base/default/images/fam_newspaper.gif diff --git a/skin/adminhtml/default/default/images/fam_newspaper_delete.gif b/skin/adminhtml/base/default/images/fam_newspaper_delete.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_newspaper_delete.gif rename to skin/adminhtml/base/default/images/fam_newspaper_delete.gif diff --git a/skin/adminhtml/default/default/images/fam_newspaper_error.gif b/skin/adminhtml/base/default/images/fam_newspaper_error.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_newspaper_error.gif rename to skin/adminhtml/base/default/images/fam_newspaper_error.gif diff --git a/skin/adminhtml/default/default/images/fam_newspaper_go.gif b/skin/adminhtml/base/default/images/fam_newspaper_go.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_newspaper_go.gif rename to skin/adminhtml/base/default/images/fam_newspaper_go.gif diff --git a/skin/adminhtml/default/default/images/fam_package.gif b/skin/adminhtml/base/default/images/fam_package.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_package.gif rename to skin/adminhtml/base/default/images/fam_package.gif diff --git a/skin/adminhtml/default/default/images/fam_package_go.gif b/skin/adminhtml/base/default/images/fam_package_go.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_package_go.gif rename to skin/adminhtml/base/default/images/fam_package_go.gif diff --git a/skin/adminhtml/default/default/images/fam_page_white.gif b/skin/adminhtml/base/default/images/fam_page_white.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_page_white.gif rename to skin/adminhtml/base/default/images/fam_page_white.gif diff --git a/skin/adminhtml/default/default/images/fam_page_white_edit.gif b/skin/adminhtml/base/default/images/fam_page_white_edit.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_page_white_edit.gif rename to skin/adminhtml/base/default/images/fam_page_white_edit.gif diff --git a/skin/adminhtml/default/default/images/fam_rainbow.gif b/skin/adminhtml/base/default/images/fam_rainbow.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_rainbow.gif rename to skin/adminhtml/base/default/images/fam_rainbow.gif diff --git a/skin/adminhtml/default/default/images/fam_refresh.gif b/skin/adminhtml/base/default/images/fam_refresh.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_refresh.gif rename to skin/adminhtml/base/default/images/fam_refresh.gif diff --git a/skin/adminhtml/default/default/images/fam_server_database.gif b/skin/adminhtml/base/default/images/fam_server_database.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_server_database.gif rename to skin/adminhtml/base/default/images/fam_server_database.gif diff --git a/skin/adminhtml/default/default/images/fam_status_online.gif b/skin/adminhtml/base/default/images/fam_status_online.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_status_online.gif rename to skin/adminhtml/base/default/images/fam_status_online.gif diff --git a/skin/adminhtml/default/default/images/fam_tag_orange.gif b/skin/adminhtml/base/default/images/fam_tag_orange.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_tag_orange.gif rename to skin/adminhtml/base/default/images/fam_tag_orange.gif diff --git a/skin/adminhtml/default/default/images/fam_user.gif b/skin/adminhtml/base/default/images/fam_user.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_user.gif rename to skin/adminhtml/base/default/images/fam_user.gif diff --git a/skin/adminhtml/default/default/images/fam_user_comment.gif b/skin/adminhtml/base/default/images/fam_user_comment.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_user_comment.gif rename to skin/adminhtml/base/default/images/fam_user_comment.gif diff --git a/skin/adminhtml/default/default/images/fam_user_edit.gif b/skin/adminhtml/base/default/images/fam_user_edit.gif similarity index 100% rename from skin/adminhtml/default/default/images/fam_user_edit.gif rename to skin/adminhtml/base/default/images/fam_user_edit.gif diff --git a/skin/adminhtml/default/default/images/filter_row_bg.gif b/skin/adminhtml/base/default/images/filter_row_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/filter_row_bg.gif rename to skin/adminhtml/base/default/images/filter_row_bg.gif diff --git a/skin/adminhtml/default/default/images/footer_bg.gif b/skin/adminhtml/base/default/images/footer_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/footer_bg.gif rename to skin/adminhtml/base/default/images/footer_bg.gif diff --git a/skin/adminhtml/default/default/images/gift-message-collapse.gif b/skin/adminhtml/base/default/images/gift-message-collapse.gif similarity index 100% rename from skin/adminhtml/default/default/images/gift-message-collapse.gif rename to skin/adminhtml/base/default/images/gift-message-collapse.gif diff --git a/skin/adminhtml/default/default/images/gift-message-expand.gif b/skin/adminhtml/base/default/images/gift-message-expand.gif similarity index 100% rename from skin/adminhtml/default/default/images/gift-message-expand.gif rename to skin/adminhtml/base/default/images/gift-message-expand.gif diff --git a/skin/adminhtml/default/default/images/gift-message-grid-column-bg.gif b/skin/adminhtml/base/default/images/gift-message-grid-column-bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/gift-message-grid-column-bg.gif rename to skin/adminhtml/base/default/images/gift-message-grid-column-bg.gif diff --git a/skin/adminhtml/default/default/images/grid-cal.gif b/skin/adminhtml/base/default/images/grid-cal.gif similarity index 100% rename from skin/adminhtml/default/default/images/grid-cal.gif rename to skin/adminhtml/base/default/images/grid-cal.gif diff --git a/skin/adminhtml/default/default/images/grid_sort_asc.gif b/skin/adminhtml/base/default/images/grid_sort_asc.gif similarity index 100% rename from skin/adminhtml/default/default/images/grid_sort_asc.gif rename to skin/adminhtml/base/default/images/grid_sort_asc.gif diff --git a/skin/adminhtml/default/default/images/grid_sort_desc.gif b/skin/adminhtml/base/default/images/grid_sort_desc.gif similarity index 100% rename from skin/adminhtml/default/default/images/grid_sort_desc.gif rename to skin/adminhtml/base/default/images/grid_sort_desc.gif diff --git a/skin/adminhtml/default/default/images/grid_th_bg.gif b/skin/adminhtml/base/default/images/grid_th_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/grid_th_bg.gif rename to skin/adminhtml/base/default/images/grid_th_bg.gif diff --git a/skin/adminhtml/default/default/images/grid_th_onclick_bg.gif b/skin/adminhtml/base/default/images/grid_th_onclick_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/grid_th_onclick_bg.gif rename to skin/adminhtml/base/default/images/grid_th_onclick_bg.gif diff --git a/skin/adminhtml/default/default/images/grouped_to_order_icon.png b/skin/adminhtml/base/default/images/grouped_to_order_icon.png similarity index 100% rename from skin/adminhtml/default/default/images/grouped_to_order_icon.png rename to skin/adminhtml/base/default/images/grouped_to_order_icon.png diff --git a/skin/adminhtml/default/default/images/header_bg.gif b/skin/adminhtml/base/default/images/header_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/header_bg.gif rename to skin/adminhtml/base/default/images/header_bg.gif diff --git a/skin/adminhtml/default/default/images/header_top_bg.gif b/skin/adminhtml/base/default/images/header_top_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/header_top_bg.gif rename to skin/adminhtml/base/default/images/header_top_bg.gif diff --git a/skin/adminhtml/default/default/images/horiz_tabs_ul_bg.gif b/skin/adminhtml/base/default/images/horiz_tabs_ul_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/horiz_tabs_ul_bg.gif rename to skin/adminhtml/base/default/images/horiz_tabs_ul_bg.gif diff --git a/skin/adminhtml/default/default/images/i_notice.gif b/skin/adminhtml/base/default/images/i_notice.gif similarity index 100% rename from skin/adminhtml/default/default/images/i_notice.gif rename to skin/adminhtml/base/default/images/i_notice.gif diff --git a/skin/adminhtml/default/default/images/i_question-mark.png b/skin/adminhtml/base/default/images/i_question-mark.png similarity index 100% rename from skin/adminhtml/default/default/images/i_question-mark.png rename to skin/adminhtml/base/default/images/i_question-mark.png diff --git a/skin/adminhtml/default/default/images/ico_success.gif b/skin/adminhtml/base/default/images/ico_success.gif similarity index 100% rename from skin/adminhtml/default/default/images/ico_success.gif rename to skin/adminhtml/base/default/images/ico_success.gif diff --git a/skin/adminhtml/default/default/images/icon-enabled.png b/skin/adminhtml/base/default/images/icon-enabled.png similarity index 100% rename from skin/adminhtml/default/default/images/icon-enabled.png rename to skin/adminhtml/base/default/images/icon-enabled.png diff --git a/skin/adminhtml/default/default/images/icon-tooltip.png b/skin/adminhtml/base/default/images/icon-tooltip.png similarity index 100% rename from skin/adminhtml/default/default/images/icon-tooltip.png rename to skin/adminhtml/base/default/images/icon-tooltip.png diff --git a/skin/adminhtml/default/default/images/icon_btn_add.gif b/skin/adminhtml/base/default/images/icon_btn_add.gif similarity index 100% rename from skin/adminhtml/default/default/images/icon_btn_add.gif rename to skin/adminhtml/base/default/images/icon_btn_add.gif diff --git a/skin/adminhtml/default/default/images/icon_btn_back.gif b/skin/adminhtml/base/default/images/icon_btn_back.gif similarity index 100% rename from skin/adminhtml/default/default/images/icon_btn_back.gif rename to skin/adminhtml/base/default/images/icon_btn_back.gif diff --git a/skin/adminhtml/default/default/images/icon_btn_delete.gif b/skin/adminhtml/base/default/images/icon_btn_delete.gif similarity index 100% rename from skin/adminhtml/default/default/images/icon_btn_delete.gif rename to skin/adminhtml/base/default/images/icon_btn_delete.gif diff --git a/skin/adminhtml/default/default/images/icon_btn_save.gif b/skin/adminhtml/base/default/images/icon_btn_save.gif similarity index 100% rename from skin/adminhtml/default/default/images/icon_btn_save.gif rename to skin/adminhtml/base/default/images/icon_btn_save.gif diff --git a/skin/adminhtml/default/default/images/icon_edit_address.gif b/skin/adminhtml/base/default/images/icon_edit_address.gif similarity index 100% rename from skin/adminhtml/default/default/images/icon_edit_address.gif rename to skin/adminhtml/base/default/images/icon_edit_address.gif diff --git a/skin/adminhtml/default/default/images/icon_export.gif b/skin/adminhtml/base/default/images/icon_export.gif similarity index 100% rename from skin/adminhtml/default/default/images/icon_export.gif rename to skin/adminhtml/base/default/images/icon_export.gif diff --git a/skin/adminhtml/default/default/images/icon_export.png b/skin/adminhtml/base/default/images/icon_export.png similarity index 100% rename from skin/adminhtml/default/default/images/icon_export.png rename to skin/adminhtml/base/default/images/icon_export.png diff --git a/skin/adminhtml/default/default/images/icon_feed.gif b/skin/adminhtml/base/default/images/icon_feed.gif similarity index 100% rename from skin/adminhtml/default/default/images/icon_feed.gif rename to skin/adminhtml/base/default/images/icon_feed.gif diff --git a/skin/adminhtml/default/default/images/icon_feed.png b/skin/adminhtml/base/default/images/icon_feed.png similarity index 100% rename from skin/adminhtml/default/default/images/icon_feed.png rename to skin/adminhtml/base/default/images/icon_feed.png diff --git a/skin/adminhtml/default/default/images/icon_note_list.gif b/skin/adminhtml/base/default/images/icon_note_list.gif similarity index 100% rename from skin/adminhtml/default/default/images/icon_note_list.gif rename to skin/adminhtml/base/default/images/icon_note_list.gif diff --git a/skin/adminhtml/default/default/images/icon_remove_address.gif b/skin/adminhtml/base/default/images/icon_remove_address.gif similarity index 100% rename from skin/adminhtml/default/default/images/icon_remove_address.gif rename to skin/adminhtml/base/default/images/icon_remove_address.gif diff --git a/skin/adminhtml/default/default/images/login_box_bg.gif b/skin/adminhtml/base/default/images/login_box_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/login_box_bg.gif rename to skin/adminhtml/base/default/images/login_box_bg.gif diff --git a/skin/adminhtml/default/default/images/login_box_bg.jpg b/skin/adminhtml/base/default/images/login_box_bg.jpg similarity index 100% rename from skin/adminhtml/default/default/images/login_box_bg.jpg rename to skin/adminhtml/base/default/images/login_box_bg.jpg diff --git a/skin/adminhtml/default/default/images/login_box_bg_auth.jpg b/skin/adminhtml/base/default/images/login_box_bg_auth.jpg similarity index 100% rename from skin/adminhtml/default/default/images/login_box_bg_auth.jpg rename to skin/adminhtml/base/default/images/login_box_bg_auth.jpg diff --git a/skin/adminhtml/default/default/images/login_box_bottom.jpg b/skin/adminhtml/base/default/images/login_box_bottom.jpg similarity index 100% rename from skin/adminhtml/default/default/images/login_box_bottom.jpg rename to skin/adminhtml/base/default/images/login_box_bottom.jpg diff --git a/skin/adminhtml/default/default/images/login_box_legal_bg.gif b/skin/adminhtml/base/default/images/login_box_legal_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/login_box_legal_bg.gif rename to skin/adminhtml/base/default/images/login_box_legal_bg.gif diff --git a/skin/adminhtml/default/default/images/logo-large.gif b/skin/adminhtml/base/default/images/logo-large.gif similarity index 100% rename from skin/adminhtml/default/default/images/logo-large.gif rename to skin/adminhtml/base/default/images/logo-large.gif diff --git a/skin/adminhtml/default/default/images/logo.svg b/skin/adminhtml/base/default/images/logo.svg similarity index 100% rename from skin/adminhtml/default/default/images/logo.svg rename to skin/adminhtml/base/default/images/logo.svg diff --git a/skin/adminhtml/default/default/images/logo_email.gif b/skin/adminhtml/base/default/images/logo_email.gif similarity index 100% rename from skin/adminhtml/default/default/images/logo_email.gif rename to skin/adminhtml/base/default/images/logo_email.gif diff --git a/skin/adminhtml/default/default/images/logo_gray.svg b/skin/adminhtml/base/default/images/logo_gray.svg similarity index 100% rename from skin/adminhtml/default/default/images/logo_gray.svg rename to skin/adminhtml/base/default/images/logo_gray.svg diff --git a/skin/adminhtml/default/default/images/logo_print.gif b/skin/adminhtml/base/default/images/logo_print.gif similarity index 100% rename from skin/adminhtml/default/default/images/logo_print.gif rename to skin/adminhtml/base/default/images/logo_print.gif diff --git a/skin/adminhtml/default/default/images/massaction_bg.gif b/skin/adminhtml/base/default/images/massaction_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/massaction_bg.gif rename to skin/adminhtml/base/default/images/massaction_bg.gif diff --git a/skin/adminhtml/default/default/images/massaction_button_bg.gif b/skin/adminhtml/base/default/images/massaction_button_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/massaction_button_bg.gif rename to skin/adminhtml/base/default/images/massaction_button_bg.gif diff --git a/skin/adminhtml/default/default/images/massaction_links_delimiter.gif b/skin/adminhtml/base/default/images/massaction_links_delimiter.gif similarity index 100% rename from skin/adminhtml/default/default/images/massaction_links_delimiter.gif rename to skin/adminhtml/base/default/images/massaction_links_delimiter.gif diff --git a/skin/adminhtml/default/default/images/middle_bg.gif b/skin/adminhtml/base/default/images/middle_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/middle_bg.gif rename to skin/adminhtml/base/default/images/middle_bg.gif diff --git a/skin/adminhtml/default/default/images/more_arrow.gif b/skin/adminhtml/base/default/images/more_arrow.gif similarity index 100% rename from skin/adminhtml/default/default/images/more_arrow.gif rename to skin/adminhtml/base/default/images/more_arrow.gif diff --git a/skin/adminhtml/default/default/images/nav1_active.gif b/skin/adminhtml/base/default/images/nav1_active.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav1_active.gif rename to skin/adminhtml/base/default/images/nav1_active.gif diff --git a/skin/adminhtml/default/default/images/nav1_bg.gif b/skin/adminhtml/base/default/images/nav1_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav1_bg.gif rename to skin/adminhtml/base/default/images/nav1_bg.gif diff --git a/skin/adminhtml/default/default/images/nav1_off.gif b/skin/adminhtml/base/default/images/nav1_off.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav1_off.gif rename to skin/adminhtml/base/default/images/nav1_off.gif diff --git a/skin/adminhtml/default/default/images/nav1_on.gif b/skin/adminhtml/base/default/images/nav1_on.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav1_on.gif rename to skin/adminhtml/base/default/images/nav1_on.gif diff --git a/skin/adminhtml/default/default/images/nav1_over.gif b/skin/adminhtml/base/default/images/nav1_over.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav1_over.gif rename to skin/adminhtml/base/default/images/nav1_over.gif diff --git a/skin/adminhtml/default/default/images/nav1_sep.gif b/skin/adminhtml/base/default/images/nav1_sep.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav1_sep.gif rename to skin/adminhtml/base/default/images/nav1_sep.gif diff --git a/skin/adminhtml/default/default/images/nav2_last_li_bg.png b/skin/adminhtml/base/default/images/nav2_last_li_bg.png similarity index 100% rename from skin/adminhtml/default/default/images/nav2_last_li_bg.png rename to skin/adminhtml/base/default/images/nav2_last_li_bg.png diff --git a/skin/adminhtml/default/default/images/nav2_last_li_over_bg.png b/skin/adminhtml/base/default/images/nav2_last_li_over_bg.png similarity index 100% rename from skin/adminhtml/default/default/images/nav2_last_li_over_bg.png rename to skin/adminhtml/base/default/images/nav2_last_li_over_bg.png diff --git a/skin/adminhtml/default/default/images/nav2_li_bg.gif b/skin/adminhtml/base/default/images/nav2_li_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav2_li_bg.gif rename to skin/adminhtml/base/default/images/nav2_li_bg.gif diff --git a/skin/adminhtml/default/default/images/nav2_li_bg.png b/skin/adminhtml/base/default/images/nav2_li_bg.png similarity index 100% rename from skin/adminhtml/default/default/images/nav2_li_bg.png rename to skin/adminhtml/base/default/images/nav2_li_bg.png diff --git a/skin/adminhtml/default/default/images/nav2_li_over_bg.png b/skin/adminhtml/base/default/images/nav2_li_over_bg.png similarity index 100% rename from skin/adminhtml/default/default/images/nav2_li_over_bg.png rename to skin/adminhtml/base/default/images/nav2_li_over_bg.png diff --git a/skin/adminhtml/default/default/images/nav2_link_bg.gif b/skin/adminhtml/base/default/images/nav2_link_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav2_link_bg.gif rename to skin/adminhtml/base/default/images/nav2_link_bg.gif diff --git a/skin/adminhtml/default/default/images/nav2_parent_arrow.gif b/skin/adminhtml/base/default/images/nav2_parent_arrow.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav2_parent_arrow.gif rename to skin/adminhtml/base/default/images/nav2_parent_arrow.gif diff --git a/skin/adminhtml/default/default/images/nav3_bg.png b/skin/adminhtml/base/default/images/nav3_bg.png similarity index 100% rename from skin/adminhtml/default/default/images/nav3_bg.png rename to skin/adminhtml/base/default/images/nav3_bg.png diff --git a/skin/adminhtml/default/default/images/nav_bg.gif b/skin/adminhtml/base/default/images/nav_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav_bg.gif rename to skin/adminhtml/base/default/images/nav_bg.gif diff --git a/skin/adminhtml/default/default/images/nav_list_bg.gif b/skin/adminhtml/base/default/images/nav_list_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav_list_bg.gif rename to skin/adminhtml/base/default/images/nav_list_bg.gif diff --git a/skin/adminhtml/default/default/images/nav_nest_link_bg.gif b/skin/adminhtml/base/default/images/nav_nest_link_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav_nest_link_bg.gif rename to skin/adminhtml/base/default/images/nav_nest_link_bg.gif diff --git a/skin/adminhtml/default/default/images/nav_nest_link_over_bg.gif b/skin/adminhtml/base/default/images/nav_nest_link_over_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav_nest_link_over_bg.gif rename to skin/adminhtml/base/default/images/nav_nest_link_over_bg.gif diff --git a/skin/adminhtml/default/default/images/nav_on_bg.gif b/skin/adminhtml/base/default/images/nav_on_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav_on_bg.gif rename to skin/adminhtml/base/default/images/nav_on_bg.gif diff --git a/skin/adminhtml/default/default/images/nav_parent_arrow.gif b/skin/adminhtml/base/default/images/nav_parent_arrow.gif similarity index 100% rename from skin/adminhtml/default/default/images/nav_parent_arrow.gif rename to skin/adminhtml/base/default/images/nav_parent_arrow.gif diff --git a/skin/adminhtml/default/default/images/note_bg.gif b/skin/adminhtml/base/default/images/note_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/note_bg.gif rename to skin/adminhtml/base/default/images/note_bg.gif diff --git a/skin/adminhtml/default/default/images/note_cell_bg.gif b/skin/adminhtml/base/default/images/note_cell_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/note_cell_bg.gif rename to skin/adminhtml/base/default/images/note_cell_bg.gif diff --git a/skin/adminhtml/default/default/images/note_msg_icon.gif b/skin/adminhtml/base/default/images/note_msg_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/note_msg_icon.gif rename to skin/adminhtml/base/default/images/note_msg_icon.gif diff --git a/skin/adminhtml/default/default/images/notice-msg.png b/skin/adminhtml/base/default/images/notice-msg.png similarity index 100% rename from skin/adminhtml/default/default/images/notice-msg.png rename to skin/adminhtml/base/default/images/notice-msg.png diff --git a/skin/adminhtml/default/default/images/pager_arrow_left.gif b/skin/adminhtml/base/default/images/pager_arrow_left.gif similarity index 100% rename from skin/adminhtml/default/default/images/pager_arrow_left.gif rename to skin/adminhtml/base/default/images/pager_arrow_left.gif diff --git a/skin/adminhtml/default/default/images/pager_arrow_left_off.gif b/skin/adminhtml/base/default/images/pager_arrow_left_off.gif similarity index 100% rename from skin/adminhtml/default/default/images/pager_arrow_left_off.gif rename to skin/adminhtml/base/default/images/pager_arrow_left_off.gif diff --git a/skin/adminhtml/default/default/images/pager_arrow_right.gif b/skin/adminhtml/base/default/images/pager_arrow_right.gif similarity index 100% rename from skin/adminhtml/default/default/images/pager_arrow_right.gif rename to skin/adminhtml/base/default/images/pager_arrow_right.gif diff --git a/skin/adminhtml/default/default/images/pager_arrow_right_off.gif b/skin/adminhtml/base/default/images/pager_arrow_right_off.gif similarity index 100% rename from skin/adminhtml/default/default/images/pager_arrow_right_off.gif rename to skin/adminhtml/base/default/images/pager_arrow_right_off.gif diff --git a/skin/adminhtml/default/default/images/paypal/logo-paypal.png b/skin/adminhtml/base/default/images/paypal/logo-paypal.png similarity index 100% rename from skin/adminhtml/default/default/images/paypal/logo-paypal.png rename to skin/adminhtml/base/default/images/paypal/logo-paypal.png diff --git a/skin/adminhtml/default/default/images/paypal/pp-allinone.png b/skin/adminhtml/base/default/images/paypal/pp-allinone.png similarity index 100% rename from skin/adminhtml/default/default/images/paypal/pp-allinone.png rename to skin/adminhtml/base/default/images/paypal/pp-allinone.png diff --git a/skin/adminhtml/default/default/images/paypal/pp-alt.png b/skin/adminhtml/base/default/images/paypal/pp-alt.png similarity index 100% rename from skin/adminhtml/default/default/images/paypal/pp-alt.png rename to skin/adminhtml/base/default/images/paypal/pp-alt.png diff --git a/skin/adminhtml/default/default/images/paypal/pp-gateways.png b/skin/adminhtml/base/default/images/paypal/pp-gateways.png similarity index 100% rename from skin/adminhtml/default/default/images/paypal/pp-gateways.png rename to skin/adminhtml/base/default/images/paypal/pp-gateways.png diff --git a/skin/adminhtml/default/default/images/paypal/pp-uk.png b/skin/adminhtml/base/default/images/paypal/pp-uk.png similarity index 100% rename from skin/adminhtml/default/default/images/paypal/pp-uk.png rename to skin/adminhtml/base/default/images/paypal/pp-uk.png diff --git a/skin/adminhtml/default/default/images/paypal_logo.gif b/skin/adminhtml/base/default/images/paypal_logo.gif similarity index 100% rename from skin/adminhtml/default/default/images/paypal_logo.gif rename to skin/adminhtml/base/default/images/paypal_logo.gif diff --git a/skin/adminhtml/default/default/images/paypal_section.png b/skin/adminhtml/base/default/images/paypal_section.png similarity index 100% rename from skin/adminhtml/default/default/images/paypal_section.png rename to skin/adminhtml/base/default/images/paypal_section.png diff --git a/skin/adminhtml/default/default/images/paypal_tick.gif b/skin/adminhtml/base/default/images/paypal_tick.gif similarity index 100% rename from skin/adminhtml/default/default/images/paypal_tick.gif rename to skin/adminhtml/base/default/images/paypal_tick.gif diff --git a/skin/adminhtml/default/default/images/placeholder/thumbnail.jpg b/skin/adminhtml/base/default/images/placeholder/thumbnail.jpg similarity index 100% rename from skin/adminhtml/default/default/images/placeholder/thumbnail.jpg rename to skin/adminhtml/base/default/images/placeholder/thumbnail.jpg diff --git a/skin/adminhtml/default/default/images/process_spinner.gif b/skin/adminhtml/base/default/images/process_spinner.gif similarity index 100% rename from skin/adminhtml/default/default/images/process_spinner.gif rename to skin/adminhtml/base/default/images/process_spinner.gif diff --git a/skin/adminhtml/default/default/images/product_rating_blank_star.gif b/skin/adminhtml/base/default/images/product_rating_blank_star.gif similarity index 100% rename from skin/adminhtml/default/default/images/product_rating_blank_star.gif rename to skin/adminhtml/base/default/images/product_rating_blank_star.gif diff --git a/skin/adminhtml/default/default/images/product_rating_full_star.gif b/skin/adminhtml/base/default/images/product_rating_full_star.gif similarity index 100% rename from skin/adminhtml/default/default/images/product_rating_full_star.gif rename to skin/adminhtml/base/default/images/product_rating_full_star.gif diff --git a/skin/adminhtml/default/default/images/reload.png b/skin/adminhtml/base/default/images/reload.png similarity index 100% rename from skin/adminhtml/default/default/images/reload.png rename to skin/adminhtml/base/default/images/reload.png diff --git a/skin/adminhtml/default/default/images/rule-ajax-loader.gif b/skin/adminhtml/base/default/images/rule-ajax-loader.gif similarity index 100% rename from skin/adminhtml/default/default/images/rule-ajax-loader.gif rename to skin/adminhtml/base/default/images/rule-ajax-loader.gif diff --git a/skin/adminhtml/default/default/images/rule_chooser_trigger.gif b/skin/adminhtml/base/default/images/rule_chooser_trigger.gif similarity index 100% rename from skin/adminhtml/default/default/images/rule_chooser_trigger.gif rename to skin/adminhtml/base/default/images/rule_chooser_trigger.gif diff --git a/skin/adminhtml/default/default/images/rule_component_add.gif b/skin/adminhtml/base/default/images/rule_component_add.gif similarity index 100% rename from skin/adminhtml/default/default/images/rule_component_add.gif rename to skin/adminhtml/base/default/images/rule_component_add.gif diff --git a/skin/adminhtml/default/default/images/rule_component_apply.gif b/skin/adminhtml/base/default/images/rule_component_apply.gif similarity index 100% rename from skin/adminhtml/default/default/images/rule_component_apply.gif rename to skin/adminhtml/base/default/images/rule_component_apply.gif diff --git a/skin/adminhtml/default/default/images/rule_component_remove.gif b/skin/adminhtml/base/default/images/rule_component_remove.gif similarity index 100% rename from skin/adminhtml/default/default/images/rule_component_remove.gif rename to skin/adminhtml/base/default/images/rule_component_remove.gif diff --git a/skin/adminhtml/default/default/images/save_btn_icon.gif b/skin/adminhtml/base/default/images/save_btn_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/save_btn_icon.gif rename to skin/adminhtml/base/default/images/save_btn_icon.gif diff --git a/skin/adminhtml/default/default/images/sec_nav_bg.gif b/skin/adminhtml/base/default/images/sec_nav_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/sec_nav_bg.gif rename to skin/adminhtml/base/default/images/sec_nav_bg.gif diff --git a/skin/adminhtml/default/default/images/section_menu_bg.gif b/skin/adminhtml/base/default/images/section_menu_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/section_menu_bg.gif rename to skin/adminhtml/base/default/images/section_menu_bg.gif diff --git a/skin/adminhtml/default/default/images/section_menu_bottom.gif b/skin/adminhtml/base/default/images/section_menu_bottom.gif similarity index 100% rename from skin/adminhtml/default/default/images/section_menu_bottom.gif rename to skin/adminhtml/base/default/images/section_menu_bottom.gif diff --git a/skin/adminhtml/default/default/images/section_menu_link_bg.gif b/skin/adminhtml/base/default/images/section_menu_link_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/section_menu_link_bg.gif rename to skin/adminhtml/base/default/images/section_menu_link_bg.gif diff --git a/skin/adminhtml/default/default/images/section_menu_link_over_bg.gif b/skin/adminhtml/base/default/images/section_menu_link_over_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/section_menu_link_over_bg.gif rename to skin/adminhtml/base/default/images/section_menu_link_over_bg.gif diff --git a/skin/adminhtml/default/default/images/section_menu_over_span_bg.gif b/skin/adminhtml/base/default/images/section_menu_over_span_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/section_menu_over_span_bg.gif rename to skin/adminhtml/base/default/images/section_menu_over_span_bg.gif diff --git a/skin/adminhtml/default/default/images/section_menu_span_bg.gif b/skin/adminhtml/base/default/images/section_menu_span_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/section_menu_span_bg.gif rename to skin/adminhtml/base/default/images/section_menu_span_bg.gif diff --git a/skin/adminhtml/default/default/images/section_menu_ul_bg.gif b/skin/adminhtml/base/default/images/section_menu_ul_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/section_menu_ul_bg.gif rename to skin/adminhtml/base/default/images/section_menu_ul_bg.gif diff --git a/skin/adminhtml/default/default/images/side_col_bg.gif b/skin/adminhtml/base/default/images/side_col_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/side_col_bg.gif rename to skin/adminhtml/base/default/images/side_col_bg.gif diff --git a/skin/adminhtml/default/default/images/simple_container_bg.gif b/skin/adminhtml/base/default/images/simple_container_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/simple_container_bg.gif rename to skin/adminhtml/base/default/images/simple_container_bg.gif diff --git a/skin/adminhtml/default/default/images/sort-arrow-down.gif b/skin/adminhtml/base/default/images/sort-arrow-down.gif similarity index 100% rename from skin/adminhtml/default/default/images/sort-arrow-down.gif rename to skin/adminhtml/base/default/images/sort-arrow-down.gif diff --git a/skin/adminhtml/default/default/images/sort-arrow-down.png b/skin/adminhtml/base/default/images/sort-arrow-down.png similarity index 100% rename from skin/adminhtml/default/default/images/sort-arrow-down.png rename to skin/adminhtml/base/default/images/sort-arrow-down.png diff --git a/skin/adminhtml/default/default/images/sort-arrow-up.gif b/skin/adminhtml/base/default/images/sort-arrow-up.gif similarity index 100% rename from skin/adminhtml/default/default/images/sort-arrow-up.gif rename to skin/adminhtml/base/default/images/sort-arrow-up.gif diff --git a/skin/adminhtml/default/default/images/sort-arrow-up.png b/skin/adminhtml/base/default/images/sort-arrow-up.png similarity index 100% rename from skin/adminhtml/default/default/images/sort-arrow-up.png rename to skin/adminhtml/base/default/images/sort-arrow-up.png diff --git a/skin/adminhtml/default/default/images/sort_heading_bg.gif b/skin/adminhtml/base/default/images/sort_heading_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/sort_heading_bg.gif rename to skin/adminhtml/base/default/images/sort_heading_bg.gif diff --git a/skin/adminhtml/default/default/images/sort_on_bg.gif b/skin/adminhtml/base/default/images/sort_on_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/sort_on_bg.gif rename to skin/adminhtml/base/default/images/sort_on_bg.gif diff --git a/skin/adminhtml/default/default/images/sort_row_bg.gif b/skin/adminhtml/base/default/images/sort_row_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/sort_row_bg.gif rename to skin/adminhtml/base/default/images/sort_row_bg.gif diff --git a/skin/adminhtml/default/default/images/spacer.gif b/skin/adminhtml/base/default/images/spacer.gif similarity index 100% rename from skin/adminhtml/default/default/images/spacer.gif rename to skin/adminhtml/base/default/images/spacer.gif diff --git a/skin/adminhtml/default/default/images/sub_button_bg.gif b/skin/adminhtml/base/default/images/sub_button_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/sub_button_bg.gif rename to skin/adminhtml/base/default/images/sub_button_bg.gif diff --git a/skin/adminhtml/default/default/images/success-msg.png b/skin/adminhtml/base/default/images/success-msg.png similarity index 100% rename from skin/adminhtml/default/default/images/success-msg.png rename to skin/adminhtml/base/default/images/success-msg.png diff --git a/skin/adminhtml/default/default/images/success_msg_icon.gif b/skin/adminhtml/base/default/images/success_msg_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/success_msg_icon.gif rename to skin/adminhtml/base/default/images/success_msg_icon.gif diff --git a/skin/adminhtml/default/default/images/tabs_link_bg.gif b/skin/adminhtml/base/default/images/tabs_link_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/tabs_link_bg.gif rename to skin/adminhtml/base/default/images/tabs_link_bg.gif diff --git a/skin/adminhtml/default/default/images/tabs_link_over_bg.gif b/skin/adminhtml/base/default/images/tabs_link_over_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/tabs_link_over_bg.gif rename to skin/adminhtml/base/default/images/tabs_link_over_bg.gif diff --git a/skin/adminhtml/default/default/images/tabs_span_bg.gif b/skin/adminhtml/base/default/images/tabs_span_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/tabs_span_bg.gif rename to skin/adminhtml/base/default/images/tabs_span_bg.gif diff --git a/skin/adminhtml/default/default/images/tag_blue_edit.gif b/skin/adminhtml/base/default/images/tag_blue_edit.gif similarity index 100% rename from skin/adminhtml/default/default/images/tag_blue_edit.gif rename to skin/adminhtml/base/default/images/tag_blue_edit.gif diff --git a/skin/adminhtml/default/default/images/tn_cancel_bg.gif b/skin/adminhtml/base/default/images/tn_cancel_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/tn_cancel_bg.gif rename to skin/adminhtml/base/default/images/tn_cancel_bg.gif diff --git a/skin/adminhtml/default/default/images/tooltip_bg.gif b/skin/adminhtml/base/default/images/tooltip_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/tooltip_bg.gif rename to skin/adminhtml/base/default/images/tooltip_bg.gif diff --git a/skin/adminhtml/default/default/images/tooltip_corner.gif b/skin/adminhtml/base/default/images/tooltip_corner.gif similarity index 100% rename from skin/adminhtml/default/default/images/tooltip_corner.gif rename to skin/adminhtml/base/default/images/tooltip_corner.gif diff --git a/skin/adminhtml/default/default/images/tooltip_top.gif b/skin/adminhtml/base/default/images/tooltip_top.gif similarity index 100% rename from skin/adminhtml/default/default/images/tooltip_top.gif rename to skin/adminhtml/base/default/images/tooltip_top.gif diff --git a/skin/adminhtml/default/default/images/tree_icons/join.gif b/skin/adminhtml/base/default/images/tree_icons/join.gif similarity index 100% rename from skin/adminhtml/default/default/images/tree_icons/join.gif rename to skin/adminhtml/base/default/images/tree_icons/join.gif diff --git a/skin/adminhtml/default/default/images/tree_icons/joinbottom.gif b/skin/adminhtml/base/default/images/tree_icons/joinbottom.gif similarity index 100% rename from skin/adminhtml/default/default/images/tree_icons/joinbottom.gif rename to skin/adminhtml/base/default/images/tree_icons/joinbottom.gif diff --git a/skin/adminhtml/default/default/images/tree_icons/line.gif b/skin/adminhtml/base/default/images/tree_icons/line.gif similarity index 100% rename from skin/adminhtml/default/default/images/tree_icons/line.gif rename to skin/adminhtml/base/default/images/tree_icons/line.gif diff --git a/skin/adminhtml/default/default/images/tree_icons/minus.gif b/skin/adminhtml/base/default/images/tree_icons/minus.gif similarity index 100% rename from skin/adminhtml/default/default/images/tree_icons/minus.gif rename to skin/adminhtml/base/default/images/tree_icons/minus.gif diff --git a/skin/adminhtml/default/default/images/tree_icons/minusbottom.gif b/skin/adminhtml/base/default/images/tree_icons/minusbottom.gif similarity index 100% rename from skin/adminhtml/default/default/images/tree_icons/minusbottom.gif rename to skin/adminhtml/base/default/images/tree_icons/minusbottom.gif diff --git a/skin/adminhtml/default/default/images/tree_icons/nolines_minus.gif b/skin/adminhtml/base/default/images/tree_icons/nolines_minus.gif similarity index 100% rename from skin/adminhtml/default/default/images/tree_icons/nolines_minus.gif rename to skin/adminhtml/base/default/images/tree_icons/nolines_minus.gif diff --git a/skin/adminhtml/default/default/images/tree_icons/nolines_plus.gif b/skin/adminhtml/base/default/images/tree_icons/nolines_plus.gif similarity index 100% rename from skin/adminhtml/default/default/images/tree_icons/nolines_plus.gif rename to skin/adminhtml/base/default/images/tree_icons/nolines_plus.gif diff --git a/skin/adminhtml/default/default/images/validation_advice_bg.gif b/skin/adminhtml/base/default/images/validation_advice_bg.gif similarity index 100% rename from skin/adminhtml/default/default/images/validation_advice_bg.gif rename to skin/adminhtml/base/default/images/validation_advice_bg.gif diff --git a/skin/adminhtml/default/default/images/varien_logo.gif b/skin/adminhtml/base/default/images/varien_logo.gif similarity index 100% rename from skin/adminhtml/default/default/images/varien_logo.gif rename to skin/adminhtml/base/default/images/varien_logo.gif diff --git a/skin/adminhtml/default/default/images/warning_msg_icon.gif b/skin/adminhtml/base/default/images/warning_msg_icon.gif similarity index 100% rename from skin/adminhtml/default/default/images/warning_msg_icon.gif rename to skin/adminhtml/base/default/images/warning_msg_icon.gif diff --git a/skin/adminhtml/default/default/images/widget/catalog__category_widget_link.gif b/skin/adminhtml/base/default/images/widget/catalog__category_widget_link.gif similarity index 100% rename from skin/adminhtml/default/default/images/widget/catalog__category_widget_link.gif rename to skin/adminhtml/base/default/images/widget/catalog__category_widget_link.gif diff --git a/skin/adminhtml/default/default/images/widget/catalog__product_widget_link.gif b/skin/adminhtml/base/default/images/widget/catalog__product_widget_link.gif similarity index 100% rename from skin/adminhtml/default/default/images/widget/catalog__product_widget_link.gif rename to skin/adminhtml/base/default/images/widget/catalog__product_widget_link.gif diff --git a/skin/adminhtml/default/default/images/widget/catalog__product_widget_new.gif b/skin/adminhtml/base/default/images/widget/catalog__product_widget_new.gif similarity index 100% rename from skin/adminhtml/default/default/images/widget/catalog__product_widget_new.gif rename to skin/adminhtml/base/default/images/widget/catalog__product_widget_new.gif diff --git a/skin/adminhtml/default/default/images/widget/cms__widget_block.gif b/skin/adminhtml/base/default/images/widget/cms__widget_block.gif similarity index 100% rename from skin/adminhtml/default/default/images/widget/cms__widget_block.gif rename to skin/adminhtml/base/default/images/widget/cms__widget_block.gif diff --git a/skin/adminhtml/default/default/images/widget/cms__widget_page_link.gif b/skin/adminhtml/base/default/images/widget/cms__widget_page_link.gif similarity index 100% rename from skin/adminhtml/default/default/images/widget/cms__widget_page_link.gif rename to skin/adminhtml/base/default/images/widget/cms__widget_page_link.gif diff --git a/skin/adminhtml/default/default/images/widget/default.gif b/skin/adminhtml/base/default/images/widget/default.gif similarity index 100% rename from skin/adminhtml/default/default/images/widget/default.gif rename to skin/adminhtml/base/default/images/widget/default.gif diff --git a/skin/adminhtml/default/default/images/widget/reports__product_widget_compared.gif b/skin/adminhtml/base/default/images/widget/reports__product_widget_compared.gif similarity index 100% rename from skin/adminhtml/default/default/images/widget/reports__product_widget_compared.gif rename to skin/adminhtml/base/default/images/widget/reports__product_widget_compared.gif diff --git a/skin/adminhtml/default/default/images/widget/reports__product_widget_viewed.gif b/skin/adminhtml/base/default/images/widget/reports__product_widget_viewed.gif similarity index 100% rename from skin/adminhtml/default/default/images/widget/reports__product_widget_viewed.gif rename to skin/adminhtml/base/default/images/widget/reports__product_widget_viewed.gif diff --git a/skin/adminhtml/default/default/images/widget_placeholder.gif b/skin/adminhtml/base/default/images/widget_placeholder.gif similarity index 100% rename from skin/adminhtml/default/default/images/widget_placeholder.gif rename to skin/adminhtml/base/default/images/widget_placeholder.gif diff --git a/skin/adminhtml/default/default/images/window_close.png b/skin/adminhtml/base/default/images/window_close.png similarity index 100% rename from skin/adminhtml/default/default/images/window_close.png rename to skin/adminhtml/base/default/images/window_close.png diff --git a/skin/adminhtml/default/default/images/window_content.png b/skin/adminhtml/base/default/images/window_content.png similarity index 100% rename from skin/adminhtml/default/default/images/window_content.png rename to skin/adminhtml/base/default/images/window_content.png diff --git a/skin/adminhtml/default/default/images/window_top.png b/skin/adminhtml/base/default/images/window_top.png similarity index 100% rename from skin/adminhtml/default/default/images/window_top.png rename to skin/adminhtml/base/default/images/window_top.png diff --git a/skin/adminhtml/default/default/images/wysiwyg/skin_image.png b/skin/adminhtml/base/default/images/wysiwyg/skin_image.png similarity index 100% rename from skin/adminhtml/default/default/images/wysiwyg/skin_image.png rename to skin/adminhtml/base/default/images/wysiwyg/skin_image.png diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento.css similarity index 100% rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento.css rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento.css diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/btn_bg.gif b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento/btn_bg.gif similarity index 100% rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento/btn_bg.gif rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento/btn_bg.gif diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/content_bg.gif b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento/content_bg.gif similarity index 100% rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento/content_bg.gif rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento/content_bg.gif diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/top_bg.gif b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento/top_bg.gif similarity index 100% rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento/top_bg.gif rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento/top_bg.gif diff --git a/skin/adminhtml/default/default/lib/prototype/windows/themes/magento/window_close.png b/skin/adminhtml/base/default/lib/prototype/windows/themes/magento/window_close.png similarity index 100% rename from skin/adminhtml/default/default/lib/prototype/windows/themes/magento/window_close.png rename to skin/adminhtml/base/default/lib/prototype/windows/themes/magento/window_close.png diff --git a/skin/adminhtml/default/default/menu.css b/skin/adminhtml/base/default/menu.css similarity index 100% rename from skin/adminhtml/default/default/menu.css rename to skin/adminhtml/base/default/menu.css diff --git a/skin/adminhtml/default/default/oauth-simple.css b/skin/adminhtml/base/default/oauth-simple.css similarity index 100% rename from skin/adminhtml/default/default/oauth-simple.css rename to skin/adminhtml/base/default/oauth-simple.css diff --git a/skin/adminhtml/default/default/print.css b/skin/adminhtml/base/default/print.css similarity index 100% rename from skin/adminhtml/default/default/print.css rename to skin/adminhtml/base/default/print.css diff --git a/skin/adminhtml/default/default/reset.css b/skin/adminhtml/base/default/reset.css similarity index 100% rename from skin/adminhtml/default/default/reset.css rename to skin/adminhtml/base/default/reset.css diff --git a/skin/adminhtml/default/openmage/override.css b/skin/adminhtml/default/openmage/override.css deleted file mode 100644 index 5dcb9816c22..00000000000 --- a/skin/adminhtml/default/openmage/override.css +++ /dev/null @@ -1,1107 +0,0 @@ -/* ! Do not edit css files ! - Edit scss version and compile with sass from scss folder like this: - $ sass override.scss ../override.css - */ -/* - 205 = default, - 0 = red, - 60 = yellow, - 120 = green, - 180 = turquoise, - 240 = blue, - 300 = purple -*/ -.popup-window .content-header, body { - color: #2f2f2f; - font: 400 12px/1.33 "Open Sans", sans-serif; - background: #f6f6f6; -} - -.content-header-floating .content-header, .footer-content, .middle, #nav, .header-top { - padding-left: 15px; - padding-right: 15px; - box-sizing: border-box; - width: 100%; -} - -.content-header h3, .content-header { - border: 0; - color: #2f2f2f; - font-size: 24px; - font-weight: 400; -} - -dl.accordion dt, .entry-edit .entry-edit-head { - background: #fefefe; - color: #2f2f2f; - padding: 4px 16px; - border: 1px solid lightgrey; -} - -.box, .entry-edit .fieldset, .entry-edit fieldset { - border: 1px solid lightgrey; - background: #eee; - border-top: 1px solid lightgrey; -} - -.grid tr.headings th a.sort-arrow-asc, .grid tr.headings th a.sort-arrow-desc { - background: none; - border: 0; - box-sizing: border-box; - font-weight: bold; - position: relative; -} - -.grid tr.headings th a.sort-arrow-asc span.sort-title:after, .grid tr.headings th a.sort-arrow-desc span.sort-title:after { - content: ""; - display: block; - position: absolute; - right: 6px; - bottom: 8px; - width: 0; - height: 0; - border-style: solid; -} - -ul.tabs a:hover, ul.tabs a.active { - background: #f4f4f4; - color: #2f2f2f; - transition: background 0.3s ease-in-out; -} - -dl.accordion dt.open a, dl.accordion dt a:hover, dl.accordion dt a, div.collapseable a.open, div.collapseable a:hover, div.collapseable a, .entry-edit .entry-edit-head a, .entry-edit .entry-edit-head strong { - color: #2f2f2f; - font-weight: 300; - font-size: 18px; - line-height: 32px; -} - -dl.accordion dt a:after, div.collapseable a:after { - content: ""; - display: block; - position: absolute; - right: 0; - bottom: 10px; - width: 0; - height: 0; - border-style: solid; - border-width: 8px 6px 0 6px; - border-color: #888 transparent transparent transparent; -} - -dl.accordion dt.open a:after, div.collapseable a.open:after { - content: ""; - display: block; - position: absolute; - right: 0; - bottom: 10px; - width: 0; - height: 0; - border-style: solid; - border-width: 0 6px 8px 6px; - border-color: transparent transparent #888 transparent; -} - -.warning-msg, .success-msg, .error-msg, .notice-msg { - border-radius: 5px; - margin: 20px 0; - padding: 10px 26px 10px 35px; - position: relative; - text-shadow: none; -} - -.grid-severity-minor, .grid-severity-major, .grid-severity-critical, .grid-severity-notice { - background: none; - padding: 0; - height: auto; -} - -.grid-severity-minor span, .grid-severity-major span, .grid-severity-critical span, .grid-severity-notice span { - font: 400 12px/1.33 "Open Sans", sans-serif; - padding: 2px 10px; -} - -.grid-severity-minor span, .grid-severity-major span { - border: 0; - background: #f0ad4e; - color: #fff; -} - -.header-right fieldset input.input-text:hover, .header-right fieldset input.input-text:focus { - background-color: #fff; - outline: none; - box-shadow: none; -} - -@font-face { - font-family: "Open Sans"; - src: url("fonts/opensans/OpenSans-Light.ttf") format("truetype"), url("fonts/opensans/OpenSans-Light.woff") format("woff"), url("fonts/opensans/OpenSans-Light.woff2") format("woff2"); /* Modern Browsers */ - font-weight: 300; - font-style: normal; -} -@font-face { - font-family: "Open Sans"; - src: url("fonts/opensans/OpenSans-Regular.ttf") format("truetype"), url("fonts/opensans/OpenSans-Regular.woff") format("woff"), url("fonts/opensans/OpenSans-Regular.woff2") format("woff2"); /* Modern Browsers */ - font-weight: 400; - font-style: normal; -} -@font-face { - font-family: "Open Sans"; - src: url("fonts/opensans/OpenSans-Bold.ttf") format("truetype"), url("fonts/opensans/OpenSans-Bold.woff") format("woff"), url("fonts/opensans/OpenSans-Bold.woff2") format("woff2"); /* Modern Browsers */ - font-weight: 700; - font-style: normal; -} -@font-face { - font-family: "Open Sans"; - src: url("fonts/opensans/OpenSans-SemiBold.ttf") format("truetype"), url("fonts/opensans/OpenSans-SemiBold.woff") format("woff"), url("fonts/opensans/OpenSans-SemiBold.woff2") format("woff2"); /* Modern Browsers */ - font-weight: 600; - font-style: normal; -} -h1 { - color: #2f2f2f; - font-weight: 400; -} - -h2 { - color: #2f2f2f; - font-weight: 400; -} - -h3 { - color: #2f2f2f; - font-weight: 400; -} - -h4 { - color: #2f2f2f; - font-weight: 400; -} - -h5 { - color: #2f2f2f; - font-weight: 400; -} - -h6 { - color: #2f2f2f; - font-weight: 400; -} - -label { - color: #2f2f2f; - font-weight: 400; -} - -a { - display: inline; - color: #269de7; - text-decoration: none; -} -a:visited { - color: #269de7; -} -a:focus { - color: #3378a3; - text-decoration: none; -} -a:hover { - color: #3378a3; - text-decoration: none; -} -a:active { - color: #3378a3; - text-decoration: none; -} -a.error span { - color: #fa4545 !important; -} - -strong { - font-weight: 600; -} - -b { - font-weight: 600; -} - -small { - font-size: 12px; - color: #2f2f2f; -} - -.wrapper { - display: flex; - flex-direction: column; - min-height: 100vh; -} - -.header-top { - border: 0; -} - -.middle { - background: #f6f6f6; - flex-grow: 1; -} - -.content-header-floating { - opacity: 0.9; - border-bottom: solid 1px #c8c8c8; -} -.content-header-floating h3 { - font-size: 18px; -} -.content-header-floating td { - padding-right: 0; -} -.content-header-floating .form-buttons { - padding-right: 0; -} - -.content-header { - margin-bottom: 0; - padding-bottom: 0; -} -.content-header h3 { - margin: 0 0.3em 0.3em; - line-height: 32px; -} - -.dashboard-container { - border: none; -} - -.columns { - background: none; -} - -.switcher { - background: none; - padding: 0 0 10px; - border: none; -} - -.entry-edit { - margin-top: 10px; -} -.entry-edit .entry-edit-head h4 { - color: #2f2f2f; - line-height: 32px; - font-size: 16px; - font-weight: 300; -} -.entry-edit .entry-edit-head .tools { - line-height: 32px; -} -.entry-edit .entry-edit-head .tools a:hover { - text-decoration: none; -} -.entry-edit .entry-edit-head .icon-copy { - width: 16px; - height: 16px; - margin: 8px 0 0 5px; - filter: revert; - float: right; -} -.grid table { - border: 1px solid lightgrey; - border-collapse: collapse; -} -.grid table.border { - border: 1px solid lightgrey; -} -.grid table.border tfoot tr td { - background: #fff !important; -} -.grid table td { - border: 1px solid lightgrey; - background: #fff; - padding: 5px; -} -.grid table td.first { - border-right: 1px solid lightgrey; -} -.grid table td.last { - border-right: 1px solid lightgrey; -} -.grid table tfoot tr td { - border: 1px solid lightgrey; - background: #fff; -} -.grid table tbody tr.selected td { - background: #f0f9ff; -} -.grid table tbody tr:hover td { - background: #f0f9ff; -} -.grid table tbody tr:nth-child(odd):hover td { - background: #f0f9ff; -} -.grid tr.filter { - background: #fff !important; -} -.grid tr.filter th { - border: 1px solid lightgrey; - border-top: 0; -} -.grid tr.filter th.sorted { - background: #f7f7f7 !important; -} -.grid tr.filter .range .range-line { - width: 125px; -} -.grid tr.filter .range.filter-range .range-line { - width: initial; -} -.grid tr.filter .range .label { - font-weight: 400; - width: 40px; - padding: 4px; -} -.grid tr.filter .range.filter-range .label { - display: none; -} -.grid tr.filter .range div.date { - min-width: 140px; -} -.grid tr.filter .range input, .grid tr.filter .range select { - width: 75px !important; -} -.grid tr.filter .range select { - float: none; -} -.grid tr.filter .date img { - padding-left: 17px; - box-sizing: border-box; - width: 17px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M9,10V12H7V10H9M13,10V12H11V10H13M17,10V12H15V10H17M19,3A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5C3.89,21 3,20.1 3,19V5A2,2 0 0,1 5,3H6V1H8V3H16V1H18V3H19M19,19V8H5V19H19M9,14V16H7V14H9M13,14V16H11V14H13M17,14V16H15V14H17Z' /%3E%3C/svg%3E") no-repeat; - height: 17px; - margin-top: 5px; -} -.grid tr.headings { - background: #71798e; - border: 1px solid #71798e; -} -.grid tr.headings th { - padding: 4px; - font-size: 12px; - vertical-align: middle; - color: #fff; - font-weight: 400; -} -.grid tr.headings th a { - color: #fff; - font-weight: 400; -} -.grid tr.headings th a:hover { - color: lightgrey; -} -.grid tr.headings th a.sort-arrow-desc span.sort-title { - background: none; -} -.grid tr.headings th a.sort-arrow-desc span.sort-title:after { - border-width: 6px 5px 0 5px; - border-color: lightgrey transparent transparent transparent; -} -.grid tr.headings th a.sort-arrow-asc span.sort-title { - background: none; -} -.grid tr.headings th a.sort-arrow-asc span.sort-title:after { - border-width: 0 5px 6px 5px; - border-color: transparent transparent lightgrey transparent; -} -.grid tr.headings th.no-link { - color: #fff; - padding: 4px; -} -.grid tr.even td { - background: #eee; -} -.grid tr.even tr td { - background: #eee; -} -.grid tbody.even tr td { - background: #eee !important; -} -.grid tbody.odd tr td { - background: #f6f6f6 !important; -} -.grid tbody tr.even td.sorted { - background: #e6e6e6 !important; -} -.grid tbody tr.odd td.sorted { - background: #f7f7f7 !important; -} -.grid tbody tr.selected td.sorted { - background: #e1f3ff !important; -} -.grid td input.input-text { - min-width: 80px; -} - -.header { - background: #3A499D; - position: relative; -} - -.header-top { - border-bottom: none !important; - height: 10px; -} -.header-top .logo { - position: absolute; - display: block; - top: 8px; - left: 0; - margin: 0; - height: 40px; - padding: 0 27px; -} -.header-top .logo svg { - height: 40px; - width: auto; -} - -.header-right { - position: absolute; - top: 10px; - right: 0; - padding: 0; - color: inherit; - z-index: 200; - height: 40px; - background: var(--color-main-xxl); -} -.header-right fieldset { - display: inline; - line-height: 40px; -} -.header-right fieldset input.input-text { - width: 250px; - border: 0 solid rgba(255, 102, 110, 0.4509803922); - margin-top: -4px; - background-color: #fff; - padding-left: 10px; - min-width: 250px; - transition: width 100ms; - transition-delay: 200ms; -} -.header-right fieldset input.input-text:focus { - width: calc(100vw - 160px); -} -.footer { - background: #eee; - padding: 15px; - margin-top: 30px; - border-top: 1px solid #c8c8c8; - font-size: 12px; -} - -ul.tabs-horiz { - background: none; - margin: 0; - padding: 0; -} -ul.tabs-horiz li { - border: none; - margin: 0 10px 0 0; -} -ul.tabs-horiz li a { - background: #eee; - color: #2f2f2f !important; - font-size: 16px; - font-weight: 300; - padding: 9px 15px; - border: 0; -} -ul.tabs-horiz li a.active { - border: 0; - background: #71798e; - color: #fff !important; -} -ul.tabs { - background: none; - color: #2f2f2f; - border-top: 0; -} -ul.tabs dl { - background: #fff; - border: 1px solid lightgrey; -} -ul.tabs a { - background: #fff; - color: #2f2f2f; - padding: 8px 18px; - border-bottom: 1px solid #eee; -} -ul.tabs a.active { - border-left: 3px solid #71798e; - padding: 8px 18px; - border-bottom: 1px solid #eee; -} -ul.tabs a.active span { - padding: 0; - background: none; - font-weight: 400; -} -ul.tabs a:hover.active { - padding: 8px 18px; -} -ul.tabs a:hover.active span { - background: none; - font-weight: 400; -} -ul.tabs span { - background: none; - padding: 0; - font-weight: 400; -} -ul.config-tabs dt { - border: 0; - font-weight: 300; - text-transform: none; - padding: 7px 7px 7px 10px; - font-size: 18px; - background: #71798e; - color: #fff; -} - -#grid_tab_content { - background: #fff; - padding: 15px; -} - -.nav-bar { - background: #3A499D; - border: 0; -} - -div.collapseable { - margin-top: 10px; -} -div.collapseable a { - position: relative; - background: none; -} -div.collapseable a.open { - background: none; -} -div.autocomplete { - border: 0; - box-shadow: 0 3px 3px rgba(50, 50, 50, 0.15); -} -div.autocomplete ul li { - color: #2f2f2f; -} -div.autocomplete ul li.selected { - background: #eee; -} - -.section-config .section-config > .config { - border: 0; -} -.section-config .section-config > .entry-edit-head { - border: 0; -} -.section-config .section-config > .entry-edit-head > a { - background: none; - color: #2f2f2f; - font-size: 14px; - font-weight: 400; - border: 0; -} -.section-config .section-config .section-config .section-config .section-config > .config { - background: #f8f8f8; -} -.section-config .section-config .section-config .section-config > .config { - background: #fefefe; -} -.section-config .section-config .section-config > .config { - background: #f8f8f8; -} -.section-config .config-advanced > .entry-edit-head { - border: 0; - font-size: 14px; - box-shadow: none; -} -.section-config .config-advanced > .entry-edit-head.collapseable a:after { - border: none; -} -.section-config .config-advanced > .entry-edit-head.collapseable a.open:after { - border: none; -} -.section-config .config-advanced > .entry-edit-head a:after { - top: 5px; -} -.section-config .config-advanced > .config { - padding: 10px; -} - -.massaction { - background: none; - border: 0; - font-size: 12px; -} -.massaction td { - border-top: 0; - padding: 10px 0; -} -.massaction .entry-edit fieldset span.form_row, .massaction .entry-edit fieldset span.field-row { - padding: 0; -} -.massaction .entry-edit .field-row label { - vertical-align: middle; -} - -.head-products { - background-position: left center; -} - -.icon-head { - background-position: left center; -} - -.x-tree-node a { - font-size: 12px; -} -.x-tree-node a span { - color: #2f2f2f; -} -.x-tree-node .x-tree-selected a span { - background: lightgrey; - color: #2f2f2f; -} - -.categories-side-col .tree-holder { - margin-right: 0; -} -.categories-side-col .tree-actions { - margin-right: 0; -} - -#loading-mask { - opacity: 1; -} -#loading-mask .backdrop { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background: rgba(0, 0, 0, 0.4); - color: #2f2f2f; -} -#loading-mask .loader { - width: 160px; - height: 100px; - border: 0; - opacity: 0.95; - color: #2f2f2f; - background: #fff; - font-size: 18px; - font-weight: 400; -} - -.error { - color: #fa4545 !important; -} - -.required { - color: #fa4545 !important; -} - -.validation-advice { - color: #fa4545 !important; - font-size: 12px; - font-weight: 600 !important; -} - -.order-totals { - background: #eee; - border: 1px solid lightgrey !important; -} - -.order-choose-address { - background: #fff; -} - -.order-save-in-address-book { - background: #fff; -} - -.messages li { - font-weight: 400 !important; - font-size: 12px !important; - padding: 10px 26px 10px 35px !important; - min-height: inherit !important; -} -.messages ul li { - margin: 0 !important; -} - -.notice-msg { - background-image: url(images/information-variant.svg) !important; - background-repeat: no-repeat !important; - background-size: 23px 23px !important; - background-color: #f9f5ec !important; - background-position: 8px center !important; - border: 1px solid #dfc97a !important; - color: #2f2f2f !important; -} -.notice-msg a { - color: #2f2f2f !important; - text-decoration: underline; -} - -.error-msg { - background-image: url(images/icon-error.png) !important; - background-repeat: no-repeat !important; - background-size: 23px 23px !important; - background-color: #f3dcd8 !important; - background-position: 8px center !important; - border: 1px solid #963535 !important; - color: #963535 !important; -} -.error-msg a { - color: #963535 !important; - text-decoration: underline; -} - -.success-msg { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23185b00' d='M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z' /%3E%3C/svg%3E") !important; - background-repeat: no-repeat !important; - background-size: 16px 16px !important; - background-color: #e4eecb !important; - background-position: 8px center !important; - border: 1px solid #ceceb6 !important; - color: #185b00 !important; -} -.success-msg a { - color: #185b00 !important; - text-decoration: underline; -} - -.warning-msg { - background-image: url(images/information-variant.svg) !important; - background-repeat: no-repeat !important; - background-size: 23px 23px !important; - background-color: #fffbf0 !important; - background-position: 8px center !important; - border: 1px solid #d87e34 !important; - color: #2f2f2f !important; -} -.warning-msg a { - color: #2f2f2f !important; - text-decoration: underline; -} - -.links-feed { - margin-top: 10px; -} - -.link-feed { - margin-right: 20px; - font-size: 0.9em; - text-decoration: none; -} - -.options-box .option-header { - background: none; - border: 0; -} -.options-box .option-title { - border-bottom: 1px solid #c8c8c8; -} -.options-box .option-box { - background: #fff; - border: 0; -} - -#page-login { - background: #f6f6f6; -} - -.login-box { - border: 1px solid #cacaca; - box-shadow: 2px 2px 4px rgba(128, 128, 128, 0.4196078431); -} -.login-box .login-form { - background: white; -} -.login-box .login-form .form-button, .login-box .login-form button { - background: #0090FF; -} -.login-box .bottom { - display: none; -} - -.login-container .legal { - background: #eaeaea; -} - -.config-heading { - background-color: #fff; - border: 0; - margin: 4px 0 0; -} -.config-heading .button span { - font-size: 13px; - font-weight: 400; - line-height: 28px; - text-shadow: none; -} - -#payment_pphs_settings_advanced-head { - margin-bottom: 10px; -} - -#payment_settings_payments_standart_advanced-head { - margin-bottom: 10px; -} - -#payment_settings_ec_advanced-head { - margin-bottom: 10px; -} - -.grid-severity-notice span { - border: 0; - background: #56af45; - color: #fff; -} - -.grid-severity-critical span { - border: 0; - background: #fa4545; - color: #fff; -} - -.custom-options .box { - overflow: auto; -} -.custom-options .option-box { - border: 0; - background: #fff; -} -.custom-options .option-box .border { - width: 700px; -} -.custom-options .option-header { - background: #fff; - border-bottom-color: #fff; -} - -.bold { - font-weight: 600 !important; -} - -#address_form_container { - margin-top: 0; -} - -.sub-btn-set { - border: 0; - padding: 6px 10px; - background: #eee; - border-top: 1px solid lightgrey; -} - -.no-display { - display: none !important; -} - -.side-col .switcher select { - margin: 4px 0; -} - -.side-col .switcher .link-store-scope { - margin: 9px -19px 0 3px; -} - -dl.accordion dt { - margin-top: 10px; -} -dl.accordion dt a { - position: relative; - background: none; -} -dl.accordion dt.open a { - background: none; -} -table.actions { - padding: 15px; - background: #fff; - border: 1px solid lightgrey; -} -table.actions td { - vertical-align: middle; -} - -.x-dd-drag-ghost a { - font-size: 12px; -} -.x-dd-drag-ghost a span { - color: #2f2f2f; -} - -.no-active-category a span { - color: #999 !important; -} - -.dialog table.table_window { - background: #fff; - border: 0; -} -.dialog table.table_window td { - padding: 6px 0; - vertical-align: middle; -} -.dialog table.table_window th { - padding: 6px 0; - vertical-align: middle; -} -.dialog table.table_window .fieldset td { - vertical-align: top; -} - -.with-button.active:after { - background: none; - margin: 0; -} - -.wrapper-popup .content-header table { - width: 90%; -} - -.tier .data { - width: 550px; -} -.tier .data select { - width: auto; -} -.tier .data input.qty { - width: 50px !important; -} - -.rule-param .label { - font-weight: 600; -} - -a.rule-param-remove img { - padding-left: 13px; - box-sizing: border-box; - width: 13px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23d50000' d='M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z' /%3E%3C/svg%3E") no-repeat; - height: 13px; -} - -img.rule-param-add { - padding-left: 13px; - box-sizing: border-box; - width: 13px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%2356af45' d='M17,13H13V17H11V13H7V11H11V7H13V11H17M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z' /%3E%3C/svg%3E") no-repeat; - height: 13px; -} - -.address-list li.on { - background: #fff; -} - -ul.tabs a.changed span.changed { - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%2356af45' d='M5,3A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5.5L18.5,3H17V9A1,1 0 0,1 16,10H8A1,1 0 0,1 7,9V3H5M12,4V9H15V4H12M7,12H17A1,1 0 0,1 18,13V19H6V13A1,1 0 0,1 7,12Z' /%3E%3C/svg%3E") !important; -} - -.notification-global { - background: #f9f5ec url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23d50000' d='M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z' /%3E%3C/svg%3E") 27px 5px no-repeat; - background-size: 15px; -} - -#page-help-link { - display: none; -} - -.message-popup { - background: #929292; -} -.message-popup .message-popup-head h2 { - color: #fff; -} -.message-popup .message-popup-head a { - background: #0090FF !important; - border: none; - margin-top: 1px; -} -.message-popup .message-popup-head a span { - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23fff' d='M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z' /%3E%3C/svg%3E") no-repeat 0 50%; - background-size: 13px; -} -.message-popup .message-popup-content { - background: #fff; -} -.message-popup .message-popup-content .read-more a { - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12M10,17L15,12L10,7V17Z' /%3E%3C/svg%3E") no-repeat 0 50%; - background-size: 13px; -} - -.pager img[src$="pager_arrow_left.gif"].arrow { - padding-left: 17px; - box-sizing: border-box; - width: 17px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M14,7L9,12L14,17V7Z' /%3E%3C/svg%3E") no-repeat; - height: 17px; -} -.pager img[src$="pager_arrow_right.gif"].arrow { - padding-left: 17px; - box-sizing: border-box; - width: 17px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12M10,17L15,12L10,7V17Z' /%3E%3C/svg%3E") no-repeat; - height: 17px; -} -.pager img[src$="pager_arrow_left_off.gif"].arrow { - padding-left: 17px; - box-sizing: border-box; - width: 17px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M14,7L9,12L14,17V7Z' /%3E%3C/svg%3E") no-repeat; - height: 17px; - opacity: 0.5; -} -.pager img[src$="pager_arrow_right_off.gif"].arrow { - padding-left: 17px; - box-sizing: border-box; - width: 17px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12M10,17L15,12L10,7V17Z' /%3E%3C/svg%3E") no-repeat; - height: 17px; - opacity: 0.5; -} - -.export img { - padding-left: 19px; - box-sizing: border-box; - width: 19px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%2356af45' d='M23,12L19,8V11H10V13H19V16M1,18V6C1,4.89 1.9,4 3,4H15A2,2 0 0,1 17,6V9H15V6H3V18H15V15H17V18A2,2 0 0,1 15,20H3A2,2 0 0,1 1,18Z' /%3E%3C/svg%3E") no-repeat; - height: 19px; -} - -img[src$="grid-cal.gif"] { - padding-left: 17px; - box-sizing: border-box; - width: 17px; - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M9,10V12H7V10H9M13,10V12H11V10H13M17,10V12H15V10H17M19,3A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5C3.89,21 3,20.1 3,19V5A2,2 0 0,1 5,3H6V1H8V3H16V1H18V3H19M19,19V8H5V19H19M9,14V16H7V14H9M13,14V16H11V14H13M17,14V16H15V14H17Z' /%3E%3C/svg%3E") no-repeat; - height: 17px; -} - -.link-store-scope { - background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%2300a9ff' d='M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z' /%3E%3C/svg%3E"); -} - -.emph, .accent { - color: #0090FF !important; -} - -@media screen and (-webkit-min-device-pixel-ratio: 0) { - select option:disabled, - select:disabled option { - color: #cacaca !important; - } -} - -/*# sourceMappingURL=override.css.map */ diff --git a/skin/adminhtml/default/openmage/override.css.map b/skin/adminhtml/default/openmage/override.css.map deleted file mode 100644 index 334bd205b64..00000000000 --- a/skin/adminhtml/default/openmage/override.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sourceRoot":"","sources":["../../../../../../skin/adminhtml/default/openmage/scss/override.scss","../../../../../../skin/adminhtml/default/openmage/scss/_variables.scss","../../../../../../skin/adminhtml/default/openmage/scss/_base.scss","../../../../../../skin/adminhtml/default/openmage/scss/_fonts.scss"],"names":[],"mappings":"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","file":"override.css"} \ No newline at end of file diff --git a/skin/adminhtml/default/openmage/calendar-blue2.css b/skin/adminhtml/openmage/default/calendar-blue2.css similarity index 100% rename from skin/adminhtml/default/openmage/calendar-blue2.css rename to skin/adminhtml/openmage/default/calendar-blue2.css diff --git a/skin/adminhtml/default/openmage/calendar-blue2.css.map b/skin/adminhtml/openmage/default/calendar-blue2.css.map similarity index 100% rename from skin/adminhtml/default/openmage/calendar-blue2.css.map rename to skin/adminhtml/openmage/default/calendar-blue2.css.map diff --git a/skin/adminhtml/default/openmage/favicon.ico b/skin/adminhtml/openmage/default/favicon.ico similarity index 100% rename from skin/adminhtml/default/openmage/favicon.ico rename to skin/adminhtml/openmage/default/favicon.ico diff --git a/skin/adminhtml/default/openmage/fonts/opensans/License.txt b/skin/adminhtml/openmage/default/fonts/opensans/License.txt similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/License.txt rename to skin/adminhtml/openmage/default/fonts/opensans/License.txt diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.ttf b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.ttf similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.ttf rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.ttf diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.woff b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.woff similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.woff rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.woff diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.woff2 b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.woff2 similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Bold.woff2 rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Bold.woff2 diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.ttf b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.ttf similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.ttf rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.ttf diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.woff b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.woff similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.woff rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.woff diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.woff2 b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.woff2 similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Light.woff2 rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Light.woff2 diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.ttf b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.ttf similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.ttf rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.ttf diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.woff b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.woff similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.woff rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.woff diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.woff2 b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.woff2 similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-Regular.woff2 rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-Regular.woff2 diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.ttf b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.ttf similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.ttf rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.ttf diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.woff b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.woff similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.woff rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.woff diff --git a/skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.woff2 b/skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.woff2 similarity index 100% rename from skin/adminhtml/default/openmage/fonts/opensans/OpenSans-SemiBold.woff2 rename to skin/adminhtml/openmage/default/fonts/opensans/OpenSans-SemiBold.woff2 diff --git a/skin/adminhtml/default/openmage/form.css b/skin/adminhtml/openmage/default/form.css similarity index 100% rename from skin/adminhtml/default/openmage/form.css rename to skin/adminhtml/openmage/default/form.css diff --git a/skin/adminhtml/default/openmage/form.css.map b/skin/adminhtml/openmage/default/form.css.map similarity index 100% rename from skin/adminhtml/default/openmage/form.css.map rename to skin/adminhtml/openmage/default/form.css.map diff --git a/skin/adminhtml/default/openmage/images/ajax-loader-tr.gif b/skin/adminhtml/openmage/default/images/ajax-loader-tr.gif similarity index 100% rename from skin/adminhtml/default/openmage/images/ajax-loader-tr.gif rename to skin/adminhtml/openmage/default/images/ajax-loader-tr.gif diff --git a/skin/adminhtml/default/openmage/images/alert-circle.svg b/skin/adminhtml/openmage/default/images/alert-circle.svg similarity index 100% rename from skin/adminhtml/default/openmage/images/alert-circle.svg rename to skin/adminhtml/openmage/default/images/alert-circle.svg diff --git a/skin/adminhtml/default/openmage/images/icon-error.png b/skin/adminhtml/openmage/default/images/icon-error.png similarity index 100% rename from skin/adminhtml/default/openmage/images/icon-error.png rename to skin/adminhtml/openmage/default/images/icon-error.png diff --git a/skin/adminhtml/default/openmage/images/information-variant.svg b/skin/adminhtml/openmage/default/images/information-variant.svg similarity index 100% rename from skin/adminhtml/default/openmage/images/information-variant.svg rename to skin/adminhtml/openmage/default/images/information-variant.svg diff --git a/skin/adminhtml/default/openmage/images/login_background.jpg b/skin/adminhtml/openmage/default/images/login_background.jpg similarity index 100% rename from skin/adminhtml/default/openmage/images/login_background.jpg rename to skin/adminhtml/openmage/default/images/login_background.jpg diff --git a/skin/adminhtml/default/openmage/images/logo.svg b/skin/adminhtml/openmage/default/images/logo.svg similarity index 100% rename from skin/adminhtml/default/openmage/images/logo.svg rename to skin/adminhtml/openmage/default/images/logo.svg diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento.css b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento.css similarity index 100% rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento.css rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento.css diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/btn_bg.gif b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/btn_bg.gif similarity index 100% rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/btn_bg.gif rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/btn_bg.gif diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/content_bg.gif b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/content_bg.gif similarity index 100% rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/content_bg.gif rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/content_bg.gif diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/top_bg.gif b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/top_bg.gif similarity index 100% rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/top_bg.gif rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/top_bg.gif diff --git a/skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/window_close.png b/skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/window_close.png similarity index 100% rename from skin/adminhtml/default/openmage/lib/prototype/windows/themes/magento/window_close.png rename to skin/adminhtml/openmage/default/lib/prototype/windows/themes/magento/window_close.png diff --git a/skin/adminhtml/default/openmage/login.css b/skin/adminhtml/openmage/default/login.css similarity index 100% rename from skin/adminhtml/default/openmage/login.css rename to skin/adminhtml/openmage/default/login.css diff --git a/skin/adminhtml/default/openmage/login.css.map b/skin/adminhtml/openmage/default/login.css.map similarity index 100% rename from skin/adminhtml/default/openmage/login.css.map rename to skin/adminhtml/openmage/default/login.css.map diff --git a/skin/adminhtml/default/openmage/menu.css b/skin/adminhtml/openmage/default/menu.css similarity index 100% rename from skin/adminhtml/default/openmage/menu.css rename to skin/adminhtml/openmage/default/menu.css diff --git a/skin/adminhtml/default/openmage/menu.css.map b/skin/adminhtml/openmage/default/menu.css.map similarity index 100% rename from skin/adminhtml/default/openmage/menu.css.map rename to skin/adminhtml/openmage/default/menu.css.map diff --git a/skin/adminhtml/openmage/default/override.css b/skin/adminhtml/openmage/default/override.css new file mode 100644 index 00000000000..630fd117c1c --- /dev/null +++ b/skin/adminhtml/openmage/default/override.css @@ -0,0 +1,886 @@ +/* ! Do not edit css files ! + Edit scss version and compile with sass from scss folder like this: + $ sass override.scss ../override.css + */ +/* + 205 = default, + 0 = red, + 60 = yellow, + 120 = green, + 180 = turquoise, + 240 = blue, + 300 = purple +*/ +body, .popup-window .content-header { + color: #2f2f2f; + font: 400 12px/1.33 'Open Sans', sans-serif; + background: #f6f6f6; } + +.header-top, #nav, .middle, .footer-content, .content-header-floating .content-header { + padding-left: 15px; + padding-right: 15px; + box-sizing: border-box; + width: 100%; } + +.content-header, .content-header h3 { + border: 0; + color: #2f2f2f; + font-size: 24px; + font-weight: 400; } + +.entry-edit .entry-edit-head, dl.accordion dt { + background: #fefefe; + color: #2f2f2f; + padding: 4px 16px; + border: 1px solid lightgrey; } + +.entry-edit fieldset, .entry-edit .fieldset, .box { + border: 1px solid lightgrey; + background: #eee; + border-top: 1px solid lightgrey; } + +.grid tr.headings th a.sort-arrow-desc, .grid tr.headings th a.sort-arrow-asc { + background: none; + border: 0; + box-sizing: border-box; + font-weight: bold; + position: relative; } + +.grid tr.headings th a.sort-arrow-desc span.sort-title:after, .grid tr.headings th a.sort-arrow-asc span.sort-title:after { + content: ""; + display: block; + position: absolute; + right: 6px; + bottom: 8px; + width: 0; + height: 0; + border-style: solid; } + +ul.tabs a.active, ul.tabs a:hover { + background: #f4f4f4; + color: #2f2f2f; + transition: background 0.3s ease-in-out; } + +.entry-edit .entry-edit-head strong, .entry-edit .entry-edit-head a, div.collapseable a, div.collapseable a:hover, div.collapseable a.open, dl.accordion dt a, dl.accordion dt a:hover, dl.accordion dt.open a { + color: #2f2f2f; + font-weight: 300; + font-size: 18px; + line-height: 32px; } + +div.collapseable a:after, dl.accordion dt a:after { + content: ""; + display: block; + position: absolute; + right: 0; + bottom: 10px; + width: 0; + height: 0; + border-style: solid; + border-width: 8px 6px 0 6px; + border-color: #888 transparent transparent transparent; } + +div.collapseable a.open:after, dl.accordion dt.open a:after { + content: ""; + display: block; + position: absolute; + right: 0; + bottom: 10px; + width: 0; + height: 0; + border-style: solid; + border-width: 0 6px 8px 6px; + border-color: transparent transparent #888 transparent; } + +.notice-msg, .error-msg, .success-msg, .warning-msg { + border-radius: 5px; + margin: 20px 0; + padding: 10px 26px 10px 35px; + position: relative; + text-shadow: none; } + +.grid-severity-notice, .grid-severity-critical, .grid-severity-major, .grid-severity-minor { + background: none; + padding: 0; + height: auto; } + +.grid-severity-notice span, .grid-severity-critical span, .grid-severity-major span, .grid-severity-minor span { + font: 400 12px/1.33 'Open Sans', sans-serif; + padding: 2px 10px; } + +.grid-severity-major span, .grid-severity-minor span { + border: 0; + background: #f0ad4e; + color: #fff; } + +.header-right fieldset input.input-text:focus, .header-right fieldset input.input-text:hover { + background-color: #fff; + outline: none; + box-shadow: none; } + +@font-face { + font-family: "Open Sans"; + src: url("fonts/opensans/OpenSans-Light.ttf") format("truetype"), url("fonts/opensans/OpenSans-Light.woff") format("woff"), url("fonts/opensans/OpenSans-Light.woff2") format("woff2"); + /* Modern Browsers */ + font-weight: 300; + font-style: normal; } +@font-face { + font-family: "Open Sans"; + src: url("fonts/opensans/OpenSans-Regular.ttf") format("truetype"), url("fonts/opensans/OpenSans-Regular.woff") format("woff"), url("fonts/opensans/OpenSans-Regular.woff2") format("woff2"); + /* Modern Browsers */ + font-weight: 400; + font-style: normal; } +@font-face { + font-family: "Open Sans"; + src: url("fonts/opensans/OpenSans-Bold.ttf") format("truetype"), url("fonts/opensans/OpenSans-Bold.woff") format("woff"), url("fonts/opensans/OpenSans-Bold.woff2") format("woff2"); + /* Modern Browsers */ + font-weight: 700; + font-style: normal; } +@font-face { + font-family: "Open Sans"; + src: url("fonts/opensans/OpenSans-SemiBold.ttf") format("truetype"), url("fonts/opensans/OpenSans-SemiBold.woff") format("woff"), url("fonts/opensans/OpenSans-SemiBold.woff2") format("woff2"); + /* Modern Browsers */ + font-weight: 600; + font-style: normal; } +h1 { + color: #2f2f2f; + font-weight: 400; } + +h2 { + color: #2f2f2f; + font-weight: 400; } + +h3 { + color: #2f2f2f; + font-weight: 400; } + +h4 { + color: #2f2f2f; + font-weight: 400; } + +h5 { + color: #2f2f2f; + font-weight: 400; } + +h6 { + color: #2f2f2f; + font-weight: 400; } + +label { + color: #2f2f2f; + font-weight: 400; } + +a { + display: inline; + color: #269de7; + text-decoration: none; } + a:visited { + color: #269de7; } + a:focus { + color: #3378a3; + text-decoration: none; } + a:hover { + color: #3378a3; + text-decoration: none; } + a:active { + color: #3378a3; + text-decoration: none; } + a.error span { + color: #fa4545 !important; } + +strong { + font-weight: 600; } + +b { + font-weight: 600; } + +small { + font-size: 12px; + color: #2f2f2f; } + +.wrapper { + display: flex; + flex-direction: column; + min-height: 100vh; } + +.header-top { + border: 0; } + +.middle { + background: #f6f6f6; + flex-grow: 1; } + +.content-header-floating { + opacity: 0.9; + border-bottom: solid 1px #c8c8c8; } + .content-header-floating h3 { + font-size: 18px; } + .content-header-floating td { + padding-right: 0; } + .content-header-floating .form-buttons { + padding-right: 0; } + +.content-header { + margin-bottom: 0; + padding-bottom: 0; } + .content-header h3 { + margin: 0 0.3em 0.3em; + line-height: 32px; } + +.dashboard-container { + border: none; } + +.columns { + background: none; } + +.switcher { + background: none; + padding: 0 0 10px; + border: none; } + +.entry-edit { + margin-top: 10px; } + .entry-edit .entry-edit-head h4 { + color: #2f2f2f; + line-height: 32px; + font-size: 16px; + font-weight: 300; } + .entry-edit .entry-edit-head .tools { + line-height: 32px; } + .entry-edit .entry-edit-head .tools a:hover { + text-decoration: none; } + .entry-edit .entry-edit-head .icon-copy { + width: 16px; + height: 16px; + margin: 8px 0 0 5px; + filter: revert; + float: right; } + .entry-edit .entry-edit-head button:not(:first-child) { + margin: 0 0 0 5px; } + +.grid table { + border: 1px solid lightgrey; + border-collapse: collapse; } + .grid table.border { + border: 1px solid lightgrey; } + .grid table.border tfoot tr td { + background: #fff !important; } + .grid table td { + border: 1px solid lightgrey; + background: #fff; + padding: 5px; } + .grid table td.first { + border-right: 1px solid lightgrey; } + .grid table td.last { + border-right: 1px solid lightgrey; } + .grid table tfoot tr td { + border: 1px solid lightgrey; + background: #fff; } + .grid table tbody tr.selected td { + background: #f0f9ff; } + .grid table tbody tr:hover td { + background: #f0f9ff; } + .grid table tbody tr:nth-child(odd):hover td { + background: #f0f9ff; } +.grid tr.filter { + background: #fff !important; } + .grid tr.filter th { + border: 1px solid lightgrey; + border-top: 0; } + .grid tr.filter th.sorted { + background: #f7f7f7 !important; } + .grid tr.filter .range .range-line { + width: 125px; } + .grid tr.filter .range.filter-range .range-line { + width: initial; } + .grid tr.filter .range .label { + font-weight: 400; + width: 40px; + padding: 4px; } + .grid tr.filter .range.filter-range .label { + display: none; } + .grid tr.filter .range div.date { + min-width: 140px; } + .grid tr.filter .range input, .grid tr.filter .range select { + width: 75px !important; } + .grid tr.filter .range select { + float: none; } + .grid tr.filter .date img { + padding-left: 17px; + box-sizing: border-box; + width: 17px; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M9,10V12H7V10H9M13,10V12H11V10H13M17,10V12H15V10H17M19,3A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5C3.89,21 3,20.1 3,19V5A2,2 0 0,1 5,3H6V1H8V3H16V1H18V3H19M19,19V8H5V19H19M9,14V16H7V14H9M13,14V16H11V14H13M17,14V16H15V14H17Z' /%3E%3C/svg%3E") no-repeat; + height: 17px; + margin-top: 5px; } +.grid tr.headings { + background: #71798e; + border: 1px solid #71798e; } + .grid tr.headings th { + padding: 4px; + font-size: 12px; + vertical-align: middle; + color: #fff; + font-weight: 400; } + .grid tr.headings th a { + color: #fff; + font-weight: 400; } + .grid tr.headings th a:hover { + color: lightgrey; } + .grid tr.headings th a.sort-arrow-desc span.sort-title { + background: none; } + .grid tr.headings th a.sort-arrow-desc span.sort-title:after { + border-width: 6px 5px 0 5px; + border-color: lightgrey transparent transparent transparent; } + .grid tr.headings th a.sort-arrow-asc span.sort-title { + background: none; } + .grid tr.headings th a.sort-arrow-asc span.sort-title:after { + border-width: 0 5px 6px 5px; + border-color: transparent transparent lightgrey transparent; } + .grid tr.headings th.no-link { + color: #fff; + padding: 4px; } +.grid tr.even td { + background: #eee; } +.grid tr.even tr td { + background: #eee; } +.grid tbody.even tr td { + background: #eee !important; } +.grid tbody.odd tr td { + background: #f6f6f6 !important; } +.grid tbody tr.even td.sorted { + background: #e6e6e6 !important; } +.grid tbody tr.odd td.sorted { + background: #f7f7f7 !important; } +.grid tbody tr.selected td.sorted { + background: #e1f3ff !important; } +.grid td input.input-text { + min-width: 80px; } + +.header { + background: #3A499D; + position: relative; } + +.header-top { + border-bottom: none !important; + height: 10px; } + .header-top .logo { + position: absolute; + display: block; + top: 8px; + left: 0; + margin: 0; + height: 40px; + padding: 0 27px; } + .header-top .logo svg { + height: 40px; + width: auto; } + +.header-right { + position: absolute; + top: 10px; + right: 0; + padding: 0; + color: inherit; + z-index: 200; + height: 40px; + background: var(--color-main-xxl); } + .header-right fieldset { + display: inline; + line-height: 40px; } + .header-right fieldset input.input-text { + width: 250px; + border: 0 solid #FF666E73; + margin-top: -4px; + background-color: #fff; + padding-left: 10px; + min-width: 250px; + transition: width 100ms; + transition-delay: 200ms; } + .header-right fieldset input.input-text:focus { + width: calc(100vw - 160px); } + +.footer { + background: #eee; + padding: 15px; + margin-top: 30px; + border-top: 1px solid #c8c8c8; + font-size: 12px; } + +ul.tabs-horiz { + background: none; + margin: 0; + padding: 0; } + ul.tabs-horiz li { + border: none; + margin: 0 10px 0 0; } + ul.tabs-horiz li a { + background: #eee; + color: #2f2f2f !important; + font-size: 16px; + font-weight: 300; + padding: 9px 15px; + border: 0; } + ul.tabs-horiz li a.active { + border: 0; + background: #71798e; + color: #fff !important; } +ul.tabs { + background: none; + color: #2f2f2f; + border-top: 0; } + ul.tabs dl { + background: #fff; + border: 1px solid lightgrey; } + ul.tabs a { + background: #fff; + color: #2f2f2f; + padding: 8px 18px; + border-bottom: 1px solid #eee; } + ul.tabs a.active { + border-left: 3px solid #71798e; + padding: 8px 18px; + border-bottom: 1px solid #eee; } + ul.tabs a.active span { + padding: 0; + background: none; + font-weight: 400; } + ul.tabs a:hover.active { + padding: 8px 18px; } + ul.tabs a:hover.active span { + background: none; + font-weight: 400; } + ul.tabs span { + background: none; + padding: 0; + font-weight: 400; } +ul.config-tabs dt { + border: 0; + font-weight: 300; + text-transform: none; + padding: 7px 7px 7px 10px; + font-size: 18px; + background: #71798e; + color: #fff; } + +#grid_tab_content { + background: #fff; + padding: 15px; } + +.nav-bar { + background: #3A499D; + border: 0; } + +div.collapseable { + margin-top: 10px; } + div.collapseable a { + position: relative; + background: none; } + div.collapseable a.open { + background: none; } +div.autocomplete { + border: 0; + box-shadow: 0 3px 3px rgba(50, 50, 50, 0.15); } + div.autocomplete ul li { + color: #2f2f2f; } + div.autocomplete ul li.selected { + background: #eee; } + +.section-config .section-config > .config { + border: 0; } +.section-config .section-config > .entry-edit-head { + border: 0; } + .section-config .section-config > .entry-edit-head > a { + background: none; + color: #2f2f2f; + font-size: 14px; + font-weight: 400; + border: 0; } +.section-config .section-config .section-config .section-config .section-config > .config { + background: #f8f8f8; } +.section-config .section-config .section-config .section-config > .config { + background: #fefefe; } +.section-config .section-config .section-config > .config { + background: #f8f8f8; } +.section-config .config-advanced > .entry-edit-head { + border: 0; + font-size: 14px; + box-shadow: none; } + .section-config .config-advanced > .entry-edit-head.collapseable a:after { + border: none; } + .section-config .config-advanced > .entry-edit-head.collapseable a.open:after { + border: none; } + .section-config .config-advanced > .entry-edit-head a:after { + top: 5px; } +.section-config .config-advanced > .config { + padding: 10px; } + +.massaction { + background: none; + border: 0; + font-size: 12px; } + .massaction td { + border-top: 0; + padding: 10px 0; } + .massaction .entry-edit fieldset span.form_row, .massaction .entry-edit fieldset span.field-row { + padding: 0; } + .massaction .entry-edit .field-row label { + vertical-align: middle; } + +.head-products { + background-position: left center; } + +.icon-head { + background-position: left center; } + +.x-tree-node a { + font-size: 12px; } + .x-tree-node a span { + color: #2f2f2f; } +.x-tree-node .x-tree-selected a span { + background: lightgrey; + color: #2f2f2f; } + +.categories-side-col .tree-holder { + margin-right: 0; } +.categories-side-col .tree-actions { + margin-right: 0; } + +#loading-mask { + opacity: 1; } + #loading-mask .backdrop { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: rgba(0, 0, 0, 0.4); + color: #2f2f2f; } + #loading-mask .loader { + width: 160px; + height: 100px; + border: 0; + opacity: 0.95; + color: #2f2f2f; + background: #fff; + font-size: 18px; + font-weight: 400; } + +.error { + color: #fa4545 !important; } + +.required { + color: #fa4545 !important; } + +.validation-advice { + color: #fa4545 !important; + font-size: 12px; + font-weight: 600 !important; } + +.order-totals { + background: #eee; + border: 1px solid lightgrey !important; } + +.order-choose-address { + background: #fff; } + +.order-save-in-address-book { + background: #fff; } + +.messages li { + font-weight: 400 !important; + font-size: 12px !important; + padding: 10px 26px 10px 35px !important; + min-height: inherit !important; } +.messages ul li { + margin: 0 !important; } + +.notice-msg { + background-image: url(images/information-variant.svg) !important; + background-repeat: no-repeat !important; + background-size: 23px 23px !important; + background-color: #f9f5ec !important; + background-position: 8px center !important; + border: 1px solid #dfc97a !important; + color: #2f2f2f !important; } + .notice-msg a { + color: #2f2f2f !important; + text-decoration: underline; } + +.error-msg { + background-image: url(images/icon-error.png) !important; + background-repeat: no-repeat !important; + background-size: 23px 23px !important; + background-color: #f3dcd8 !important; + background-position: 8px center !important; + border: 1px solid #963535 !important; + color: #963535 !important; } + .error-msg a { + color: #963535 !important; + text-decoration: underline; } + +.success-msg { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23185b00' d='M9,20.42L2.79,14.21L5.62,11.38L9,14.77L18.88,4.88L21.71,7.71L9,20.42Z' /%3E%3C/svg%3E") !important; + background-repeat: no-repeat !important; + background-size: 16px 16px !important; + background-color: #e4eecb !important; + background-position: 8px center !important; + border: 1px solid #ceceb6 !important; + color: #185b00 !important; } + .success-msg a { + color: #185b00 !important; + text-decoration: underline; } + +.warning-msg { + background-image: url(images/information-variant.svg) !important; + background-repeat: no-repeat !important; + background-size: 23px 23px !important; + background-color: #fffbf0 !important; + background-position: 8px center !important; + border: 1px solid #d87e34 !important; + color: #2f2f2f !important; } + .warning-msg a { + color: #2f2f2f !important; + text-decoration: underline; } + +.links-feed { + margin-top: 10px; } + +.link-feed { + margin-right: 20px; + font-size: 0.9em; + text-decoration: none; } + +.options-box .option-header { + background: none; + border: 0; } +.options-box .option-title { + border-bottom: 1px solid #c8c8c8; } +.options-box .option-box { + background: #fff; + border: 0; } + +#page-login { + background: #f6f6f6; } + +.login-box { + border: 1px solid #cacaca; + box-shadow: 2px 2px 4px #8080806b; } + .login-box .login-form { + background: white; } + .login-box .login-form .form-button, .login-box .login-form button { + background: #0090FF; } + .login-box .bottom { + display: none; } + +.login-container .legal { + background: #eaeaea; } + +.config-heading { + background-color: #fff; + border: 0; + margin: 4px 0 0; } + .config-heading .button span { + font-size: 13px; + font-weight: 400; + line-height: 28px; + text-shadow: none; } + +#payment_pphs_settings_advanced-head { + margin-bottom: 10px; } + +#payment_settings_payments_standart_advanced-head { + margin-bottom: 10px; } + +#payment_settings_ec_advanced-head { + margin-bottom: 10px; } + +.grid-severity-notice span { + border: 0; + background: #56af45; + color: #fff; } + +.grid-severity-critical span { + border: 0; + background: #fa4545; + color: #fff; } + +.custom-options .box { + overflow: auto; } +.custom-options .option-box { + border: 0; + background: #fff; } + .custom-options .option-box .border { + width: 700px; } +.custom-options .option-header { + background: #fff; + border-bottom-color: #fff; } + +.bold { + font-weight: 600 !important; } + +#address_form_container { + margin-top: 0; } + +.sub-btn-set { + border: 0; + padding: 6px 10px; + background: #eee; + border-top: 1px solid lightgrey; } + +.no-display { + display: none !important; } + +.side-col .switcher select { + margin: 4px 0; } + +.side-col .switcher .link-store-scope { + margin: 9px -19px 0 3px; } + +dl.accordion dt { + margin-top: 10px; } + dl.accordion dt a { + position: relative; + background: none; } + dl.accordion dt.open a { + background: none; } + +table.actions { + padding: 15px; + background: #fff; + border: 1px solid lightgrey; } + table.actions td { + vertical-align: middle; } + +.x-dd-drag-ghost a { + font-size: 12px; } + .x-dd-drag-ghost a span { + color: #2f2f2f; } + +.no-active-category a span { + color: #999 !important; } + +.dialog table.table_window { + background: #fff; + border: 0; } + .dialog table.table_window td { + padding: 6px 0; + vertical-align: middle; } + .dialog table.table_window th { + padding: 6px 0; + vertical-align: middle; } + .dialog table.table_window .fieldset td { + vertical-align: top; } + +.with-button.active:after { + background: none; + margin: 0; } + +.wrapper-popup .content-header table { + width: 90%; } + +.tier .data { + width: 550px; } + .tier .data select { + width: auto; } + .tier .data input.qty { + width: 50px !important; } + +.rule-param .label { + font-weight: 600; } + +a.rule-param-remove img { + padding-left: 13px; + box-sizing: border-box; + width: 13px; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23d50000' d='M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z' /%3E%3C/svg%3E") no-repeat; + height: 13px; } + +img.rule-param-add { + padding-left: 13px; + box-sizing: border-box; + width: 13px; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%2356af45' d='M17,13H13V17H11V13H7V11H11V7H13V11H17M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z' /%3E%3C/svg%3E") no-repeat; + height: 13px; } + +.address-list li.on { + background: #fff; } + +ul.tabs a.changed span.changed { + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%2356af45' d='M5,3A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5.5L18.5,3H17V9A1,1 0 0,1 16,10H8A1,1 0 0,1 7,9V3H5M12,4V9H15V4H12M7,12H17A1,1 0 0,1 18,13V19H6V13A1,1 0 0,1 7,12Z' /%3E%3C/svg%3E") !important; } + +.notification-global { + background: #f9f5ec url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23d50000' d='M13,13H11V7H13M13,17H11V15H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z' /%3E%3C/svg%3E") 27px 5px no-repeat; + background-size: 15px; } + +#page-help-link { + display: none; } + +.message-popup { + background: #929292; } + .message-popup .message-popup-head h2 { + color: #fff; } + .message-popup .message-popup-head a { + background: #0090FF !important; + border: none; + margin-top: 1px; } + .message-popup .message-popup-head a span { + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%23fff' d='M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z' /%3E%3C/svg%3E") no-repeat 0 50%; + background-size: 13px; } + .message-popup .message-popup-content { + background: #fff; } + .message-popup .message-popup-content .read-more a { + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12M10,17L15,12L10,7V17Z' /%3E%3C/svg%3E") no-repeat 0 50%; + background-size: 13px; } + +.pager img[src$='pager_arrow_left.gif'].arrow { + padding-left: 17px; + box-sizing: border-box; + width: 17px; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M14,7L9,12L14,17V7Z' /%3E%3C/svg%3E") no-repeat; + height: 17px; } +.pager img[src$='pager_arrow_right.gif'].arrow { + padding-left: 17px; + box-sizing: border-box; + width: 17px; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12M10,17L15,12L10,7V17Z' /%3E%3C/svg%3E") no-repeat; + height: 17px; } +.pager img[src$='pager_arrow_left_off.gif'].arrow { + padding-left: 17px; + box-sizing: border-box; + width: 17px; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M14,7L9,12L14,17V7Z' /%3E%3C/svg%3E") no-repeat; + height: 17px; + opacity: 0.5; } +.pager img[src$='pager_arrow_right_off.gif'].arrow { + padding-left: 17px; + box-sizing: border-box; + width: 17px; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12M10,17L15,12L10,7V17Z' /%3E%3C/svg%3E") no-repeat; + height: 17px; + opacity: 0.5; } + +.export img { + padding-left: 19px; + box-sizing: border-box; + width: 19px; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%2356af45' d='M23,12L19,8V11H10V13H19V16M1,18V6C1,4.89 1.9,4 3,4H15A2,2 0 0,1 17,6V9H15V6H3V18H15V15H17V18A2,2 0 0,1 15,20H3A2,2 0 0,1 1,18Z' /%3E%3C/svg%3E") no-repeat; + height: 19px; } + +img[src$='grid-cal.gif'] { + padding-left: 17px; + box-sizing: border-box; + width: 17px; + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%230090FF' d='M9,10V12H7V10H9M13,10V12H11V10H13M17,10V12H15V10H17M19,3A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5C3.89,21 3,20.1 3,19V5A2,2 0 0,1 5,3H6V1H8V3H16V1H18V3H19M19,19V8H5V19H19M9,14V16H7V14H9M13,14V16H11V14H13M17,14V16H15V14H17Z' /%3E%3C/svg%3E") no-repeat; + height: 17px; } + +.link-store-scope { + background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='width:24px;height:24px' viewBox='0 0 24 24'%3E%3Cpath fill='%2300a9ff' d='M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z' /%3E%3C/svg%3E"); } + +.emph, .accent { + color: #0090FF !important; } + +@media screen and (-webkit-min-device-pixel-ratio: 0) { + select option:disabled, + select:disabled option { + color: #cacaca !important; } } + +/*# sourceMappingURL=override.css.map */ diff --git a/skin/adminhtml/openmage/default/override.css.map b/skin/adminhtml/openmage/default/override.css.map new file mode 100644 index 00000000000..cac2a8a2edc --- /dev/null +++ b/skin/adminhtml/openmage/default/override.css.map @@ -0,0 +1,7 @@ +{ +"version": 3, +"mappings": "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", +"sources": ["scss/override.scss","scss/_variables.scss","scss/_base.scss","scss/_fonts.scss"], +"names": [], +"file": "override.css" +} diff --git a/skin/adminhtml/default/openmage/scss/_base.scss b/skin/adminhtml/openmage/default/scss/_base.scss similarity index 100% rename from skin/adminhtml/default/openmage/scss/_base.scss rename to skin/adminhtml/openmage/default/scss/_base.scss diff --git a/skin/adminhtml/default/openmage/scss/_fonts.scss b/skin/adminhtml/openmage/default/scss/_fonts.scss similarity index 100% rename from skin/adminhtml/default/openmage/scss/_fonts.scss rename to skin/adminhtml/openmage/default/scss/_fonts.scss diff --git a/skin/adminhtml/default/openmage/scss/_icons.scss b/skin/adminhtml/openmage/default/scss/_icons.scss similarity index 100% rename from skin/adminhtml/default/openmage/scss/_icons.scss rename to skin/adminhtml/openmage/default/scss/_icons.scss diff --git a/skin/adminhtml/default/openmage/scss/_variables.scss b/skin/adminhtml/openmage/default/scss/_variables.scss similarity index 100% rename from skin/adminhtml/default/openmage/scss/_variables.scss rename to skin/adminhtml/openmage/default/scss/_variables.scss diff --git a/skin/adminhtml/default/openmage/scss/calendar-blue2.scss b/skin/adminhtml/openmage/default/scss/calendar-blue2.scss similarity index 100% rename from skin/adminhtml/default/openmage/scss/calendar-blue2.scss rename to skin/adminhtml/openmage/default/scss/calendar-blue2.scss diff --git a/skin/adminhtml/default/openmage/scss/form.scss b/skin/adminhtml/openmage/default/scss/form.scss similarity index 100% rename from skin/adminhtml/default/openmage/scss/form.scss rename to skin/adminhtml/openmage/default/scss/form.scss diff --git a/skin/adminhtml/default/openmage/scss/login.scss b/skin/adminhtml/openmage/default/scss/login.scss similarity index 100% rename from skin/adminhtml/default/openmage/scss/login.scss rename to skin/adminhtml/openmage/default/scss/login.scss diff --git a/skin/adminhtml/default/openmage/scss/menu.scss b/skin/adminhtml/openmage/default/scss/menu.scss similarity index 100% rename from skin/adminhtml/default/openmage/scss/menu.scss rename to skin/adminhtml/openmage/default/scss/menu.scss diff --git a/skin/adminhtml/default/openmage/scss/override.scss b/skin/adminhtml/openmage/default/scss/override.scss similarity index 99% rename from skin/adminhtml/default/openmage/scss/override.scss rename to skin/adminhtml/openmage/default/scss/override.scss index c7bd0ae9018..b2be0b2c82a 100644 --- a/skin/adminhtml/default/openmage/scss/override.scss +++ b/skin/adminhtml/openmage/default/scss/override.scss @@ -194,6 +194,10 @@ small { filter: revert; float: right; } + + button:not(:first-child) { + margin: 0 0 0 5px; + } } fieldset {