php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 23:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2644 from tof06/2643-add-modal-size-attribute

Browse Source 
Add size attribute to Modal
This commit is contained in:
Alexander Makarov
2014-03-06 16:28:58 +03:00
parent bdce87b242 6f49e46609
commit 5433aeccc8
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/bootstrap/CHANGELOG.md
View File

@@ -12,9 +12,11 @@ Yii Framework 2 bootstrap extension Change Log
- Enh #1601: Added support for tagName and encodeLabel parameters in ButtonDropdown (omnilight) - Enh #1601: Added support for tagName and encodeLabel parameters in ButtonDropdown (omnilight)
- Enh #1881: Improved `yii\bootstrap\NavBar` with `containerOptions`, `innerContainerOptions` and `renderInnerContainer` (creocoder) - Enh #1881: Improved `yii\bootstrap\NavBar` with `containerOptions`, `innerContainerOptions` and `renderInnerContainer` (creocoder)
- Enh #2425: Tabs widget now selects first tab if no active tab is specified (samdark) - Enh #2425: Tabs widget now selects first tab if no active tab is specified (samdark)
- Enh #2643: Add size attribute to Modal (tof06)
- Chg #1459: Update Collapse to use bootstrap 3 classes (tonydspaniard) - Chg #1459: Update Collapse to use bootstrap 3 classes (tonydspaniard)
- Chg #1820: Update Progress to use bootstrap 3 markup (samdark) - Chg #1820: Update Progress to use bootstrap 3 markup (samdark)
2.0.0 alpha, December 1, 2013 2.0.0 alpha, December 1, 2013
----------------------------- -----------------------------

10
extensions/bootstrap/Modal.php
View File

@@ -35,6 +35,10 @@ use yii\helpers\Html;
*/ */
class Modal extends Widget class Modal extends Widget
{ {
const SIZE_LARGE = "modal-lg";
const SIZE_SMALL = "modal-sm";
const SIZE_DEFAULT = "";
/** /**
* @var string the header content in the modal window. * @var string the header content in the modal window.
*/ */
@@ -43,6 +47,10 @@ class Modal extends Widget
* @var string the footer content in the modal window. * @var string the footer content in the modal window.
*/ */
public $footer; public $footer;
/**
* @var string the modal size. Can be MODAL_LG or MODAL_SM, or empty for default.
*/
public $size;
/** /**
* @var array the options for rendering the close button tag. * @var array the options for rendering the close button tag.
* The close button is displayed in the header of the modal window. Clicking * The close button is displayed in the header of the modal window. Clicking
@@ -86,7 +94,7 @@ class Modal extends Widget
echo $this->renderToggleButton() . "\n"; echo $this->renderToggleButton() . "\n";
echo Html::beginTag('div', $this->options) . "\n"; echo Html::beginTag('div', $this->options) . "\n";
echo Html::beginTag('div', ['class' => 'modal-dialog']) . "\n"; echo Html::beginTag('div', ['class' => 'modal-dialog ' . $this->size]) . "\n";
echo Html::beginTag('div', ['class' => 'modal-content']) . "\n"; echo Html::beginTag('div', ['class' => 'modal-content']) . "\n";
echo $this->renderHeader() . "\n"; echo $this->renderHeader() . "\n";
echo $this->renderBodyBegin() . "\n"; echo $this->renderBodyBegin() . "\n";