Browse Source

Merge pull request #1197 from slavcodev/asset-dir

Move AppAsset from config to assets directory
tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
6fd0f0da19
  1. 1
      apps/advanced/backend/assets/.gitkeep
  2. 2
      apps/advanced/backend/assets/AppAsset.php
  3. 2
      apps/advanced/backend/views/layouts/main.php
  4. 2
      apps/advanced/frontend/assets/.gitkeep
  5. 2
      apps/advanced/frontend/assets/AppAsset.php
  6. 2
      apps/advanced/frontend/views/layouts/main.php
  7. 2
      apps/basic/assets/AppAsset.php
  8. 2
      apps/basic/views/layouts/main.php
  9. 2
      docs/guide/view.md

1
apps/advanced/backend/assets/.gitkeep

@ -1 +0,0 @@
*

2
apps/advanced/backend/config/AppAsset.php → apps/advanced/backend/assets/AppAsset.php

@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
namespace backend\config; namespace backend\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;

2
apps/advanced/backend/views/layouts/main.php

@ -1,5 +1,5 @@
<?php <?php
use backend\config\AppAsset; use backend\assets\AppAsset;
use yii\helpers\Html; use yii\helpers\Html;
use yii\bootstrap\Nav; use yii\bootstrap\Nav;
use yii\bootstrap\NavBar; use yii\bootstrap\NavBar;

2
apps/advanced/frontend/assets/.gitkeep

@ -1,2 +0,0 @@
*
!.gitignore

2
apps/advanced/frontend/config/AppAsset.php → apps/advanced/frontend/assets/AppAsset.php

@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
namespace frontend\config; namespace frontend\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;

2
apps/advanced/frontend/views/layouts/main.php

@ -3,7 +3,7 @@ use yii\helpers\Html;
use yii\bootstrap\Nav; use yii\bootstrap\Nav;
use yii\bootstrap\NavBar; use yii\bootstrap\NavBar;
use yii\widgets\Breadcrumbs; use yii\widgets\Breadcrumbs;
use frontend\config\AppAsset; use frontend\assets\AppAsset;
use frontend\widgets\Alert; use frontend\widgets\Alert;
/** /**

2
apps/basic/config/AppAsset.php → apps/basic/assets/AppAsset.php

@ -5,7 +5,7 @@
* @license http://www.yiiframework.com/license/ * @license http://www.yiiframework.com/license/
*/ */
namespace app\config; namespace app\assets;
use yii\web\AssetBundle; use yii\web\AssetBundle;

2
apps/basic/views/layouts/main.php

@ -3,7 +3,7 @@ use yii\helpers\Html;
use yii\bootstrap\Nav; use yii\bootstrap\Nav;
use yii\bootstrap\NavBar; use yii\bootstrap\NavBar;
use yii\widgets\Breadcrumbs; use yii\widgets\Breadcrumbs;
use app\config\AppAsset; use app\assets\AppAsset;
/** /**
* @var \yii\web\View $this * @var \yii\web\View $this

2
docs/guide/view.md

@ -240,7 +240,7 @@ details on how to define asset bundles in [asset manager](assets.md) section of
asset bundle, it's very straightforward: asset bundle, it's very straightforward:
```php ```php
frontend\config\AppAsset::register($this); frontend\assets\AppAsset::register($this);
``` ```
### Layout ### Layout

Loading…
Cancel
Save