Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/design/adminhtml/default/default/layout/main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,9 @@ Default layout, loads most of the pages
<action method="addItem"><type>js</type><name>calendar/calendar.js</name><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>
<action method="addItem"><type>js</type><name>calendar/calendar-setup.js</name><!--<params/><if/><condition>can_load_calendar_js</condition>--></action>

<action method="addItem"><type>js</type><name>extjs/ext-tree.js</name><params/><if/><condition>can_load_ext_js</condition></action>
<action method="addItem"><type>js</type><name>extjs/ext-tree.min.js</name><params/><if/><condition>can_load_ext_js</condition></action>
<action method="addItem"><type>js</type><name>extjs/fix-defer.js</name><params/><if/><condition>can_load_ext_js</condition></action>
<action method="addItem"><type>js</type><name>extjs/ext-tree-checkbox.js</name><params/><if/><condition>can_load_ext_js</condition></action>
<action method="addItem"><type>js_css</type><name>extjs/resources/css/ext-all.css</name><params/><if/><condition>can_load_ext_js</condition></action>
<action method="addItem"><type>js_css</type><name>extjs/resources/css/ytheme-magento.css</name><params/><if/><condition>can_load_ext_js</condition></action>

<action method="addItem"><type>js</type><name>mage/adminhtml/rules.js</name><params/><if/><condition>can_load_rules_js</condition></action>
Expand Down
3 changes: 1 addition & 2 deletions app/design/adminhtml/default/default/layout/oauth.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,12 @@

<action method="removeItem"><type>css</type><name>print.css</name></action>
<action method="removeItem"><type>js_css</type><name>calendar/calendar-win2k-1.css</name></action>
<action method="removeItem"><type>js_css</type><name>extjs/resources/css/ext-all.css</name></action>
<action method="removeItem"><type>js_css</type><name>extjs/resources/css/ytheme-magento.css</name></action>
<action method="removeItem"><type>skin_css</type><name>menu.css</name></action>

<action method="removeItem"><type>js</type><name>calendar/calendar.js</name></action>
<action method="removeItem"><type>js</type><name>calendar/calendar-setup.js</name></action>
<action method="removeItem"><type>js</type><name>extjs/ext-tree.js</name></action>
<action method="removeItem"><type>js</type><name>extjs/ext-tree.min.js</name></action>
<action method="removeItem"><type>js</type><name>extjs/fix-defer.js</name></action>
<action method="removeItem"><type>js</type><name>extjs/ext-tree-checkbox.js</name></action>
</reference>
Expand Down
3 changes: 0 additions & 3 deletions js/extjs/css/README.txt

This file was deleted.

286 changes: 0 additions & 286 deletions js/extjs/css/basic-dialog.css

This file was deleted.

Loading