bs5 changes in ui

TonisOrmisson · Feb 23, 2024 · 978042d · 978042d
1 parent f74db56
commit 978042d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -18,8 +18,9 @@
     "php": ">=8.0.2",
     "ext-intl": "*",
     "yiisoft/yii2": "~2.0.5",
+    "yiisoft/yii2-bootstrap5": "^2.0",
     "yiisoft/yii2-bootstrap": "~2.0.0",
-    "egulias/email-validator":"^3.2"
+    "egulias/email-validator": "^3|^4"
   },
   "require-dev": {
     "andmemasin/yii2-myabstract": "^5.0",
@@ -44,7 +45,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0.x-dev"
+      "dev-master": "2.0.x-dev"
     }
   },
 

diff --git a/src/controllers/SiteController.php b/src/controllers/SiteController.php
@@ -64,7 +64,7 @@ public function actionIndex()
             }
             Yii::$app->session->addFlash('success',Yii::t('app','Checked {count} e-mails in {duration}!',[
                 'count'=>count($model->emailAddresses),
-                'duration'=>$formatter->asDuration(Yii::getLogger()->getElapsedTime())
+                'duration'=>$formatter->asDuration((int)Yii::getLogger()->getElapsedTime())
             ]));
         }
         return $this->render('index', [

diff --git a/src/views/site/_validation-list.php b/src/views/site/_validation-list.php
@@ -86,10 +86,10 @@
 
 ?>
 <?php if($model->emailAddresses):?>
-    <div class="panel panel-primary email-validation-results" id="email-validation-results">
-        <div class="panel-heading"><?= Yii::t('app','Results')?></div>
+    <div class="card card-primary email-validation-results" id="email-validation-results">
+        <div class="card-header"><?= Yii::t('app','Results')?></div>
 
-        <div class="panel-body">
+        <div class="card-body">
             <?= \yii\grid\GridView::widget([
                 'dataProvider' => $dataProvider,
                 'columns' => $columns

diff --git a/src/views/site/index.php b/src/views/site/index.php
@@ -3,7 +3,7 @@
 use andmemasin\emailsvalidator\models\EmailsValidationForm;
 use yii\widgets\ActiveForm;
 use yii\helpers\Html;
-use yii\bootstrap\Alert;
+use yii\bootstrap5\Alert;
 
 /* @var $this yii\web\View */
 /* @var EmailsValidationForm $model */
@@ -32,14 +32,14 @@
     <?php endif;?>
 
 
-    <div class="panel panel-default email-validation-results" id="email-validation-results">
-        <div class="panel-heading">
+    <div class="card card-default email-validation-results" id="email-validation-results">
+        <div class="card-header">
             <?= Yii::t('app','Input')?>
-            <a class="pull-right btn btn-default btn-xs" data-toggle="collapse" href="#emails-validation-input"><?=Yii::t('app','Show/hide')?></a>
+            <div class="float-right btn btn-default btn-xs" data-bs-toggle="collapse" data-bs-target="#emails-validation-input"><?=Yii::t('app','Show/hide')?></div>
         </div>
 
-        <div id="emails-validation-input" class="panel-collapse collapse <?=(count($model->emailAddresses)>0 ? null:'in')?>">
-            <div class="panel-body ">
+        <div id="emails-validation-input" class="card-collapse collapse <?=(count($model->emailAddresses)>0 ? null:'in')?>">
+            <div class="card-body ">
                 <?php $form = ActiveForm::begin() ?>
                 <?= $form->field($model, 'textInput')->textarea(['rows'=>10]); ?>