Browse Source

Merge pull request #1093 from mongosoft/master

code style
tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
08c844f318
  1. 2
      apps/advanced/frontend/views/site/contact.php
  2. 2
      apps/basic/views/site/contact.php
  3. 2
      apps/basic/views/site/login.php
  4. 4
      framework/yii/gii/views/default/view.php
  5. 2
      framework/yii/views/errorHandler/exception.php

2
apps/advanced/frontend/views/site/contact.php

@ -28,7 +28,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [ <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
'options' => ['class' => 'form-control'], 'options' => ['class' => 'form-control'],
'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>', 'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
]); ?> ]) ?>
<div class="form-group"> <div class="form-group">
<?= Html::submitButton('Submit', ['class' => 'btn btn-primary']) ?> <?= Html::submitButton('Submit', ['class' => 'btn btn-primary']) ?>
</div> </div>

2
apps/basic/views/site/contact.php

@ -36,7 +36,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [ <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
'options' => ['class' => 'form-control'], 'options' => ['class' => 'form-control'],
'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>', 'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
]); ?> ]) ?>
<div class="form-group"> <div class="form-group">
<?= Html::submitButton('Submit', ['class' => 'btn btn-primary']) ?> <?= Html::submitButton('Submit', ['class' => 'btn btn-primary']) ?>
</div> </div>

2
apps/basic/views/site/login.php

@ -30,7 +30,7 @@ $this->params['breadcrumbs'][] = $this->title;
<?= $form->field($model, 'rememberMe', [ <?= $form->field($model, 'rememberMe', [
'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>", 'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
])->checkbox(); ?> ])->checkbox() ?>
<div class="form-group"> <div class="form-group">
<div class="col-lg-offset-1 col-lg-11"> <div class="col-lg-offset-1 col-lg-11">

4
framework/yii/gii/views/default/view.php

@ -37,12 +37,12 @@ foreach ($generator->templates as $name => $path) {
<?= $this->renderFile($generator->formView(), [ <?= $this->renderFile($generator->formView(), [
'generator' => $generator, 'generator' => $generator,
'form' => $form, 'form' => $form,
]); ?> ]) ?>
<?= $form->field($generator, 'template')->sticky() <?= $form->field($generator, 'template')->sticky()
->label('Code Template') ->label('Code Template')
->dropDownList($templates)->hint(' ->dropDownList($templates)->hint('
Please select which set of the templates should be used to generated the code. Please select which set of the templates should be used to generated the code.
'); ?> ') ?>
<div class="form-group"> <div class="form-group">
<?= Html::submitButton('Preview', ['name' => 'preview', 'class' => 'btn btn-primary']) ?> <?= Html::submitButton('Preview', ['name' => 'preview', 'class' => 'btn btn-primary']) ?>

2
framework/yii/views/errorHandler/exception.php

@ -368,7 +368,7 @@ pre .diff .change{
<?= $handler->renderCallStackItem($exception->getFile(), $exception->getLine(), null, null, 1) ?> <?= $handler->renderCallStackItem($exception->getFile(), $exception->getLine(), null, null, 1) ?>
<?php for ($i = 0, $trace = $exception->getTrace(), $length = count($trace); $i < $length; ++$i): ?> <?php for ($i = 0, $trace = $exception->getTrace(), $length = count($trace); $i < $length; ++$i): ?>
<?= $handler->renderCallStackItem(@$trace[$i]['file'] ?: null, @$trace[$i]['line'] ?: null, <?= $handler->renderCallStackItem(@$trace[$i]['file'] ?: null, @$trace[$i]['line'] ?: null,
@$trace[$i]['class'] ?: null, @$trace[$i]['function'] ?: null, $i + 2); ?> @$trace[$i]['class'] ?: null, @$trace[$i]['function'] ?: null, $i + 2) ?>
<?php endfor; ?> <?php endfor; ?>
</ul> </ul>
</div> </div>

Loading…
Cancel
Save