...

pavlinter · Mar 24, 2016 · 8817fc8 · 8817fc8
1 parent 3d040b3
commit 8817fc8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/admpages2/Module.php b/admpages2/Module.php
@@ -119,12 +119,6 @@ public function init()
             unset($this->pageTypes['page']);
         }
 
-        if (!isset($this->pageLayouts['page-image'])) {
-            $this->pageLayouts = ['page-image' => self::t('layouts', 'Page + image', ['dot' => false])] + $this->pageLayouts;
-        } else if($this->pageLayouts['page-image'] === false) {
-            unset($this->pageLayouts['page-image']);
-        }
-
         if (!isset($this->pageLayouts['page'])) {
             $this->pageLayouts = ['page' => self::t('layouts', 'Page', ['dot' => false])] + $this->pageLayouts;
         } else if($this->pageLayouts['page'] === false) {

diff --git a/admpages2/controllers/DefaultController.php b/admpages2/controllers/DefaultController.php
@@ -82,7 +82,7 @@ public function actionIndex($alias)
             }
         }
 
-        return $this->render('@vendor/pavlinter/yii2-adm-pages2/admpages/views/default/' . $model->layout, [
+        return $this->render('@vendor/pavlinter/yii2-adm-pages2/admpages2/views/default/' . $model->layout, [
             'model' => $model,
         ]);
     }
@@ -137,7 +137,7 @@ public function actionMain()
             }
         }
 
-        return $this->render('@vendor/pavlinter/yii2-adm-pages2/admpages/views/default/' . $model->layout, [
+        return $this->render('@vendor/pavlinter/yii2-adm-pages2/admpages2/views/default/' . $model->layout, [
             'model' => $model,
         ]);
     }

diff --git a/admpages2/controllers/PageController.php b/admpages2/controllers/PageController.php
@@ -77,7 +77,7 @@ public function actionFiles($id, $id_parent = null)
             $id_parent = 0;
         }
 
-        $elfinderData = []; //for https://github.com/pavlinter/yii2-app-core
+        $elfinderData = []; //for https://github.com/pavlinter/yii2-adm-app
         $elfinderData['w'] = isset($files[$model->type]['maxWidth']) ? $files[$model->type]['maxWidth'] : 0;
         $elfinderData['h'] = isset($files[$model->type]['maxHeight']) ? $files[$model->type]['maxWidth'] : 0;
         $elfinderData['watermark'] = isset($files[$model->type]['watermark']) && $files[$model->type]['watermark']? 1 : 0;

diff --git a/admpages2/views/page/_form.php b/admpages2/views/page/_form.php
@@ -141,10 +141,10 @@
             <div class="col-xs-6 col-sm-4 col-md-4">
                 <?= $form->field($model, 'weight')->textInput(['maxlength' => 10]) ?>
             </div>
-            <div class="col-xs-6 col-sm-4 col-md-4 form-without-label">
+            <div class="col-xs-6 col-sm-4 col-md-2 form-without-label">
                 <?= $form->field($model, 'active', ["template" => "{input}\n{label}\n{hint}\n{error}"])->widget(CheckboxX::classname(), ['pluginOptions'=>['threeState' => false]]); ?>
             </div>
-            <div class="col-xs-6 col-sm-4 col-md-4 form-without-label">
+            <div class="col-xs-6 col-sm-4 col-md-2 form-without-label">
                 <?= $form->field($model, 'visible', ["template" => "{input}\n{label}\n{hint}\n{error}"])->widget(CheckboxX::classname(), ['pluginOptions'=>['threeState' => false]]); ?>
             </div>
         </div>