new architecture

Smarteh · Sep 9, 2013 · 575691c · 575691c
1 parent 5f543ce
commit 575691c
Show file tree

Hide file tree

Showing 1,892 changed files with 54 additions and 54 deletions.
diff --git a/framework/cli/views/webapp/assets/git-gitignore b/framework/cli/views/webapp/assets/git-gitignore
diff --git a/framework/cli/views/webapp/assets/hg-hgkeep b/framework/cli/views/webapp/assets/hg-hgkeep
diff --git a/framework/cli/views/webapp/images/git-gitkeep b/framework/cli/views/webapp/images/git-gitkeep
diff --git a/framework/cli/views/webapp/images/hg-hgkeep b/framework/cli/views/webapp/images/hg-hgkeep
diff --git a/framework/cli/views/webapp/protected/commands/shell/git-gitkeep b/framework/cli/views/webapp/protected/commands/shell/git-gitkeep
diff --git a/framework/cli/views/webapp/protected/commands/shell/hg-hgkeep b/framework/cli/views/webapp/protected/commands/shell/hg-hgkeep
diff --git a/framework/cli/views/webapp/protected/extensions/git-gitkeep b/framework/cli/views/webapp/protected/extensions/git-gitkeep
diff --git a/framework/cli/views/webapp/protected/extensions/hg-hgkeep b/framework/cli/views/webapp/protected/extensions/hg-hgkeep
diff --git a/framework/cli/views/webapp/protected/messages/git-gitkeep b/framework/cli/views/webapp/protected/messages/git-gitkeep
diff --git a/framework/cli/views/webapp/protected/messages/hg-hgkeep b/framework/cli/views/webapp/protected/messages/hg-hgkeep
diff --git a/framework/cli/views/webapp/protected/migrations/git-gitkeep b/framework/cli/views/webapp/protected/migrations/git-gitkeep
diff --git a/framework/cli/views/webapp/protected/migrations/hg-hgkeep b/framework/cli/views/webapp/protected/migrations/hg-hgkeep
diff --git a/framework/cli/views/webapp/protected/runtime/git-gitignore b/framework/cli/views/webapp/protected/runtime/git-gitignore
diff --git a/framework/cli/views/webapp/protected/runtime/hg-hgkeep b/framework/cli/views/webapp/protected/runtime/hg-hgkeep
diff --git a/framework/cli/views/webapp/protected/tests/fixtures/git-gitkeep b/framework/cli/views/webapp/protected/tests/fixtures/git-gitkeep
diff --git a/framework/cli/views/webapp/protected/tests/fixtures/hg-hgkeep b/framework/cli/views/webapp/protected/tests/fixtures/hg-hgkeep
diff --git a/framework/cli/views/webapp/protected/tests/report/git-gitignore b/framework/cli/views/webapp/protected/tests/report/git-gitignore
diff --git a/framework/cli/views/webapp/protected/tests/report/hg-hgkeep b/framework/cli/views/webapp/protected/tests/report/hg-hgkeep
diff --git a/framework/cli/views/webapp/protected/tests/unit/git-gitkeep b/framework/cli/views/webapp/protected/tests/unit/git-gitkeep
diff --git a/framework/cli/views/webapp/protected/tests/unit/hg-hgkeep b/framework/cli/views/webapp/protected/tests/unit/hg-hgkeep
diff --git a/framework/cli/views/webapp/protected/vendor/git-gitkeep b/framework/cli/views/webapp/protected/vendor/git-gitkeep
diff --git a/framework/cli/views/webapp/protected/vendor/hg-hgkeep b/framework/cli/views/webapp/protected/vendor/hg-hgkeep
diff --git a/framework/cli/views/webapp/themes/classic/views/layouts/git-gitkeep b/framework/cli/views/webapp/themes/classic/views/layouts/git-gitkeep
diff --git a/framework/cli/views/webapp/themes/classic/views/layouts/hg-hgkeep b/framework/cli/views/webapp/themes/classic/views/layouts/hg-hgkeep
diff --git a/framework/cli/views/webapp/themes/classic/views/site/git-gitkeep b/framework/cli/views/webapp/themes/classic/views/site/git-gitkeep
diff --git a/framework/cli/views/webapp/themes/classic/views/site/hg-hgkeep b/framework/cli/views/webapp/themes/classic/views/site/hg-hgkeep
diff --git a/framework/cli/views/webapp/themes/classic/views/system/git-gitkeep b/framework/cli/views/webapp/themes/classic/views/system/git-gitkeep
diff --git a/framework/cli/views/webapp/themes/classic/views/system/hg-hgkeep b/framework/cli/views/webapp/themes/classic/views/system/hg-hgkeep
diff --git a/protected/config/main.php b/protected/config/main.php
@@ -44,7 +44,7 @@
             'class' => 'application.modules.install.InstallModule',
         ),
         'yupe'  => array(
-            'class'        => 'application.modules.yupe.YupeModule',
+            //'class'        => 'application.modules.yupe.YupeModule',
             'brandUrl'     => 'http://yupe.ru?from=engine',
             'cache'        => true,
         ),
@@ -84,6 +84,9 @@
             'class'   => 'application.modules.yupe.extensions.EPhpThumb.EPhpThumb',
             'options' => array('jpegQuality' => 80),
         ),
+        'themeManager'       => array(
+            'basePath'       => dirname(__DIR__) . '/../themes',
+        ),
         // конфигурирование urlManager, подробнее: http://www.yiiframework.ru/doc/guide/ru/topics.url
         'urlManager' => array(
             'class'          => 'application.modules.yupe.components.urlManager.LangUrlManager',

diff --git a/assets/.gitignore → public/assets/.gitignore b/assets/.gitignore → public/assets/.gitignore
diff --git a/favicon.ico → public/favicon.ico b/favicon.ico → public/favicon.ico
diff --git a/index-test.php → public/index-test.php b/index-test.php → public/index-test.php
diff --git a/index.php → public/index.php b/index.php → public/index.php
@@ -22,27 +22,25 @@
     defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL', 3);
 
     // путь к фреймворку Yii
-    $yii = dirname(__FILE__) . '/framework/yii.php';
+    $yii = dirname(__FILE__) . '/../vendor/framework/yii.php';
 
 } else { //production считается во всех случаях, когда не выполнены условия
     // путь к фреймворку Yii, при необходимости заменить на yii.php
-    $yii = dirname(__FILE__) . '/framework/yiilite.php';
+    $yii = dirname(__FILE__) . '/../vendor/framework/yiilite.php';
     // путь к основному конфигурационному файлу Yii
 }
 
-$base = require_once dirname(__FILE__) . '/protected/config/main.php';
+$base = require_once dirname(__FILE__) . '/../protected/config/main.php';
 
-$userspace = dirname(__FILE__) . '/protected/config/userspace.php';
+$userspace = dirname(__FILE__) . '/../protected/config/userspace.php';
 $userspace = file_exists($userspace) ? (require_once $userspace) : array();
 
 require $yii;
 
-Yii::setPathOfAlias('application', dirname(__FILE__) . '/protected/');
-Yii::setPathOfAlias('yii', dirname(__FILE__) . '/framework/');
+Yii::setPathOfAlias('application', dirname(__FILE__) . '/../protected/');
+Yii::setPathOfAlias('yii', dirname(__FILE__) . '/../framework/');
 
-use application\modules\yupe\components\ConfigManager;
-
-$confManager = new ConfigManager();
+$confManager = new application\modules\yupe\components\ConfigManager();
 $config = $confManager->merge($base, $userspace);
 
 Yii::createWebApplication($config)->run();
diff --git a/robots.txt → public/robots.txt b/robots.txt → public/robots.txt
diff --git a/framework/cli/views/webapp/css/bg.gif → public/web/css/bg.gif b/framework/cli/views/webapp/css/bg.gif → public/web/css/bg.gif
diff --git a/web/css/flags.css → public/web/css/flags.css b/web/css/flags.css → public/web/css/flags.css
diff --git a/web/css/flags.png → public/web/css/flags.png b/web/css/flags.png → public/web/css/flags.png
diff --git a/web/css/ie.css → public/web/css/ie.css b/web/css/ie.css → public/web/css/ie.css
diff --git a/web/css/install.css → public/web/css/install.css b/web/css/install.css → public/web/css/install.css
diff --git a/web/css/main.css → public/web/css/main.css b/web/css/main.css → public/web/css/main.css
diff --git a/web/css/screen.css → public/web/css/screen.css b/web/css/screen.css → public/web/css/screen.css
diff --git a/web/css/styles.css → public/web/css/styles.css b/web/css/styles.css → public/web/css/styles.css
diff --git a/web/images/avatar.png → public/web/images/avatar.png b/web/images/avatar.png → public/web/images/avatar.png
diff --git a/web/images/banners/125yupe.jpg → public/web/images/banners/125yupe.jpg b/web/images/banners/125yupe.jpg → public/web/images/banners/125yupe.jpg
diff --git a/web/images/banners/468yupe.jpg → public/web/images/banners/468yupe.jpg b/web/images/banners/468yupe.jpg → public/web/images/banners/468yupe.jpg
diff --git a/web/images/cooll.png → public/web/images/cooll.png b/web/images/cooll.png → public/web/images/cooll.png
diff --git a/web/images/down.gif → public/web/images/down.gif b/web/images/down.gif → public/web/images/down.gif
diff --git a/web/images/github.jpg → public/web/images/github.jpg b/web/images/github.jpg → public/web/images/github.jpg
diff --git a/web/images/logo.png → public/web/images/logo.png b/web/images/logo.png → public/web/images/logo.png
diff --git a/web/images/mail.png → public/web/images/mail.png b/web/images/mail.png → public/web/images/mail.png
diff --git a/web/images/main-logo.png → public/web/images/main-logo.png b/web/images/main-logo.png → public/web/images/main-logo.png
diff --git a/web/images/yupe-small.png → public/web/images/yupe-small.png b/web/images/yupe-small.png → public/web/images/yupe-small.png
diff --git a/web/images/yupe_black.png → public/web/images/yupe_black.png b/web/images/yupe_black.png → public/web/images/yupe_black.png
diff --git a/web/images/yupe_white.png → public/web/images/yupe_white.png b/web/images/yupe_white.png → public/web/images/yupe_white.png
diff --git a/web/images/yupe_yellow.png → public/web/images/yupe_yellow.png b/web/images/yupe_yellow.png → public/web/images/yupe_yellow.png
diff --git a/web/install/css/bootstrap.min.css → public/web/install/css/bootstrap.min.css b/web/install/css/bootstrap.min.css → public/web/install/css/bootstrap.min.css
diff --git a/web/install/css/install.css → public/web/install/css/install.css b/web/install/css/install.css → public/web/install/css/install.css
diff --git a/...nstall/img/glyphicons-halflings-white.png → ...nstall/img/glyphicons-halflings-white.png b/...nstall/img/glyphicons-halflings-white.png → ...nstall/img/glyphicons-halflings-white.png
diff --git a/web/install/img/glyphicons-halflings.png → .../web/install/img/glyphicons-halflings.png b/web/install/img/glyphicons-halflings.png → .../web/install/img/glyphicons-halflings.png
diff --git a/web/install/js/bootstrap.min.js → public/web/install/js/bootstrap.min.js b/web/install/js/bootstrap.min.js → public/web/install/js/bootstrap.min.js
diff --git a/framework/web/js/source/jquery.min.js → public/web/install/js/jquery.min.js b/framework/web/js/source/jquery.min.js → public/web/install/js/jquery.min.js
diff --git a/themes/default/views/layouts/main.php b/themes/default/views/layouts/main.php
@@ -1,11 +1,16 @@
+<?php
+    $static = Yii::app()->assetManager->publish(
+        Yii::app()->theme->basePath . '/web'
+    );
+?>
 <!DOCTYPE html>
 <html lang="<?php echo Yii::app()->language; ?>">
 <head>
     <meta charset="<?php echo Yii::app()->charset; ?>"/>
     <meta name="keywords" content="<?php echo $this->keywords; ?>"/>
     <meta name="description" content="<?php echo $this->description; ?>"/>
-    <link rel="shortcut icon" href="<?php echo Yii::app()->theme->baseUrl; ?>/web/images/favicon.ico"/>
-    <link rel="stylesheet" href="<?php echo Yii::app()->theme->baseUrl; ?>/web/css/main.css"/>
+    <link rel="shortcut icon" href="<?php echo $static; ?>/images/favicon.ico"/>
+    <link rel="stylesheet" href="<?php echo $static; ?>/css/main.css"/>
     <title><?php echo CHtml::encode($this->pageTitle); ?></title>
     <?php
     if(Yii::app()->hasComponent('highlightjs'))
@@ -92,43 +97,58 @@
                 <div class="span12">
                     <div class="span3">
                         <ul class="unstyled">
-                            <li>Ресурсы<li>
-                            <li><a href="https://twitter.com/yupecms" target="_blank">Twitter</a></li>
-                            <li><a href="http://vk.com/amylabs" target="_blank">Вконтакте</a></li>
-                            <li><a href="https://www.facebook.com/amylabs.ru" target="_blank">Facebook</a></li>
-                            <li><a href="https://plus.google.com/u/0/b/111468098477631231532/111468098477631231532/posts" target="_blank">Google+</a></li>
+                            <li>Ресурсы</li>
+                            <li>
+                                <!--                        <i class="icon-twitter">-->
+                                <a href="https://twitter.com/yupecms" target="_blank"></i> Twitter</a>
+                            </li>
+                            <li>
+                                <!--                        <i class="icon-vk"></i>-->
+                                <a href="http://vk.com/amylabs" target="_blank"> Вконтакте</a>
+                            </li>
+                            <li>
+                                <!--                        <i class="icon-facebook"></i>-->
+                                <a href="https://www.facebook.com/amylabs.ru" target="_blank"> Facebook</a>
+                            </li>
+                            <li>
+                                <!--                        <i class="icon-google-plus"></i>-->
+                                <a href="https://plus.google.com/u/0/b/111468098477631231532/111468098477631231532/posts"
+                                   target="_blank">Google+</a>
+                            </li>
                             <li><a href="http://yupe.ru/blog/yupe-mini-cms-yii" target="_blank">Блог</a></li>
                             <li><a href="http://yupe.ru/" target="_blank">Сайт</a></li>
                         </ul>
                     </div>
                     <div class="span3">
                         <ul class="unstyled">
-                            <li>Поддержка<li>
-                            <li><a href="http://yupe.ru/feedback/index/" target="_blank">Контакты</a></li>
+                            <li>Поддержка</li>
+                            <li><a href="http://yupe.ru/docs/index.html" target="_blank">Документация</a></li>
+                            <li><a href="http://api.yupe.ru/" target="_blank">API</a></li>
                             <li><a href="http://yupe.ru/talk/" target="_blank">Форум</a></li>
                             <li><a href="http://yupe.ru/wiki/default/pageIndex" target="_blank">Wiki</a></li>
-                            <li><a href="http://yupe.ru/docs/index.html" target="_blank">Документация</a></li>
                             <li><a href="http://yupe.ru/feedback/faq/" target="_blank">FAQ</a></li>
-                            <li><a href="http://amylabs.ru/contact?from=yupe" target="_blank">Коммерческая поддержка</a></li>
+                            <li><a href="http://yupe.ru/feedback/index/" target="_blank">Контакты</a></li>
                         </ul>
                     </div>
                     <div class="span3">
                         <ul class="unstyled">
-                            <li>Юпи!<li>
+                            <li>Юпи!</li>
                             <li><a href="http://yupe.ru/pages/about/" target="_blank">О проекте</a></li>
                             <li><a href="http://yupe.ru/docs/yupe/team.html" target="_blank">Команда</a></li>
                             <li><a href="https://github.com/yupe/yupe/" target="_blank">Github</a></li>
                             <li><a href="https://github.com/yupe/yupe-ext/" target="_blank">Доп. модули</a></li>
                             <li><a href="http://yupe.ru/docs/yupe/capability.html" target="_blank">Возможности</a></li>
-                            <li><a href="http://yupe.ru/docs/yupe/assistance.project.html" target="_blank">Помощь проекту</a></li>
+                            <li><a href="http://yupe.ru/docs/yupe/assistance.project.html" target="_blank">Помощь проекту</a>
+                            </li>
                         </ul>
                     </div>
                     <div class="span3">
                         <ul class="unstyled">
-                            <li>Наши друзья<li>
+                            <li>Друзья</li>
                             <li><a href="http://allframeworks.ru" target="_blank">allframeworks</a></li>
                             <li><a href="http://amylabs.ru" target="_blank">amylabs</a></li>
-                            <li><a href="http://yupe.ru/feedback/index/" target="_blank">Хочешь в друзья ?</a></li>
+                            <li><a href="http://yupe.ru/feedback/index/" target="_blank">Хочешь в друзья?</a></li>
+                            <li><a href="http://amylabs.ru/contact?from=yupe" target="_blank">Коммерческая поддержка</a></li>
                         </ul>
                     </div>
                 </div>

diff --git a/themes/default/views/layouts/modern.php b/themes/default/views/layouts/modern.php
@@ -177,8 +177,7 @@
     <div class="span12">
         <div class="span3">
             <ul class="unstyled">
-                <li>Ресурсы
-                <li>
+                <li>Ресурсы</li>
                 <li>
                     <!--                        <i class="icon-twitter">-->
                     <a href="https://twitter.com/yupecms" target="_blank"></i> Twitter</a>
@@ -202,20 +201,18 @@
         </div>
         <div class="span3">
             <ul class="unstyled">
-                <li>Поддержка
-                <li>
-                <li><a href="http://yupe.ru/feedback/index/" target="_blank">Контакты</a></li>
+                <li>Поддержка</li>
+                <li><a href="http://yupe.ru/docs/index.html" target="_blank">Документация</a></li>
+                <li><a href="http://api.yupe.ru/" target="_blank">API</a></li>
                 <li><a href="http://yupe.ru/talk/" target="_blank">Форум</a></li>
                 <li><a href="http://yupe.ru/wiki/default/pageIndex" target="_blank">Wiki</a></li>
-                <li><a href="http://yupe.ru/docs/index.html" target="_blank">Документация</a></li>
                 <li><a href="http://yupe.ru/feedback/faq/" target="_blank">FAQ</a></li>
-                <li><a href="http://amylabs.ru/contact?from=yupe" target="_blank">Коммерческая поддержка</a></li>
+                <li><a href="http://yupe.ru/feedback/index/" target="_blank">Контакты</a></li>
             </ul>
         </div>
         <div class="span3">
             <ul class="unstyled">
-                <li>Юпи!
-                <li>
+                <li>Юпи!</li>
                 <li><a href="http://yupe.ru/pages/about/" target="_blank">О проекте</a></li>
                 <li><a href="http://yupe.ru/docs/yupe/team.html" target="_blank">Команда</a></li>
                 <li><a href="https://github.com/yupe/yupe/" target="_blank">Github</a></li>
@@ -227,11 +224,11 @@
         </div>
         <div class="span3">
             <ul class="unstyled">
-                <li>Наши друзья
-                <li>
+                <li>Друзья</li>
                 <li><a href="http://allframeworks.ru" target="_blank">allframeworks</a></li>
                 <li><a href="http://amylabs.ru" target="_blank">amylabs</a></li>
                 <li><a href="http://yupe.ru/feedback/index/" target="_blank">Хочешь в друзья?</a></li>
+                <li><a href="http://amylabs.ru/contact?from=yupe" target="_blank">Коммерческая поддержка</a></li>
             </ul>
         </div>
     </div>

diff --git a/uploads/.gitignore b/uploads/.gitignore
diff --git a/framework/.htaccess → vendor/framework/.htaccess b/framework/.htaccess → vendor/framework/.htaccess
diff --git a/framework/YiiBase.php → vendor/framework/YiiBase.php b/framework/YiiBase.php → vendor/framework/YiiBase.php
diff --git a/framework/base/CApplication.php → vendor/framework/base/CApplication.php b/framework/base/CApplication.php → vendor/framework/base/CApplication.php
diff --git a/framework/base/CApplicationComponent.php → .../framework/base/CApplicationComponent.php b/framework/base/CApplicationComponent.php → .../framework/base/CApplicationComponent.php
diff --git a/framework/base/CBehavior.php → vendor/framework/base/CBehavior.php b/framework/base/CBehavior.php → vendor/framework/base/CBehavior.php
diff --git a/framework/base/CComponent.php → vendor/framework/base/CComponent.php b/framework/base/CComponent.php → vendor/framework/base/CComponent.php
diff --git a/framework/base/CErrorEvent.php → vendor/framework/base/CErrorEvent.php b/framework/base/CErrorEvent.php → vendor/framework/base/CErrorEvent.php
diff --git a/framework/base/CErrorHandler.php → vendor/framework/base/CErrorHandler.php b/framework/base/CErrorHandler.php → vendor/framework/base/CErrorHandler.php
diff --git a/framework/base/CException.php → vendor/framework/base/CException.php b/framework/base/CException.php → vendor/framework/base/CException.php
diff --git a/framework/base/CExceptionEvent.php → vendor/framework/base/CExceptionEvent.php b/framework/base/CExceptionEvent.php → vendor/framework/base/CExceptionEvent.php
diff --git a/framework/base/CHttpException.php → vendor/framework/base/CHttpException.php b/framework/base/CHttpException.php → vendor/framework/base/CHttpException.php
diff --git a/framework/base/CModel.php → vendor/framework/base/CModel.php b/framework/base/CModel.php → vendor/framework/base/CModel.php
diff --git a/framework/base/CModelBehavior.php → vendor/framework/base/CModelBehavior.php b/framework/base/CModelBehavior.php → vendor/framework/base/CModelBehavior.php
diff --git a/framework/base/CModelEvent.php → vendor/framework/base/CModelEvent.php b/framework/base/CModelEvent.php → vendor/framework/base/CModelEvent.php
diff --git a/framework/base/CModule.php → vendor/framework/base/CModule.php b/framework/base/CModule.php → vendor/framework/base/CModule.php
diff --git a/framework/base/CSecurityManager.php → vendor/framework/base/CSecurityManager.php b/framework/base/CSecurityManager.php → vendor/framework/base/CSecurityManager.php
diff --git a/framework/base/CStatePersister.php → vendor/framework/base/CStatePersister.php b/framework/base/CStatePersister.php → vendor/framework/base/CStatePersister.php
diff --git a/framework/base/interfaces.php → vendor/framework/base/interfaces.php b/framework/base/interfaces.php → vendor/framework/base/interfaces.php
diff --git a/framework/caching/CApcCache.php → vendor/framework/caching/CApcCache.php b/framework/caching/CApcCache.php → vendor/framework/caching/CApcCache.php
diff --git a/framework/caching/CCache.php → vendor/framework/caching/CCache.php b/framework/caching/CCache.php → vendor/framework/caching/CCache.php
diff --git a/framework/caching/CDbCache.php → vendor/framework/caching/CDbCache.php b/framework/caching/CDbCache.php → vendor/framework/caching/CDbCache.php
diff --git a/framework/caching/CDummyCache.php → vendor/framework/caching/CDummyCache.php b/framework/caching/CDummyCache.php → vendor/framework/caching/CDummyCache.php
diff --git a/framework/caching/CEAcceleratorCache.php → .../framework/caching/CEAcceleratorCache.php b/framework/caching/CEAcceleratorCache.php → .../framework/caching/CEAcceleratorCache.php
diff --git a/framework/caching/CFileCache.php → vendor/framework/caching/CFileCache.php b/framework/caching/CFileCache.php → vendor/framework/caching/CFileCache.php
diff --git a/framework/caching/CMemCache.php → vendor/framework/caching/CMemCache.php b/framework/caching/CMemCache.php → vendor/framework/caching/CMemCache.php
diff --git a/framework/caching/CRedisCache.php → vendor/framework/caching/CRedisCache.php b/framework/caching/CRedisCache.php → vendor/framework/caching/CRedisCache.php
diff --git a/framework/caching/CWinCache.php → vendor/framework/caching/CWinCache.php b/framework/caching/CWinCache.php → vendor/framework/caching/CWinCache.php
diff --git a/framework/caching/CXCache.php → vendor/framework/caching/CXCache.php b/framework/caching/CXCache.php → vendor/framework/caching/CXCache.php
diff --git a/framework/caching/CZendDataCache.php → vendor/framework/caching/CZendDataCache.php b/framework/caching/CZendDataCache.php → vendor/framework/caching/CZendDataCache.php
diff --git a/...caching/dependencies/CCacheDependency.php → ...caching/dependencies/CCacheDependency.php b/...caching/dependencies/CCacheDependency.php → ...caching/dependencies/CCacheDependency.php
diff --git a/.../dependencies/CChainedCacheDependency.php → .../dependencies/CChainedCacheDependency.php b/.../dependencies/CChainedCacheDependency.php → .../dependencies/CChainedCacheDependency.php
diff --git a/...ching/dependencies/CDbCacheDependency.php → ...ching/dependencies/CDbCacheDependency.php b/...ching/dependencies/CDbCacheDependency.php → ...ching/dependencies/CDbCacheDependency.php
diff --git a/...ependencies/CDirectoryCacheDependency.php → ...ependencies/CDirectoryCacheDependency.php b/...ependencies/CDirectoryCacheDependency.php → ...ependencies/CDirectoryCacheDependency.php
diff --git a/...ng/dependencies/CExpressionDependency.php → ...ng/dependencies/CExpressionDependency.php b/...ng/dependencies/CExpressionDependency.php → ...ng/dependencies/CExpressionDependency.php
diff --git a/...ing/dependencies/CFileCacheDependency.php → ...ing/dependencies/CFileCacheDependency.php b/...ing/dependencies/CFileCacheDependency.php → ...ing/dependencies/CFileCacheDependency.php
diff --git a/...endencies/CGlobalStateCacheDependency.php → ...endencies/CGlobalStateCacheDependency.php b/...endencies/CGlobalStateCacheDependency.php → ...endencies/CGlobalStateCacheDependency.php
diff --git a/framework/cli/commands/MessageCommand.php → ...framework/cli/commands/MessageCommand.php b/framework/cli/commands/MessageCommand.php → ...framework/cli/commands/MessageCommand.php
diff --git a/framework/cli/commands/MigrateCommand.php → ...framework/cli/commands/MigrateCommand.php b/framework/cli/commands/MigrateCommand.php → ...framework/cli/commands/MigrateCommand.php
diff --git a/framework/cli/commands/ShellCommand.php → ...r/framework/cli/commands/ShellCommand.php b/framework/cli/commands/ShellCommand.php → ...r/framework/cli/commands/ShellCommand.php
diff --git a/framework/cli/commands/WebAppCommand.php → .../framework/cli/commands/WebAppCommand.php b/framework/cli/commands/WebAppCommand.php → .../framework/cli/commands/WebAppCommand.php
diff --git a/.../cli/commands/shell/ControllerCommand.php → .../cli/commands/shell/ControllerCommand.php b/.../cli/commands/shell/ControllerCommand.php → .../cli/commands/shell/ControllerCommand.php
diff --git a/framework/cli/commands/shell/CrudCommand.php → ...mework/cli/commands/shell/CrudCommand.php b/framework/cli/commands/shell/CrudCommand.php → ...mework/cli/commands/shell/CrudCommand.php
diff --git a/framework/cli/commands/shell/FormCommand.php → ...mework/cli/commands/shell/FormCommand.php b/framework/cli/commands/shell/FormCommand.php → ...mework/cli/commands/shell/FormCommand.php
diff --git a/framework/cli/commands/shell/HelpCommand.php → ...mework/cli/commands/shell/HelpCommand.php b/framework/cli/commands/shell/HelpCommand.php → ...mework/cli/commands/shell/HelpCommand.php
diff --git a/...ework/cli/commands/shell/ModelCommand.php → ...ework/cli/commands/shell/ModelCommand.php b/...ework/cli/commands/shell/ModelCommand.php → ...ework/cli/commands/shell/ModelCommand.php
diff --git a/...work/cli/commands/shell/ModuleCommand.php → ...work/cli/commands/shell/ModuleCommand.php b/...work/cli/commands/shell/ModuleCommand.php → ...work/cli/commands/shell/ModuleCommand.php
diff --git a/...cli/views/shell/controller/controller.php → ...cli/views/shell/controller/controller.php b/...cli/views/shell/controller/controller.php → ...cli/views/shell/controller/controller.php
diff --git a/...ework/cli/views/shell/controller/view.php → ...ework/cli/views/shell/controller/view.php b/...ework/cli/views/shell/controller/view.php → ...ework/cli/views/shell/controller/view.php
diff --git a/framework/cli/views/shell/crud/_form.php → .../framework/cli/views/shell/crud/_form.php b/framework/cli/views/shell/crud/_form.php → .../framework/cli/views/shell/crud/_form.php
diff --git a/framework/cli/views/shell/crud/_search.php → ...ramework/cli/views/shell/crud/_search.php b/framework/cli/views/shell/crud/_search.php → ...ramework/cli/views/shell/crud/_search.php
diff --git a/framework/cli/views/shell/crud/_view.php → .../framework/cli/views/shell/crud/_view.php b/framework/cli/views/shell/crud/_view.php → .../framework/cli/views/shell/crud/_view.php
diff --git a/framework/cli/views/shell/crud/admin.php → .../framework/cli/views/shell/crud/admin.php b/framework/cli/views/shell/crud/admin.php → .../framework/cli/views/shell/crud/admin.php
diff --git a/...ework/cli/views/shell/crud/controller.php → ...ework/cli/views/shell/crud/controller.php b/...ework/cli/views/shell/crud/controller.php → ...ework/cli/views/shell/crud/controller.php
diff --git a/framework/cli/views/shell/crud/create.php → ...framework/cli/views/shell/crud/create.php b/framework/cli/views/shell/crud/create.php → ...framework/cli/views/shell/crud/create.php
diff --git a/framework/cli/views/shell/crud/index.php → .../framework/cli/views/shell/crud/index.php b/framework/cli/views/shell/crud/index.php → .../framework/cli/views/shell/crud/index.php
diff --git a/framework/cli/views/shell/crud/test.php → ...r/framework/cli/views/shell/crud/test.php b/framework/cli/views/shell/crud/test.php → ...r/framework/cli/views/shell/crud/test.php
diff --git a/framework/cli/views/shell/crud/update.php → ...framework/cli/views/shell/crud/update.php b/framework/cli/views/shell/crud/update.php → ...framework/cli/views/shell/crud/update.php
diff --git a/framework/cli/views/shell/crud/view.php → ...r/framework/cli/views/shell/crud/view.php b/framework/cli/views/shell/crud/view.php → ...r/framework/cli/views/shell/crud/view.php
diff --git a/framework/cli/views/shell/form/action.php → ...framework/cli/views/shell/form/action.php b/framework/cli/views/shell/form/action.php → ...framework/cli/views/shell/form/action.php
diff --git a/framework/cli/views/shell/form/form.php → ...r/framework/cli/views/shell/form/form.php b/framework/cli/views/shell/form/form.php → ...r/framework/cli/views/shell/form/form.php
diff --git a/framework/cli/views/shell/model/fixture.php → ...amework/cli/views/shell/model/fixture.php b/framework/cli/views/shell/model/fixture.php → ...amework/cli/views/shell/model/fixture.php
diff --git a/framework/cli/views/shell/model/model.php → ...framework/cli/views/shell/model/model.php b/framework/cli/views/shell/model/model.php → ...framework/cli/views/shell/model/model.php
diff --git a/framework/cli/views/shell/model/test.php → .../framework/cli/views/shell/model/test.php b/framework/cli/views/shell/model/test.php → .../framework/cli/views/shell/model/test.php
diff --git a/.../module/controllers/DefaultController.php → .../module/controllers/DefaultController.php b/.../module/controllers/DefaultController.php → .../module/controllers/DefaultController.php
diff --git a/framework/cli/views/shell/module/module.php → ...amework/cli/views/shell/module/module.php b/framework/cli/views/shell/module/module.php → ...amework/cli/views/shell/module/module.php
diff --git a/...iews/shell/module/views/default/index.php → ...iews/shell/module/views/default/index.php b/...iews/shell/module/views/default/index.php → ...iews/shell/module/views/default/index.php
diff --git a/framework/zii/widgets/assets/gridview/bg.gif → vendor/framework/cli/views/webapp/css/bg.gif b/framework/zii/widgets/assets/gridview/bg.gif → vendor/framework/cli/views/webapp/css/bg.gif
diff --git a/framework/cli/views/webapp/css/form.css → ...r/framework/cli/views/webapp/css/form.css b/framework/cli/views/webapp/css/form.css → ...r/framework/cli/views/webapp/css/form.css
diff --git a/framework/cli/views/webapp/css/ie.css → vendor/framework/cli/views/webapp/css/ie.css b/framework/cli/views/webapp/css/ie.css → vendor/framework/cli/views/webapp/css/ie.css
diff --git a/framework/cli/views/webapp/css/main.css → ...r/framework/cli/views/webapp/css/main.css b/framework/cli/views/webapp/css/main.css → ...r/framework/cli/views/webapp/css/main.css
diff --git a/framework/cli/views/webapp/css/print.css → .../framework/cli/views/webapp/css/print.css b/framework/cli/views/webapp/css/print.css → .../framework/cli/views/webapp/css/print.css
diff --git a/framework/cli/views/webapp/css/screen.css → ...framework/cli/views/webapp/css/screen.css b/framework/cli/views/webapp/css/screen.css → ...framework/cli/views/webapp/css/screen.css
diff --git a/framework/cli/views/webapp/hg-hgignore → ...or/framework/cli/views/webapp/hg-hgignore b/framework/cli/views/webapp/hg-hgignore → ...or/framework/cli/views/webapp/hg-hgignore
diff --git a/framework/cli/views/webapp/index-test.php → ...framework/cli/views/webapp/index-test.php b/framework/cli/views/webapp/index-test.php → ...framework/cli/views/webapp/index-test.php
diff --git a/framework/cli/views/webapp/index.php → vendor/framework/cli/views/webapp/index.php b/framework/cli/views/webapp/index.php → vendor/framework/cli/views/webapp/index.php
diff --git a/...work/cli/views/webapp/protected/.htaccess → ...work/cli/views/webapp/protected/.htaccess b/...work/cli/views/webapp/protected/.htaccess → ...work/cli/views/webapp/protected/.htaccess
diff --git a/...ebapp/protected/components/Controller.php → ...ebapp/protected/components/Controller.php b/...ebapp/protected/components/Controller.php → ...ebapp/protected/components/Controller.php
diff --git a/...app/protected/components/UserIdentity.php → ...app/protected/components/UserIdentity.php b/...app/protected/components/UserIdentity.php → ...app/protected/components/UserIdentity.php
diff --git a/...views/webapp/protected/config/console.php → ...views/webapp/protected/config/console.php b/...views/webapp/protected/config/console.php → ...views/webapp/protected/config/console.php
diff --git a/...li/views/webapp/protected/config/main.php → ...li/views/webapp/protected/config/main.php b/...li/views/webapp/protected/config/main.php → ...li/views/webapp/protected/config/main.php
diff --git a/...li/views/webapp/protected/config/test.php → ...li/views/webapp/protected/config/test.php b/...li/views/webapp/protected/config/test.php → ...li/views/webapp/protected/config/test.php
diff --git a/.../protected/controllers/SiteController.php → .../protected/controllers/SiteController.php b/.../protected/controllers/SiteController.php → .../protected/controllers/SiteController.php
diff --git a/...ws/webapp/protected/data/schema.mysql.sql → ...ws/webapp/protected/data/schema.mysql.sql b/...ws/webapp/protected/data/schema.mysql.sql → ...ws/webapp/protected/data/schema.mysql.sql
diff --git a/...s/webapp/protected/data/schema.sqlite.sql → ...s/webapp/protected/data/schema.sqlite.sql b/...s/webapp/protected/data/schema.sqlite.sql → ...s/webapp/protected/data/schema.sqlite.sql
diff --git a/.../views/webapp/protected/data/testdrive.db → .../views/webapp/protected/data/testdrive.db b/.../views/webapp/protected/data/testdrive.db → .../views/webapp/protected/data/testdrive.db
diff --git a/...s/webapp/protected/models/ContactForm.php → ...s/webapp/protected/models/ContactForm.php b/...s/webapp/protected/models/ContactForm.php → ...s/webapp/protected/models/ContactForm.php
diff --git a/...ews/webapp/protected/models/LoginForm.php → ...ews/webapp/protected/models/LoginForm.php b/...ews/webapp/protected/models/LoginForm.php → ...ews/webapp/protected/models/LoginForm.php
diff --git a/...ws/webapp/protected/tests/WebTestCase.php → ...ws/webapp/protected/tests/WebTestCase.php b/...ws/webapp/protected/tests/WebTestCase.php → ...ws/webapp/protected/tests/WebTestCase.php
diff --git a/...iews/webapp/protected/tests/bootstrap.php → ...iews/webapp/protected/tests/bootstrap.php b/...iews/webapp/protected/tests/bootstrap.php → ...iews/webapp/protected/tests/bootstrap.php
diff --git a/...p/protected/tests/functional/SiteTest.php → ...p/protected/tests/functional/SiteTest.php b/...p/protected/tests/functional/SiteTest.php → ...p/protected/tests/functional/SiteTest.php
diff --git a/...ebapp/protected/views/layouts/column1.php → ...ebapp/protected/views/layouts/column1.php b/...ebapp/protected/views/layouts/column1.php → ...ebapp/protected/views/layouts/column1.php
diff --git a/...ebapp/protected/views/layouts/column2.php → ...ebapp/protected/views/layouts/column2.php b/...ebapp/protected/views/layouts/column2.php → ...ebapp/protected/views/layouts/column2.php
diff --git a/...s/webapp/protected/views/layouts/main.php → ...s/webapp/protected/views/layouts/main.php b/...s/webapp/protected/views/layouts/main.php → ...s/webapp/protected/views/layouts/main.php
diff --git a/...s/webapp/protected/views/site/contact.php → ...s/webapp/protected/views/site/contact.php b/...s/webapp/protected/views/site/contact.php → ...s/webapp/protected/views/site/contact.php
diff --git a/...ews/webapp/protected/views/site/error.php → ...ews/webapp/protected/views/site/error.php b/...ews/webapp/protected/views/site/error.php → ...ews/webapp/protected/views/site/error.php
diff --git a/...ews/webapp/protected/views/site/index.php → ...ews/webapp/protected/views/site/index.php b/...ews/webapp/protected/views/site/index.php → ...ews/webapp/protected/views/site/index.php
diff --git a/...ews/webapp/protected/views/site/login.php → ...ews/webapp/protected/views/site/login.php b/...ews/webapp/protected/views/site/login.php → ...ews/webapp/protected/views/site/login.php
diff --git a/...bapp/protected/views/site/pages/about.php → ...bapp/protected/views/site/pages/about.php b/...bapp/protected/views/site/pages/about.php → ...bapp/protected/views/site/pages/about.php
diff --git a/framework/cli/views/webapp/protected/yiic → ...framework/cli/views/webapp/protected/yiic b/framework/cli/views/webapp/protected/yiic → ...framework/cli/views/webapp/protected/yiic
diff --git a/...ework/cli/views/webapp/protected/yiic.bat → ...ework/cli/views/webapp/protected/yiic.bat b/...ework/cli/views/webapp/protected/yiic.bat → ...ework/cli/views/webapp/protected/yiic.bat
diff --git a/...ework/cli/views/webapp/protected/yiic.php → ...ework/cli/views/webapp/protected/yiic.php b/...ework/cli/views/webapp/protected/yiic.php → ...ework/cli/views/webapp/protected/yiic.php
diff --git a/...ews/webapp/themes/classic/views/.htaccess → ...ews/webapp/themes/classic/views/.htaccess b/...ews/webapp/themes/classic/views/.htaccess → ...ews/webapp/themes/classic/views/.htaccess
diff --git a/...work/collections/CAttributeCollection.php → ...work/collections/CAttributeCollection.php b/...work/collections/CAttributeCollection.php → ...work/collections/CAttributeCollection.php
diff --git a/framework/collections/CConfiguration.php → .../framework/collections/CConfiguration.php b/framework/collections/CConfiguration.php → .../framework/collections/CConfiguration.php
diff --git a/framework/collections/CList.php → vendor/framework/collections/CList.php b/framework/collections/CList.php → vendor/framework/collections/CList.php
diff --git a/framework/collections/CListIterator.php → ...r/framework/collections/CListIterator.php b/framework/collections/CListIterator.php → ...r/framework/collections/CListIterator.php
diff --git a/framework/collections/CMap.php → vendor/framework/collections/CMap.php b/framework/collections/CMap.php → vendor/framework/collections/CMap.php
diff --git a/framework/collections/CMapIterator.php → ...or/framework/collections/CMapIterator.php b/framework/collections/CMapIterator.php → ...or/framework/collections/CMapIterator.php
diff --git a/framework/collections/CQueue.php → vendor/framework/collections/CQueue.php b/framework/collections/CQueue.php → vendor/framework/collections/CQueue.php
diff --git a/framework/collections/CQueueIterator.php → .../framework/collections/CQueueIterator.php b/framework/collections/CQueueIterator.php → .../framework/collections/CQueueIterator.php
diff --git a/framework/collections/CStack.php → vendor/framework/collections/CStack.php b/framework/collections/CStack.php → vendor/framework/collections/CStack.php
diff --git a/framework/collections/CStackIterator.php → .../framework/collections/CStackIterator.php b/framework/collections/CStackIterator.php → .../framework/collections/CStackIterator.php
diff --git a/framework/collections/CTypedList.php → vendor/framework/collections/CTypedList.php b/framework/collections/CTypedList.php → vendor/framework/collections/CTypedList.php
diff --git a/framework/collections/CTypedMap.php → vendor/framework/collections/CTypedMap.php b/framework/collections/CTypedMap.php → vendor/framework/collections/CTypedMap.php
diff --git a/framework/console/CConsoleApplication.php → ...framework/console/CConsoleApplication.php b/framework/console/CConsoleApplication.php → ...framework/console/CConsoleApplication.php
diff --git a/framework/console/CConsoleCommand.php → vendor/framework/console/CConsoleCommand.php b/framework/console/CConsoleCommand.php → vendor/framework/console/CConsoleCommand.php
diff --git a/...ework/console/CConsoleCommandBehavior.php → ...ework/console/CConsoleCommandBehavior.php b/...ework/console/CConsoleCommandBehavior.php → ...ework/console/CConsoleCommandBehavior.php
diff --git a/framework/console/CConsoleCommandEvent.php → ...ramework/console/CConsoleCommandEvent.php b/framework/console/CConsoleCommandEvent.php → ...ramework/console/CConsoleCommandEvent.php
diff --git a/framework/console/CConsoleCommandRunner.php → ...amework/console/CConsoleCommandRunner.php b/framework/console/CConsoleCommandRunner.php → ...amework/console/CConsoleCommandRunner.php
diff --git a/framework/console/CHelpCommand.php → vendor/framework/console/CHelpCommand.php b/framework/console/CHelpCommand.php → vendor/framework/console/CHelpCommand.php
diff --git a/framework/db/CDbCommand.php → vendor/framework/db/CDbCommand.php b/framework/db/CDbCommand.php → vendor/framework/db/CDbCommand.php
diff --git a/framework/db/CDbConnection.php → vendor/framework/db/CDbConnection.php b/framework/db/CDbConnection.php → vendor/framework/db/CDbConnection.php
diff --git a/framework/db/CDbDataReader.php → vendor/framework/db/CDbDataReader.php b/framework/db/CDbDataReader.php → vendor/framework/db/CDbDataReader.php
diff --git a/framework/db/CDbException.php → vendor/framework/db/CDbException.php b/framework/db/CDbException.php → vendor/framework/db/CDbException.php
diff --git a/framework/db/CDbMigration.php → vendor/framework/db/CDbMigration.php b/framework/db/CDbMigration.php → vendor/framework/db/CDbMigration.php
diff --git a/framework/db/CDbTransaction.php → vendor/framework/db/CDbTransaction.php b/framework/db/CDbTransaction.php → vendor/framework/db/CDbTransaction.php
diff --git a/framework/db/ar/CActiveFinder.php → vendor/framework/db/ar/CActiveFinder.php b/framework/db/ar/CActiveFinder.php → vendor/framework/db/ar/CActiveFinder.php
diff --git a/framework/db/ar/CActiveRecord.php → vendor/framework/db/ar/CActiveRecord.php b/framework/db/ar/CActiveRecord.php → vendor/framework/db/ar/CActiveRecord.php
diff --git a/framework/db/ar/CActiveRecordBehavior.php → ...framework/db/ar/CActiveRecordBehavior.php b/framework/db/ar/CActiveRecordBehavior.php → ...framework/db/ar/CActiveRecordBehavior.php
diff --git a/framework/db/schema/CDbColumnSchema.php → ...r/framework/db/schema/CDbColumnSchema.php b/framework/db/schema/CDbColumnSchema.php → ...r/framework/db/schema/CDbColumnSchema.php
diff --git a/framework/db/schema/CDbCommandBuilder.php → ...framework/db/schema/CDbCommandBuilder.php b/framework/db/schema/CDbCommandBuilder.php → ...framework/db/schema/CDbCommandBuilder.php
diff --git a/framework/db/schema/CDbCriteria.php → vendor/framework/db/schema/CDbCriteria.php b/framework/db/schema/CDbCriteria.php → vendor/framework/db/schema/CDbCriteria.php
diff --git a/framework/db/schema/CDbExpression.php → vendor/framework/db/schema/CDbExpression.php b/framework/db/schema/CDbExpression.php → vendor/framework/db/schema/CDbExpression.php
diff --git a/framework/db/schema/CDbSchema.php → vendor/framework/db/schema/CDbSchema.php b/framework/db/schema/CDbSchema.php → vendor/framework/db/schema/CDbSchema.php
diff --git a/framework/db/schema/CDbTableSchema.php → ...or/framework/db/schema/CDbTableSchema.php b/framework/db/schema/CDbTableSchema.php → ...or/framework/db/schema/CDbTableSchema.php
diff --git a/...rk/db/schema/mssql/CMssqlColumnSchema.php → ...rk/db/schema/mssql/CMssqlColumnSchema.php b/...rk/db/schema/mssql/CMssqlColumnSchema.php → ...rk/db/schema/mssql/CMssqlColumnSchema.php
diff --git a/.../db/schema/mssql/CMssqlCommandBuilder.php → .../db/schema/mssql/CMssqlCommandBuilder.php b/.../db/schema/mssql/CMssqlCommandBuilder.php → .../db/schema/mssql/CMssqlCommandBuilder.php
diff --git a/...work/db/schema/mssql/CMssqlPdoAdapter.php → ...work/db/schema/mssql/CMssqlPdoAdapter.php b/...work/db/schema/mssql/CMssqlPdoAdapter.php → ...work/db/schema/mssql/CMssqlPdoAdapter.php
diff --git a/framework/db/schema/mssql/CMssqlSchema.php → ...ramework/db/schema/mssql/CMssqlSchema.php b/framework/db/schema/mssql/CMssqlSchema.php → ...ramework/db/schema/mssql/CMssqlSchema.php
diff --git a/...b/schema/mssql/CMssqlSqlsrvPdoAdapter.php → ...b/schema/mssql/CMssqlSqlsrvPdoAdapter.php b/...b/schema/mssql/CMssqlSqlsrvPdoAdapter.php → ...b/schema/mssql/CMssqlSqlsrvPdoAdapter.php
diff --git a/...ork/db/schema/mssql/CMssqlTableSchema.php → ...ork/db/schema/mssql/CMssqlTableSchema.php b/...ork/db/schema/mssql/CMssqlTableSchema.php → ...ork/db/schema/mssql/CMssqlTableSchema.php
diff --git a/...rk/db/schema/mysql/CMysqlColumnSchema.php → ...rk/db/schema/mysql/CMysqlColumnSchema.php b/...rk/db/schema/mysql/CMysqlColumnSchema.php → ...rk/db/schema/mysql/CMysqlColumnSchema.php
diff --git a/.../db/schema/mysql/CMysqlCommandBuilder.php → .../db/schema/mysql/CMysqlCommandBuilder.php b/.../db/schema/mysql/CMysqlCommandBuilder.php → .../db/schema/mysql/CMysqlCommandBuilder.php
diff --git a/framework/db/schema/mysql/CMysqlSchema.php → ...ramework/db/schema/mysql/CMysqlSchema.php b/framework/db/schema/mysql/CMysqlSchema.php → ...ramework/db/schema/mysql/CMysqlSchema.php
diff --git a/...ork/db/schema/mysql/CMysqlTableSchema.php → ...ork/db/schema/mysql/CMysqlTableSchema.php b/...ork/db/schema/mysql/CMysqlTableSchema.php → ...ork/db/schema/mysql/CMysqlTableSchema.php
diff --git a/framework/db/schema/oci/COciColumnSchema.php → ...mework/db/schema/oci/COciColumnSchema.php b/framework/db/schema/oci/COciColumnSchema.php → ...mework/db/schema/oci/COciColumnSchema.php
diff --git a/...work/db/schema/oci/COciCommandBuilder.php → ...work/db/schema/oci/COciCommandBuilder.php b/...work/db/schema/oci/COciCommandBuilder.php → ...work/db/schema/oci/COciCommandBuilder.php
diff --git a/framework/db/schema/oci/COciSchema.php → ...or/framework/db/schema/oci/COciSchema.php b/framework/db/schema/oci/COciSchema.php → ...or/framework/db/schema/oci/COciSchema.php
diff --git a/framework/db/schema/oci/COciTableSchema.php → ...amework/db/schema/oci/COciTableSchema.php b/framework/db/schema/oci/COciTableSchema.php → ...amework/db/schema/oci/COciTableSchema.php
diff --git a/...rk/db/schema/pgsql/CPgsqlColumnSchema.php → ...rk/db/schema/pgsql/CPgsqlColumnSchema.php b/...rk/db/schema/pgsql/CPgsqlColumnSchema.php → ...rk/db/schema/pgsql/CPgsqlColumnSchema.php
diff --git a/.../db/schema/pgsql/CPgsqlCommandBuilder.php → .../db/schema/pgsql/CPgsqlCommandBuilder.php b/.../db/schema/pgsql/CPgsqlCommandBuilder.php → .../db/schema/pgsql/CPgsqlCommandBuilder.php
diff --git a/framework/db/schema/pgsql/CPgsqlSchema.php → ...ramework/db/schema/pgsql/CPgsqlSchema.php b/framework/db/schema/pgsql/CPgsqlSchema.php → ...ramework/db/schema/pgsql/CPgsqlSchema.php
diff --git a/...ork/db/schema/pgsql/CPgsqlTableSchema.php → ...ork/db/schema/pgsql/CPgsqlTableSchema.php b/...ork/db/schema/pgsql/CPgsqlTableSchema.php → ...ork/db/schema/pgsql/CPgsqlTableSchema.php
diff --git a/.../db/schema/sqlite/CSqliteColumnSchema.php → .../db/schema/sqlite/CSqliteColumnSchema.php b/.../db/schema/sqlite/CSqliteColumnSchema.php → .../db/schema/sqlite/CSqliteColumnSchema.php
diff --git a/...b/schema/sqlite/CSqliteCommandBuilder.php → ...b/schema/sqlite/CSqliteCommandBuilder.php b/...b/schema/sqlite/CSqliteCommandBuilder.php → ...b/schema/sqlite/CSqliteCommandBuilder.php
diff --git a/framework/db/schema/sqlite/CSqliteSchema.php → ...mework/db/schema/sqlite/CSqliteSchema.php b/framework/db/schema/sqlite/CSqliteSchema.php → ...mework/db/schema/sqlite/CSqliteSchema.php
diff --git a/framework/gii/CCodeFile.php → vendor/framework/gii/CCodeFile.php b/framework/gii/CCodeFile.php → vendor/framework/gii/CCodeFile.php
diff --git a/framework/gii/CCodeForm.php → vendor/framework/gii/CCodeForm.php b/framework/gii/CCodeForm.php → vendor/framework/gii/CCodeForm.php
diff --git a/framework/gii/CCodeGenerator.php → vendor/framework/gii/CCodeGenerator.php b/framework/gii/CCodeGenerator.php → vendor/framework/gii/CCodeGenerator.php
diff --git a/framework/gii/CCodeModel.php → vendor/framework/gii/CCodeModel.php b/framework/gii/CCodeModel.php → vendor/framework/gii/CCodeModel.php
diff --git a/framework/gii/GiiModule.php → vendor/framework/gii/GiiModule.php b/framework/gii/GiiModule.php → vendor/framework/gii/GiiModule.php
diff --git a/framework/gii/assets/css/ie.css → vendor/framework/gii/assets/css/ie.css b/framework/gii/assets/css/ie.css → vendor/framework/gii/assets/css/ie.css
diff --git a/framework/gii/assets/css/main.css → vendor/framework/gii/assets/css/main.css b/framework/gii/assets/css/main.css → vendor/framework/gii/assets/css/main.css
diff --git a/framework/gii/assets/css/print.css → vendor/framework/gii/assets/css/print.css b/framework/gii/assets/css/print.css → vendor/framework/gii/assets/css/print.css
diff --git a/framework/gii/assets/css/screen.css → vendor/framework/gii/assets/css/screen.css b/framework/gii/assets/css/screen.css → vendor/framework/gii/assets/css/screen.css
diff --git a/framework/gii/assets/images/logo.png → vendor/framework/gii/assets/images/logo.png b/framework/gii/assets/images/logo.png → vendor/framework/gii/assets/images/logo.png
diff --git a/framework/gii/assets/js/fancybox/blank.gif → ...ramework/gii/assets/js/fancybox/blank.gif b/framework/gii/assets/js/fancybox/blank.gif → ...ramework/gii/assets/js/fancybox/blank.gif
diff --git a/...rk/gii/assets/js/fancybox/fancy_close.png → ...rk/gii/assets/js/fancybox/fancy_close.png b/...rk/gii/assets/js/fancybox/fancy_close.png → ...rk/gii/assets/js/fancybox/fancy_close.png
diff --git a/.../gii/assets/js/fancybox/fancy_loading.png → .../gii/assets/js/fancybox/fancy_loading.png b/.../gii/assets/js/fancybox/fancy_loading.png → .../gii/assets/js/fancybox/fancy_loading.png
diff --git a/...gii/assets/js/fancybox/fancy_nav_left.png → ...gii/assets/js/fancybox/fancy_nav_left.png b/...gii/assets/js/fancybox/fancy_nav_left.png → ...gii/assets/js/fancybox/fancy_nav_left.png
diff --git a/...ii/assets/js/fancybox/fancy_nav_right.png → ...ii/assets/js/fancybox/fancy_nav_right.png b/...ii/assets/js/fancybox/fancy_nav_right.png → ...ii/assets/js/fancybox/fancy_nav_right.png
diff --git a/...gii/assets/js/fancybox/fancy_shadow_e.png → ...gii/assets/js/fancybox/fancy_shadow_e.png b/...gii/assets/js/fancybox/fancy_shadow_e.png → ...gii/assets/js/fancybox/fancy_shadow_e.png
diff --git a/...gii/assets/js/fancybox/fancy_shadow_n.png → ...gii/assets/js/fancybox/fancy_shadow_n.png b/...gii/assets/js/fancybox/fancy_shadow_n.png → ...gii/assets/js/fancybox/fancy_shadow_n.png
diff --git a/...ii/assets/js/fancybox/fancy_shadow_ne.png → ...ii/assets/js/fancybox/fancy_shadow_ne.png b/...ii/assets/js/fancybox/fancy_shadow_ne.png → ...ii/assets/js/fancybox/fancy_shadow_ne.png
diff --git a/...ii/assets/js/fancybox/fancy_shadow_nw.png → ...ii/assets/js/fancybox/fancy_shadow_nw.png b/...ii/assets/js/fancybox/fancy_shadow_nw.png → ...ii/assets/js/fancybox/fancy_shadow_nw.png
diff --git a/...gii/assets/js/fancybox/fancy_shadow_s.png → ...gii/assets/js/fancybox/fancy_shadow_s.png b/...gii/assets/js/fancybox/fancy_shadow_s.png → ...gii/assets/js/fancybox/fancy_shadow_s.png
diff --git a/...ii/assets/js/fancybox/fancy_shadow_se.png → ...ii/assets/js/fancybox/fancy_shadow_se.png b/...ii/assets/js/fancybox/fancy_shadow_se.png → ...ii/assets/js/fancybox/fancy_shadow_se.png
diff --git a/...ii/assets/js/fancybox/fancy_shadow_sw.png → ...ii/assets/js/fancybox/fancy_shadow_sw.png b/...ii/assets/js/fancybox/fancy_shadow_sw.png → ...ii/assets/js/fancybox/fancy_shadow_sw.png
diff --git a/...gii/assets/js/fancybox/fancy_shadow_w.png → ...gii/assets/js/fancybox/fancy_shadow_w.png b/...gii/assets/js/fancybox/fancy_shadow_w.png → ...gii/assets/js/fancybox/fancy_shadow_w.png
diff --git a/...i/assets/js/fancybox/fancy_title_left.png → ...i/assets/js/fancybox/fancy_title_left.png b/...i/assets/js/fancybox/fancy_title_left.png → ...i/assets/js/fancybox/fancy_title_left.png
diff --git a/...i/assets/js/fancybox/fancy_title_main.png → ...i/assets/js/fancybox/fancy_title_main.png b/...i/assets/js/fancybox/fancy_title_main.png → ...i/assets/js/fancybox/fancy_title_main.png
diff --git a/...i/assets/js/fancybox/fancy_title_over.png → ...i/assets/js/fancybox/fancy_title_over.png b/...i/assets/js/fancybox/fancy_title_over.png → ...i/assets/js/fancybox/fancy_title_over.png
diff --git a/.../assets/js/fancybox/fancy_title_right.png → .../assets/js/fancybox/fancy_title_right.png b/.../assets/js/fancybox/fancy_title_right.png → .../assets/js/fancybox/fancy_title_right.png
diff --git a/...ork/gii/assets/js/fancybox/fancybox-x.png → ...ork/gii/assets/js/fancybox/fancybox-x.png b/...ork/gii/assets/js/fancybox/fancybox-x.png → ...ork/gii/assets/js/fancybox/fancybox-x.png
diff --git a/...ork/gii/assets/js/fancybox/fancybox-y.png → ...ork/gii/assets/js/fancybox/fancybox-y.png b/...ork/gii/assets/js/fancybox/fancybox-y.png → ...ork/gii/assets/js/fancybox/fancybox-y.png
diff --git a/...ework/gii/assets/js/fancybox/fancybox.png → ...ework/gii/assets/js/fancybox/fancybox.png b/...ework/gii/assets/js/fancybox/fancybox.png → ...ework/gii/assets/js/fancybox/fancybox.png
diff --git a/...ets/js/fancybox/jquery.fancybox-1.3.1.css → ...ets/js/fancybox/jquery.fancybox-1.3.1.css b/...ets/js/fancybox/jquery.fancybox-1.3.1.css → ...ets/js/fancybox/jquery.fancybox-1.3.1.css
diff --git a/...js/fancybox/jquery.fancybox-1.3.1.pack.js → ...js/fancybox/jquery.fancybox-1.3.1.pack.js b/...js/fancybox/jquery.fancybox-1.3.1.pack.js → ...js/fancybox/jquery.fancybox-1.3.1.pack.js
diff --git a/...gii/assets/js/jquery.tooltip-1.2.6.min.js → ...gii/assets/js/jquery.tooltip-1.2.6.min.js b/...gii/assets/js/jquery.tooltip-1.2.6.min.js → ...gii/assets/js/jquery.tooltip-1.2.6.min.js
diff --git a/framework/gii/assets/js/main.js → vendor/framework/gii/assets/js/main.js b/framework/gii/assets/js/main.js → vendor/framework/gii/assets/js/main.js
diff --git a/framework/gii/assets/js/tooltip.js → vendor/framework/gii/assets/js/tooltip.js b/framework/gii/assets/js/tooltip.js → vendor/framework/gii/assets/js/tooltip.js
diff --git a/framework/gii/components/Pear/Text/Diff.php → ...amework/gii/components/Pear/Text/Diff.php b/framework/gii/components/Pear/Text/Diff.php → ...amework/gii/components/Pear/Text/Diff.php
diff --git a/...mponents/Pear/Text/Diff/Engine/native.php → ...mponents/Pear/Text/Diff/Engine/native.php b/...mponents/Pear/Text/Diff/Engine/native.php → ...mponents/Pear/Text/Diff/Engine/native.php
diff --git a/...omponents/Pear/Text/Diff/Engine/shell.php → ...omponents/Pear/Text/Diff/Engine/shell.php b/...omponents/Pear/Text/Diff/Engine/shell.php → ...omponents/Pear/Text/Diff/Engine/shell.php
diff --git a/...mponents/Pear/Text/Diff/Engine/string.php → ...mponents/Pear/Text/Diff/Engine/string.php b/...mponents/Pear/Text/Diff/Engine/string.php → ...mponents/Pear/Text/Diff/Engine/string.php
diff --git a/...omponents/Pear/Text/Diff/Engine/xdiff.php → ...omponents/Pear/Text/Diff/Engine/xdiff.php b/...omponents/Pear/Text/Diff/Engine/xdiff.php → ...omponents/Pear/Text/Diff/Engine/xdiff.php
diff --git a/.../gii/components/Pear/Text/Diff/Mapped.php → .../gii/components/Pear/Text/Diff/Mapped.php b/.../gii/components/Pear/Text/Diff/Mapped.php → .../gii/components/Pear/Text/Diff/Mapped.php
diff --git a/...ii/components/Pear/Text/Diff/Renderer.php → ...ii/components/Pear/Text/Diff/Renderer.php b/...ii/components/Pear/Text/Diff/Renderer.php → ...ii/components/Pear/Text/Diff/Renderer.php
diff --git a/...nents/Pear/Text/Diff/Renderer/context.php → ...nents/Pear/Text/Diff/Renderer/context.php b/...nents/Pear/Text/Diff/Renderer/context.php → ...nents/Pear/Text/Diff/Renderer/context.php
diff --git a/...onents/Pear/Text/Diff/Renderer/inline.php → ...onents/Pear/Text/Diff/Renderer/inline.php b/...onents/Pear/Text/Diff/Renderer/inline.php → ...onents/Pear/Text/Diff/Renderer/inline.php
diff --git a/...nents/Pear/Text/Diff/Renderer/unified.php → ...nents/Pear/Text/Diff/Renderer/unified.php b/...nents/Pear/Text/Diff/Renderer/unified.php → ...nents/Pear/Text/Diff/Renderer/unified.php
diff --git a/...ii/components/Pear/Text/Diff/ThreeWay.php → ...ii/components/Pear/Text/Diff/ThreeWay.php b/...ii/components/Pear/Text/Diff/ThreeWay.php → ...ii/components/Pear/Text/Diff/ThreeWay.php
diff --git a/framework/gii/components/Pear/Text/Diff3.php → ...mework/gii/components/Pear/Text/Diff3.php b/framework/gii/components/Pear/Text/Diff3.php → ...mework/gii/components/Pear/Text/Diff3.php
diff --git a/framework/gii/components/TextDiff.php → vendor/framework/gii/components/TextDiff.php b/framework/gii/components/TextDiff.php → vendor/framework/gii/components/TextDiff.php
diff --git a/framework/gii/components/UserIdentity.php → ...framework/gii/components/UserIdentity.php b/framework/gii/components/UserIdentity.php → ...framework/gii/components/UserIdentity.php
diff --git a/...ork/gii/controllers/DefaultController.php → ...ork/gii/controllers/DefaultController.php b/...ork/gii/controllers/DefaultController.php → ...ork/gii/controllers/DefaultController.php
diff --git a/.../generators/controller/ControllerCode.php → .../generators/controller/ControllerCode.php b/.../generators/controller/ControllerCode.php → .../generators/controller/ControllerCode.php
diff --git a/...rators/controller/ControllerGenerator.php → ...rators/controller/ControllerGenerator.php b/...rators/controller/ControllerGenerator.php → ...rators/controller/ControllerGenerator.php
diff --git a/...ntroller/templates/default/controller.php → ...ntroller/templates/default/controller.php b/...ntroller/templates/default/controller.php → ...ntroller/templates/default/controller.php
diff --git a/...ors/controller/templates/default/view.php → ...ors/controller/templates/default/view.php b/...ors/controller/templates/default/view.php → ...ors/controller/templates/default/view.php
diff --git a/...gii/generators/controller/views/index.php → ...gii/generators/controller/views/index.php b/...gii/generators/controller/views/index.php → ...gii/generators/controller/views/index.php
diff --git a/framework/gii/generators/crud/CrudCode.php → ...ramework/gii/generators/crud/CrudCode.php b/framework/gii/generators/crud/CrudCode.php → ...ramework/gii/generators/crud/CrudCode.php
diff --git a/...ork/gii/generators/crud/CrudGenerator.php → ...ork/gii/generators/crud/CrudGenerator.php b/...ork/gii/generators/crud/CrudGenerator.php → ...ork/gii/generators/crud/CrudGenerator.php
diff --git a/...nerators/crud/templates/default/_form.php → ...nerators/crud/templates/default/_form.php b/...nerators/crud/templates/default/_form.php → ...nerators/crud/templates/default/_form.php
diff --git a/...rators/crud/templates/default/_search.php → ...rators/crud/templates/default/_search.php b/...rators/crud/templates/default/_search.php → ...rators/crud/templates/default/_search.php
diff --git a/...nerators/crud/templates/default/_view.php → ...nerators/crud/templates/default/_view.php b/...nerators/crud/templates/default/_view.php → ...nerators/crud/templates/default/_view.php
diff --git a/...nerators/crud/templates/default/admin.php → ...nerators/crud/templates/default/admin.php b/...nerators/crud/templates/default/admin.php → ...nerators/crud/templates/default/admin.php
diff --git a/...ors/crud/templates/default/controller.php → ...ors/crud/templates/default/controller.php b/...ors/crud/templates/default/controller.php → ...ors/crud/templates/default/controller.php
diff --git a/...erators/crud/templates/default/create.php → ...erators/crud/templates/default/create.php b/...erators/crud/templates/default/create.php → ...erators/crud/templates/default/create.php
diff --git a/...nerators/crud/templates/default/index.php → ...nerators/crud/templates/default/index.php b/...nerators/crud/templates/default/index.php → ...nerators/crud/templates/default/index.php
diff --git a/...erators/crud/templates/default/update.php → ...erators/crud/templates/default/update.php b/...erators/crud/templates/default/update.php → ...erators/crud/templates/default/update.php
diff --git a/...enerators/crud/templates/default/view.php → ...enerators/crud/templates/default/view.php b/...enerators/crud/templates/default/view.php → ...enerators/crud/templates/default/view.php
diff --git a/...ework/gii/generators/crud/views/index.php → ...ework/gii/generators/crud/views/index.php b/...ework/gii/generators/crud/views/index.php → ...ework/gii/generators/crud/views/index.php
diff --git a/framework/gii/generators/form/FormCode.php → ...ramework/gii/generators/form/FormCode.php b/framework/gii/generators/form/FormCode.php → ...ramework/gii/generators/form/FormCode.php
diff --git a/...ork/gii/generators/form/FormGenerator.php → ...ork/gii/generators/form/FormGenerator.php b/...ork/gii/generators/form/FormGenerator.php → ...ork/gii/generators/form/FormGenerator.php
diff --git a/...erators/form/templates/default/action.php → ...erators/form/templates/default/action.php b/...erators/form/templates/default/action.php → ...erators/form/templates/default/action.php
diff --git a/...enerators/form/templates/default/form.php → ...enerators/form/templates/default/form.php b/...enerators/form/templates/default/form.php → ...enerators/form/templates/default/form.php
diff --git a/...ework/gii/generators/form/views/index.php → ...ework/gii/generators/form/views/index.php b/...ework/gii/generators/form/views/index.php → ...ework/gii/generators/form/views/index.php
diff --git a/framework/gii/generators/model/ModelCode.php → ...mework/gii/generators/model/ModelCode.php b/framework/gii/generators/model/ModelCode.php → ...mework/gii/generators/model/ModelCode.php
diff --git a/...k/gii/generators/model/ModelGenerator.php → ...k/gii/generators/model/ModelGenerator.php b/...k/gii/generators/model/ModelGenerator.php → ...k/gii/generators/model/ModelGenerator.php
diff --git a/...erators/model/templates/default/model.php → ...erators/model/templates/default/model.php b/...erators/model/templates/default/model.php → ...erators/model/templates/default/model.php
diff --git a/...work/gii/generators/model/views/index.php → ...work/gii/generators/model/views/index.php b/...work/gii/generators/model/views/index.php → ...work/gii/generators/model/views/index.php
diff --git a/...work/gii/generators/module/ModuleCode.php → ...work/gii/generators/module/ModuleCode.php b/...work/gii/generators/module/ModuleCode.php → ...work/gii/generators/module/ModuleCode.php
diff --git a/...gii/generators/module/ModuleGenerator.php → ...gii/generators/module/ModuleGenerator.php b/...gii/generators/module/ModuleGenerator.php → ...gii/generators/module/ModuleGenerator.php
diff --git a/...default/controllers/DefaultController.php → ...default/controllers/DefaultController.php b/...default/controllers/DefaultController.php → ...default/controllers/DefaultController.php
diff --git a/...ators/module/templates/default/module.php → ...ators/module/templates/default/module.php b/...ators/module/templates/default/module.php → ...ators/module/templates/default/module.php