Commit 02f2d4975aef82c5a47c3f6adf5f110fccbb9f5b
Merge remote-tracking branch 'origin/master'
Showing
2 changed files
with
3 additions
and
53 deletions
Show diff stats
.htaccess
| ... | ... | @@ -5,7 +5,7 @@ AddDefaultCharset utf-8 |
| 5 | 5 | RewriteEngine On |
| 6 | 6 | |
| 7 | 7 | # the main rewrite rule for the frontend application |
| 8 | - RewriteCond %{REQUEST_URI} !^/(backend/web|admin|uploads) | |
| 8 | + RewriteCond %{REQUEST_URI} !^/(backend/web|admin|storage) | |
| 9 | 9 | RewriteRule !^frontend/web /frontend/web%{REQUEST_URI} [L] |
| 10 | 10 | |
| 11 | 11 | # redirect to the page without a trailing slash (uncomment if necessary) | ... | ... |
backend/views/site/index.php
| ... | ... | @@ -3,57 +3,7 @@ |
| 3 | 3 | /* @var $this yii\web\View */ |
| 4 | 4 | |
| 5 | 5 | use artweb\artbox\core\helpers\ImageHelper; |
| 6 | - use artweb\artbox\gentelella\widgets\XPanel; | |
| 7 | - use yii\bootstrap\Collapse; | |
| 8 | 6 | |
| 9 | 7 | $this->title = 'My Yii Application'; |
| 10 | -?> | |
| 11 | -<?php | |
| 12 | - $panel = XPanel::begin( | |
| 13 | - [ | |
| 14 | - 'title' => 'Test', | |
| 15 | - ] | |
| 16 | - ); | |
| 17 | - echo Collapse::widget( | |
| 18 | - [ | |
| 19 | - 'items' => [ | |
| 20 | - // equivalent to the above | |
| 21 | - [ | |
| 22 | - 'label' => '<p>Collapsible Group Item #1</p>', | |
| 23 | - 'content' => 'Anim pariatur cliche...', | |
| 24 | - // open its content by default | |
| 25 | - 'contentOptions' => [ 'class' => 'in' ], | |
| 26 | - ], | |
| 27 | - // another group item | |
| 28 | - [ | |
| 29 | - 'label' => 'Collapsible Group Item #1', | |
| 30 | - 'content' => 'Anim pariatur cliche...', | |
| 31 | - ], | |
| 32 | - // if you want to swap out .panel-body with .list-group, you may use the following | |
| 33 | - [ | |
| 34 | - 'label' => 'Collapsible Group Item #1', | |
| 35 | - 'content' => [ | |
| 36 | - 'Anim pariatur cliche...', | |
| 37 | - 'Anim pariatur cliche...', | |
| 38 | - ], | |
| 39 | - 'footer' => 'Footer' | |
| 40 | - // the footer label in list-group | |
| 41 | - ], | |
| 42 | - [ | |
| 43 | - 'label' => 'Collapsible Group Item #1', | |
| 44 | - 'content' => [ | |
| 45 | - 'Anim pariatur cliche...', | |
| 46 | - 'Anim pariatur cliche...', | |
| 47 | - ], | |
| 48 | - 'footer' => 'Footer', | |
| 49 | - // the footer label in list-group | |
| 50 | - ], | |
| 51 | - ], | |
| 52 | - 'options' => [ | |
| 53 | - 'class' => 'accordion', | |
| 54 | - ], | |
| 55 | - 'encodeLabels' => false, | |
| 56 | - ] | |
| 57 | - ); | |
| 58 | - $panel::end(); | |
| 59 | -?> | |
| 60 | 8 | \ No newline at end of file |
| 9 | + | |
| 10 | + | |
| 61 | 11 | \ No newline at end of file | ... | ... |