Skip to content

Commit

Permalink
Merge branch 'OpenMage:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@sreichel
sreichel authored Apr 18, 2024
2 parents f17443e + 2ab5574 commit 244f7f1
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 52 deletions.
1 change: 0 additions & 1 deletion app/design/adminhtml/default/default/template/forgotpassword.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css') ?>" media="all" />
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css') ?>" media="all" />
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/prototype.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/default/default/template/login.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css') ?>" media="all" />
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css') ?>" media="all" />
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/prototype.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
<title><?php echo htmlspecialchars(html_entity_decode($this->getTitle())) ?></title>
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>

<script type="text/javascript">
//<![CDATA[
Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/default/default/template/page/head.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<meta name="robots" content="noindex, nofollow"/>
<title><?php echo htmlspecialchars(html_entity_decode($this->getTitle())) ?></title>
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>

<script type="text/javascript">
var BLANK_URL = '<?php echo $this->getJsUrl() ?>blank.html';
Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/default/default/template/resetforgottenpassword.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css') ?>" media="all" />
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css') ?>" media="all" />
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/prototype.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/default/openmage/template/forgotpassword.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<title><?php echo Mage::helper('adminhtml')->__('Log into OpenMage Admin Page') ?></title>
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('login.css') ?>" media="all" />
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/prototype.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/default/openmage/template/login.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<title><?php echo Mage::helper('adminhtml')->__('Log into OpenMage Admin Page') ?></title>
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('login.css') ?>" media="all" />
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/prototype.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/default/openmage/template/resetforgottenpassword.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<title><?php echo Mage::helper('adminhtml')->__('Reset a Password') ?></title>
<link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('login.css') ?>" media="all" />
<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/prototype.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('prototype/validation.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl('scriptaculous/effects.js') ?>"></script>
Expand Down
1 change: 0 additions & 1 deletion app/design/frontend/base/default/template/oauth/authorize/head-simple.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@
<meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>" />
<title><?php echo $this->getTitle() ?></title>
<link rel="icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon" />

<?php echo $this->getCssJsHtml() ?>
1 change: 0 additions & 1 deletion app/design/frontend/base/default/template/page/html/head.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<meta name="keywords" content="<?php echo htmlspecialchars($this->getKeywords()) ?>" />
<meta name="robots" content="<?php echo htmlspecialchars($this->getRobots()) ?>" />
<link rel="icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon" />
<?php echo $this->getCssJsHtml() ?>
<?php echo $this->getChildHtml() ?>
<?php echo $this->helper('core/js')->getTranslatorScript() ?>
Expand Down
3 changes: 0 additions & 3 deletions app/design/install/default/default/template/page.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo Mage::helper('install')->__('OpenMage Installation Wizard') ?></title>

<link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />
<link rel="shortcut icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon" />

<script type="text/javascript" src="<?php echo $this->getJsUrl() ?>prototype/prototype.js"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl() ?>prototype/validation.js"></script>
<script type="text/javascript" src="<?php echo $this->getJsUrl() ?>scriptaculous/effects.js"></script>
Expand Down
77 changes: 39 additions & 38 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion errors/default/page.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<meta name="robots" content="*" />
<link rel="stylesheet" href="css/styles.css" type="text/css" />
<link rel="icon" href="images/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
</head>
<body>
<div class="wrapper">
Expand Down

0 comments on commit 244f7f1

Please sign in to comment.