diff --git a/app/design/adminhtml/default/default/locale/en_US/translate.csv b/app/design/adminhtml/default/default/locale/en_US/translate.csv index 05cf0012840..a54cdeac163 100644 --- a/app/design/adminhtml/default/default/locale/en_US/translate.csv +++ b/app/design/adminhtml/default/default/locale/en_US/translate.csv @@ -170,7 +170,7 @@ "Order Comment","Order Comment" "Edit Role","Edit Role" "Tax Rates Import / Export","Tax Rates Import / Export" -"Magento Logo","Magento Logo" +"OpenMage Logo","OpenMage Logo" "A name is required","A name is required" "Assigned options","Assigned options" "Please Enter New Group Name","Please Enter New Group Name" diff --git a/app/design/adminhtml/default/default/template/example.phtml b/app/design/adminhtml/default/default/template/example.phtml deleted file mode 100644 index bfba40f3bb6..00000000000 --- a/app/design/adminhtml/default/default/template/example.phtml +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - <?php echo Mage::helper('adminhtml')->__('Magento Commerce - Administrative Panel') ?> - - - - - - - -
- -
-

Today is: June 01, 2007|Minu Oh (Administrator)|Logout

-
- -
-
-
- - getLayout()->createBlock('adminhtml/page_menu')->toHtml() ?> - -
-
- -
-
-
-
-
- - - - - -

Minu Oh - Customer View

Save
-
-
-

Personal Information

-
-

Last Logged in: June, 16, 2007 ( Currently OFFLINE )

-

Account Created: April 1, 2001

-
- Contact Information
Minu Oh ( minu@varien.com)
- 3402 Motor Ave Suite B
- Los Angeles, CA 90034
- United States
- T | (310) 123-1234
-
-
-
-

Sales Tally

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Lifetime SalesAverage Sale
Total$9000.82$400.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
Site 1$1899.82$82.99
-
-
-
-
-

Sales Stat

-
-
Last 5 Orders
-
-
Wishlist (5 items)
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Product IDProduct NamePrice
Total$400.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
00212Some sort of product name goes here$82.99
-
Gift Registries (0 items)
-
-
Shopping Cart (1 item)
-
-
- - - - - -

- -
- - - - - -

Minu Oh - Addresses

 - Delete - Save - New Address -
-
-
-

Customer Addresses

-
    -
  • -
    Minu Oh
    - 3402 Motor Ave Suite B
    - Los Angeles, CA 90034
    - T | 310-123-1234 -
    -
    • -
  • -
    Minu Oh
    - 3402 Motor Ave Suite B
    - Los Angeles, CA 90034
    - T | 310-123-1234 -
    -
    • -
  • -
    Minu Oh
    - 3402 Motor Ave Suite B
    - Los Angeles, CA 90034
    - T | 310-123-1234 -
    -
    • -
  • -
    Minu Oh
    - 3402 Motor Ave Suite B
    - Los Angeles, CA 90034
    - T | 310-123-1234 -
    -
    • -
-
-
-

Edit Address Entry

-
-
-
    -
    • -
    • -
    • -
    • -
    • -
    • -
-
-
-
- - - - - - -
-
- - -
-

Customer Insight

- -
-
- -
-
-
- - -
-

Copyright © 2008 Magento Commerce. All Right Reserved.
- Version 1.0 | Powered by Varien

-
- - diff --git a/app/design/adminhtml/default/default/template/page/header.phtml b/app/design/adminhtml/default/default/template/page/header.phtml index 216f70fab1c..f8080488a88 100644 --- a/app/design/adminhtml/default/default/template/page/header.phtml +++ b/app/design/adminhtml/default/default/template/page/header.phtml @@ -27,7 +27,7 @@ /** @var $this Mage_Adminhtml_Block_Page_Header */ ?>
- +

__("Logged in as %s", $this->escapeHtml($this->getUser()->getUsername())) ?>|formatDate(null, 'full') ?>|__('Log Out') ?> diff --git a/app/design/install/default/default/template/page.phtml b/app/design/install/default/default/template/page.phtml index 5756d1f5042..c5ba26a25d5 100644 --- a/app/design/install/default/default/template/page.phtml +++ b/app/design/install/default/default/template/page.phtml @@ -60,7 +60,7 @@

- <?php echo Mage::helper('core')->quoteEscape(Mage::helper('install')->__('OpenMage')) ?> + <?php echo Mage::helper('core')->quoteEscape(Mage::helper('install')->__('OpenMage')) ?>

getChildHtml('topSearch') ?> diff --git a/errors/default/images/favicon.ico b/errors/default/images/favicon.ico index 1cb7c771371..85b35553c9a 100644 Binary files a/errors/default/images/favicon.ico and b/errors/default/images/favicon.ico differ diff --git a/errors/default/images/logo.gif b/errors/default/images/logo.gif deleted file mode 100644 index 91ee33d3504..00000000000 Binary files a/errors/default/images/logo.gif and /dev/null differ diff --git a/errors/default/images/logo.svg b/errors/default/images/logo.svg new file mode 100644 index 00000000000..c824afaaa74 --- /dev/null +++ b/errors/default/images/logo.svg @@ -0,0 +1,45 @@ + + + + + + + + + diff --git a/errors/default/page.phtml b/errors/default/page.phtml index 9564cc00cb9..19dfa8d9577 100644 --- a/errors/default/page.phtml +++ b/errors/default/page.phtml @@ -42,7 +42,7 @@
- +
diff --git a/favicon.ico b/favicon.ico index 19c2c8abb89..85b35553c9a 100644 Binary files a/favicon.ico and b/favicon.ico differ diff --git a/skin/adminhtml/default/default/boxes.css b/skin/adminhtml/default/default/boxes.css index 6f7b9b36907..bebd6933b88 100644 --- a/skin/adminhtml/default/default/boxes.css +++ b/skin/adminhtml/default/default/boxes.css @@ -590,7 +590,7 @@ div.main-col-inner { float:left; /* Fixes some inner clears in the liquid main-c /* HEADER & FOOTER *******************************************************************************/ -.logo { float:left; margin:5px 20px 5px 27px; height:43px; } +.logo { float:left; margin:7px 20px 5px 32px; height:30px; } .header-top { border-bottom:1px solid #5F767F; } /* Header right */ @@ -721,7 +721,8 @@ div.autocomplete ul li { padding:.5em .7em; min-height:32px; cursor:pointer; tex /* LOGIN *******************************************************************************/ #page-login { background:#f8f8f8; text-align:center; } -.login-container { width:581px; margin:170px auto; padding-left:32px; background:url(images/login_logo.png) no-repeat; } +.login-container { position: relative; width:581px; margin:170px auto; padding-left:32px; } +.login-container::before { content: "";position: absolute;width: 150px;height: 35px;top: 60px;left: -55px;background: url(images/logo_gray.svg) 0 0 no-repeat;background-size: contain;transform: rotate(-90deg); } .login-form { padding:27px 57px 35px 57px; background:url(images/login_box_bg.jpg) no-repeat; text-align:left; } .login-form .input-left { float:left; } .login-form .input-right { float:right; } diff --git a/skin/adminhtml/default/default/favicon.ico b/skin/adminhtml/default/default/favicon.ico index 19c2c8abb89..85b35553c9a 100644 Binary files a/skin/adminhtml/default/default/favicon.ico and b/skin/adminhtml/default/default/favicon.ico differ diff --git a/skin/adminhtml/default/default/images/login_logo.png b/skin/adminhtml/default/default/images/login_logo.png deleted file mode 100644 index 21f107b1791..00000000000 Binary files a/skin/adminhtml/default/default/images/login_logo.png and /dev/null differ diff --git a/skin/adminhtml/default/default/images/logo-large.gif b/skin/adminhtml/default/default/images/logo-large.gif index 7f4401e20ff..48766cf4af5 100644 Binary files a/skin/adminhtml/default/default/images/logo-large.gif and b/skin/adminhtml/default/default/images/logo-large.gif differ diff --git a/skin/adminhtml/default/default/images/logo.png b/skin/adminhtml/default/default/images/logo.png deleted file mode 100644 index e85d25bc192..00000000000 Binary files a/skin/adminhtml/default/default/images/logo.png and /dev/null differ diff --git a/skin/adminhtml/default/default/images/logo.svg b/skin/adminhtml/default/default/images/logo.svg new file mode 100644 index 00000000000..ee8c022e36c --- /dev/null +++ b/skin/adminhtml/default/default/images/logo.svg @@ -0,0 +1,45 @@ + + + + + + + + + diff --git a/skin/adminhtml/default/default/images/logo_email.gif b/skin/adminhtml/default/default/images/logo_email.gif index 05712b94d64..0c4ed888223 100644 Binary files a/skin/adminhtml/default/default/images/logo_email.gif and b/skin/adminhtml/default/default/images/logo_email.gif differ diff --git a/skin/adminhtml/default/default/images/logo_gray.svg b/skin/adminhtml/default/default/images/logo_gray.svg new file mode 100644 index 00000000000..c64be5599bf --- /dev/null +++ b/skin/adminhtml/default/default/images/logo_gray.svg @@ -0,0 +1,45 @@ + + + + + + + + + diff --git a/skin/adminhtml/default/default/images/logo_print.gif b/skin/adminhtml/default/default/images/logo_print.gif index 05712b94d64..0c4ed888223 100644 Binary files a/skin/adminhtml/default/default/images/logo_print.gif and b/skin/adminhtml/default/default/images/logo_print.gif differ diff --git a/skin/adminhtml/default/openmage/favicon.ico b/skin/adminhtml/default/openmage/favicon.ico index 65f6a256525..85b35553c9a 100644 Binary files a/skin/adminhtml/default/openmage/favicon.ico and b/skin/adminhtml/default/openmage/favicon.ico differ diff --git a/skin/adminhtml/default/openmage/images/logo-openmage.png b/skin/adminhtml/default/openmage/images/logo-openmage.png deleted file mode 100644 index ad8a3c5a139..00000000000 Binary files a/skin/adminhtml/default/openmage/images/logo-openmage.png and /dev/null differ diff --git a/skin/adminhtml/default/openmage/images/logo.svg b/skin/adminhtml/default/openmage/images/logo.svg index 553083d0d24..55c19e583ae 100644 --- a/skin/adminhtml/default/openmage/images/logo.svg +++ b/skin/adminhtml/default/openmage/images/logo.svg @@ -4,12 +4,12 @@ - + - + + + + + + + +