From e3801fbf6bdf167c31f4f2bbb774f75659956d57 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Thu, 8 Aug 2013 20:00:48 -0400 Subject: [PATCH] Upgraded bootstrap to 3.0RC1. --- apps/advanced/backend/config/AppAsset.php | 2 +- apps/advanced/frontend/config/AppAsset.php | 2 +- apps/basic/config/AppAsset.php | 2 +- apps/basic/views/layouts/main.php | 33 +- apps/basic/views/site/contact.php | 30 +- apps/basic/views/site/index.php | 53 +- apps/basic/views/site/login.php | 18 +- apps/basic/web/css/site.css | 124 +- framework/yii/bootstrap/AffixAsset.php | 26 - framework/yii/bootstrap/AlertAsset.php | 26 - framework/yii/bootstrap/BootstrapAsset.php | 2 + framework/yii/bootstrap/BootstrapPluginAsset.php | 27 + framework/yii/bootstrap/ButtonAsset.php | 26 - framework/yii/bootstrap/CarouselAsset.php | 26 - framework/yii/bootstrap/CollapseAsset.php | 26 - framework/yii/bootstrap/DropdownAsset.php | 26 - framework/yii/bootstrap/ModalAsset.php | 26 - framework/yii/bootstrap/NavBar.php | 21 +- framework/yii/bootstrap/PopoverAsset.php | 24 - framework/yii/bootstrap/Progress.php | 6 +- framework/yii/bootstrap/ResponsiveAsset.php | 24 - framework/yii/bootstrap/ScrollspyAsset.php | 26 - framework/yii/bootstrap/TabAsset.php | 26 - framework/yii/bootstrap/TooltipAsset.php | 26 - framework/yii/bootstrap/TransitionAsset.php | 25 - framework/yii/bootstrap/TypeaheadAsset.php | 26 - framework/yii/bootstrap/Widget.php | 17 +- framework/yii/bootstrap/assets.php | 24 - .../bootstrap/assets/css/bootstrap-glyphicons.css | 2 + .../bootstrap/assets/css/bootstrap-responsive.css | 1109 --- .../assets/css/bootstrap-responsive.min.css | 9 - framework/yii/bootstrap/assets/css/bootstrap.css | 7236 ++++++++------------ .../yii/bootstrap/assets/css/bootstrap.min.css | 8 +- .../assets/fonts/glyphiconshalflings-regular.eot | Bin 0 -> 33358 bytes .../assets/fonts/glyphiconshalflings-regular.otf | Bin 0 -> 18116 bytes .../assets/fonts/glyphiconshalflings-regular.svg | 175 + .../assets/fonts/glyphiconshalflings-regular.ttf | Bin 0 -> 32896 bytes .../assets/fonts/glyphiconshalflings-regular.woff | Bin 0 -> 18944 bytes .../assets/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../bootstrap/assets/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes .../yii/bootstrap/assets/js/bootstrap-affix.js | 117 - .../yii/bootstrap/assets/js/bootstrap-alert.js | 99 - .../yii/bootstrap/assets/js/bootstrap-button.js | 105 - .../yii/bootstrap/assets/js/bootstrap-carousel.js | 207 - .../yii/bootstrap/assets/js/bootstrap-collapse.js | 167 - .../yii/bootstrap/assets/js/bootstrap-dropdown.js | 169 - .../yii/bootstrap/assets/js/bootstrap-modal.js | 247 - .../yii/bootstrap/assets/js/bootstrap-popover.js | 114 - .../yii/bootstrap/assets/js/bootstrap-scrollspy.js | 162 - framework/yii/bootstrap/assets/js/bootstrap-tab.js | 144 - .../yii/bootstrap/assets/js/bootstrap-tooltip.js | 361 - .../bootstrap/assets/js/bootstrap-transition.js | 60 - .../yii/bootstrap/assets/js/bootstrap-typeahead.js | 335 - framework/yii/bootstrap/assets/js/bootstrap.js | 1948 ++++++ framework/yii/bootstrap/assets/js/bootstrap.min.js | 6 + framework/yii/debug/DebugAsset.php | 2 +- framework/yii/debug/assets/main.css | 106 +- framework/yii/debug/panels/RequestPanel.php | 2 +- framework/yii/debug/views/default/index.php | 16 +- framework/yii/debug/views/default/toolbar.css | 2 +- framework/yii/debug/views/default/view.php | 32 +- framework/yii/helpers/HtmlBase.php | 34 +- framework/yii/widgets/ActiveField.php | 43 +- framework/yii/widgets/ActiveForm.php | 4 +- framework/yii/widgets/Breadcrumbs.php | 2 +- framework/yii/widgets/LinkPager.php | 15 +- framework/yii/widgets/LinkSorter.php | 15 +- 67 files changed, 5355 insertions(+), 8418 deletions(-) delete mode 100644 framework/yii/bootstrap/AffixAsset.php delete mode 100644 framework/yii/bootstrap/AlertAsset.php create mode 100644 framework/yii/bootstrap/BootstrapPluginAsset.php delete mode 100644 framework/yii/bootstrap/ButtonAsset.php delete mode 100644 framework/yii/bootstrap/CarouselAsset.php delete mode 100644 framework/yii/bootstrap/CollapseAsset.php delete mode 100644 framework/yii/bootstrap/DropdownAsset.php delete mode 100644 framework/yii/bootstrap/ModalAsset.php delete mode 100644 framework/yii/bootstrap/PopoverAsset.php delete mode 100644 framework/yii/bootstrap/ResponsiveAsset.php delete mode 100644 framework/yii/bootstrap/ScrollspyAsset.php delete mode 100644 framework/yii/bootstrap/TabAsset.php delete mode 100644 framework/yii/bootstrap/TooltipAsset.php delete mode 100644 framework/yii/bootstrap/TransitionAsset.php delete mode 100644 framework/yii/bootstrap/TypeaheadAsset.php delete mode 100644 framework/yii/bootstrap/assets.php create mode 100644 framework/yii/bootstrap/assets/css/bootstrap-glyphicons.css delete mode 100644 framework/yii/bootstrap/assets/css/bootstrap-responsive.css delete mode 100644 framework/yii/bootstrap/assets/css/bootstrap-responsive.min.css create mode 100644 framework/yii/bootstrap/assets/fonts/glyphiconshalflings-regular.eot create mode 100644 framework/yii/bootstrap/assets/fonts/glyphiconshalflings-regular.otf create mode 100644 framework/yii/bootstrap/assets/fonts/glyphiconshalflings-regular.svg create mode 100644 framework/yii/bootstrap/assets/fonts/glyphiconshalflings-regular.ttf create mode 100644 framework/yii/bootstrap/assets/fonts/glyphiconshalflings-regular.woff delete mode 100644 framework/yii/bootstrap/assets/img/glyphicons-halflings-white.png delete mode 100644 framework/yii/bootstrap/assets/img/glyphicons-halflings.png delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-affix.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-alert.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-button.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-carousel.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-collapse.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-dropdown.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-modal.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-popover.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-scrollspy.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-tab.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-tooltip.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-transition.js delete mode 100644 framework/yii/bootstrap/assets/js/bootstrap-typeahead.js create mode 100644 framework/yii/bootstrap/assets/js/bootstrap.js create mode 100644 framework/yii/bootstrap/assets/js/bootstrap.min.js diff --git a/apps/advanced/backend/config/AppAsset.php b/apps/advanced/backend/config/AppAsset.php index 944807a..90a850d 100644 --- a/apps/advanced/backend/config/AppAsset.php +++ b/apps/advanced/backend/config/AppAsset.php @@ -23,6 +23,6 @@ class AppAsset extends AssetBundle ); public $depends = array( 'yii\web\YiiAsset', - 'yii\bootstrap\ResponsiveAsset', + 'yii\bootstrap\BootstrapAsset', ); } diff --git a/apps/advanced/frontend/config/AppAsset.php b/apps/advanced/frontend/config/AppAsset.php index 0ba2c1d..1801661 100644 --- a/apps/advanced/frontend/config/AppAsset.php +++ b/apps/advanced/frontend/config/AppAsset.php @@ -23,6 +23,6 @@ class AppAsset extends AssetBundle ); public $depends = array( 'yii\web\YiiAsset', - 'yii\bootstrap\ResponsiveAsset', + 'yii\bootstrap\BootstrapAsset', ); } diff --git a/apps/basic/config/AppAsset.php b/apps/basic/config/AppAsset.php index 94369bf..3e22b9b 100644 --- a/apps/basic/config/AppAsset.php +++ b/apps/basic/config/AppAsset.php @@ -24,6 +24,6 @@ class AppAsset extends AssetBundle ); public $depends = array( 'yii\web\YiiAsset', - 'yii\bootstrap\ResponsiveAsset', + 'yii\bootstrap\BootstrapAsset', ); } diff --git a/apps/basic/views/layouts/main.php b/apps/basic/views/layouts/main.php index 5f8603f..2b32d5b 100644 --- a/apps/basic/views/layouts/main.php +++ b/apps/basic/views/layouts/main.php @@ -21,26 +21,19 @@ app\config\AppAsset::register($this); beginBody(); ?>
-

My Company

+

My Company

- - + array('class' => 'nav navbar-nav nav-justified'), + 'items' => array( + array('label' => 'Home', 'url' => array('/site/index')), + array('label' => 'About', 'url' => array('/site/about')), + array('label' => 'Contact', 'url' => array('/site/contact')), + Yii::$app->user->isGuest ? + array('label' => 'Login', 'url' => array('/site/login')) : + array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout')), + ), + )); ?>
-
-