Merge pull request #1 from woodroow/bugfix

Bugfix

Author: phpNT

.gitignore

@@ -1,4 +1,5 @@
-# Composer
-vendor/
-composer.lock
-composer.phar
+# Composer
+vendor/
+composer.lock
+composer.phar
+/nbproject/private/

ImageLoadWidget.php

@@ -33,6 +33,8 @@ class ImageLoadWidget extends Widget
     public $updateImageText     = 'Изменить фото';
     public $deleteImageText     = 'Удалить фото';
     public $headerModal         = 'Загрузить аватар';   // заголовок в модальном окне
+    public $buttonClass         = 'btm btn-info';       // класс для кнопок - загрузить/обновить
+    public $previewSize         = 'file_small';         // размер изображения для превью(либо file_small, либо просто file)
     public $sizeModal           = 'modal-lg';           // размер модального окна
     public $frontendUrl         = '';
     public $baseUrl             = '@webroot';           // алиас к изображениям
@@ -153,6 +155,8 @@ public function registerClientScriptMany()
                         image_id: window.idImage,
                         images_num: "$this->images_num",
                         images_label: "$this->images_label",
+                        buttonClass: "$this->buttonClass",
+                        previewSize: "$this->previewSize",
                         images_temp: "$this->images_temp",
                         imageSmallWidth: "$this->imageSmallWidth",
                         imageSmallHeight: "$this->imageSmallHeight",
@@ -271,6 +275,8 @@ public function registerClientScriptOne()
                         image_id: window.idImage,
                         images_num: "$this->images_num",
                         images_label: "$this->images_label",
+                        buttonClass: "$this->buttonClass",
+                        previewSize: "$this->previewSize",
                         images_temp: "$this->images_temp",
                         imageSmallWidth: "$this->imageSmallWidth",
                         imageSmallHeight: "$this->imageSmallHeight",

README.md

@@ -69,6 +69,8 @@ use phpnt\cropper\ImageLoadWidget;
             'imageSmallHeight' => 750,                                      // высота миниатюры
             'imagePath' => '/uploads/avatars/',                             // путь, куда будут записыватся изображения относительно алиаса
             'noImage' => 2,                                                 // 1 - no-logo, 2 - no-avatar, 3 - no-img или путь к другой картинке
+            'buttonClass'=> 'btm btn-info',                                 // класс кнопки "обновить аватар"/"загрузить аватар" / по умолчанию btm btn-info
+            'previewSize'=> 'file',                                         // размер изображения для превью(либо file_small, либо просто file)
             'pluginOptions' => [                                            // настройки плагина
                 'aspectRatio' => 1/1,                                       // установите соотношение сторон рамки обрезки. По умолчанию свободное отношение.
                 'strict' => false,                                          // true - рамка не может вызодить за холст, false - может

composer.json

@@ -16,7 +16,7 @@
             "homepage": "http://phpnt.com"
         }
     ],
-    "require": {
+    "require": { 
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",
         "bower-asset/cropper": "*",

controllers/ImagesController.php

@@ -49,6 +49,8 @@ public function actionAutoloadImage()
                 'object_id'                 => $imageData['object_id'],
                 'images_num'                => $imageData['images_num'],
                 'images_label'              => $imageData['images_label'],
+                'buttonClass'               => $imageData['buttonClass'],
+                'previewSize'               => $imageData['previewSize'],
                 'images_temp'               => $imageData['images_temp'],
                 'imageSmallWidth'           => $imageData['imageSmallWidth'],
                 'imageSmallHeight'          => $imageData['imageSmallHeight'],
@@ -102,6 +104,8 @@ public function actionDeleteImage()
                 'object_id'                 => $imageData['object_id'],
                 'images_num'                => $imageData['images_num'],
                 'images_label'              => $imageData['images_label'],
+                'buttonClass'               => $imageData['buttonClass'],
+                'previewSize'               => $imageData['previewSize'],
                 'images_temp'               => $imageData['images_temp'],
                 'imageSmallWidth'           => $imageData['imageSmallWidth'],
                 'imageSmallHeight'          => $imageData['imageSmallHeight'],

nbproject/project.properties

@@ -0,0 +1,7 @@
+include.path=${php.global.include.path}
+php.version=PHP_56
+source.encoding=UTF-8
+src.dir=.
+tags.asp=false
+tags.short=false
+web.root=.

nbproject/project.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.php.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/php-project/1">
+            <name>yii2-cropper</name>
+        </data>
+    </configuration>
+</project>

views/_image.php

@@ -66,18 +66,18 @@
 <?php
 if ($imagesObject):
     foreach($imagesObject as $image):
-        $imageFileSmall = $frontendUrl.$image->file_small; ?>
+        $imageFileSmall = $frontendUrl.$image->$previewSize; ?>
         <div class="<?= $imageContainerClass ?> image-padding">
             <?= Html::button('', ['class' => $buttonDeleteClass, 'onClick' => "window.idImage = '".$image->id."'; deleteImage(event);"]); ?>
             <?= Html::img($imageFileSmall, ['class' => $imageClass, 'onclick' => "window.idImage = '".$image->id."'; $('#imageform-image-$id').click();"]); ?>
-            <?= Html::button($updateImageText, ['class' => 'btm btn-info', 'style' => 'width: 100%;', 'onclick' => "window.idImage = '".$image->id."'; $('#imageform-image-$id').click();"]) ?>
+            <?= Html::button($updateImageText, ['class' => $buttonClass, 'style' => 'width: 100%;', 'onclick' => "window.idImage = '".$image->id."'; $('#imageform-image-$id').click();"]) ?>
         </div>
     <?php endforeach;
 else:
     ?>
     <div class="<?= $imageContainerClass; ?> image-padding">
         <?= Html::img($noImage, ['class' => $imageClass, 'onclick' => "window.idImage = 0; $('#imageform-image-$id').click();"]); ?>
-        <?= Html::button($createImageText, ['class' => 'btm btn-info', 'style' => 'width: 100%;', 'onclick' => " window.idImage = 0; $('#imageform-image-$id').click();"]) ?>
+        <?= Html::button($createImageText, ['class' => $buttonClass, 'style' => 'width: 100%;', 'onclick' => " window.idImage = 0; $('#imageform-image-$id').click();"]) ?>
     </div>
     <?php
 endif;
@@ -92,6 +92,8 @@
 echo Html::input('hidden', 'imageData[imageSmallWidth]', $imageSmallWidth);
 echo Html::input('hidden', 'imageData[imageSmallHeight]', $imageSmallHeight);
 echo Html::input('hidden', 'imageData[createImageText]', $createImageText);
+echo Html::input('hidden', 'imageData[buttonClass]', $buttonClass);
+echo Html::input('hidden', 'imageData[previewSize]', $previewSize);
 echo Html::input('hidden', 'imageData[updateImageText]', $updateImageText);
 echo Html::input('hidden', 'imageData[deleteImageText]', $deleteImageText);
 echo Html::input('hidden', 'imageData[frontendUrl]', $frontendUrl);

views/view.php

@@ -21,6 +21,8 @@
         'images_label'              => $widget->images_label,
         'images_temp'               => $widget->images_temp,
         'imageSmallWidth'           => $widget->imageSmallWidth,
+        'buttonClass'               => $widget->buttonClass,
+        'previewSize'               => $widget->previewSize,
         'imageSmallHeight'          => $widget->imageSmallHeight,
         'imagesObject'              => $widget->imagesObject,
         'modelImageForm'            => $modelImageForm,