fix: i18n and widget for yii2 2.0.22

krissss · Jul 15, 2019 · 7f79863 · 7f79863
1 parent f7363ed
commit 7f79863
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -17,9 +17,10 @@
  "yiisoft/yii2": "~2.0.6"
  },
  "suggest": {
- "dmstr/yii2-adminlte-asset": "^2.5",
- "kartik-v/yii2-dynagrid": "^1.4",
- "kartik-v/yii2-datecontrol": "^1.9"
+ "dmstr/yii2-adminlte-asset": "admin theme",
+ "kartik-v/yii2-dynagrid": "index list",
+ "kartik-v/yii2-datecontrol": "date picker",
+ "kartik-v/yii2-widget-activeform": "form"
  },
  "autoload": {
  "psr-4": {

diff --git a/widgets/BaseViewWidget.php b/widgets/BaseViewWidget.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\kriss\widgets;
+namespace kriss\widgets;
 
 use yii\base\Widget;
 

diff --git a/widgets/SimpleActiveForm.php b/widgets/SimpleActiveForm.php
@@ -72,8 +72,8 @@ public function run()
  {$header}
  <div class="box-body">
  {$content}
+ {$footer}
  </div>
- {$footer}
  {$endFrom}
 </div>
 HTML;

diff --git a/widgets/SimpleAjaxForm.php b/widgets/SimpleAjaxForm.php
@@ -2,7 +2,7 @@
 
 namespace kriss\widgets;
 
-use kartik\widgets\ActiveForm;
+use kartik\form\ActiveForm;
 use Yii;
 use yii\base\Widget;
 use yii\helpers\Html;
@@ -87,7 +87,7 @@ protected function renderHeader()
  $header = '';
  if ($this->header || $this->renderCancel) {
  $cancelButton = $this->renderCancel ? '<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>' : '';
- $headerTitle = $this->header ? Html::tag('h4', $this->header, ['class' => 'model-title']) : '';
+ $headerTitle = $this->header ? Html::tag('h4', $this->header, ['class' => 'modal-title']) : '';
  $header = Html::tag('div', $cancelButton . $headerTitle, ['class' => 'modal-header']);
  }
  return $header;

diff --git a/widgets/SimpleAjaxView.php b/widgets/SimpleAjaxView.php
@@ -2,7 +2,6 @@
 
 namespace kriss\widgets;
 
-use app\kriss\widgets\BaseViewWidget;
 use Yii;
 use yii\helpers\Html;
 

diff --git a/widgets/SimpleBoxView.php b/widgets/SimpleBoxView.php
@@ -2,7 +2,6 @@
 
 namespace kriss\widgets;
 
-use app\kriss\widgets\BaseViewWidget;
 use Yii;
 use yii\helpers\Html;
 

diff --git a/widgets/SimpleSearchForm.php b/widgets/SimpleSearchForm.php
@@ -97,15 +97,15 @@ public function run()
  $endFrom = Html::endForm();
 
  $html = <<<HTML
-<div class="box box-default {$collapsedClass}">
- {$beginForm}
+{$beginForm}
+<div class="box box-default {$collapsedClass}"> 
  {$header}
  <div class="box-body">
  {$content}
+ {$footer}
  </div>
- {$footer}
- {$endFrom}
 </div>
+{$endFrom}
 HTML;
  return $html;
  }
@@ -116,7 +116,8 @@ protected function renderHeader($collapsedToolsClass)
 <div class="box-header with-border">
  <h3 class="box-title">{$this->header}</h3>
  <div class="box-tools pull-right">
- <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa $collapsedToolsClass"></i>
+ <button type="button" class="btn btn-box-tool" data-widget="collapse">
+ <i class="fa $collapsedToolsClass"></i>
  </button>
  </div>
 </div>