Browse Source

Fixes issue #172: Added Object::className().

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
c5bad9ea1b
  1. 6
      apps/bootstrap/protected/views/layouts/main.php
  2. 4
      apps/bootstrap/protected/views/site/contact.php
  3. 4
      apps/bootstrap/protected/views/site/login.php
  4. 8
      framework/base/Object.php

6
apps/bootstrap/protected/views/layouts/main.php

@ -1,9 +1,11 @@
<?php <?php
use yii\helpers\Html;
use yii\widgets\Menu;
/** /**
* @var $this \yii\base\View * @var $this \yii\base\View
* @var $content string * @var $content string
*/ */
use yii\helpers\Html;
$this->registerAssetBundle('app'); $this->registerAssetBundle('app');
?> ?>
<?php $this->beginPage(); ?> <?php $this->beginPage(); ?>
@ -23,7 +25,7 @@ $this->registerAssetBundle('app');
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<?php $this->widget('yii\widgets\Menu', array( <?php $this->widget(Menu::className(), array(
'options' => array('class' => 'nav'), 'options' => array('class' => 'nav'),
'items' => array( 'items' => array(
array('label' => 'Home', 'url' => array('/site/index')), array('label' => 'Home', 'url' => array('/site/index')),

4
apps/bootstrap/protected/views/site/contact.php

@ -1,5 +1,7 @@
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
* @var yii\widgets\ActiveForm $form * @var yii\widgets\ActiveForm $form
@ -20,7 +22,7 @@ $this->params['breadcrumbs'][] = $this->title;
If you have business inquiries or other questions, please fill out the following form to contact us. Thank you. If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
</p> </p>
<?php $form = $this->beginWidget('yii\widgets\ActiveForm', array( <?php $form = $this->beginWidget(ActiveForm::className(), array(
'options' => array('class' => 'form-horizontal'), 'options' => array('class' => 'form-horizontal'),
'fieldConfig' => array('inputOptions' => array('class' => 'input-xlarge')), 'fieldConfig' => array('inputOptions' => array('class' => 'input-xlarge')),
)); ?> )); ?>

4
apps/bootstrap/protected/views/site/login.php

@ -1,5 +1,7 @@
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
* @var yii\widgets\ActiveForm $form * @var yii\widgets\ActiveForm $form
@ -12,7 +14,7 @@ $this->params['breadcrumbs'][] = $this->title;
<p>Please fill out the following fields to login:</p> <p>Please fill out the following fields to login:</p>
<?php $form = $this->beginWidget('yii\widgets\ActiveForm', array('options' => array('class' => 'form-horizontal'))); ?> <?php $form = $this->beginWidget(ActiveForm::className(), array('options' => array('class' => 'form-horizontal'))); ?>
<?php echo $form->field($model, 'username')->textInput(); ?> <?php echo $form->field($model, 'username')->textInput(); ?>
<?php echo $form->field($model, 'password')->passwordInput(); ?> <?php echo $form->field($model, 'password')->passwordInput(); ?>
<?php echo $form->field($model, 'rememberMe')->checkbox(); ?> <?php echo $form->field($model, 'rememberMe')->checkbox(); ?>

8
framework/base/Object.php

@ -15,6 +15,14 @@ namespace yii\base;
class Object class Object
{ {
/** /**
* @return string the fully qualified name of this class.
*/
public static function className()
{
return get_called_class();
}
/**
* Constructor. * Constructor.
* The default implementation does two things: * The default implementation does two things:
* *

Loading…
Cancel
Save