Interface_Adminhtml_Default - Version 1.9.2.0

Version Notes

1.9.2.0

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Adminhtml_Default
Version 1.9.2.0
Comparing to
See all releases


Code changes from version 1.9.1.1 to 1.9.2.0

Files changed (78) hide show
  1. app/design/adminhtml/default/default/etc/theme.xml +3 -3
  2. app/design/adminhtml/default/default/layout/importexport.xml +26 -0
  3. app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml +2 -2
  4. app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml +1 -1
  5. app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml +1 -1
  6. app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml +2 -2
  7. app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml +2 -2
  8. app/design/adminhtml/default/default/template/backup/dialogs.phtml +26 -0
  9. app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml +1 -1
  10. app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml +4 -4
  11. app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml +7 -7
  12. app/design/adminhtml/default/default/template/catalog/category/edit.phtml +1 -1
  13. app/design/adminhtml/default/default/template/catalog/category/tree.phtml +2 -2
  14. app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml +1 -1
  15. app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml +3 -3
  16. app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml +4 -4
  17. app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml +1 -1
  18. app/design/adminhtml/default/default/template/catalog/product/edit.phtml +1 -1
  19. app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml +4 -4
  20. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml +3 -3
  21. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml +5 -5
  22. app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml +4 -4
  23. app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml +2 -2
  24. app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml +3 -3
  25. app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml +1 -1
  26. app/design/adminhtml/default/default/template/cms/browser/tree.phtml +1 -1
  27. app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml +2 -2
  28. app/design/adminhtml/default/default/template/customer/tab/addresses.phtml +19 -15
  29. app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml +1 -1
  30. app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml +1 -1
  31. app/design/adminhtml/default/default/template/eav/attribute/options.phtml +3 -3
  32. app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml +2 -2
  33. app/design/adminhtml/default/default/template/importexport/export/form/before.phtml +1 -1
  34. app/design/adminhtml/default/default/template/importexport/import/form/before.phtml +1 -1
  35. app/design/adminhtml/default/default/template/login.phtml +1 -1
  36. app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml +1 -1
  37. app/design/adminhtml/default/default/template/newsletter/template/edit.phtml +3 -3
  38. app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml +2 -2
  39. app/design/adminhtml/default/default/template/oauth/authorize/button.phtml +2 -2
  40. app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml +1 -1
  41. app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml +3 -2
  42. app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml +3 -2
  43. app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml +1 -1
  44. app/design/adminhtml/default/default/template/page.phtml +1 -1
  45. app/design/adminhtml/default/default/template/page/head.phtml +26 -0
  46. app/design/adminhtml/default/default/template/page/header.phtml +3 -3
  47. app/design/adminhtml/default/default/template/page/js/calendar.phtml +31 -31
  48. app/design/adminhtml/default/default/template/paygate/form/cc.phtml +1 -1
  49. app/design/adminhtml/default/default/template/payment/form/cc.phtml +3 -3
  50. app/design/adminhtml/default/default/template/payment/form/ccsave.phtml +4 -4
  51. app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml +1 -1
  52. app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml +28 -2
  53. app/design/adminhtml/default/default/template/permissions/roles.phtml +1 -0
  54. app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml +27 -1
  55. app/design/adminhtml/default/default/template/poll/answers/list.phtml +4 -4
  56. app/design/adminhtml/default/default/template/popup.phtml +1 -1
  57. app/design/adminhtml/default/default/template/rating/detailed.phtml +1 -1
  58. app/design/adminhtml/default/default/template/report/grid.phtml +2 -2
  59. app/design/adminhtml/default/default/template/resetforgottenpassword.phtml +1 -1
  60. app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml +2 -2
  61. app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml +1 -1
  62. app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml +1 -1
  63. app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml +1 -1
  64. app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml +1 -1
  65. app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml +1 -1
  66. app/design/adminhtml/default/default/template/store/switcher.phtml +1 -1
  67. app/design/adminhtml/default/default/template/system/config/form/field/array.phtml +3 -3
  68. app/design/adminhtml/default/default/template/system/config/js.phtml +2 -2
  69. app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml +1 -1
  70. app/design/adminhtml/default/default/template/system/convert/profile/run.phtml +26 -0
  71. app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml +26 -0
  72. app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml +6 -6
  73. app/design/adminhtml/default/default/template/system/email/template/edit.phtml +2 -2
  74. app/design/adminhtml/default/default/template/widget/grid.phtml +4 -4
  75. app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml +2 -2
  76. app/design/adminhtml/default/default/template/widget/tabs.phtml +2 -2
  77. app/design/adminhtml/default/default/template/widget/tabshoriz.phtml +1 -1
  78. package.xml +6 -6
app/design/adminhtml/default/default/etc/theme.xml CHANGED
@@ -11,17 +11,17 @@
11
  * http://opensource.org/licenses/afl-3.0.php
12
  * If you did not receive a copy of the license and are unable to
13
  * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
  *
16
  * DISCLAIMER
17
  *
18
  * Do not edit or add to this file if you wish to upgrade Magento to newer
19
  * versions in the future. If you wish to customize Magento for your
20
- * needs please refer to http://www.magentocommerce.com for more information.
21
  *
22
  * @category design
23
  * @package default_default
24
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
11
  * http://opensource.org/licenses/afl-3.0.php
12
  * If you did not receive a copy of the license and are unable to
13
  * obtain it through the world-wide-web, please send an email
14
+ * to license@magento.com so we can send you a copy immediately.
15
  *
16
  * DISCLAIMER
17
  *
18
  * Do not edit or add to this file if you wish to upgrade Magento to newer
19
  * versions in the future. If you wish to customize Magento for your
20
+ * needs please refer to http://www.magento.com for more information.
21
  *
22
  * @category design
23
  * @package default_default
24
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
  -->
app/design/adminhtml/default/default/layout/importexport.xml CHANGED
@@ -1,4 +1,30 @@
1
  <?xml version="1.0"?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  <layout>
3
  <adminhtml_import_index>
4
  <reference name="content">
1
  <?xml version="1.0"?>
2
+ <!--
3
+ /**
4
+ * Magento
5
+ *
6
+ * NOTICE OF LICENSE
7
+ *
8
+ * This source file is subject to the Academic Free License (AFL 3.0)
9
+ * that is bundled with this package in the file LICENSE_AFL.txt.
10
+ * It is also available through the world-wide-web at this URL:
11
+ * http://opensource.org/licenses/afl-3.0.php
12
+ * If you did not receive a copy of the license and are unable to
13
+ * obtain it through the world-wide-web, please send an email
14
+ * to license@magento.com so we can send you a copy immediately.
15
+ *
16
+ * DISCLAIMER
17
+ *
18
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
19
+ * versions in the future. If you wish to customize Magento for your
20
+ * needs please refer to http://www.magento.com for more information.
21
+ *
22
+ * @category design
23
+ * @package default_default
24
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
25
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
+ */
27
+ -->
28
  <layout>
29
  <adminhtml_import_index>
30
  <reference name="content">
app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml CHANGED
@@ -52,7 +52,7 @@
52
  if(checkbox[0]){
53
  var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
54
  if (warning && checkBoxes.size() > 0) {
55
- if ( !confirm("<?php echo $this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
56
  checkbox[0].checked = false;
57
  checkBoxes.each(function(elem) {
58
  if (elem.value.status == 1) {
@@ -78,7 +78,7 @@
78
  function myhandler(obj)
79
  {
80
  if (checkBoxes.size() > 0) {
81
- if ( !confirm("<?php echo $this->__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>") ) {
82
  obj.checked = false;
83
  checkBoxes.each(function(elem) {
84
  if (elem.value.status == 1) {
52
  if(checkbox[0]){
53
  var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
54
  if (warning && checkBoxes.size() > 0) {
55
+ if ( !confirm("<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>") ) {
56
  checkbox[0].checked = false;
57
  checkBoxes.each(function(elem) {
58
  if (elem.value.status == 1) {
78
  function myhandler(obj)
79
  {
80
  if (checkBoxes.size() > 0) {
81
+ if ( !confirm("<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')) ?>") ) {
82
  obj.checked = false;
83
  checkBoxes.each(function(elem) {
84
  if (elem.value.status == 1) {
app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml CHANGED
@@ -53,7 +53,7 @@
53
  if(checkbox[0] && !checkbox[0].checked){
54
  var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
55
  if (checked && warning && radioBoxes.size() > 0) {
56
- if ( !confirm("<?php echo $this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
57
  checkbox[0].checked = false;
58
  for(i in radioBoxes) {
59
  if( radioBoxes[i].status == 1) {
53
  if(checkbox[0] && !checkbox[0].checked){
54
  var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
55
  if (checked && warning && radioBoxes.size() > 0) {
56
+ if ( !confirm("<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>") ) {
57
  checkbox[0].checked = false;
58
  for(i in radioBoxes) {
59
  if( radioBoxes[i].status == 1) {
app/design/adminhtml/default/default/template/api2/permissions/user/edit/tab/roles/js.phtml CHANGED
@@ -45,7 +45,7 @@ function getActiveRestRole() {
45
  function restRolesRowClick(grid, event) {
46
  var newRestRole = getActiveRestRole();
47
  if (newRestRole.value !== activeRestRole.value) {
48
- if (!confirm("Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?") ) {
49
  newRestRole.checked = !newRestRole.checked;
50
  activeRestRole.checked = true;
51
  } else {
45
  function restRolesRowClick(grid, event) {
46
  var newRestRole = getActiveRestRole();
47
  if (newRestRole.value !== activeRestRole.value) {
48
+ if (!confirm("<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>")) {
49
  newRestRole.checked = !newRestRole.checked;
50
  activeRestRole.checked = true;
51
  } else {
app/design/adminhtml/default/default/template/api2/role/users_grid_js.phtml CHANGED
@@ -61,7 +61,7 @@
61
  var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
62
  if (checked) {
63
  checkbox[0].checked = true;
64
- if ( confirm("<?php echo $this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
65
  checkBoxes.set(checkbox[0].value, checked);
66
  varienElementMethods.setHasChanges(checkbox[0]);
67
  } else {
@@ -96,7 +96,7 @@
96
  function myhandler(o)
97
  {
98
  if (checkBoxes.size() > 0) {
99
- if (!confirm("<?php echo $this->__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>") ) {
100
  o.checked = !o.checked;
101
  } else {
102
  checkBoxes.each(function(el){
61
  var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
62
  if (checked) {
63
  checkbox[0].checked = true;
64
+ if ( confirm("<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>") ) {
65
  checkBoxes.set(checkbox[0].value, checked);
66
  varienElementMethods.setHasChanges(checkbox[0]);
67
  } else {
96
  function myhandler(o)
97
  {
98
  if (checkBoxes.size() > 0) {
99
+ if (!confirm("<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')) ?>") ) {
100
  o.checked = !o.checked;
101
  } else {
102
  checkBoxes.each(function(el){
app/design/adminhtml/default/default/template/authorizenet/directpost/info.phtml CHANGED
@@ -55,7 +55,7 @@ $_orderUrl = $this->helper('authorizenet')->getPlaceOrderAdminUrl();
55
  <li>
56
  <div class="input-box">
57
  <label for="<?php echo $_code ?>_cc_number"><?php echo Mage::helper('payment')->__('Credit Card Number') ?> <span class="required">*</span></label><br/>
58
- <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('payment')->__('Credit Card Number') ?>" class="input-text validate-cc-number" value="<?php echo $this->getInfoData('cc_number')?>" />
59
  </div>
60
  </li>
61
  <li>
@@ -79,7 +79,7 @@ $_orderUrl = $this->helper('authorizenet')->getPlaceOrderAdminUrl();
79
  <li>
80
  <div class="input-box">
81
  <label for="<?php echo $_code ?>_cc_cid"><?php echo Mage::helper('payment')->__('Card Verification Number') ?> <span class="required">*</span></label><br/>
82
- <input type="text" title="<?php echo Mage::helper('payment')->__('Card Verification Number') ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" style="width:3em;" value="<?php echo $this->getInfoData('cc_cid')?>" />
83
  </div>
84
  </li>
85
  <?php endif; ?>
55
  <li>
56
  <div class="input-box">
57
  <label for="<?php echo $_code ?>_cc_number"><?php echo Mage::helper('payment')->__('Credit Card Number') ?> <span class="required">*</span></label><br/>
58
+ <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('payment')->__('Credit Card Number')) ?>" class="input-text validate-cc-number" value="<?php echo $this->getInfoData('cc_number')?>" />
59
  </div>
60
  </li>
61
  <li>
79
  <li>
80
  <div class="input-box">
81
  <label for="<?php echo $_code ?>_cc_cid"><?php echo Mage::helper('payment')->__('Card Verification Number') ?> <span class="required">*</span></label><br/>
82
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('payment')->__('Card Verification Number')) ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" style="width:3em;" value="<?php echo $this->getInfoData('cc_cid')?>" />
83
  </div>
84
  </li>
85
  <?php endif; ?>
app/design/adminhtml/default/default/template/backup/dialogs.phtml CHANGED
@@ -1,3 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <div class="backup-dialog" style="display: none;" id="rollback-warning">
2
  <div class="entry-edit">
3
  <div class="entry-edit-head">
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package default_default
23
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
  <div class="backup-dialog" style="display: none;" id="rollback-warning">
28
  <div class="entry-edit">
29
  <div class="entry-edit-head">
app/design/adminhtml/default/default/template/bundle/product/edit/bundle.phtml CHANGED
@@ -71,7 +71,7 @@ $('product_bundle_container').select('input', 'select', 'textarea', 'button').ea
71
  }
72
  });
73
  <?php endif; ?>
74
- Validation.add('validate-greater-zero-based-on-option', '<?php echo $this->__('Please enter a number greater 0 in this field.') ?>', function(v, el) {
75
  var optionType = $(el).up('div.grid').previous('table.option-header').select('select.select-product-option-type')[0],
76
  v = Number(v) || 0;
77
 
71
  }
72
  });
73
  <?php endif; ?>
74
+ Validation.add('validate-greater-zero-based-on-option', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please enter a number greater 0 in this field.')) ?>', function(v, el) {
75
  var optionType = $(el).up('div.grid').previous('table.option-header').select('select.select-product-option-type')[0],
76
  v = Number(v) || 0;
77
 
app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option.phtml CHANGED
@@ -27,7 +27,7 @@
27
  <script type="text/javascript">
28
  optionTemplate = '<div id="<?php echo $this->getFieldId() ?>_{{index}}" class="option-box"> ' +
29
  '<div class="option-title"> ' +
30
- '<label for="<?php echo $this->getFieldName() ?>[{{index}}][title]"><?php echo Mage::helper('bundle')->__('Default Title') ?> <span class="required">*</span></label>' +
31
  <?php if ($this->isDefaultStore()): ?>
32
  '<input class="input-text required-entry" type="text" name="<?php echo $this->getFieldName() ?>[{{index}}][title]" id="id_<?php echo $this->getFieldName() ?>_{{index}}_title" value="{{title}}">' +
33
  <?php else: ?>
@@ -39,11 +39,11 @@ optionTemplate = '<div id="<?php echo $this->getFieldId() ?>_{{index}}" class="
39
  '<thead>' +
40
  '<tr>' +
41
  <?php if (!$this->isDefaultStore()): ?>
42
- '<th class="opt-title"><?php echo Mage::helper('bundle')->__('Store View Title') ?> <span class="required">*</span></th>' +
43
  <?php endif; ?>
44
- '<th class="opt-type"><?php echo Mage::helper('bundle')->__('Input Type') ?></th>' +
45
  '<th class="opt-req"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Is Required')) ?></th>' +
46
- '<th class="opt-order"><?php echo Mage::helper('bundle')->__('Position') ?></th>' +
47
  '<th>&nbsp;</th>' +
48
  '</tr>' +
49
  '</thead>' +
27
  <script type="text/javascript">
28
  optionTemplate = '<div id="<?php echo $this->getFieldId() ?>_{{index}}" class="option-box"> ' +
29
  '<div class="option-title"> ' +
30
+ '<label for="<?php echo $this->getFieldName() ?>[{{index}}][title]"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Default Title')) ?> <span class="required">*</span></label>' +
31
  <?php if ($this->isDefaultStore()): ?>
32
  '<input class="input-text required-entry" type="text" name="<?php echo $this->getFieldName() ?>[{{index}}][title]" id="id_<?php echo $this->getFieldName() ?>_{{index}}_title" value="{{title}}">' +
33
  <?php else: ?>
39
  '<thead>' +
40
  '<tr>' +
41
  <?php if (!$this->isDefaultStore()): ?>
42
+ '<th class="opt-title"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Store View Title')) ?> <span class="required">*</span></th>' +
43
  <?php endif; ?>
44
+ '<th class="opt-type"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Input Type')) ?></th>' +
45
  '<th class="opt-req"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Is Required')) ?></th>' +
46
+ '<th class="opt-order"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Position')) ?></th>' +
47
  '<th>&nbsp;</th>' +
48
  '</tr>' +
49
  '</thead>' +
app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml CHANGED
@@ -30,15 +30,15 @@
30
  var bundleTemplateBox = '<table class="border" cellpadding="0" cellspacing="0">' +
31
  ' <thead>' +
32
  ' <tr class="headings">' +
33
- ' <th><?php echo Mage::helper('catalog')->__('Name') ?></th>' +
34
  <?php if ($this->getCanReadPrice() !== false) : ?>
35
- ' <th class="type-price price-type-box"><?php echo Mage::helper('catalog')->__('Price') ?></th>' +
36
- ' <th class="type-type price-type-box"><?php echo Mage::helper('bundle')->__('Price Type') ?></th>' +
37
  <?php endif; ?>
38
- ' <th class="type-price"><?php echo Mage::helper('bundle')->__('Default Qty') ?></th>' +
39
- ' <th class="type-uqty qty-box"><?php echo$this->jsQuoteEscape(Mage::helper('bundle')->__('User Defined Qty')) ?></th>' +
40
- ' <th class="type-order"><?php echo Mage::helper('bundle')->__('Position') ?></th>' +
41
- ' <th style="width:1px"><?php echo Mage::helper('bundle')->__('Default') ?></th>' +
42
  ' <th class="last">&nbsp;</th>' +
43
  ' </tr>' +
44
  ' </thead> ' +
30
  var bundleTemplateBox = '<table class="border" cellpadding="0" cellspacing="0">' +
31
  ' <thead>' +
32
  ' <tr class="headings">' +
33
+ ' <th><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Name')) ?></th>' +
34
  <?php if ($this->getCanReadPrice() !== false) : ?>
35
+ ' <th class="type-price price-type-box"><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Price')) ?></th>' +
36
+ ' <th class="type-type price-type-box"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Price Type')) ?></th>' +
37
  <?php endif; ?>
38
+ ' <th class="type-price"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Default Qty')) ?></th>' +
39
+ ' <th class="type-uqty qty-box"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('User Defined Qty')) ?></th>' +
40
+ ' <th class="type-order"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Position')) ?></th>' +
41
+ ' <th style="width:1px"><?php echo $this->jsQuoteEscape(Mage::helper('bundle')->__('Default')) ?></th>' +
42
  ' <th class="last">&nbsp;</th>' +
43
  ' </tr>' +
44
  ' </thead> ' +
app/design/adminhtml/default/default/template/catalog/category/edit.phtml CHANGED
@@ -51,7 +51,7 @@
51
  * with this form, we surely delete same category in the tree and at backend
52
  */
53
  function categoryDelete(url, useAjax, categoryId) {
54
- if (confirm('<?php echo Mage::helper('catalog')->__('Are you sure you want to delete this category?') ?>')){
55
  if (useAjax){
56
  tree.nodeForDelete = categoryId;
57
  updateContent(url, {}, true);
51
  * with this form, we surely delete same category in the tree and at backend
52
  */
53
  function categoryDelete(url, useAjax, categoryId) {
54
+ if (confirm('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Are you sure you want to delete this category?')) ?>')){
55
  if (useAjax){
56
  tree.nodeForDelete = categoryId;
57
  updateContent(url, {}, true);
app/design/adminhtml/default/default/template/catalog/category/tree.phtml CHANGED
@@ -199,7 +199,7 @@ function reRenderTree(event, switcher)
199
  storeParam += obj.switchParams;
200
  }
201
  if (switcher.useConfirm) {
202
- if (!confirm("<?php echo $this->__('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")){
203
  obj.value = '<?php echo (int) $this->getStoreId() ?>';
204
  return false;
205
  }
@@ -372,7 +372,7 @@ Ext.onReady(function()
372
 
373
  defaultLoadTreeParams = {
374
  parameters : {
375
- text : '<?php echo htmlentities($this->getRoot()->getName()) ?>',
376
  draggable : false,
377
  allowDrop : <?php if ($this->getRoot()->getIsVisible()): ?>true<?php else : ?>false<?php endif; ?>,
378
  id : <?php echo (int) $this->getRoot()->getId() ?>,
199
  storeParam += obj.switchParams;
200
  }
201
  if (switcher.useConfirm) {
202
+ if (!confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please confirm site switching. All data that hasn\'t been saved will be lost.')) ?>')){
203
  obj.value = '<?php echo (int) $this->getStoreId() ?>';
204
  return false;
205
  }
372
 
373
  defaultLoadTreeParams = {
374
  parameters : {
375
+ text : '<?php echo Mage::helper('core')->jsQuoteEscape(htmlentities($this->getRoot()->getName())) ?>',
376
  draggable : false,
377
  allowDrop : <?php if ($this->getRoot()->getIsVisible()): ?>true<?php else : ?>false<?php endif; ?>,
378
  id : <?php echo (int) $this->getRoot()->getId() ?>,
app/design/adminhtml/default/default/template/catalog/category/widget/tree.phtml CHANGED
@@ -95,7 +95,7 @@ Ext.onReady(function()
95
  // Add empty node to reset category filter
96
  if(!emptyNodeAdded) {
97
  var empty = Object.clone(_node);
98
- empty.text = '<?php echo $this->__('None') ?>';
99
  empty.children = [];
100
  empty.id = 'none';
101
  empty.path = '1/none';
95
  // Add empty node to reset category filter
96
  if(!emptyNodeAdded) {
97
  var empty = Object.clone(_node);
98
+ empty.text = '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('None')) ?>';
99
  empty.children = [];
100
  empty.id = 'none';
101
  empty.path = '1/none';
app/design/adminhtml/default/default/template/catalog/product/attribute/options.phtml CHANGED
@@ -119,7 +119,7 @@ var templateText =
119
  '<td class="a-left" id="delete_button_container_{{id}}">'+
120
  '<input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />'+
121
  <?php if (!$this->getReadOnly()):?>
122
- '<?php echo $this->getDeleteButtonHtml() ?>'+
123
  <?php endif;?>
124
  '<\/td>'+
125
  '<\/tr>';
@@ -210,11 +210,11 @@ if($('add_new_option_button')){
210
  Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption));
211
  }
212
  Validation.addAllThese([
213
- ['required-option', '<?php echo Mage::helper('catalog')->__('Failed') ?>', function(v) {
214
  return !Validation.get('IsEmpty').test(v);
215
  }]]);
216
  Validation.addAllThese([
217
- ['required-options-count', '<?php echo Mage::helper('catalog')->__('Options is required') ?>', function(v) {
218
  return !Validation.get('IsEmpty').test(v);
219
  }]]);
220
  <?php foreach ($this->getOptionValues() as $_value): ?>
119
  '<td class="a-left" id="delete_button_container_{{id}}">'+
120
  '<input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />'+
121
  <?php if (!$this->getReadOnly()):?>
122
+ '<?php echo Mage::helper('core')->jsQuoteEscape($this->getDeleteButtonHtml()) ?>'+
123
  <?php endif;?>
124
  '<\/td>'+
125
  '<\/tr>';
210
  Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption));
211
  }
212
  Validation.addAllThese([
213
+ ['required-option', '<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Failed')) ?>', function(v) {
214
  return !Validation.get('IsEmpty').test(v);
215
  }]]);
216
  Validation.addAllThese([
217
+ ['required-options-count', '<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Options is required')) ?>', function(v) {
218
  return !Validation.get('IsEmpty').test(v);
219
  }]]);
220
  <?php foreach ($this->getOptionValues() as $_value): ?>
app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml CHANGED
@@ -110,7 +110,7 @@
110
 
111
  this.ge = new Ext.tree.TreeEditor(tree, {
112
  allowBlank:false,
113
- blankText:'<?php echo Mage::helper('catalog')->__('A name is required') ?>',
114
  selectOnFocus:true,
115
  cls:'folder'
116
  });
@@ -283,7 +283,7 @@
283
  },
284
 
285
  addGroup : function() {
286
- var group_name = prompt("<?php echo Mage::helper('catalog')->__('Please enter a new group name') ?>","");
287
  group_name = group_name.strip();
288
  if( group_name == '' ) {
289
  this.addGroup();
@@ -325,7 +325,7 @@
325
  }
326
  for (var i=0; i < TreePanels.root.childNodes.length; i++) {
327
  if (TreePanels.root.childNodes[i].text.toLowerCase() == name.toLowerCase() && TreePanels.root.childNodes[i].id != exceptNodeId) {
328
- errorText = "<?php echo Mage::helper('catalog')->__('Attribute group with the \"/name/\" name already exists') ?>";
329
  alert(errorText.replace("/name/",name));
330
  return false;
331
  }
@@ -424,7 +424,7 @@
424
  rightRemove : function(tree, nodeThis, node) {
425
  if( nodeThis.firstChild == null && node.id != 'empty' ) {
426
  var newNode = new Ext.tree.TreeNode({
427
- text : '<?php echo Mage::helper('catalog')->__('Empty') ?>',
428
  id : 'empty',
429
  cls : 'folder',
430
  is_user_defined : 1,
110
 
111
  this.ge = new Ext.tree.TreeEditor(tree, {
112
  allowBlank:false,
113
+ blankText:'<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('A name is required')) ?>',
114
  selectOnFocus:true,
115
  cls:'folder'
116
  });
283
  },
284
 
285
  addGroup : function() {
286
+ var group_name = prompt("<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Please enter a new group name')) ?>","");
287
  group_name = group_name.strip();
288
  if( group_name == '' ) {
289
  this.addGroup();
325
  }
326
  for (var i=0; i < TreePanels.root.childNodes.length; i++) {
327
  if (TreePanels.root.childNodes[i].text.toLowerCase() == name.toLowerCase() && TreePanels.root.childNodes[i].id != exceptNodeId) {
328
+ errorText = "<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Attribute group with the \"/name/\" name already exists')) ?>";
329
  alert(errorText.replace("/name/",name));
330
  return false;
331
  }
424
  rightRemove : function(tree, nodeThis, node) {
425
  if( nodeThis.firstChild == null && node.id != 'empty' ) {
426
  var newNode = new Ext.tree.TreeNode({
427
+ text : '<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Empty')) ?>',
428
  id : 'empty',
429
  cls : 'folder',
430
  is_user_defined : 1,
app/design/adminhtml/default/default/template/catalog/product/composite/fieldset/grouped.phtml CHANGED
@@ -75,7 +75,7 @@
75
  <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
76
  <td class="a-center">
77
  <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
78
- <input type="text" name="super_group[<?php echo $_item->getId() ?>]" id="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo Mage::helper('catalog')->__('Qty') ?>" class="input-text qty" />
79
  <input type="hidden" value="1" price="<?php echo $this->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?php echo $_item->getId() ?>]" />
80
  <?php else: ?>
81
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
75
  <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
76
  <td class="a-center">
77
  <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
78
+ <input type="text" name="super_group[<?php echo $_item->getId() ?>]" id="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('catalog')->__('Qty')) ?>" class="input-text qty" />
79
  <input type="hidden" value="1" price="<?php echo $this->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?php echo $_item->getId() ?>]" />
80
  <?php else: ?>
81
  <p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
app/design/adminhtml/default/default/template/catalog/product/edit.phtml CHANGED
@@ -126,7 +126,7 @@ Event.observe(window, 'load', function() {
126
  });
127
 
128
  Validation.addAllThese([
129
- ['validate-super-product-attributes', '<?php echo Mage::helper('catalog')->__('Please select one or more attributes.') ?>', function(v) {
130
  return (v != "no-attributes");
131
  }]]);
132
  //]]>
126
  });
127
 
128
  Validation.addAllThese([
129
+ ['validate-super-product-attributes', '<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Please select one or more attributes.')) ?>', function(v) {
130
  return (v != "no-attributes");
131
  }]]);
132
  //]]>
app/design/adminhtml/default/default/template/catalog/product/edit/options/option.phtml CHANGED
@@ -37,11 +37,11 @@ var firstStepTemplate = '<div class="option-box" id="option_{{id}}">'+
37
  '<input type="hidden" id="<?php echo $this->getFieldId() ?>_{{id}}_option_id" name="<?php echo $this->getFieldName() ?>[{{id}}][option_id]" value="{{option_id}}" />'+
38
  '<thead>'+
39
  '<tr>'+
40
- '<th class="opt-title"><?php echo Mage::helper('catalog')->__('Title') ?> <span class="required">*</span></th>'+
41
- '<th class="opt-type"><?php echo Mage::helper('catalog')->__('Input Type') ?> <span class="required">*</span></th>'+
42
  '<th class="opt-req"><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Is Required')) ?></th>'+
43
- '<th class="opt-order"><?php echo Mage::helper('catalog')->__('Sort Order') ?></th>'+
44
- '<th class="a-right"><?php echo $this->jsQuoteEscape($this->getDeleteButtonHtml()) ?></th>'+
45
  '</tr>'+
46
  '</thead>'+
47
  '<tr>'+
37
  '<input type="hidden" id="<?php echo $this->getFieldId() ?>_{{id}}_option_id" name="<?php echo $this->getFieldName() ?>[{{id}}][option_id]" value="{{option_id}}" />'+
38
  '<thead>'+
39
  '<tr>'+
40
+ '<th class="opt-title"><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Title')) ?> <span class="required">*</span></th>'+
41
+ '<th class="opt-type"><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Input Type')) ?> <span class="required">*</span></th>'+
42
  '<th class="opt-req"><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Is Required')) ?></th>'+
43
+ '<th class="opt-order"><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Sort Order')) ?></th>'+
44
+ '<th class="a-right"><?php echo $this->jsQuoteEscape($this->jsQuoteEscape($this->getDeleteButtonHtml())) ?></th>'+
45
  '</tr>'+
46
  '</thead>'+
47
  '<tr>'+
app/design/adminhtml/default/default/template/catalog/product/edit/options/type/date.phtml CHANGED
@@ -29,10 +29,10 @@
29
  OptionTemplateDate = '<table class="border" cellpadding="0" cellspacing="0">'+
30
  '<tr class="headings">'+
31
  <?php if ($this->getCanReadPrice() !== false) : ?>
32
- '<th class="type-price"><?php echo Mage::helper('catalog')->__('Price') ?></th>' +
33
- '<th class="type-type"><?php echo Mage::helper('catalog')->__('Price Type') ?></th>' +
34
  <?php endif; ?>
35
- '<th class="last"><?php echo Mage::helper('catalog')->__('SKU') ?></th>'+
36
  '</tr>'+
37
  '<tr>'+
38
  <?php if ($this->getCanReadPrice() !== false) : ?>
29
  OptionTemplateDate = '<table class="border" cellpadding="0" cellspacing="0">'+
30
  '<tr class="headings">'+
31
  <?php if ($this->getCanReadPrice() !== false) : ?>
32
+ '<th class="type-price"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price')) ?></th>' +
33
+ '<th class="type-type"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price Type')) ?></th>' +
34
  <?php endif; ?>
35
+ '<th class="last"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('SKU')) ?></th>'+
36
  '</tr>'+
37
  '<tr>'+
38
  <?php if ($this->getCanReadPrice() !== false) : ?>
app/design/adminhtml/default/default/template/catalog/product/edit/options/type/select.phtml CHANGED
@@ -31,13 +31,13 @@ OptionTemplateSelect = '<table class="border" cellpadding="0" cellspacing="0">'+
31
  '<input type="hidden" class="required-option-select-type-rows" name="validation_{{option_id}}_result" value="" >'+
32
  '<thead>'+
33
  '<tr class="headings">'+
34
- '<th class="type-title"><?php echo Mage::helper('catalog')->__('Title') ?> <span class="required">*</span></th>'+
35
  <?php if ($this->getCanReadPrice() !== false) : ?>
36
- '<th class="type-price"><?php echo Mage::helper('catalog')->__('Price') ?></th>' +
37
- '<th class="type-type"><?php echo Mage::helper('catalog')->__('Price Type') ?></th>' +
38
  <?php endif; ?>
39
- '<th class="type-sku"><?php echo Mage::helper('catalog')->__('SKU') ?></th>'+
40
- '<th class="type-order"><?php echo Mage::helper('catalog')->__('Sort Order') ?></th>'+
41
  '<th class="type-butt last">&nbsp;</th>'+
42
  '</tr>'+
43
  '</thead>'+
31
  '<input type="hidden" class="required-option-select-type-rows" name="validation_{{option_id}}_result" value="" >'+
32
  '<thead>'+
33
  '<tr class="headings">'+
34
+ '<th class="type-title"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Title')) ?> <span class="required">*</span></th>'+
35
  <?php if ($this->getCanReadPrice() !== false) : ?>
36
+ '<th class="type-price"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price')) ?></th>' +
37
+ '<th class="type-type"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price Type')) ?></th>' +
38
  <?php endif; ?>
39
+ '<th class="type-sku"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('SKU')) ?></th>'+
40
+ '<th class="type-order"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Sort Order')) ?></th>'+
41
  '<th class="type-butt last">&nbsp;</th>'+
42
  '</tr>'+
43
  '</thead>'+
app/design/adminhtml/default/default/template/catalog/product/edit/options/type/text.phtml CHANGED
@@ -29,11 +29,11 @@
29
  OptionTemplateText = '<table class="border" cellpadding="0" cellspacing="0">'+
30
  '<tr class="headings">'+
31
  <?php if ($this->getCanReadPrice() !== false) : ?>
32
- '<th class="type-price"><?php echo Mage::helper('catalog')->__('Price') ?></th>' +
33
- '<th class="type-type"><?php echo Mage::helper('catalog')->__('Price Type') ?></th>' +
34
  <?php endif; ?>
35
- '<th class="type-sku"><?php echo Mage::helper('catalog')->__('SKU') ?></th>'+
36
- '<th class="type-last last"><?php echo Mage::helper('catalog')->__('Max Characters') ?> </th>'+
37
  '</tr>'+
38
  '<tr>'+
39
  <?php if ($this->getCanReadPrice() !== false) : ?>
29
  OptionTemplateText = '<table class="border" cellpadding="0" cellspacing="0">'+
30
  '<tr class="headings">'+
31
  <?php if ($this->getCanReadPrice() !== false) : ?>
32
+ '<th class="type-price"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price')) ?></th>' +
33
+ '<th class="type-type"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Price Type')) ?></th>' +
34
  <?php endif; ?>
35
+ '<th class="type-sku"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('SKU')) ?></th>'+
36
+ '<th class="type-last last"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('Max Characters')) ?> </th>'+
37
  '</tr>'+
38
  '<tr>'+
39
  <?php if ($this->getCanReadPrice() !== false) : ?>
app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml CHANGED
@@ -77,8 +77,8 @@ var groupPriceRowTemplate = '<tr>'
77
  + '</select></td>'
78
  + '<td><input class="<?php echo $_htmlClass; ?> required-entry <?php echo $_priceValueValidation; ?>" type="text" name="<?php echo $_htmlName; ?>[{{index}}][price]" value="{{price}}" id="group_price_row_{{index}}_price" /></td>'
79
  + '<td class="last"><input type="hidden" name="<?php echo $_htmlName; ?>[{{index}}][delete]" class="delete" value="" id="group_price_row_{{index}}_delete" />'
80
- + '<button title="<?php echo Mage::helper('catalog')->__('Delete Group Price'); ?>" type="button" class="scalable delete icon-btn delete-product-option" id="group_price_row_{{index}}_delete_button" onclick="return groupPriceControl.deleteItem(event);">'
81
- + '<span><?php echo Mage::helper('catalog')->__('Delete'); ?></span></button></td>'
82
  + '</tr>';
83
 
84
  var groupPriceControl = {
77
  + '</select></td>'
78
  + '<td><input class="<?php echo $_htmlClass; ?> required-entry <?php echo $_priceValueValidation; ?>" type="text" name="<?php echo $_htmlName; ?>[{{index}}][price]" value="{{price}}" id="group_price_row_{{index}}_price" /></td>'
79
  + '<td class="last"><input type="hidden" name="<?php echo $_htmlName; ?>[{{index}}][delete]" class="delete" value="" id="group_price_row_{{index}}_delete" />'
80
+ + '<button title="<?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Delete Group Price')); ?>" type="button" class="scalable delete icon-btn delete-product-option" id="group_price_row_{{index}}_delete_button" onclick="return groupPriceControl.deleteItem(event);">'
81
+ + '<span><?php echo $this->jsQuoteEscape(Mage::helper('catalog')->__('Delete')); ?></span></button></td>'
82
  + '</tr>';
83
 
84
  var groupPriceControl = {
app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml CHANGED
@@ -80,11 +80,11 @@ var tierPriceRowTemplate = '<tr>'
80
  <?php endforeach ?>
81
  + '</select></td>'
82
  + '<td class="nobr"><input class="<?php echo $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?php echo $_htmlName ?>[{{index}}][price_qty]" value="{{qty}}" id="tier_price_row_{{index}}_qty" />'
83
- + ' <small class="nobr"><?php echo Mage::helper('catalog')->__("and above")?></small></td>'
84
  + '<td><input class="<?php echo $_htmlClass ?> required-entry <?php echo $_priceValueValidation ?>" type="text" name="<?php echo $_htmlName ?>[{{index}}][price]" value="{{price}}" id="tier_price_row_{{index}}_price" /></td>'
85
  + '<td class="last"><input type="hidden" name="<?php echo $_htmlName ?>[{{index}}][delete]" class="delete" value="" id="tier_price_row_{{index}}_delete" />'
86
- + '<button title="<?php echo Mage::helper('catalog')->__("Delete Tier") ?>" type="button" class="scalable delete icon-btn delete-product-option" id="tier_price_row_{{index}}_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
87
- + '<span><span><span><?php echo Mage::helper('catalog')->__("Delete") ?></span></span></span></button></td>'
88
  + '</tr>';
89
 
90
  var tierPriceControl = {
80
  <?php endforeach ?>
81
  + '</select></td>'
82
  + '<td class="nobr"><input class="<?php echo $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?php echo $_htmlName ?>[{{index}}][price_qty]" value="{{qty}}" id="tier_price_row_{{index}}_qty" />'
83
+ + ' <small class="nobr"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__('and above')) ?></small></td>'
84
  + '<td><input class="<?php echo $_htmlClass ?> required-entry <?php echo $_priceValueValidation ?>" type="text" name="<?php echo $_htmlName ?>[{{index}}][price]" value="{{price}}" id="tier_price_row_{{index}}_price" /></td>'
85
  + '<td class="last"><input type="hidden" name="<?php echo $_htmlName ?>[{{index}}][delete]" class="delete" value="" id="tier_price_row_{{index}}_delete" />'
86
+ + '<button title="<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__("Delete Tier")) ?>" type="button" class="scalable delete icon-btn delete-product-option" id="tier_price_row_{{index}}_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
87
+ + '<span><span><span><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__("Delete")) ?></span></span></span></button></td>'
88
  + '</tr>';
89
 
90
  var tierPriceControl = {
app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml CHANGED
@@ -56,7 +56,7 @@
56
  maxUploadFileSizeInBytes = <?php echo $this->getDataMaxSizeInBytes() ?>;
57
  maxUploadFileSize = '<?php echo $this->getDataMaxSize() ?>';
58
 
59
- <?php echo $this->getJsObjectName() ?> = new Flex.Uploader('<?php echo $this->getHtmlId() ?>', '<?php echo $this->getSkinUrl('media/uploader.swf') ?>', <?php echo $this->getConfigJson() ?>);
60
  <?php echo $this->getJsObjectName() ?>.onFilesComplete = function(completedFiles){
61
  completedFiles.each(function(file){
62
  <?php echo $this->getJsObjectName() ?>.removeFile(file.id);
56
  maxUploadFileSizeInBytes = <?php echo $this->getDataMaxSizeInBytes() ?>;
57
  maxUploadFileSize = '<?php echo $this->getDataMaxSize() ?>';
58
 
59
+ <?php echo $this->getJsObjectName() ?> = new Flex.Uploader('<?php echo $this->getHtmlId() ?>', '<?php echo $this->getUploaderUrl('media/uploader.swf') ?>', <?php echo $this->getConfigJson() ?>);
60
  <?php echo $this->getJsObjectName() ?>.onFilesComplete = function(completedFiles){
61
  completedFiles.each(function(file){
62
  <?php echo $this->getJsObjectName() ?>.removeFile(file.id);
app/design/adminhtml/default/default/template/cms/browser/tree.phtml CHANGED
@@ -55,7 +55,7 @@ Ext.onReady(function(){
55
 
56
  // set the root node
57
  var root = new Tree.AsyncTreeNode({
58
- text: '<?php echo $this->getRootNodeName() ?>',
59
  draggable:false,
60
  id:'root'
61
  });
55
 
56
  // set the root node
57
  var root = new Tree.AsyncTreeNode({
58
+ text: '<?php echo Mage::helper('core')->jsQuoteEscape($this->getRootNodeName()) ?>',
59
  draggable:false,
60
  id:'root'
61
  });
app/design/adminhtml/default/default/template/customer/system/config/validatevat.phtml CHANGED
@@ -42,11 +42,11 @@
42
  new Ajax.Request('<?php echo $this->getAjaxUrl() ?>', {
43
  parameters: params,
44
  onSuccess: function(response) {
45
- result = '<?php echo $this->__('VAT Number is Invalid') ?>';
46
  try {
47
  response = response.responseText;
48
  if (response == 1) {
49
- result = '<?php echo $this->__('VAT Number is Valid') ?>';
50
  elem.removeClassName('fail').addClassName('success')
51
  } else {
52
  elem.removeClassName('success').addClassName('fail')
42
  new Ajax.Request('<?php echo $this->getAjaxUrl() ?>', {
43
  parameters: params,
44
  onSuccess: function(response) {
45
+ result = '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('VAT Number is Invalid')) ?>';
46
  try {
47
  response = response.responseText;
48
  if (response == 1) {
49
+ result = '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('VAT Number is Valid')) ?>';
50
  elem.removeClassName('fail').addClassName('success')
51
  } else {
52
  elem.removeClassName('success').addClassName('fail')
app/design/adminhtml/default/default/template/customer/tab/addresses.phtml CHANGED
@@ -39,10 +39,10 @@
39
  <li id="address_item_<?php echo $_address->getId() ?>">
40
  <?php if (!$this->isReadonly()): ?>
41
  <a href="#" class="btn-remove-address">
42
- <img src="<?php echo $this->getSkinUrl('images/cancel_icon.gif') ?>" alt="Remove address" id="delete_button<?php echo ++$_iterator ?>" />
43
  </a>
44
  <a href="#" id="select_button_<?php echo $_address->getId() ?>" class="select_button btn-edit-address">
45
- <img src="<?php echo $this->getSkinUrl('images/edit_icon.gif') ?>" alt="Edit address"/>
46
  </a>
47
  <?php endif;?>
48
  <address>
@@ -50,11 +50,11 @@
50
  </address>
51
  <div class="address-type">
52
  <span class="address-type-line">
53
- <input type="radio" <?php if ($this->isReadonly()):?> disabled="disabled"<?php endif;?> value="<?php echo $_address->getId() ?>" id="address_item_billing<?php echo $_address->getId() ?>" name="account[default_billing]" title="<?php echo Mage::helper('customer')->__('Set as Default Billing Address') ?>"<?php if($_address->getId()==$customer->getDefaultBilling()): ?> checked="checked"<?php endif; ?>/>
54
  &nbsp;<label for="address_item_billing<?php echo $_address->getId() ?>"><?php echo Mage::helper('customer')->__('Default Billing Address') ?></label>
55
  </span>
56
  <span class="address-type-line">
57
- <input type="radio" <?php if ($this->isReadonly()):?> disabled="disabled"<?php endif;?> value="<?php echo $_address->getId() ?>" id="address_item_shipping<?php echo $_address->getId() ?>" name="account[default_shipping]" title="<?php echo Mage::helper('customer')->__('Set as Default Shipping Address') ?>"<?php if($_address->getId()==$customer->getDefaultShipping()): ?> checked="checked"<?php endif; ?>/>
58
  &nbsp;<label for="address_item_shipping<?php echo $_address->getId() ?>"><?php echo Mage::helper('customer')->__('Default Shipping Address') ?></label>
59
  </span>
60
  </div>
@@ -69,20 +69,20 @@
69
  <div id="address_item_template" class="no-display template">
70
  <?php if (!$this->isReadonly()): ?>
71
  <a href="#" class="btn-remove-address">
72
- <img src="<?php echo $this->getSkinUrl('images/cancel_icon.gif') ?>" alt="Remove address" id="delete_button<?php echo ++$_iterator ?>" />
73
  </a>
74
  <a href="#" id="select_button_" class="select_button btn-edit-address">
75
- <img src="<?php echo $this->getSkinUrl('images/edit_icon.gif') ?>" alt="Edit address"/>
76
  </a>
77
  <?php endif;?>
78
  <address><?php echo Mage::helper('customer')->__('New Customer Address') ?></address>
79
  <div class="address-type">
80
  <span class="address-type-line">
81
- <input <?php if ($this->isReadonly()):?> disabled="disabled"<?php endif;?> type="radio" value="<?php echo $_templatePrefix ?>" id="address_item_billing<?php echo $_templatePrefix ?>" name="account[default_billing]" title="<?php echo Mage::helper('customer')->__('Set as Default Billing Address') ?>"/>
82
  &nbsp;<label for="address_item_billing<?php echo $_templatePrefix ?>"><?php echo Mage::helper('customer')->__('Default Billing Address') ?></label>
83
  </span>
84
  <span class="address-type-line">
85
- <input <?php if ($this->isReadonly()):?> disabled="disabled"<?php endif;?> type="radio" value="<?php echo $_templatePrefix ?>" id="address_item_shipping<?php echo $_templatePrefix ?>" name="account[default_shipping]" title="<?php echo Mage::helper('customer')->__('Set as Default Shipping Address') ?>"/>
86
  &nbsp;<label for="address_item_shipping<?php echo $_templatePrefix ?>"><?php echo Mage::helper('customer')->__('Default Shipping Address') ?></label>
87
  </span>
88
  </div>
@@ -176,7 +176,7 @@ addressesModel.prototype = {
176
  $('no_address_message').show();
177
  }
178
  else {
179
- this.formContainer.innerHTML+= '<div id="no_address_message"><?php echo addslashes(Mage::helper('customer')->__('This customer has no saved addresses.')) ?></div>'
180
  }
181
  }
182
  },
@@ -189,7 +189,7 @@ addressesModel.prototype = {
189
  $('form_'+item.id).addressItem = item;
190
 
191
  // set Zip optional/required
192
- var countryElement = $('_item' + item.id.replace(/address_item_/, '') + 'country_id');
193
  varienGlobalEvents.fireEvent("address_country_changed", countryElement);
194
  }
195
  },
@@ -242,6 +242,10 @@ addressesModel.prototype = {
242
  newForm.statusBar = newItem;
243
  newForm.addressItem = newItem;
244
 
 
 
 
 
245
  this.addItemObservers(newItem);
246
  this.setActiveItem(newItem);
247
  this.bindCountryRegionRelation(newForm.id);
@@ -335,9 +339,9 @@ addressesModel.prototype = {
335
  //new Effect.Appear($('form_'+item.id), {duration : 0.3 });
336
  //$('form_'+item.id).focus();
337
  this.addFieldChangeObserver($('form_'+item.id));
338
- var regionIdElement = $('_item' + item.id.replace(/address_item_/, '') + 'region_id');
339
- var regionElement = $('_item' + item.id.replace(/address_item_/, '') + 'region');
340
- this.countryEl = $('_item' + item.id.replace(/address_item_/, '') + 'country_id');
341
  if (regionIdElement && regionElement) {
342
  var actualId = regionElement.id;
343
  if (('select' == regionIdElement.tagName.toLowerCase()) && regionIdElement) {
@@ -435,7 +439,7 @@ addressesModel.prototype = {
435
  },
436
 
437
  deleteAddress : function(item){
438
- if(confirm('<?php echo Mage::helper('customer')->__('Are you sure you want to delete this address?') ?>')){
439
  if (!item.isNewAddress && $('deleted_'+item.id)){
440
  $('deleted_'+item.id).value = 1;
441
  if (item.formBlock){
@@ -453,7 +457,7 @@ addressesModel.prototype = {
453
  },
454
 
455
  cancelAdd : function(button){
456
- if(confirm('<?php echo addslashes(Mage::helper('customer')->__('Are you sure you want to cancel adding of this address?')) ?>')){
457
  var item = $(this.baseItemId + button.id.replace(new RegExp('[a-z_]*',''), ''));
458
 
459
  if( item.isNewAddress){
39
  <li id="address_item_<?php echo $_address->getId() ?>">
40
  <?php if (!$this->isReadonly()): ?>
41
  <a href="#" class="btn-remove-address">
42
+ <img src="<?php echo $this->getSkinUrl('images/cancel_icon.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('customer')->__('Remove address')) ?>" id="delete_button<?php echo ++$_iterator ?>" />
43
  </a>
44
  <a href="#" id="select_button_<?php echo $_address->getId() ?>" class="select_button btn-edit-address">
45
+ <img src="<?php echo $this->getSkinUrl('images/edit_icon.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('customer')->__('Edit address')) ?>"/>
46
  </a>
47
  <?php endif;?>
48
  <address>
50
  </address>
51
  <div class="address-type">
52
  <span class="address-type-line">
53
+ <input type="radio" <?php if ($this->isReadonly()):?> disabled="disabled"<?php endif;?> value="<?php echo $_address->getId() ?>" id="address_item_billing<?php echo $_address->getId() ?>" name="account[default_billing]" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('customer')->__('Set as Default Billing Address')) ?>"<?php if($_address->getId()==$customer->getDefaultBilling()): ?> checked="checked"<?php endif; ?>/>
54
  &nbsp;<label for="address_item_billing<?php echo $_address->getId() ?>"><?php echo Mage::helper('customer')->__('Default Billing Address') ?></label>
55
  </span>
56
  <span class="address-type-line">
57
+ <input type="radio" <?php if ($this->isReadonly()):?> disabled="disabled"<?php endif;?> value="<?php echo $_address->getId() ?>" id="address_item_shipping<?php echo $_address->getId() ?>" name="account[default_shipping]" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('customer')->__('Set as Default Shipping Address')) ?>"<?php if($_address->getId()==$customer->getDefaultShipping()): ?> checked="checked"<?php endif; ?>/>
58
  &nbsp;<label for="address_item_shipping<?php echo $_address->getId() ?>"><?php echo Mage::helper('customer')->__('Default Shipping Address') ?></label>
59
  </span>
60
  </div>
69
  <div id="address_item_template" class="no-display template">
70
  <?php if (!$this->isReadonly()): ?>
71
  <a href="#" class="btn-remove-address">
72
+ <img src="<?php echo $this->getSkinUrl('images/cancel_icon.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('customer')->__('Remove address')) ?>" id="delete_button<?php echo ++$_iterator ?>" />
73
  </a>
74
  <a href="#" id="select_button_" class="select_button btn-edit-address">
75
+ <img src="<?php echo $this->getSkinUrl('images/edit_icon.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('customer')->__('Edit address')) ?>"/>
76
  </a>
77
  <?php endif;?>
78
  <address><?php echo Mage::helper('customer')->__('New Customer Address') ?></address>
79
  <div class="address-type">
80
  <span class="address-type-line">
81
+ <input <?php if ($this->isReadonly()):?> disabled="disabled"<?php endif;?> type="radio" value="<?php echo $_templatePrefix ?>" id="address_item_billing<?php echo $_templatePrefix ?>" name="account[default_billing]" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('customer')->__('Set as Default Billing Address')) ?>"/>
82
  &nbsp;<label for="address_item_billing<?php echo $_templatePrefix ?>"><?php echo Mage::helper('customer')->__('Default Billing Address') ?></label>
83
  </span>
84
  <span class="address-type-line">
85
+ <input <?php if ($this->isReadonly()):?> disabled="disabled"<?php endif;?> type="radio" value="<?php echo $_templatePrefix ?>" id="address_item_shipping<?php echo $_templatePrefix ?>" name="account[default_shipping]" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('customer')->__('Set as Default Shipping Address')) ?>"/>
86
  &nbsp;<label for="address_item_shipping<?php echo $_templatePrefix ?>"><?php echo Mage::helper('customer')->__('Default Shipping Address') ?></label>
87
  </span>
88
  </div>
176
  $('no_address_message').show();
177
  }
178
  else {
179
+ this.formContainer.innerHTML+= '<div id="no_address_message"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('customer')->__('This customer has no saved addresses.')) ?></div>'
180
  }
181
  }
182
  },
189
  $('form_'+item.id).addressItem = item;
190
 
191
  // set Zip optional/required
192
+ var countryElement = $('_item' + item.id.replace(/address_item_/, '').replace(new RegExp(this.baseItemId), '') + 'country_id');
193
  varienGlobalEvents.fireEvent("address_country_changed", countryElement);
194
  }
195
  },
242
  newForm.statusBar = newItem;
243
  newForm.addressItem = newItem;
244
 
245
+ // set Zip optional/required
246
+ var countryElement = $('_item' + newItem.id.replace(/address_item_/, '').replace(new RegExp(this.baseItemId), '') + 'country_id');
247
+ varienGlobalEvents.fireEvent("address_country_changed", countryElement);
248
+
249
  this.addItemObservers(newItem);
250
  this.setActiveItem(newItem);
251
  this.bindCountryRegionRelation(newForm.id);
339
  //new Effect.Appear($('form_'+item.id), {duration : 0.3 });
340
  //$('form_'+item.id).focus();
341
  this.addFieldChangeObserver($('form_'+item.id));
342
+ var regionIdElement = $('_item' + item.id.replace(/address_item_/, '').replace(new RegExp(this.baseItemId), '') + 'region_id');
343
+ var regionElement = $('_item' + item.id.replace(/address_item_/, '').replace(new RegExp(this.baseItemId), '') + 'region');
344
+ this.countryEl = $('_item' + item.id.replace(/address_item_/, '').replace(new RegExp(this.baseItemId), '') + 'country_id');
345
  if (regionIdElement && regionElement) {
346
  var actualId = regionElement.id;
347
  if (('select' == regionIdElement.tagName.toLowerCase()) && regionIdElement) {
439
  },
440
 
441
  deleteAddress : function(item){
442
+ if(confirm('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('customer')->__('Are you sure you want to delete this address?')) ?>')){
443
  if (!item.isNewAddress && $('deleted_'+item.id)){
444
  $('deleted_'+item.id).value = 1;
445
  if (item.formBlock){
457
  },
458
 
459
  cancelAdd : function(button){
460
+ if(confirm('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('customer')->__('Are you sure you want to cancel adding of this address?')) ?>')){
461
  var item = $(this.baseItemId + button.id.replace(new RegExp('[a-z_]*',''), ''));
462
 
463
  if( item.isNewAddress){
app/design/adminhtml/default/default/template/customer/tab/wishlist.phtml CHANGED
@@ -59,7 +59,7 @@ wishlistControl = {
59
  },
60
 
61
  removeItem: function (itemId) {
62
- if(!confirm('<?php echo Mage::helper('customer')->__('Are you sure that you want to remove this item?') ?>')) {
63
  return false;
64
  }
65
  this.reload('&delete=' + itemId);
59
  },
60
 
61
  removeItem: function (itemId) {
62
+ if(!confirm('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('customer')->__('Are you sure that you want to remove this item?')) ?>')) {
63
  return false;
64
  }
65
  this.reload('&delete=' + itemId);
app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml CHANGED
@@ -185,7 +185,7 @@ var linkTemplate = '<tr>'+
185
  '</td>'+
186
  '<td class="a-center"><input type="text" name="downloadable[link][{{id}}][sort_order]" value="{{sort_order}}" class="input-text sort" /></td>'+
187
  '<td>'+
188
- '<button id="downloadable_link_{{id}}_delete_button" type="button" class="scalable delete icon-btn delete-link-item"><span><span><span><?php echo Mage::helper('downloadable')->__('Delete'); ?></span></span></span></button>'+
189
  '</td>'+
190
  '</tr>';
191
 
185
  '</td>'+
186
  '<td class="a-center"><input type="text" name="downloadable[link][{{id}}][sort_order]" value="{{sort_order}}" class="input-text sort" /></td>'+
187
  '<td>'+
188
+ '<button id="downloadable_link_{{id}}_delete_button" type="button" class="scalable delete icon-btn delete-link-item"><span><span><span><?php echo $this->jsQuoteEscape(Mage::helper('downloadable')->__('Delete')); ?></span></span></span></button>'+
189
  '</td>'+
190
  '</tr>';
191
 
app/design/adminhtml/default/default/template/eav/attribute/options.phtml CHANGED
@@ -119,7 +119,7 @@ var templateText =
119
  '<td class="a-left" id="delete_button_container_{{id}}">'+
120
  '<input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />'+
121
  <?php if (!$this->getReadOnly()):?>
122
- '<?php echo $this->getDeleteButtonHtml() ?>'+
123
  <?php endif;?>
124
  '<\/td>'+
125
  '<\/tr>';
@@ -210,11 +210,11 @@ if($('add_new_option_button')){
210
  Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption));
211
  }
212
  Validation.addAllThese([
213
- ['required-option', '<?php echo $this->__('Failed') ?>', function(v) {
214
  return !Validation.get('IsEmpty').test(v);
215
  }]]);
216
  Validation.addAllThese([
217
- ['required-options-count', '<?php echo $this->__('Options is required') ?>', function(v) {
218
  return !Validation.get('IsEmpty').test(v);
219
  }]]);
220
  <?php foreach ($this->getOptionValues() as $_value): ?>
119
  '<td class="a-left" id="delete_button_container_{{id}}">'+
120
  '<input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />'+
121
  <?php if (!$this->getReadOnly()):?>
122
+ '<?php echo Mage::helper('core')->jsQuoteEscape($this->getDeleteButtonHtml()) ?>'+
123
  <?php endif;?>
124
  '<\/td>'+
125
  '<\/tr>';
210
  Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption));
211
  }
212
  Validation.addAllThese([
213
+ ['required-option', '<?php echo $this->jsQuoteEscape($this->__('Failed')) ?>', function(v) {
214
  return !Validation.get('IsEmpty').test(v);
215
  }]]);
216
  Validation.addAllThese([
217
+ ['required-options-count', '<?php echo $this->jsQuoteEscape($this->__('Options is required')) ?>', function(v) {
218
  return !Validation.get('IsEmpty').test(v);
219
  }]]);
220
  <?php foreach ($this->getOptionValues() as $_value): ?>
app/design/adminhtml/default/default/template/googlebase/types/edit/attributes.phtml CHANGED
@@ -81,8 +81,8 @@ var attributesSelectTemplate = '<div id="<?php echo $this->getFieldId() ?>_{{ind
81
  '<table class="option-header" cellpadding="0" cellspacing="0">' +
82
  '<thead>' +
83
  '<tr>' +
84
- '<th class="opt-type"><?php echo Mage::helper('googlebase')->__('Attribute') ?></th>' +
85
- '<th class="opt-req"><?php echo Mage::helper('googlebase')->__('Google Base Attribute') ?></th>' +
86
  '<th>&nbsp;</th>' +
87
  '</tr>' +
88
  '</thead>' +
81
  '<table class="option-header" cellpadding="0" cellspacing="0">' +
82
  '<thead>' +
83
  '<tr>' +
84
+ '<th class="opt-type"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('googlebase')->__('Attribute')) ?></th>' +
85
+ '<th class="opt-req"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('googlebase')->__('Google Base Attribute')) ?></th>' +
86
  '<th>&nbsp;</th>' +
87
  '</tr>' +
88
  '</thead>' +
app/design/adminhtml/default/default/template/importexport/export/form/before.phtml CHANGED
@@ -66,7 +66,7 @@
66
  form.submit();
67
  form.action = oldAction;
68
  } else {
69
- alert('Invalid data');
70
  }
71
  }
72
  //]]>
66
  form.submit();
67
  form.action = oldAction;
68
  } else {
69
+ alert('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Invalid data')) ?>');
70
  }
71
  }
72
  //]]>
app/design/adminhtml/default/default/template/importexport/import/form/before.phtml CHANGED
@@ -96,7 +96,7 @@
96
  varienForm.prototype.postToFrameProcessResponse = function(response)
97
  {
98
  if ('object' != typeof(response)) {
99
- return alert('Invalid response');
100
  }
101
  $H(response).each(function(pair) {
102
  switch (pair.key) {
96
  varienForm.prototype.postToFrameProcessResponse = function(response)
97
  {
98
  if ('object' != typeof(response)) {
99
+ return alert('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Invalid response')) ?>');
100
  }
101
  $H(response).each(function(pair) {
102
  switch (pair.key) {
app/design/adminhtml/default/default/template/login.phtml CHANGED
@@ -64,7 +64,7 @@
64
  <div class="clear"></div>
65
  <div class="form-buttons">
66
  <a class="left" href="<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/index/forgotpassword', array('_nosecret' => true)) ?>"><?php echo Mage::helper('adminhtml')->__('Forgot your password?') ?></a>
67
- <input type="submit" class="form-button" value="<?php echo Mage::helper('adminhtml')->__('Login') ?>" title="<?php echo Mage::helper('adminhtml')->__('Login') ?>" /></div>
68
  </div>
69
  <p class="legal"><?php echo Mage::helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright &copy; %s Magento Inc.', date('Y')) ?></p>
70
  </form>
64
  <div class="clear"></div>
65
  <div class="form-buttons">
66
  <a class="left" href="<?php echo Mage::helper('adminhtml')->getUrl('adminhtml/index/forgotpassword', array('_nosecret' => true)) ?>"><?php echo Mage::helper('adminhtml')->__('Forgot your password?') ?></a>
67
+ <input type="submit" class="form-button" value="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Login')) ?>" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Login')) ?>" /></div>
68
  </div>
69
  <p class="legal"><?php echo Mage::helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright &copy; %s Magento Inc.', date('Y')) ?></p>
70
  </form>
app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml CHANGED
@@ -49,7 +49,7 @@
49
  <?php echo $this->getChildHtml('preview_form'); ?>
50
  </div>
51
  <div id="loading-mask" style="display:none">
52
- <p class="loader" id="loading_mask_loader"><img src="<?php echo $this->getSkinUrl('images/ajax-loader-tr.gif') ?>" alt="<?php echo Mage::helper('adminhtml')->__('Loading...') ?>"/><br/><?php echo Mage::helper('adminhtml')->__('Please wait...') ?></p>
53
  </div>
54
 
55
  <script type="text/javascript">
49
  <?php echo $this->getChildHtml('preview_form'); ?>
50
  </div>
51
  <div id="loading-mask" style="display:none">
52
+ <p class="loader" id="loading_mask_loader"><img src="<?php echo $this->getSkinUrl('images/ajax-loader-tr.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Loading...')) ?>"/><br/><?php echo Mage::helper('adminhtml')->__('Please wait...') ?></p>
53
  </div>
54
 
55
  <script type="text/javascript">
app/design/adminhtml/default/default/template/newsletter/template/edit.phtml CHANGED
@@ -79,7 +79,7 @@
79
  },
80
 
81
  stripTags: function () {
82
- if(!window.confirm("<?php echo Mage::helper('newsletter')->__('Are you sure that you want to strip all tags?') ?>")) {
83
  return false;
84
  }
85
  if(this.isEditor()) {
@@ -125,7 +125,7 @@
125
  }
126
 
127
  if($F('code').blank() || $F('code')==templateControl.templateName) {
128
- value = prompt('<?php echo Mage::helper('newsletter')->__('Please enter new template name') ?>', templateControl.templateName + '<?php echo Mage::helper('newsletter')->__(' Copy') ?>');
129
  if(!value) {
130
  if(value !== null) {
131
  $('code').value = '';
@@ -170,7 +170,7 @@
170
  },
171
 
172
  deleteTemplate: function() {
173
- if(window.confirm("<?php echo Mage::helper('newsletter')->__('Are you sure that you want to delete this template?') ?>")) {
174
  window.location.href = '<?php echo $this->getDeleteUrl() ?>';
175
  }
176
  },
79
  },
80
 
81
  stripTags: function () {
82
+ if(!window.confirm("<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('newsletter')->__('Are you sure that you want to strip all tags?')) ?>")) {
83
  return false;
84
  }
85
  if(this.isEditor()) {
125
  }
126
 
127
  if($F('code').blank() || $F('code')==templateControl.templateName) {
128
+ value = prompt('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('newsletter')->__('Please enter new template name')) ?>', templateControl.templateName + '<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('newsletter')->__(' Copy')) ?>');
129
  if(!value) {
130
  if(value !== null) {
131
  $('code').value = '';
170
  },
171
 
172
  deleteTemplate: function() {
173
+ if(window.confirm("<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('newsletter')->__('Are you sure that you want to delete this template?')) ?>")) {
174
  window.location.href = '<?php echo $this->getDeleteUrl() ?>';
175
  }
176
  },
app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml CHANGED
@@ -47,12 +47,12 @@ $logo = $this->getSkinUrl('images/logo-large.gif', array('_area' => 'adminhtml',
47
  <p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
48
  <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
49
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
50
- <button type="submit" class="button" title="<?php echo $this->__('Authorize') ?>">
51
  <span><span><?php echo $this->__('Authorize') ?></span></span></button>
52
  </form>
53
  <form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
54
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
55
- <button type="submit" class="button" title="<?php echo $this->__('Reject') ?>">
56
  <span><span><?php echo $this->__('Reject') ?></span></span></button>
57
  </form>
58
  <?php endif; ?>
47
  <p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
48
  <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
49
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
50
+ <button type="submit" class="button" title="<?php echo $this->quoteEscape($this->__('Authorize')) ?>">
51
  <span><span><?php echo $this->__('Authorize') ?></span></span></button>
52
  </form>
53
  <form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
54
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
55
+ <button type="submit" class="button" title="<?php echo $this->quoteEscape($this->__('Reject')) ?>">
56
  <span><span><?php echo $this->__('Reject') ?></span></span></button>
57
  </form>
58
  <?php endif; ?>
app/design/adminhtml/default/default/template/oauth/authorize/button.phtml CHANGED
@@ -45,11 +45,11 @@
45
  <p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
46
  <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
47
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
48
- <button type="submit" class="button" title="<?php echo $this->__('Authorize') ?>"><span><span><?php echo $this->__('Authorize') ?></span></span></button>
49
  </form>
50
  <form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
51
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
52
- <button type="submit" class="button" title="<?php echo $this->__('Reject') ?>"><span><span><?php echo $this->__('Reject') ?></span></span></button>
53
  </form>
54
  <?php endif; ?>
55
  </div>
45
  <p><?php echo $this->__('After authorization application will have access to you account.'); ?></p>
46
  <form id="oauth_authorize_confirm" action="<?php echo $this->getConfirmUrl() ?>" method="get">
47
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
48
+ <button type="submit" class="button" title="<?php echo $this->quoteEscape($this->__('Authorize')) ?>"><span><span><?php echo $this->__('Authorize') ?></span></span></button>
49
  </form>
50
  <form id="oauth_authorize_reject" action="<?php echo $this->getRejectUrl() ?>" method="get">
51
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>">
52
+ <button type="submit" class="button" title="<?php echo $this->quoteEscape($this->__('Reject')) ?>"><span><span><?php echo $this->__('Reject') ?></span></span></button>
53
  </form>
54
  <?php endif; ?>
55
  </div>
app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml CHANGED
@@ -44,7 +44,7 @@
44
  <?php endif; ?>
45
  <button type="submit" class="button"
46
  onclick="window.close();"
47
- title="<?php echo $this->__('Close') ?>">
48
  <span><span><?php echo $this->__('Close') ?></span></span>
49
  </button>
50
  </div>
44
  <?php endif; ?>
45
  <button type="submit" class="button"
46
  onclick="window.close();"
47
+ title="<?php echo $this->quoteEscape($this->__('Close')) ?>">
48
  <span><span><?php echo $this->__('Close') ?></span></span>
49
  </button>
50
  </div>
app/design/adminhtml/default/default/template/oauth/authorize/form/login-simple.phtml CHANGED
@@ -39,6 +39,7 @@
39
  <?php echo $this->getMessagesBlock()->toHtml() ?>
40
  <?php if (!$this->getHasException()) : ?>
41
  <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
 
42
  <fieldset class="fieldset">
43
  <h2 class="legend"><?php echo $this->getFormTitle() ?></h2>
44
  <p class="description"><?php echo $this->__('Log in to use <strong>%s</strong>', $this->getConsumer()->getName()) ?></p>
@@ -62,9 +63,9 @@
62
  <div class="clear"></div>
63
  <div class="form-buttons">
64
  <button type="submit" class="form-button"
65
- title="<?php echo $this->__('Login') ?>"/><?php echo $this->__('Login') ?></button>
66
  <button type="button" onclick="document.location.href='<?php echo $this->getRejectUrl(); ?>';"
67
- title="<?php echo $this->__('Reject') ?>"><?php echo $this->__('Reject') ?></button>
68
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
69
  </div>
70
  </div>
39
  <?php echo $this->getMessagesBlock()->toHtml() ?>
40
  <?php if (!$this->getHasException()) : ?>
41
  <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
42
+ <?php echo $this->getBlockHtml('formkey'); ?>
43
  <fieldset class="fieldset">
44
  <h2 class="legend"><?php echo $this->getFormTitle() ?></h2>
45
  <p class="description"><?php echo $this->__('Log in to use <strong>%s</strong>', $this->getConsumer()->getName()) ?></p>
63
  <div class="clear"></div>
64
  <div class="form-buttons">
65
  <button type="submit" class="form-button"
66
+ title="<?php echo $this->quoteEscape($this->__('Login')) ?>"/><?php echo $this->__('Login') ?></button>
67
  <button type="button" onclick="document.location.href='<?php echo $this->getRejectUrl(); ?>';"
68
+ title="<?php echo $this->quoteEscape($this->__('Reject')) ?>"><?php echo $this->__('Reject') ?></button>
69
  <p class="required"><?php echo $this->__('* Required Fields') ?></p>
70
  </div>
71
  </div>
app/design/adminhtml/default/default/template/oauth/authorize/form/login.phtml CHANGED
@@ -38,6 +38,7 @@
38
  <?php echo $this->getMessagesBlock()->toHtml() ?>
39
  <?php if (!$this->getHasException()): ?>
40
  <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
 
41
  <fieldset>
42
  <input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
43
  <h2><?php echo $this->__('Log in to Admin Panel'); ?></h2>
@@ -48,8 +49,8 @@
48
  <input type="password" id="login" name="login[password]" class="required-entry input-text" value="" /></div>
49
  <div class="clear"></div>
50
  <div class="form-buttons">
51
- <button type="submit" class="form-button" title="<?php echo $this->__('Login') ?>" ><?php echo $this->__('Login') ?></button>
52
- <button onclick="document.location.href='<?php echo $this->getRejectUrl() ?>'; return false;" title="<?php echo $this->__('Reject') ?>"><?php echo $this->__('Reject') ?></button>
53
  </div>
54
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>"/>
55
  </fieldset>
38
  <?php echo $this->getMessagesBlock()->toHtml() ?>
39
  <?php if (!$this->getHasException()): ?>
40
  <form method="post" action="<?php echo $this->getPostActionUrl() ?>" id="loginForm">
41
+ <?php echo $this->getBlockHtml('formkey'); ?>
42
  <fieldset>
43
  <input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
44
  <h2><?php echo $this->__('Log in to Admin Panel'); ?></h2>
49
  <input type="password" id="login" name="login[password]" class="required-entry input-text" value="" /></div>
50
  <div class="clear"></div>
51
  <div class="form-buttons">
52
+ <button type="submit" class="form-button" title="<?php echo $this->quoteEscape($this->__('Login')) ?>" ><?php echo $this->__('Login') ?></button>
53
+ <button onclick="document.location.href='<?php echo $this->getRejectUrl() ?>'; return false;" title="<?php echo $this->quoteEscape($this->__('Reject')) ?>"><?php echo $this->__('Reject') ?></button>
54
  </div>
55
  <input type="hidden" name="oauth_token" value="<?php echo $this->escapeHtml($this->getToken()) ?>"/>
56
  </fieldset>
app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml CHANGED
@@ -39,7 +39,7 @@
39
  <div id="messages">
40
  <?php echo $this->getMessagesBlock()->toHtml() ?>
41
  </div>
42
- <button type="submit" class="button" onclick="window.close();" title="<?php echo $this->__('Close') ?>">
43
  <span><span><?php echo $this->__('Close') ?></span></span>
44
  </button>
45
  </div>
39
  <div id="messages">
40
  <?php echo $this->getMessagesBlock()->toHtml() ?>
41
  </div>
42
+ <button type="submit" class="button" onclick="window.close();" title="<?php echo $this->quoteEscape($this->__('Close')) ?>">
43
  <span><span><?php echo $this->__('Close') ?></span></span>
44
  </button>
45
  </div>
app/design/adminhtml/default/default/template/page.phtml CHANGED
@@ -82,7 +82,7 @@
82
  <?php echo $this->getChildHtml('js') ?>
83
  <?php echo $this->getChildHtml('profiler') ?>
84
  <div id="loading-mask" style="display:none">
85
- <p class="loader" id="loading_mask_loader"><img src="<?php echo $this->getSkinUrl('images/ajax-loader-tr.gif') ?>" alt="<?php echo Mage::helper('adminhtml')->__('Loading...') ?>"/><br/><?php echo Mage::helper('adminhtml')->__('Please wait...') ?></p>
86
  </div>
87
 
88
  <?php echo $this->getChildHtml('before_body_end') ?>
82
  <?php echo $this->getChildHtml('js') ?>
83
  <?php echo $this->getChildHtml('profiler') ?>
84
  <div id="loading-mask" style="display:none">
85
+ <p class="loader" id="loading_mask_loader"><img src="<?php echo $this->getSkinUrl('images/ajax-loader-tr.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Loading...')) ?>"/><br/><?php echo Mage::helper('adminhtml')->__('Please wait...') ?></p>
86
  </div>
87
 
88
  <?php echo $this->getChildHtml('before_body_end') ?>
app/design/adminhtml/default/default/template/page/head.phtml CHANGED
@@ -1,3 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
2
  <title><?php echo htmlspecialchars(html_entity_decode($this->getTitle())) ?></title>
3
  <link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package default_default
23
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
  <meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
28
  <title><?php echo htmlspecialchars(html_entity_decode($this->getTitle())) ?></title>
29
  <link rel="icon" href="<?php echo $this->getSkinUrl('favicon.ico') ?>" type="image/x-icon"/>
app/design/adminhtml/default/default/template/page/header.phtml CHANGED
@@ -27,7 +27,7 @@
27
  /** @var $this Mage_Adminhtml_Block_Page_Header */
28
  ?>
29
  <div class="header-top">
30
- <a href="<?php echo $this->getHomeLink() ?>"><img src="<?php echo $this->getSkinUrl('images/logo.gif') ?>" alt="<?php echo $this->__('Magento Logo') ?>" class="logo"/></a>
31
  <div class="header-right">
32
  <p class="super">
33
  <?php echo $this->__("Logged in as %s", $this->escapeHtml($this->getUser()->getUsername())) ?><span class="separator">|</span><?php echo $this->formatDate(null, 'full') ?><span class="separator">|</span><a href="<?php echo $this->getLogoutLink() ?>" class="link-logout"><?php echo $this->__('Log Out') ?></a>
@@ -36,10 +36,10 @@
36
  <fieldset>
37
  <legend>Search</legend>
38
  <span id="global_search_indicator" class="autocomplete-indicator" style="display: none">
39
- <img src="<?php echo $this->getSkinUrl('images/ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading...') ?>" class="v-middle"/>
40
  </span>
41
  <?php $defSearch = $this->__('Global Record Search') ?>
42
- <input id="global_search" name="query" type="text" class="input-text" value="<?php if(!empty($query)): ?><?php echo $query ?><?php else: ?><?php echo $defSearch ?><?php endif ?>" onfocus="if(this.value=='<?php echo $defSearch ?>')this.value=''; " onblur="if(this.value=='')this.value='<?php echo $defSearch ?>';" />
43
  <div id="global_search_autocomplete" class="autocomplete"></div>
44
  <script type="text/javascript">
45
  new Ajax.Autocompleter(
27
  /** @var $this Mage_Adminhtml_Block_Page_Header */
28
  ?>
29
  <div class="header-top">
30
+ <a href="<?php echo $this->getHomeLink() ?>"><img src="<?php echo $this->getSkinUrl('images/logo.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Magento Logo')) ?>" class="logo"/></a>
31
  <div class="header-right">
32
  <p class="super">
33
  <?php echo $this->__("Logged in as %s", $this->escapeHtml($this->getUser()->getUsername())) ?><span class="separator">|</span><?php echo $this->formatDate(null, 'full') ?><span class="separator">|</span><a href="<?php echo $this->getLogoutLink() ?>" class="link-logout"><?php echo $this->__('Log Out') ?></a>
36
  <fieldset>
37
  <legend>Search</legend>
38
  <span id="global_search_indicator" class="autocomplete-indicator" style="display: none">
39
+ <img src="<?php echo $this->getSkinUrl('images/ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Loading...')) ?>" class="v-middle"/>
40
  </span>
41
  <?php $defSearch = $this->__('Global Record Search') ?>
42
+ <input id="global_search" name="query" type="text" class="input-text" value="<?php if(!empty($query)): ?><?php echo $query ?><?php else: ?><?php echo Mage::helper('core')->quoteEscape($defSearch) ?><?php endif ?>" onfocus="if(this.value=='<?php echo Mage::helper('core')->quoteEscape($defSearch, true) ?>')this.value=''; " onblur="if(this.value=='')this.value='<?php echo $defSearch ?>';" />
43
  <div id="global_search_autocomplete" class="autocomplete"></div>
44
  <script type="text/javascript">
45
  new Ajax.Autocompleter(
app/design/adminhtml/default/default/template/page/js/calendar.phtml CHANGED
@@ -37,61 +37,61 @@
37
  <script type="text/javascript">
38
  //<![CDATA[
39
  enUS = <?php echo $enUS?>; // en_US locale reference
40
- Calendar._DN = <?php echo $days['wide']?>; // full day names
41
- Calendar._SDN = <?php echo $days['abbreviated']?>; // short day names
42
- Calendar._FD = <?php echo $firstDay?>; // First day of the week. "0" means display Sunday first, "1" means display Monday first, etc.
43
- Calendar._MN = <?php echo $months['wide']?>; // full month names
44
- Calendar._SMN = <?php echo $months['abbreviated']?>; // short month names
45
  Calendar._am = <?php echo $am ?>; // am/pm
46
  Calendar._pm = <?php echo $pm ?>;
47
 
48
  // tooltips
49
  Calendar._TT = {};
50
- Calendar._TT["INFO"] = "<?php echo $this->__('About the calendar');?>";
51
 
52
  Calendar._TT["ABOUT"] =
53
- "<?php echo $this->__('DHTML Date/Time Selector')?>\n" +
54
  "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" +
55
- "<?php echo $this->__('For latest version visit: %s', 'http://www.dynarch.com/projects/calendar/')?>\n" +
56
- "<?php echo $this->__('Distributed under GNU LGPL. See %s for details.', 'http://gnu.org/licenses/lgpl.html')?>" +
57
  "\n\n" +
58
- "<?php echo $this->__('Date selection:')?>\n" +
59
- "<?php echo $this->__('- Use the %s, %s buttons to select year', '\\xab', '\xbb')?>\n" +
60
- "<?php echo $this->__('- Use the %s buttons to select month', '" + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + "')?>\n" +
61
- "<?php echo $this->__('- Hold mouse button on any of the above buttons for faster selection.')?>";
62
  Calendar._TT["ABOUT_TIME"] = "\n\n" +
63
- "<?php echo $this->__('Time selection:')?>\n" +
64
- "<?php echo $this->__('- Click on any of the time parts to increase it')?>\n" +
65
- "<?php echo $this->__('- or Shift-click to decrease it')?>\n" +
66
- "<?php echo $this->__('- or click and drag for faster selection.')?>";
67
 
68
- Calendar._TT["PREV_YEAR"] = "<?php echo $this->__('Prev. year (hold for menu)');?>";
69
- Calendar._TT["PREV_MONTH"] = "<?php echo $this->__('Prev. month (hold for menu)');?>";
70
- Calendar._TT["GO_TODAY"] = "<?php echo $this->__('Go Today');?>";
71
- Calendar._TT["NEXT_MONTH"] = "<?php echo $this->__('Next month (hold for menu)');?>";
72
- Calendar._TT["NEXT_YEAR"] = "<?php echo $this->__('Next year (hold for menu)');?>";
73
- Calendar._TT["SEL_DATE"] = "<?php echo $this->__('Select date');?>";
74
- Calendar._TT["DRAG_TO_MOVE"] = "<?php echo $this->__('Drag to move');?>";
75
  Calendar._TT["PART_TODAY"] = ' (' + <?php echo $today ?> + ')';
76
 
77
  // the following is to inform that "%s" is to be the first day of week
78
- Calendar._TT["DAY_FIRST"] = "<?php echo $this->__('Display %s first', '%s');?>";
79
 
80
  // This may be locale-dependent. It specifies the week-end days, as an array
81
  // of comma-separated numbers. The numbers are from 0 to 6: 0 means Sunday, 1
82
  // means Monday, etc.
83
- Calendar._TT["WEEKEND"] = <?php echo $weekendDays?>;
84
 
85
- Calendar._TT["CLOSE"] = "<?php echo $this->__('Close');?>";
86
  Calendar._TT["TODAY"] = <?php echo $today ?>;
87
- Calendar._TT["TIME_PART"] = "<?php echo $this->__('(Shift-)Click or drag to change value');?>";
88
 
89
  // date formats
90
- Calendar._TT["DEF_DATE_FORMAT"] = <?php echo $defaultFormat?>;
91
- Calendar._TT["TT_DATE_FORMAT"] = <?php echo $toolTipFormat?>;
92
 
93
  Calendar._TT["WK"] = <?php echo $week ?>;
94
- Calendar._TT["TIME"] = "<?php echo $this->__('Time:');?>";
95
 
96
  CalendarDateObject._LOCAL_TIMZEONE_OFFSET_SECONDS = <?php echo $this->getTimezoneOffsetSeconds() ?>;
97
  CalendarDateObject._SERVER_TIMZEONE_SECONDS = <?php echo $this->getStoreTimestamp() ?>;
37
  <script type="text/javascript">
38
  //<![CDATA[
39
  enUS = <?php echo $enUS?>; // en_US locale reference
40
+ Calendar._DN = <?php echo $days['wide'] ?>; // full day names
41
+ Calendar._SDN = <?php echo $days['abbreviated'] ?>; // short day names
42
+ Calendar._FD = <?php echo $firstDay ?>; // First day of the week. "0" means display Sunday first, "1" means display Monday first, etc.
43
+ Calendar._MN = <?php echo $months['wide'] ?>; // full month names
44
+ Calendar._SMN = <?php echo $months['abbreviated'] ?>; // short month names
45
  Calendar._am = <?php echo $am ?>; // am/pm
46
  Calendar._pm = <?php echo $pm ?>;
47
 
48
  // tooltips
49
  Calendar._TT = {};
50
+ Calendar._TT["INFO"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('About the calendar')); ?>";
51
 
52
  Calendar._TT["ABOUT"] =
53
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('DHTML Date/Time Selector')) ?>\n" +
54
  "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" +
55
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('For latest version visit: %s', 'http://www.dynarch.com/projects/calendar/')) ?>\n" +
56
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Distributed under GNU LGPL. See %s for details.', 'http://gnu.org/licenses/lgpl.html')) ?>" +
57
  "\n\n" +
58
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Date selection:')) ?>\n" +
59
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('- Use the %s, %s buttons to select year', '\\xab', '\xbb')) ?>\n" +
60
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('- Use the %s, %s buttons to select month', '\u2039', '\u203a')) ?>\n" +
61
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('- Hold mouse button on any of the above buttons for faster selection.')) ?>";
62
  Calendar._TT["ABOUT_TIME"] = "\n\n" +
63
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Time selection:')) ?>\n" +
64
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('- Click on any of the time parts to increase it')) ?>\n" +
65
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('- or Shift-click to decrease it')) ?>\n" +
66
+ "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('- or click and drag for faster selection.')) ?>";
67
 
68
+ Calendar._TT["PREV_YEAR"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Prev. year (hold for menu)')); ?>";
69
+ Calendar._TT["PREV_MONTH"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Prev. month (hold for menu)')); ?>";
70
+ Calendar._TT["GO_TODAY"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Go Today')); ?>";
71
+ Calendar._TT["NEXT_MONTH"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Next month (hold for menu)')); ?>";
72
+ Calendar._TT["NEXT_YEAR"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Next year (hold for menu)')); ?>";
73
+ Calendar._TT["SEL_DATE"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Select date')); ?>";
74
+ Calendar._TT["DRAG_TO_MOVE"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Drag to move')); ?>";
75
  Calendar._TT["PART_TODAY"] = ' (' + <?php echo $today ?> + ')';
76
 
77
  // the following is to inform that "%s" is to be the first day of week
78
+ Calendar._TT["DAY_FIRST"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Display %s first', '%s')); ?>";
79
 
80
  // This may be locale-dependent. It specifies the week-end days, as an array
81
  // of comma-separated numbers. The numbers are from 0 to 6: 0 means Sunday, 1
82
  // means Monday, etc.
83
+ Calendar._TT["WEEKEND"] = <?php echo $weekendDays ?>;
84
 
85
+ Calendar._TT["CLOSE"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Close')); ?>";
86
  Calendar._TT["TODAY"] = <?php echo $today ?>;
87
+ Calendar._TT["TIME_PART"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('(Shift-)Click or drag to change value')); ?>";
88
 
89
  // date formats
90
+ Calendar._TT["DEF_DATE_FORMAT"] = <?php echo $defaultFormat ?>;
91
+ Calendar._TT["TT_DATE_FORMAT"] = <?php echo $toolTipFormat ?>;
92
 
93
  Calendar._TT["WK"] = <?php echo $week ?>;
94
+ Calendar._TT["TIME"] = "<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Time:')); ?>";
95
 
96
  CalendarDateObject._LOCAL_TIMZEONE_OFFSET_SECONDS = <?php echo $this->getTimezoneOffsetSeconds() ?>;
97
  CalendarDateObject._SERVER_TIMZEONE_SECONDS = <?php echo $this->getStoreTimestamp() ?>;
app/design/adminhtml/default/default/template/paygate/form/cc.phtml CHANGED
@@ -62,7 +62,7 @@
62
  });
63
  }
64
  <?php if ($_message = $this->getPartialAuthorizationConfirmationMessage()): ?>
65
- if (!confirm('<?php echo $_message ?>')) {
66
  cancelPaymentAuthorizations();
67
  }
68
  <?php endif;?>
62
  });
63
  }
64
  <?php if ($_message = $this->getPartialAuthorizationConfirmationMessage()): ?>
65
+ if (!confirm('<?php echo Mage::helper('core')->jsQuoteEscape($_message) ?>')) {
66
  cancelPaymentAuthorizations();
67
  }
68
  <?php endif;?>
app/design/adminhtml/default/default/template/payment/form/cc.phtml CHANGED
@@ -41,7 +41,7 @@
41
  <li>
42
  <div class="input-box">
43
  <label for="<?php echo $_code ?>_cc_number"><?php echo Mage::helper('payment')->__('Credit Card Number') ?> <span class="required">*</span></label><br/>
44
- <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('payment')->__('Credit Card Number') ?>" class="input-text validate-cc-number" value="<?php echo $this->getInfoData('cc_number')?>"/>
45
  </div>
46
  </li>
47
  <li>
@@ -65,7 +65,7 @@
65
  <li>
66
  <div class="input-box">
67
  <label for="<?php echo $_code ?>_cc_cid"><?php echo Mage::helper('payment')->__('Card Verification Number') ?> <span class="required">*</span></label><br/>
68
- <input type="text" title="<?php echo Mage::helper('payment')->__('Card Verification Number') ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" style="width:3em;" value="<?php echo $this->getInfoData('cc_cid')?>"/>
69
  </div>
70
  </li>
71
  <?php endif; ?>
@@ -77,7 +77,7 @@
77
  <li>
78
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
79
  <span class="input-box">
80
- <input type="text" title="<?php echo $this->__('Issue Number') ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
81
  </span>
82
  </li>
83
 
41
  <li>
42
  <div class="input-box">
43
  <label for="<?php echo $_code ?>_cc_number"><?php echo Mage::helper('payment')->__('Credit Card Number') ?> <span class="required">*</span></label><br/>
44
+ <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('payment')->__('Credit Card Number')) ?>" class="input-text validate-cc-number" value="<?php echo $this->getInfoData('cc_number')?>"/>
45
  </div>
46
  </li>
47
  <li>
65
  <li>
66
  <div class="input-box">
67
  <label for="<?php echo $_code ?>_cc_cid"><?php echo Mage::helper('payment')->__('Card Verification Number') ?> <span class="required">*</span></label><br/>
68
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('payment')->__('Card Verification Number')) ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" style="width:3em;" value="<?php echo $this->getInfoData('cc_cid')?>"/>
69
  </div>
70
  </li>
71
  <?php endif; ?>
77
  <li>
78
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
79
  <span class="input-box">
80
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Issue Number')) ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
81
  </span>
82
  </li>
83
 
app/design/adminhtml/default/default/template/payment/form/ccsave.phtml CHANGED
@@ -29,7 +29,7 @@
29
  <li>
30
  <div class="input-box">
31
  <label for="<?php echo $_code ?>_cc_owner"><?php echo Mage::helper('payment')->__('Name on Card') ?> <span class="required">*</span></label><br/>
32
- <input type="text" title="<?php echo Mage::helper('payment')->__('Name on Card') ?>" class="required-entry input-text" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->getInfoData('cc_owner') ?>"/>
33
  </div>
34
  </li>
35
  <li>
@@ -47,7 +47,7 @@
47
  <li>
48
  <div class="input-box">
49
  <label for="<?php echo $_code ?>_cc_number"><?php echo Mage::helper('payment')->__('Credit Card Number') ?> <span class="required">*</span></label><br/>
50
- <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('payment')->__('Credit Card Number') ?>" class="input-text validate-cc-number" value="<?php echo $this->getInfoData('cc_number')?>"/>
51
  </div>
52
  </li>
53
  <li>
@@ -71,7 +71,7 @@
71
  <li>
72
  <div class="input-box">
73
  <label for="<?php echo $_code ?>_cc_cid"><?php echo Mage::helper('payment')->__('Card Verification Number') ?> <span class="required">*</span></label><br/>
74
- <input type="text" title="<?php echo Mage::helper('payment')->__('Card Verification Number') ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" style="width:3em;" value="<?php echo $this->getInfoData('cc_cid')?>"/>
75
  </div>
76
  </li>
77
  <?php endif; ?>
@@ -82,7 +82,7 @@
82
  <li>
83
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
84
  <span class="input-box">
85
- <input type="text" title="<?php echo $this->__('Issue Number') ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
86
  </span>
87
  </li>
88
 
29
  <li>
30
  <div class="input-box">
31
  <label for="<?php echo $_code ?>_cc_owner"><?php echo Mage::helper('payment')->__('Name on Card') ?> <span class="required">*</span></label><br/>
32
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('payment')->__('Name on Card')) ?>" class="required-entry input-text" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->getInfoData('cc_owner') ?>"/>
33
  </div>
34
  </li>
35
  <li>
47
  <li>
48
  <div class="input-box">
49
  <label for="<?php echo $_code ?>_cc_number"><?php echo Mage::helper('payment')->__('Credit Card Number') ?> <span class="required">*</span></label><br/>
50
+ <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('payment')->__('Credit Card Number')) ?>" class="input-text validate-cc-number" value="<?php echo $this->getInfoData('cc_number')?>"/>
51
  </div>
52
  </li>
53
  <li>
71
  <li>
72
  <div class="input-box">
73
  <label for="<?php echo $_code ?>_cc_cid"><?php echo Mage::helper('payment')->__('Card Verification Number') ?> <span class="required">*</span></label><br/>
74
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('payment')->__('Card Verification Number')) ?>" class="required-entry input-text validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" style="width:3em;" value="<?php echo $this->getInfoData('cc_cid')?>"/>
75
  </div>
76
  </li>
77
  <?php endif; ?>
82
  <li>
83
  <label for="<?php echo $_code ?>_cc_issue"><?php echo $this->__('Issue Number') ?>:</label>
84
  <span class="input-box">
85
+ <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Issue Number')) ?>" class="input-text validate-cc-ukss cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" />
86
  </span>
87
  </li>
88
 
app/design/adminhtml/default/default/template/payment/form/purchaseorder.phtml CHANGED
@@ -28,7 +28,7 @@
28
  <li>
29
  <div class="input-box">
30
  <label for="po_number"><?php echo Mage::helper('payment')->__('Purchase Order Number') ?> <span class="required">*</span></label><br/>
31
- <input type="text" id="po_number" name="payment[po_number]" title="<?php echo Mage::helper('payment')->__("Purchase Order Number") ?>" class="required-entry input-text" value="<?php echo $this->getInfoData('po_number') ?>"/>
32
  </div>
33
  </li>
34
  </ul>
28
  <li>
29
  <div class="input-box">
30
  <label for="po_number"><?php echo Mage::helper('payment')->__('Purchase Order Number') ?> <span class="required">*</span></label><br/>
31
+ <input type="text" id="po_number" name="payment[po_number]" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('payment')->__('Purchase Order Number')) ?>" class="required-entry input-text" value="<?php echo $this->getInfoData('po_number') ?>"/>
32
  </div>
33
  </li>
34
  </ul>
app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml CHANGED
@@ -1,3 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <script type="text/javascript">
2
  <!--
3
  <?php $myBlock = $this->getLayout()->getBlock('roleUsersGrid'); ?>
@@ -29,7 +55,7 @@
29
  if(checkbox[0]){
30
  var checked = isInput ? !checkbox[0].checked : checkbox[0].checked;
31
  if (checked) {
32
- if ( confirm("<?php echo $this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
33
  checkbox[0].checked = false;
34
  checkBoxes.unset(checkbox[0].value);
35
  varienElementMethods.setHasChanges(checkbox[0]);
@@ -65,7 +91,7 @@
65
  function massSelectUsers(allCheckbox)
66
  {
67
  if (!allCheckbox.checked && checkBoxes.size() > 0) {
68
- if (!confirm("<?php echo $this->__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>") ) {
69
  allCheckbox.checked = false;
70
  return false;
71
  }
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package default_default
23
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
  <script type="text/javascript">
28
  <!--
29
  <?php $myBlock = $this->getLayout()->getBlock('roleUsersGrid'); ?>
55
  if(checkbox[0]){
56
  var checked = isInput ? !checkbox[0].checked : checkbox[0].checked;
57
  if (checked) {
58
+ if ( confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>') ) {
59
  checkbox[0].checked = false;
60
  checkBoxes.unset(checkbox[0].value);
61
  varienElementMethods.setHasChanges(checkbox[0]);
91
  function massSelectUsers(allCheckbox)
92
  {
93
  if (!allCheckbox.checked && checkBoxes.size() > 0) {
94
+ if (!confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')) ?>') ) {
95
  allCheckbox.checked = false;
96
  return false;
97
  }
app/design/adminhtml/default/default/template/permissions/roles.phtml CHANGED
@@ -29,6 +29,7 @@
29
  <tr>
30
  <td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo $this->__('Roles') ?></h3></td>
31
  <td class="form-buttons">
 
32
  <button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><span><span><?php echo $this->__('Add New Role') ?></span></span></span></button>
33
  </td>
34
  </tr>
29
  <tr>
30
  <td style="width:50%;"><h3 class="icon-head head-permissions-role"><?php echo $this->__('Roles') ?></h3></td>
31
  <td class="form-buttons">
32
+ <button class="scalable" onclick="window.location='<?php echo $this->getRefreshRolesUrl() ?>'"><span><span><span><?php echo $this->__('Refresh Roles') ?></span></span></span></button>
33
  <button class="scalable add" onclick="window.location='<?php echo $this->getAddNewUrl() ?>'"><span><span><span><?php echo $this->__('Add New Role') ?></span></span></span></button>
34
  </td>
35
  </tr>
app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml CHANGED
@@ -1,3 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <script type="text/javascript">
2
  <!--
3
  <?php $myBlock = $this->getLayout()->getBlock('user.roles.grid'); ?>
@@ -27,7 +53,7 @@
27
  if(checkbox[0] && !checkbox[0].checked){
28
  var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
29
  if (checked && warning && radioBoxes.size() > 0) {
30
- if ( !confirm("<?php echo $this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
31
  checkbox[0].checked = false;
32
  for(i in radioBoxes) {
33
  if( radioBoxes[i].status == 1) {
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package default_default
23
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
  <script type="text/javascript">
28
  <!--
29
  <?php $myBlock = $this->getLayout()->getBlock('user.roles.grid'); ?>
53
  if(checkbox[0] && !checkbox[0].checked){
54
  var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
55
  if (checked && warning && radioBoxes.size() > 0) {
56
+ if ( !confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>') ) {
57
  checkbox[0].checked = false;
58
  for(i in radioBoxes) {
59
  if( radioBoxes[i].status == 1) {
app/design/adminhtml/default/default/template/poll/answers/list.phtml CHANGED
@@ -57,7 +57,7 @@
57
  var answer = function() {
58
  return {
59
  del : function(obj) {
60
- if( confirm('<?php echo Mage::helper('poll')->__('Are you sure you want to delete it?') ?>') ) {
61
  fieldSet = obj.up('div.fieldset');
62
  if( $('id_' + fieldSet.id) ) {
63
  var itemId = $('id_' + fieldSet.id).value;
@@ -82,13 +82,13 @@
82
  return '<div class="fieldset fieldset-wide" id="poll_answer_fieldset_' + id + '">'
83
  +'<table cellspacing="0" class="form-list">'
84
  +'<tr>'
85
- + '<td class="label"><label for="answer_' + id + '"><?php echo Mage::helper('poll')->__('Answer Title:') ?> <span class="required">*</span></label><\/td>'
86
  + '<td class="value"><input type="text" id="answer_' + id + '" name="answer[' + id + '][title]" value="" class="input-text required-entry" /><\/td>'
87
  +'<\/tr>'
88
  +'<tr>'
89
- + '<td class="label"><label for="answer_votes_' + id + '"><?php echo Mage::helper('poll')->__('Votes Count:') ?> <span class="required">*</span></label><\/td>'
90
  + '<td class="value"><input type="text" id="answer_votes_' + id + '" name="answer[' + id + '][votes]" value="0" class="input-text required-entry validate-not-negative-number" />'
91
- + '<p class="a-left" style="margin:7px 0 0;"><?php echo $this->getDeleteButtonHtml() ?></p>'
92
  +'<\/td>'
93
  +'<\/tr>'
94
  +'<\/table>'
57
  var answer = function() {
58
  return {
59
  del : function(obj) {
60
+ if( confirm('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('poll')->__('Are you sure you want to delete it?')) ?>') ) {
61
  fieldSet = obj.up('div.fieldset');
62
  if( $('id_' + fieldSet.id) ) {
63
  var itemId = $('id_' + fieldSet.id).value;
82
  return '<div class="fieldset fieldset-wide" id="poll_answer_fieldset_' + id + '">'
83
  +'<table cellspacing="0" class="form-list">'
84
  +'<tr>'
85
+ + '<td class="label"><label for="answer_' + id + '"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('poll')->__('Answer Title:')) ?> <span class="required">*</span></label><\/td>'
86
  + '<td class="value"><input type="text" id="answer_' + id + '" name="answer[' + id + '][title]" value="" class="input-text required-entry" /><\/td>'
87
  +'<\/tr>'
88
  +'<tr>'
89
+ + '<td class="label"><label for="answer_votes_' + id + '"><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('poll')->__('Votes Count:')) ?> <span class="required">*</span></label><\/td>'
90
  + '<td class="value"><input type="text" id="answer_votes_' + id + '" name="answer[' + id + '][votes]" value="0" class="input-text required-entry validate-not-negative-number" />'
91
+ + '<p class="a-left" style="margin:7px 0 0;"><?php echo Mage::helper('core')->quoteEscape($this->getDeleteButtonHtml()) ?></p>'
92
  +'<\/td>'
93
  +'<\/tr>'
94
  +'<\/table>'
app/design/adminhtml/default/default/template/popup.phtml CHANGED
@@ -72,7 +72,7 @@
72
  <?php echo $this->getChildHtml('js') ?>
73
  <?php echo $this->getChildHtml('profiler') ?>
74
  <div id="loading-mask" style="display:none;">
75
- <p class="loader" id="loading_mask_loader"><img src="<?php echo $this->getSkinUrl('images/ajax-loader-tr.gif') ?>" alt="<?php echo Mage::helper('adminhtml')->__('Loading...') ?>" /><br /><?php echo Mage::helper('adminhtml')->__('Please wait...') ?></p>
76
  </div>
77
  </div>
78
  <?php echo $this->getChildHtml('before_body_end') ?>
72
  <?php echo $this->getChildHtml('js') ?>
73
  <?php echo $this->getChildHtml('profiler') ?>
74
  <div id="loading-mask" style="display:none;">
75
+ <p class="loader" id="loading_mask_loader"><img src="<?php echo $this->getSkinUrl('images/ajax-loader-tr.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Loading...')) ?>" /><br /><?php echo Mage::helper('adminhtml')->__('Please wait...') ?></p>
76
  </div>
77
  </div>
78
  <?php echo $this->getChildHtml('before_body_end') ?>
app/design/adminhtml/default/default/template/rating/detailed.phtml CHANGED
@@ -59,7 +59,7 @@
59
  //<![CDATA[
60
  Validation.addAllThese(
61
  [
62
- ['validate-rating', '<?php echo Mage::helper('rating')->__('Please select one of each ratings above') ?>', function(v) {
63
  var trs = $('product-review-table').getElementsBySelector('tr');
64
  var inputs;
65
  var error = 1;
59
  //<![CDATA[
60
  Validation.addAllThese(
61
  [
62
+ ['validate-rating', '<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('rating')->__('Please select one of each ratings above')) ?>', function(v) {
63
  var trs = $('product-review-table').getElementsBySelector('tr');
64
  var inputs;
65
  var error = 1;
app/design/adminhtml/default/default/template/report/grid.phtml CHANGED
@@ -60,12 +60,12 @@ $numColumns = sizeof($this->getColumns());
60
  <?php if($this->getDateFilterVisibility()): ?>
61
  <td class="a-left filter">
62
  <div class="f-left">
63
- <div><?php echo $this->__('From') ?>:&nbsp;<input class="input-text no-changes required-entry" type="text" id="period_date_from" name="report_from" value="<?php echo $this->getFilter('report_from') ?>" style="width:5em" /> <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" title="<?php echo $this->__('Select Date') ?>" id="period_date_from_trig" alt="<?php echo $this->__('Select Date') ?>" class="v-middle"/>&nbsp;&nbsp;</div>
64
  <div id="period_date_from_advaice"></div>
65
  </div>
66
 
67
  <div class="f-left">
68
- <div><?php echo $this->__('To') ?>:&nbsp;<input class="input-text no-changes required-entry" type="text" id="period_date_to" name="report_to" value="<?php echo $this->getFilter('report_to') ?>" style="width:5em" /> <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" class="v-middle" title="<?php echo $this->__('Select Date') ?>"id="period_date_to_trig" alt="<?php echo $this->__('Select Date') ?>"/>&nbsp;&nbsp;</div>
69
  <div id="period_date_to_advaice"></div>
70
  </div>
71
 
60
  <?php if($this->getDateFilterVisibility()): ?>
61
  <td class="a-left filter">
62
  <div class="f-left">
63
+ <div><?php echo $this->__('From') ?>:&nbsp;<input class="input-text no-changes required-entry" type="text" id="period_date_from" name="report_from" value="<?php echo $this->getFilter('report_from') ?>" style="width:5em" /> <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Select Date')) ?>" id="period_date_from_trig" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Select Date')) ?>" class="v-middle"/>&nbsp;&nbsp;</div>
64
  <div id="period_date_from_advaice"></div>
65
  </div>
66
 
67
  <div class="f-left">
68
+ <div><?php echo $this->__('To') ?>:&nbsp;<input class="input-text no-changes required-entry" type="text" id="period_date_to" name="report_to" value="<?php echo $this->getFilter('report_to') ?>" style="width:5em" /> <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" class="v-middle" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Select Date')) ?>"id="period_date_to_trig" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Select Date')) ?>"/>&nbsp;&nbsp;</div>
69
  <div id="period_date_to_advaice"></div>
70
  </div>
71
 
app/design/adminhtml/default/default/template/resetforgottenpassword.phtml CHANGED
@@ -63,7 +63,7 @@
63
  <div class="clear"></div>
64
  <div class="form-buttons">
65
  <a class="left" href="<?php echo $this->getUrl('adminhtml', array('_nosecret' => true)) ?>">&laquo; <?php echo Mage::helper('adminhtml')->__('Back to Login'); ?></a>
66
- <button type="submit" title="<?php echo Mage::helper('adminhtml')->__('Reset Password'); ?>" class="forgot-password"><span><span><span><?php echo Mage::helper('adminhtml')->__('Reset Password'); ?></span></span></span></button>
67
  </div>
68
  </fieldset>
69
  <p class="legal"><?php echo Mage::helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright &copy; %s Magento Inc.', date('Y')); ?></p>
63
  <div class="clear"></div>
64
  <div class="form-buttons">
65
  <a class="left" href="<?php echo $this->getUrl('adminhtml', array('_nosecret' => true)) ?>">&laquo; <?php echo Mage::helper('adminhtml')->__('Back to Login'); ?></a>
66
+ <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Reset Password')); ?>" class="forgot-password"><span><span><span><?php echo Mage::helper('adminhtml')->__('Reset Password'); ?></span></span></span></button>
67
  </div>
68
  </fieldset>
69
  <p class="legal"><?php echo Mage::helper('adminhtml')->__('Magento is a trademark of Magento Inc. Copyright &copy; %s Magento Inc.', date('Y')); ?></p>
app/design/adminhtml/default/default/template/sales/order/create/form/address.phtml CHANGED
@@ -64,8 +64,8 @@ endif; ?>
64
  </select>
65
  <br/>
66
  <?php if($this->getIsShipping()): ?>
67
- <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing" onclick="order.setShippingAsBilling(this.checked)" <?php if($this->getIsAsBilling()): ?>checked<?php endif; ?>/>
68
- <label for="order-shipping_same_as_billing" class="no-float"><?php echo Mage::helper('sales')->__('Same As Billing Address') ?></label>
69
  <?php else: ?>
70
  &nbsp;
71
  <?php endif; ?>
64
  </select>
65
  <br/>
66
  <?php if($this->getIsShipping()): ?>
67
+ <input type="checkbox" id="order-shipping_as_billing" name="shipping_as_billing" value="1" onclick="order.setShippingAsBilling(this.checked)" <?php if($this->getIsAsBilling()): ?>checked<?php endif; ?>/>
68
+ <label for="order-shipping_as_billing" class="no-float"><?php echo Mage::helper('sales')->__('Same As Billing Address') ?></label>
69
  <?php else: ?>
70
  &nbsp;
71
  <?php endif; ?>
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/totals/adjustments.phtml CHANGED
@@ -50,7 +50,7 @@
50
  <script type="text/javascript">
51
  //<![CDATA[
52
  Validation.addAllThese([
53
- ['not-negative-amount', '<?php echo $this->helper('sales')->__('Please enter positive number in this field.') ?>', function(v) {
54
  if(v.length)
55
  return /^\s*\d+([,.]\d+)*\s*%?\s*$/.test(v);
56
  else
50
  <script type="text/javascript">
51
  //<![CDATA[
52
  Validation.addAllThese([
53
+ ['not-negative-amount', '<?php echo Mage::helper('core')->jsQuoteEscape($this->helper('sales')->__('Please enter positive number in this field.')) ?>', function(v) {
54
  if(v.length)
55
  return /^\s*\d+([,.]\d+)*\s*%?\s*$/.test(v);
56
  else
app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml CHANGED
@@ -139,7 +139,7 @@ function submitShipment(btn) {
139
 
140
  function validQtyItems() {
141
  var valid = true;
142
- var errorMessage = '<?php echo $this->helper('sales')->__('Invalid value(s) for Qty to Ship') ?>';
143
  $$('.qty-item').each(function(item) {
144
  var val = parseFloat(item.value);
145
  if (isNaN(val) || val < 0) {
139
 
140
  function validQtyItems() {
141
  var valid = true;
142
+ var errorMessage = '<?php echo Mage::helper('core')->jsQuoteEscape($this->helper('sales')->__('Invalid value(s) for Qty to Ship')) ?>';
143
  $$('.qty-item').each(function(item) {
144
  var val = parseFloat(item.value);
145
  if (isNaN(val) || val < 0) {
app/design/adminhtml/default/default/template/sales/order/shipment/view/form.phtml CHANGED
@@ -48,7 +48,7 @@
48
  <fieldset>
49
  <div>
50
  <?php if($this->getShipment()->getTracksCollection()->count()): ?>
51
- <a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($this->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo $this->__('Track this shipment') ?>"><?php echo $this->__('Track this shipment') ?></a>
52
  <br/>
53
  <?php endif; ?>
54
  <strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
48
  <fieldset>
49
  <div>
50
  <?php if($this->getShipment()->getTracksCollection()->count()): ?>
51
+ <a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($this->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Track this shipment')) ?>"><?php echo $this->__('Track this shipment') ?></a>
52
  <br/>
53
  <?php endif; ?>
54
  <strong><?php echo $this->escapeHtml($_order->getShippingDescription()) ?></strong>
app/design/adminhtml/default/default/template/sales/order/shipment/view/tracking.phtml CHANGED
@@ -82,7 +82,7 @@ function selectCarrier(elem) {
82
  }
83
 
84
  function deleteTrackingNumber(url) {
85
- if (confirm('<?php echo Mage::helper('sales')->__('Are you sure?') ?>')) {
86
  submitAndReloadArea($('shipment_tracking_info').parentNode, url)
87
  }
88
  }
82
  }
83
 
84
  function deleteTrackingNumber(url) {
85
+ if (confirm('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('sales')->__('Are you sure?')) ?>')) {
86
  submitAndReloadArea($('shipment_tracking_info').parentNode, url)
87
  }
88
  }
app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml CHANGED
@@ -57,7 +57,7 @@
57
  </div>
58
  <fieldset>
59
  <?php if ($_order->getTracksCollection()->count()) : ?>
60
- <a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo $this->__('Track Order') ?>"><?php echo $this->__('Track Order') ?></a>
61
  <br/>
62
  <?php endif; ?>
63
  <?php if ($_order->getShippingDescription()): ?>
57
  </div>
58
  <fieldset>
59
  <?php if ($_order->getTracksCollection()->count()) : ?>
60
+ <a href="#" id="linkId" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopupUrlBySalesModel($_order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo $this->quoteEscape($this->__('Track Order')) ?>"><?php echo $this->__('Track Order') ?></a>
61
  <br/>
62
  <?php endif; ?>
63
  <?php if ($_order->getShippingDescription()): ?>
app/design/adminhtml/default/default/template/store/switcher.phtml CHANGED
@@ -61,7 +61,7 @@
61
  storeParam += obj.switchParams;
62
  }
63
  <?php if ($this->getUseConfirm()): ?>
64
- if (confirm("<?php echo $this->__('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")) {
65
  setLocation('<?php echo $this->getSwitchUrl() ?>' + storeParam);
66
  return true;
67
  } else {
61
  storeParam += obj.switchParams;
62
  }
63
  <?php if ($this->getUseConfirm()): ?>
64
+ if (confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please confirm site switching. All data that hasn\'t been saved will be lost.')) ?>')) {
65
  setLocation('<?php echo $this->getSwitchUrl() ?>' + storeParam);
66
  return true;
67
  } else {
app/design/adminhtml/default/default/template/system/config/form/field/array.phtml CHANGED
@@ -74,13 +74,13 @@ var arrayRow<?php echo $_htmlId ?> = {
74
  '<tr id="#{_id}">'
75
  <?php foreach ($this->_columns as $columnName => $column):?>
76
  +'<td>'
77
- +'<?php echo $this->_renderCellTemplate($columnName)?>'
78
  +'<\/td>'
79
  <?php endforeach;?>
80
  <?php if ($this->_addAfter):?>
81
- +'<td><button onclick="" class="scalable add" type="button" id="addAfterBtn#{_id}"><span><span><span><?php echo Mage::helper('adminhtml')->__('Add after') ?><\/span><\/span><\/span><\/button><\/td>'
82
  <?php endif;?>
83
- +'<td><button onclick="arrayRow<?php echo $_htmlId ?>.del(\'#{_id}\')" class="scalable delete" type="button"><span><span><span><?php echo Mage::helper('adminhtml')->__('Delete') ?><\/span><\/span><\/span><\/button><\/td>'
84
  +'<\/tr>'
85
  ),
86
 
74
  '<tr id="#{_id}">'
75
  <?php foreach ($this->_columns as $columnName => $column):?>
76
  +'<td>'
77
+ +'<?php echo Mage::helper('core')->jsQuoteEscape($this->_renderCellTemplate($columnName)) ?>'
78
  +'<\/td>'
79
  <?php endforeach;?>
80
  <?php if ($this->_addAfter):?>
81
+ +'<td><button onclick="" class="scalable add" type="button" id="addAfterBtn#{_id}"><span><span><span><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('adminhtml')->__('Add after')) ?><\/span><\/span><\/span><\/button><\/td>'
82
  <?php endif;?>
83
+ +'<td><button onclick="arrayRow<?php echo $_htmlId ?>.del(\'#{_id}\')" class="scalable delete" type="button"><span><span><span><?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('adminhtml')->__('Delete')) ?><\/span><\/span><\/span><\/button><\/td>'
84
  +'<\/tr>'
85
  ),
86
 
app/design/adminhtml/default/default/template/system/config/js.phtml CHANGED
@@ -234,7 +234,7 @@ perPageModel.prototype = {
234
  },
235
  addValidate : function()
236
  {
237
- Validation.add('validate-per-page-value-list', '<?php echo $this->__('Please enter a valid value, ex: 10,20,30')?>', function(v) {
238
  var isValid = !Validation.get('IsEmpty').test(v);
239
  var values = v.split(',');
240
  for (var i=0;i<values.length;i++) {
@@ -244,7 +244,7 @@ perPageModel.prototype = {
244
  }
245
  return isValid;
246
  });
247
- Validation.add('validate-per-page-value', '<?php echo $this->__('Please enter a valid value from list')?>', function(v, elm) {
248
  if (Validation.get('IsEmpty').test(v)) {
249
  return false;
250
  }
234
  },
235
  addValidate : function()
236
  {
237
+ Validation.add('validate-per-page-value-list', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please enter a valid value, ex: 10,20,30')) ?>', function(v) {
238
  var isValid = !Validation.get('IsEmpty').test(v);
239
  var values = v.split(',');
240
  for (var i=0;i<values.length;i++) {
244
  }
245
  return isValid;
246
  });
247
+ Validation.add('validate-per-page-value', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Please enter a valid value from list')) ?>', function(v, elm) {
248
  if (Validation.get('IsEmpty').test(v)) {
249
  return false;
250
  }
app/design/adminhtml/default/default/template/system/config/system/storage/media/synchronize.phtml CHANGED
@@ -29,7 +29,7 @@
29
 
30
  <script type="text/javascript">
31
  //<![CDATA[
32
- Validation.add('required-synchronize', '<?php echo $this->__('Synchronization is required.') ?>', function(){
33
  storage = getConnectionName(
34
  $('system_media_storage_configuration_media_storage').value,
35
  $('system_media_storage_configuration_media_database').value
29
 
30
  <script type="text/javascript">
31
  //<![CDATA[
32
+ Validation.add('required-synchronize', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Synchronization is required.')) ?>', function(){
33
  storage = getConnectionName(
34
  $('system_media_storage_configuration_media_storage').value,
35
  $('system_media_storage_configuration_media_database').value
app/design/adminhtml/default/default/template/system/convert/profile/run.phtml CHANGED
@@ -1,3 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <script type="text/javascript">
2
  function runProfile(popup)
3
  {
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package default_default
23
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
  <script type="text/javascript">
28
  function runProfile(popup)
29
  {
app/design/adminhtml/default/default/template/system/convert/profile/upload.phtml CHANGED
@@ -1,3 +1,29 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <h4 class="icon-head head-edit-form fieldset-legend">Upload File</h4>
2
  <div id="messages">
3
  <ul class="messages">
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-3.0.php
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@magento.com so we can send you a copy immediately.
14
+ *
15
+ * DISCLAIMER
16
+ *
17
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18
+ * versions in the future. If you wish to customize Magento for your
19
+ * needs please refer to http://www.magento.com for more information.
20
+ *
21
+ * @category design
22
+ * @package default_default
23
+ * @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
  <h4 class="icon-head head-edit-form fieldset-legend">Upload File</h4>
28
  <div id="messages">
29
  <ul class="messages">
app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml CHANGED
@@ -122,8 +122,8 @@ function exportUrlField()
122
 
123
  function changeEntityType()
124
  {
125
- //toggleSelectOption('remove', 'profile_entity_type', 'profile_direction', 'customer', 'import', '<?php echo $this->__('Import') ?>');
126
- //toggleSelectOption('remove', 'profile_entity_type', 'profile_store_id', 'customer', '0', '<?php echo $this->__('Default Values') ?>');
127
  //showOption('profile_direction');
128
  changeDirection();
129
  }
@@ -131,7 +131,7 @@ function changeEntityType()
131
 
132
  function changeDirection()
133
  {
134
- toggleSelectOption('remove', 'profile_direction', 'profile_data_transfer', 'export', 'interactive', '<?php echo $this->__('Interactive') ?>');
135
  //showOption('profile_data_transfer');
136
  if ($('profile_direction').value == 'import') {
137
  profileImportOnly.each(function(id){if ($(id))$(id).up(1).show();});
@@ -199,7 +199,7 @@ Event.observe(window, 'load', function(){
199
  <?php if ($_group->getId() != $_store->getGroupId()) continue; ?>
200
  <?php if (!$_websiteShow): ?>
201
  <?php $_websiteShow=true; ?>
202
- <optgroup label="<?php echo $_website->getName() ?>"></optgroup>
203
  <?php endif; ?>
204
  <?php if (!$_groupShow): ?>
205
  <?php $_groupShow=true; ?>
@@ -528,10 +528,10 @@ Event.observe(window, 'load', function(){
528
  <span class="field-row">
529
  <label for="customer_filter_created_at_from"><?php echo $this->__("Customer Since:") ?></label>
530
  <input class="input-text" style="width:5em" id="customer_filter_created_at_from" name="gui_data[customer][filter][created_at][from]" value="<?php echo $this->getValue('gui_data/customer/filter/created_at/from') ?>"/>
531
- <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" alt="" class="v-middle" id="customer_filter_created_at_from_trig" title="<?php echo $this->__('Date selector') ?>" />
532
  <?php echo $this->__('to') ?>
533
  <input class="input-text" style="width:5em" id="customer_filter_created_at_to" name="gui_data[customer][filter][created_at][to]" value="<?php echo $this->getValue('gui_data/customer/filter/created_at/to') ?>"/>
534
- <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" alt="" class="v-middle" id="customer_filter_created_at_to_trig" title="<?php echo $this->__('Date selector') ?>" />
535
  <script type="text/javascript">
536
  Calendar.setup({
537
  inputField : "customer_filter_created_at_from",
122
 
123
  function changeEntityType()
124
  {
125
+ //toggleSelectOption('remove', 'profile_entity_type', 'profile_direction', 'customer', 'import', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Import')) ?>');
126
+ //toggleSelectOption('remove', 'profile_entity_type', 'profile_store_id', 'customer', '0', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Default Values')) ?>');
127
  //showOption('profile_direction');
128
  changeDirection();
129
  }
131
 
132
  function changeDirection()
133
  {
134
+ toggleSelectOption('remove', 'profile_direction', 'profile_data_transfer', 'export', 'interactive', '<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Interactive')) ?>');
135
  //showOption('profile_data_transfer');
136
  if ($('profile_direction').value == 'import') {
137
  profileImportOnly.each(function(id){if ($(id))$(id).up(1).show();});
199
  <?php if ($_group->getId() != $_store->getGroupId()) continue; ?>
200
  <?php if (!$_websiteShow): ?>
201
  <?php $_websiteShow=true; ?>
202
+ <optgroup label="<?php echo Mage::helper('core')->quoteEscape($_website->getName()) ?>"></optgroup>
203
  <?php endif; ?>
204
  <?php if (!$_groupShow): ?>
205
  <?php $_groupShow=true; ?>
528
  <span class="field-row">
529
  <label for="customer_filter_created_at_from"><?php echo $this->__("Customer Since:") ?></label>
530
  <input class="input-text" style="width:5em" id="customer_filter_created_at_from" name="gui_data[customer][filter][created_at][from]" value="<?php echo $this->getValue('gui_data/customer/filter/created_at/from') ?>"/>
531
+ <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" alt="" class="v-middle" id="customer_filter_created_at_from_trig" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Date selector')) ?>" />
532
  <?php echo $this->__('to') ?>
533
  <input class="input-text" style="width:5em" id="customer_filter_created_at_to" name="gui_data[customer][filter][created_at][to]" value="<?php echo $this->getValue('gui_data/customer/filter/created_at/to') ?>"/>
534
+ <img src="<?php echo $this->getSkinUrl('images/grid-cal.gif') ?>" alt="" class="v-middle" id="customer_filter_created_at_to_trig" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Date selector')) ?>" />
535
  <script type="text/javascript">
536
  Calendar.setup({
537
  inputField : "customer_filter_created_at_from",
app/design/adminhtml/default/default/template/system/email/template/edit.phtml CHANGED
@@ -132,7 +132,7 @@
132
  this.renderPaths(<?php echo $this->getUsedCurrentlyForPaths(); ?>, 'used_currently_for');
133
  },
134
  stripTags: function () {
135
- if(!window.confirm("<?php echo $this->__('Are you sure that you want to strip tags?') ?>")) {
136
  return false;
137
  }
138
  this.unconvertedText = $('template_text').value;
@@ -181,7 +181,7 @@
181
  },
182
 
183
  deleteTemplate: function() {
184
- if(window.confirm("<?php echo $this->__('Are you sure that you want to delete this template?') ?>")) {
185
  window.location.href = '<?php echo $this->getDeleteUrl() ?>';
186
  }
187
  },
132
  this.renderPaths(<?php echo $this->getUsedCurrentlyForPaths(); ?>, 'used_currently_for');
133
  },
134
  stripTags: function () {
135
+ if(!window.confirm("<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure that you want to strip tags?')) ?>")) {
136
  return false;
137
  }
138
  this.unconvertedText = $('template_text').value;
181
  },
182
 
183
  deleteTemplate: function() {
184
+ if(window.confirm("<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure that you want to delete this template?')) ?>")) {
185
  window.location.href = '<?php echo $this->getDeleteUrl() ?>';
186
  }
187
  },
app/design/adminhtml/default/default/template/widget/grid.phtml CHANGED
@@ -62,17 +62,17 @@ $numColumns = sizeof($this->getColumns());
62
  <?php $_curPage = $this->getCollection()->getCurPage() ?>
63
  <?php $_lastPage = $this->getCollection()->getLastPageNumber() ?>
64
  <?php if($_curPage>1): ?>
65
- <a href="#" title="<?php echo $this->__('Previous page') ?>" onclick="<?php echo $this->getJsObjectName() ?>.setPage('<?php echo ($_curPage-1) ?>');return false;"><img src="<?php echo $this->getSkinUrl('images/pager_arrow_left.gif') ?>" alt="Go to Previous page" class="arrow"/></a>
66
  <?php else: ?>
67
- <img src="<?php echo $this->getSkinUrl('images/pager_arrow_left_off.gif') ?>" alt="Go to Previous page" class="arrow"/>
68
  <?php endif; ?>
69
 
70
  <input type="text" name="<?php echo $this->getVarNamePage() ?>" value="<?php echo $_curPage ?>" class="input-text page" onkeypress="<?php echo $this->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')"/>
71
 
72
  <?php if($_curPage < $_lastPage): ?>
73
- <a href="#" title="<?php echo $this->__('Next page') ?>" onclick="<?php echo $this->getJsObjectName() ?>.setPage('<?php echo ($_curPage+1) ?>');return false;"><img src="<?php echo $this->getSkinUrl('images/pager_arrow_right.gif') ?>" alt="Go to Next page" class="arrow"/></a>
74
  <?php else: ?>
75
- <img src="<?php echo $this->getSkinUrl('images/pager_arrow_right_off.gif') ?>" alt="Go to Previous page" class="arrow"/>
76
  <?php endif; ?>
77
 
78
  <?php echo $this->__('of %s pages', $this->getCollection()->getLastPageNumber()) ?>
62
  <?php $_curPage = $this->getCollection()->getCurPage() ?>
63
  <?php $_lastPage = $this->getCollection()->getLastPageNumber() ?>
64
  <?php if($_curPage>1): ?>
65
+ <a href="#" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Previous page')) ?>" onclick="<?php echo $this->getJsObjectName() ?>.setPage('<?php echo ($_curPage-1) ?>');return false;"><img src="<?php echo $this->getSkinUrl('images/pager_arrow_left.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Go to Previous page')) ?>" class="arrow"/></a>
66
  <?php else: ?>
67
+ <img src="<?php echo $this->getSkinUrl('images/pager_arrow_left_off.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Go to Previous page')) ?>" class="arrow"/>
68
  <?php endif; ?>
69
 
70
  <input type="text" name="<?php echo $this->getVarNamePage() ?>" value="<?php echo $_curPage ?>" class="input-text page" onkeypress="<?php echo $this->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')"/>
71
 
72
  <?php if($_curPage < $_lastPage): ?>
73
+ <a href="#" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Next page')) ?>" onclick="<?php echo $this->getJsObjectName() ?>.setPage('<?php echo ($_curPage+1) ?>');return false;"><img src="<?php echo $this->getSkinUrl('images/pager_arrow_right.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Go to Next page')) ?>" class="arrow"/></a>
74
  <?php else: ?>
75
+ <img src="<?php echo $this->getSkinUrl('images/pager_arrow_right_off.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Go to Next page')) ?>" class="arrow"/>
76
  <?php endif; ?>
77
 
78
  <?php echo $this->__('of %s pages', $this->getCollection()->getLastPageNumber()) ?>
app/design/adminhtml/default/default/template/widget/instance/edit/layout.phtml CHANGED
@@ -346,7 +346,7 @@ var WidgetInstance = {
346
  chooser.show();
347
  }
348
  } catch (e) {
349
- alert('Error occurs during loading chooser.');
350
  }
351
  }
352
  });
@@ -439,7 +439,7 @@ var WidgetInstance = {
439
  }
440
  }
441
  } catch (e) {
442
- alert('Error occurs during loading chooser.');
443
  }
444
  }
445
  });
346
  chooser.show();
347
  }
348
  } catch (e) {
349
+ alert('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Error occurs during loading chooser.')) ?>');
350
  }
351
  }
352
  });
439
  }
440
  }
441
  } catch (e) {
442
+ alert('<?php echo Mage::helper('core')->jsQuoteEscape(Mage::helper('widget')->__('Error occurs during loading chooser.')) ?>');
443
  }
444
  }
445
  });
app/design/adminhtml/default/default/template/widget/tabs.phtml CHANGED
@@ -32,8 +32,8 @@
32
  <?php foreach ($tabs as $_tab): ?>
33
  <?php if (!$this->canShowTab($_tab)): continue; endif; ?>
34
  <li <?php if($this->getTabIsHidden($_tab)): ?> style="display:none"<?php endif; ?>>
35
- <a href="<?php echo $this->getTabUrl($_tab) ?>" id="<?php echo $this->getTabId($_tab) ?>" name="<?php echo $this->getTabId($_tab, false) ?>" title="<?php echo $this->getTabTitle($_tab) ?>" class="tab-item-link <?php echo $this->getTabClass($_tab) ?><?php if (preg_match('/\s?ajax\s?/', $_tab->getClass())) {?> notloaded<?php }?>">
36
- <span><span class="changed" title="<?php echo $t