simplify form view(s)

schmunk42 · Mar 27, 2023 · f33a31c · f33a31c
1 parent 4cd779f
commit f33a31c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/src/generators/crud/default/views/_form-fields.php b/src/generators/crud/default/views/_form-fields.php
@@ -15,11 +15,10 @@
  * @var <?= ltrim($generator->modelClass, '\\') ?> $model
  * @var yii\widgets\ActiveForm $form
  */
-
 ?>
 <?php
 foreach ($safeAttributes as $attribute) {
-    echo "\n\n\t<!-- attribute $attribute -->\n";
+    echo "\n\n<!-- attribute $attribute -->\n";
     $prepend = $generator->prependActiveField($attribute, $model);
     $field = $generator->activeField($attribute, $model);
     $append = $generator->appendActiveField($attribute, $model);

diff --git a/src/generators/crud/default/views/_form.php b/src/generators/crud/default/views/_form.php
@@ -49,32 +49,18 @@
     );
     ?>
 
-    <div class="">
-        <?php echo "<?php \$this->beginBlock('main'); ?>\n"; ?>
-        <div class="form-fields">
-            <?php echo "<?php echo \$this->render('_form-fields', ['form' => \$form, 'model' => \$model])?>\n"?>
-        </div>
-        <?php echo '<?php $this->endBlock(); ?>'; ?>
-
         <?php
-        $label = substr(strrchr($model::class, '\\'), 1);
-
-        $items = <<<EOS
-[
-    'label'   => Yii::t('$generator->modelMessageCategory', '$label'),
-    'content' => \$this->blocks['main'],
-    'active'  => true,
-],
-EOS;
-        ?>
-
-        <?=
-        "<?=
+        $label = $generator->generateString(substr(strrchr($model::class, '\\'), 1));
+        echo "<?=
     Tabs::widget(
                  [
                     'encodeLabels' => false,
                     'items' => [ 
-                        $items
+                        [
+                            'label'   => $label,
+                            'content' => \$this->render('_form-fields', ['form' => \$form, 'model' => \$model]),
+                            'active'  => true,
+                        ]
                     ]
                  ]
     );
@@ -97,7 +83,5 @@
 
         <?= '<?php ' ?>ActiveForm::end(); ?>
 
-    </div>
-
 </div>