TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add core build tag to core assets

This commit is contained in:
Sam Georges 2014-05-24 16:57:38 +10:00
parent bd5e169ac1
commit 9e2a76d821
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/behaviors/RelationController.php
View File

@ -116,7 +116,7 @@ class RelationController extends ControllerBehavior
{
parent::__construct($controller);
$this->addJs('js/october.relation.js');
$this->addJs('js/october.relation.js', 'core');
/*
* Build configuration

6
modules/backend/formwidgets/CodeEditor.php
View File

@ -90,9 +90,9 @@ class CodeEditor extends FormWidgetBase
*/
public function loadAssets()
{
$this->addCss('css/codeeditor.css');
$this->addJs('vendor/ace/ace.js');
$this->addJs('js/codeeditor.js');
$this->addCss('css/codeeditor.css', 'core');
$this->addJs('vendor/ace/ace.js', 'core');
$this->addJs('js/codeeditor.js', 'core');
}
}

10
modules/backend/formwidgets/Datepicker.php
View File

@ -77,11 +77,11 @@ class Datepicker extends FormWidgetBase
*/
public function loadAssets()
{
$this->addCss('vendor/pikaday/css/pikaday.css');
$this->addCss('css/datepicker.css');
$this->addJs('vendor/pikaday/js/pikaday.js');
$this->addJs('vendor/pikaday/js/pikaday.jquery.js');
$this->addJs('js/datepicker.js');
$this->addCss('vendor/pikaday/css/pikaday.css', 'core');
$this->addCss('css/datepicker.css', 'core');
$this->addJs('vendor/pikaday/js/pikaday.js', 'core');
$this->addJs('vendor/pikaday/js/pikaday.jquery.js', 'core');
$this->addJs('js/datepicker.js', 'core');
}
/**

4
modules/backend/formwidgets/FileUpload.php
View File

@ -153,8 +153,8 @@ class FileUpload extends FormWidgetBase
*/
public function loadAssets()
{
$this->addCss('css/fileupload.css');
$this->addJs('js/fileupload.js');
$this->addCss('css/fileupload.css', 'core');
$this->addJs('js/fileupload.js', 'core');
}
/**

8
modules/backend/formwidgets/RichEditor.php
View File

@ -41,10 +41,10 @@ class RichEditor extends FormWidgetBase
*/
public function loadAssets()
{
$this->addCss('vendor/redactor/redactor.css');
$this->addCss('css/richeditor.css');
$this->addJs('vendor/redactor/redactor.js');
$this->addJs('js/richeditor.js');
$this->addCss('vendor/redactor/redactor.css', 'core');
$this->addCss('css/richeditor.css', 'core');
$this->addJs('vendor/redactor/redactor.js', 'core');
$this->addJs('js/richeditor.js', 'core');
}
}

2
modules/backend/widgets/Form.php
View File

@ -120,7 +120,7 @@ class Form extends WidgetBase
*/
public function loadAssets()
{
$this->addJs('js/form.js');
$this->addJs('js/form.js', 'core');
}
/**

2
modules/backend/widgets/Lists.php
View File

@ -157,7 +157,7 @@ class Lists extends WidgetBase
*/
public function loadAssets()
{
$this->addJs('js/october.list.js');
$this->addJs('js/october.list.js', 'core');
}
/**

6
modules/backend/widgets/ReportContainer.php
View File

@ -82,9 +82,9 @@ class ReportContainer extends WidgetBase
*/
public function loadAssets()
{
$this->addCss('css/reportcontainer.css');
$this->addJs('vendor/isotope/jquery.isotope.min.js');
$this->addJs('js/reportcontainer.js');
$this->addCss('css/reportcontainer.css', 'core');
$this->addJs('vendor/isotope/jquery.isotope.min.js', 'core');
$this->addJs('js/reportcontainer.js', 'core');
}
//

6
modules/cms/widgets/AssetList.php
View File

@ -71,9 +71,9 @@ class AssetList extends WidgetBase
*/
public function loadAssets()
{
$this->addCss('css/assetlist.css');
$this->addJs('js/assetlist.js');
$this->addJs('/modules/backend/widgets/form/assets/js/form.js');
$this->addCss('css/assetlist.css', 'core');
$this->addJs('js/assetlist.js', 'core');
$this->addJs('/modules/backend/widgets/form/assets/js/form.js', 'core');
}
/**

2
modules/system/controllers/Settings.php
View File

@ -31,7 +31,7 @@ class Settings extends Controller
{
parent::__construct();
$this->addCss('/modules/system/assets/css/settings.css');
$this->addCss('/modules/system/assets/css/settings.css', 'core');
BackendMenu::setContext('October.System', 'system', 'settings');
}

2
modules/system/controllers/Updates.php
View File

@ -31,7 +31,7 @@ class Updates extends Controller
{
parent::__construct();
$this->addCss('/modules/system/assets/css/updates.css');
$this->addCss('/modules/system/assets/css/updates.css', 'core');
BackendMenu::setContext('October.System', 'system', 'updates');
}