Commit 6c1a3f755e39000be2982c15ed2c74a7f0a83c28
Merge remote-tracking branch 'origin/master'
Showing
14 changed files
with
149 additions
and
468 deletions
Show diff stats
backend/views/specialization/_form.php
| @@ -27,7 +27,7 @@ use \kartik\color\ColorInput; | @@ -27,7 +27,7 @@ use \kartik\color\ColorInput; | ||
| 27 | 'options' => ['placeholder' => 'Select color ...'], | 27 | 'options' => ['placeholder' => 'Select color ...'], |
| 28 | ]); | 28 | ]); |
| 29 | 29 | ||
| 30 | - echo \common\widgets\ImageUploader::widget([ | 30 | + echo common\modules\file\widgets\ImageUploader::widget([ |
| 31 | 'model'=> $model, | 31 | 'model'=> $model, |
| 32 | 'field'=>'image', | 32 | 'field'=>'image', |
| 33 | 'width'=>940, | 33 | 'width'=>940, |
common/models/Portfolio.php
common/widgets/ImageUploader.php renamed to common/modules/file/widgets/ImageUploaderInput.php
| @@ -6,17 +6,16 @@ | @@ -6,17 +6,16 @@ | ||
| 6 | * Time: 16:18 | 6 | * Time: 16:18 |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | -namespace common\widgets; | ||
| 10 | -use yii\base\Widget; | 9 | +namespace common\modules\file\widgets; |
| 10 | +use yii\bootstrap\Html; | ||
| 11 | +use yii\widgets\InputWidget; | ||
| 11 | 12 | ||
| 12 | 13 | ||
| 13 | -class ImageUploader extends Widget | 14 | +class ImageUploaderInput extends InputWidget |
| 14 | { | 15 | { |
| 15 | public $height = 0; | 16 | public $height = 0; |
| 16 | public $width = 0; | 17 | public $width = 0; |
| 17 | - public $field; | ||
| 18 | public $file; | 18 | public $file; |
| 19 | - public $model; | ||
| 20 | public $multi = false; | 19 | public $multi = false; |
| 21 | public $gallery; | 20 | public $gallery; |
| 22 | public $size; | 21 | public $size; |
| @@ -37,7 +36,7 @@ class ImageUploader extends Widget | @@ -37,7 +36,7 @@ class ImageUploader extends Widget | ||
| 37 | [ | 36 | [ |
| 38 | 'model'=>$this->model, | 37 | 'model'=>$this->model, |
| 39 | 'size' => $this->size, | 38 | 'size' => $this->size, |
| 40 | - 'field' => $this->field, | 39 | + 'field' => $this->attribute, |
| 41 | 'height' => $this->height, | 40 | 'height' => $this->height, |
| 42 | 'width' => $this->width, | 41 | 'width' => $this->width, |
| 43 | 'multi' => $this->multi, | 42 | 'multi' => $this->multi, |
common/widgets/ImageResizer.php deleted
| 1 | -<?php | ||
| 2 | -namespace common\widgets; | ||
| 3 | - | ||
| 4 | -use yii\web\UploadedFile; | ||
| 5 | -use common\models\ImageSizerForm; | ||
| 6 | -use yii\base\Widget; | ||
| 7 | -use Imagine\Image\Box; | ||
| 8 | -use yii\imagine\Image; | ||
| 9 | -use Yii; | ||
| 10 | -use Imagine\Gd\Imagine; | ||
| 11 | - | ||
| 12 | -class ImageResizer extends Widget | ||
| 13 | -{ | ||
| 14 | - | ||
| 15 | - public $height; | ||
| 16 | - public $width; | ||
| 17 | - | ||
| 18 | - public function init(){ | ||
| 19 | - | ||
| 20 | - parent::init(); | ||
| 21 | - | ||
| 22 | - } | ||
| 23 | - | ||
| 24 | - public function run(){ | ||
| 25 | - | ||
| 26 | - $model = new ImageSizerForm(); | ||
| 27 | - | ||
| 28 | - $request = Yii::$app->request->post(); | ||
| 29 | - | ||
| 30 | - if ($request) { | ||
| 31 | - | ||
| 32 | - if(isset($request['old_img'])){ | ||
| 33 | - $this->deleteImages($request['old_img']); | ||
| 34 | - } | ||
| 35 | - | ||
| 36 | - | ||
| 37 | - $model->file = UploadedFile::getInstance($model, 'file'); | ||
| 38 | - | ||
| 39 | - if(!$model->file){ | ||
| 40 | - return json_encode(["error"=>"Не указан файл"]); | ||
| 41 | - } | ||
| 42 | - | ||
| 43 | - $md5_file = md5_file($model->file->tempName); | ||
| 44 | - | ||
| 45 | - $imgDir = Yii::getAlias('@storage/'.$md5_file.'/'); | ||
| 46 | - | ||
| 47 | - $imageOrigAlias = Yii::getAlias($imgDir.'original'.'.'.$model->file->extension); | ||
| 48 | - | ||
| 49 | - if(!is_dir($imgDir)) { | ||
| 50 | - mkdir($imgDir, 0755, true); | ||
| 51 | - } | ||
| 52 | - | ||
| 53 | - $model->file->saveAs($imageOrigAlias); | ||
| 54 | - | ||
| 55 | - if($request['width'] && $request['height']){ | ||
| 56 | - | ||
| 57 | - $imageAlias = Yii::getAlias($imgDir.$request['width'].'x'.$request['height'].'.'.$model->file->extension); | ||
| 58 | - | ||
| 59 | - $imageLink = '/storage/'.$md5_file.'/'.$request['width'].'x'.$request['height'].'.'.$model->file->extension; | ||
| 60 | - | ||
| 61 | - $this->resizeImg($request['width'],$request['height'], $imageOrigAlias,$imageAlias); | ||
| 62 | - | ||
| 63 | - } else { | ||
| 64 | - | ||
| 65 | - $imageLink = '/storage/'.$md5_file.'/'.'original'.'.'.$model->file->extension; | ||
| 66 | - | ||
| 67 | - } | ||
| 68 | - | ||
| 69 | - | ||
| 70 | - if($model->multi){ | ||
| 71 | -// $view = $this->renderPartial('@app/components/views/_gallery_item', [ | ||
| 72 | -// 'item' => ['image'=>$imageLink], | ||
| 73 | -// ]); | ||
| 74 | -// | ||
| 75 | -// return json_encode(['link'=>$imageLink, 'view' =>$view]); | ||
| 76 | - | ||
| 77 | - | ||
| 78 | - } else { | ||
| 79 | - $p1[0] = "<img style='height:160px' src='$imageLink' class='file-preview-image'>"; | ||
| 80 | - return json_encode(['success','initialPreview' => $p1, 'append' => false, 'name' =>$imageLink,]); | ||
| 81 | - } | ||
| 82 | - | ||
| 83 | - | ||
| 84 | - } else { | ||
| 85 | - return json_encode(['error']); | ||
| 86 | - } | ||
| 87 | - | ||
| 88 | - | ||
| 89 | - | ||
| 90 | - | ||
| 91 | - } | ||
| 92 | - | ||
| 93 | - | ||
| 94 | - public function isBigger($width,$height,$w,$h) | ||
| 95 | - { | ||
| 96 | - if($width>$w){ | ||
| 97 | - return true; | ||
| 98 | - }else if($height >$h) { | ||
| 99 | - return true; | ||
| 100 | - } | ||
| 101 | - return false; | ||
| 102 | - } | ||
| 103 | - | ||
| 104 | - | ||
| 105 | - | ||
| 106 | - | ||
| 107 | - | ||
| 108 | - public function resizeImg($w, $h, $imageAlias,$imageAliasSave) | ||
| 109 | - { | ||
| 110 | - $img = Image::getImagine()->open(Yii::getAlias($imageAlias)); | ||
| 111 | - | ||
| 112 | - $size = $img->getSize(); | ||
| 113 | - | ||
| 114 | - $width = $size->getWidth(); | ||
| 115 | - $height = $size->getHeight(); | ||
| 116 | - | ||
| 117 | - $e_width = $w/$h; | ||
| 118 | - $e_height = $h/$w; | ||
| 119 | - | ||
| 120 | - $e1_width = $width/$height; | ||
| 121 | - $e1_height = $height/$width; | ||
| 122 | - | ||
| 123 | - if($this->isBigger($width,$height,$w,$h)){ | ||
| 124 | - if($e_width<$e1_width){ | ||
| 125 | - $new_width = $width*($e_width/$e1_width); | ||
| 126 | - $width = $new_width; | ||
| 127 | - }else { | ||
| 128 | - $new_height = $height*($e_height/$e1_height); | ||
| 129 | - $height = $new_height; | ||
| 130 | - } | ||
| 131 | - | ||
| 132 | - | ||
| 133 | - } else { | ||
| 134 | - $img->save($imageAliasSave, array('flatten' => false)); | ||
| 135 | - return true; | ||
| 136 | - } | ||
| 137 | - | ||
| 138 | - | ||
| 139 | - Image::crop($imageAlias, $width, $height,[0,0]) | ||
| 140 | - ->save(Yii::getAlias($imageAliasSave), ['quality' => | ||
| 141 | - 100]); | ||
| 142 | - | ||
| 143 | - | ||
| 144 | - $imagine = new Imagine(); | ||
| 145 | - $imagine->open($imageAliasSave) | ||
| 146 | - ->resize(new Box($w, $h)) | ||
| 147 | - ->save($imageAliasSave, array('flatten' => false)); | ||
| 148 | - | ||
| 149 | - | ||
| 150 | - | ||
| 151 | - } | ||
| 152 | - | ||
| 153 | - | ||
| 154 | - private function deleteImages($old_img){ | ||
| 155 | - | ||
| 156 | - if(!empty($old_img) && file_exists($_SERVER['DOCUMENT_ROOT'].$old_img)){ | ||
| 157 | - | ||
| 158 | - $rootDir = explode("/", $old_img); | ||
| 159 | - | ||
| 160 | - $row = $_SERVER['DOCUMENT_ROOT'].'/'.$rootDir[1].'/'.$rootDir[2].'/'; | ||
| 161 | - | ||
| 162 | - $allFiles = scandir($row); | ||
| 163 | - | ||
| 164 | - $allFiles = array_slice($allFiles, 2); | ||
| 165 | - | ||
| 166 | - foreach($allFiles as $oldFile){ | ||
| 167 | - | ||
| 168 | - unlink($row.$oldFile); | ||
| 169 | - | ||
| 170 | - } | ||
| 171 | - | ||
| 172 | - } | ||
| 173 | - } | ||
| 174 | - | ||
| 175 | - public function actionDeleteImage(){ | ||
| 176 | - $old_img = Yii::$app->request->post('old_img'); | ||
| 177 | - | ||
| 178 | - if ($old_img) { | ||
| 179 | - $this->deleteImages($old_img); | ||
| 180 | - } | ||
| 181 | - } | ||
| 182 | - | ||
| 183 | - | ||
| 184 | - | ||
| 185 | -} | ||
| 186 | \ No newline at end of file | 0 | \ No newline at end of file |
common/widgets/views/image_sizer.php deleted
| 1 | -<?php | ||
| 2 | -/** | ||
| 3 | - * Created by PhpStorm. | ||
| 4 | - * User: vitaliy | ||
| 5 | - * Date: 05.10.15 | ||
| 6 | - * Time: 16:20 | ||
| 7 | - */ | ||
| 8 | -use yii\helpers\Html; | ||
| 9 | - | ||
| 10 | -$id = $model::tableName().'_id'; | ||
| 11 | - | ||
| 12 | -?> | ||
| 13 | -<div class="file-uploader-block"> | ||
| 14 | - <?php if(!$multi):?> | ||
| 15 | - | ||
| 16 | - | ||
| 17 | - <?= Html::activeHiddenInput( $model,$field,['id' => "{$field}_picture_link"]) ?> | ||
| 18 | - <input type="hidden" id="<?=$field?>_old_img" name="ImageSizerForm[old_img]" value="<?=$model->$field?>"/> | ||
| 19 | - <input type="hidden" id="<?=$field?>_new_img" name="ImageSizerForm[new_img]" value=""/> | ||
| 20 | - <input type="hidden" id="<?=$field?>_row_id" name="ImageSizerForm[new_img]" value="<?=$model->$id?>"/> | ||
| 21 | - <div class="tst"> | ||
| 22 | - <div id="<?= $field?>_img_block" class="admin-avatar-pattern-wr"> | ||
| 23 | - <div class="admin-avatar-pattern"> | ||
| 24 | - <?php | ||
| 25 | - if($remover && $model->$field) { | ||
| 26 | - ?> | ||
| 27 | - <span id="<?=$field?>_remove_img" class="remover_image" style="left:<?=$size[0]['width']?>px"><img src="/images/delete-ico.png" alt=""></span> | ||
| 28 | - <?php | ||
| 29 | - } | ||
| 30 | - ?> | ||
| 31 | - <?= $model->$field ? Html::img($model->$field): '' ?> | ||
| 32 | - </div> | ||
| 33 | - </div> | ||
| 34 | - </div> | ||
| 35 | - | ||
| 36 | - <span class="btn btn-success fileinput-button uploader-button"> | ||
| 37 | -<!-- <i class="glyphicon glyphicon-plus"></i>--> | ||
| 38 | - <span><?=$name?></span> | ||
| 39 | - | ||
| 40 | - <?= Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo')]);?> | ||
| 41 | - </span> | ||
| 42 | - | ||
| 43 | - <script> | ||
| 44 | - $(function() | ||
| 45 | - { | ||
| 46 | - | ||
| 47 | - $("#<?= $field?>").fileupload( | ||
| 48 | - { | ||
| 49 | - dataType : 'json', formData : {size : '<?= json_encode($size)?>'}, | ||
| 50 | - done : function(e, data) | ||
| 51 | - { | ||
| 52 | - if($("#<?=$field?>_buttons_block").length) | ||
| 53 | - { | ||
| 54 | - $("#<?=$field?>_buttons_block").remove() | ||
| 55 | - } | ||
| 56 | - | ||
| 57 | - $("#<?= $field?>").parent().prev().find('.admin-ava-wr').remove() | ||
| 58 | - | ||
| 59 | - var host = window.location.host.toString(); | ||
| 60 | - var img = '<div class="admin-ava-wr">' + | ||
| 61 | - <?php | ||
| 62 | - if($remover) { | ||
| 63 | - echo "'<span id=\"" . $field . "_remove_img\" class=\"remover_image\" style=\"left:{$size[0]['width']}px\"><img src=\"/images/delete-ico.png\" alt=\"\"></span>'+"; | ||
| 64 | - } | ||
| 65 | - ?> | ||
| 66 | - '<img style="vertical-align: middle; width: <?=$width?>px; height: <?=$height?>px;" src="http://' + host + data.result.link + '"></div>' + '<div id="<?=$field?>_buttons_block">' + '<button type="button" id="<?=$field?>_save_img" class="btn btn-success img-action-buttons" >Сохранить</button>' + '<button type="button" id="<?=$field?>_remove_img" class="btn btn-danger img-action-buttons" >Отмена</button>' + '</div>'; | ||
| 67 | - var block = $("#<?= $field?>_img_block .admin-avatar-pattern"); | ||
| 68 | - block.find('img').remove(); | ||
| 69 | - block.append(img); | ||
| 70 | - block.parents('.file-uploader-block').parent().addClass('success_download'); | ||
| 71 | - $("#<?=$field?>_picture_link").val(data.result.link); | ||
| 72 | - $("#<?=$field?>_new_img").val(data.result.link); | ||
| 73 | - } | ||
| 74 | - } | ||
| 75 | - ); | ||
| 76 | - | ||
| 77 | - $('body').on( | ||
| 78 | - 'click', '#<?=$field?>_save_img', function() | ||
| 79 | - { | ||
| 80 | - $("#<?= $field?>_img_block").parent().parent().parent() | ||
| 81 | - .removeClass('success_download') | ||
| 82 | - | ||
| 83 | - $("#<?=$field?>_buttons_block").remove(); | ||
| 84 | - var old_url = $('#<?=$field?>_old_img').val(); | ||
| 85 | - var new_url = $('#<?=$field?>_new_img').val(); | ||
| 86 | - var model = '<?=str_replace('\\', '-', $model::className());?>'; | ||
| 87 | - $.post( | ||
| 88 | - "/file/uploader/delete-image", { | ||
| 89 | - new_url : new_url, old_img : old_url, model : model, field : "<?= $field?>", | ||
| 90 | - id : "<?=$model->$id?>", action : 'save' | ||
| 91 | - }, function() | ||
| 92 | - { | ||
| 93 | - } | ||
| 94 | - ); | ||
| 95 | - $("#<?=$field?>_picture_link").val(new_url); | ||
| 96 | - } | ||
| 97 | - ); | ||
| 98 | - | ||
| 99 | - $('body').on( | ||
| 100 | - 'click', '#<?=$field?>_remove_img', function() | ||
| 101 | - { | ||
| 102 | - $("#<?= $field?>_img_block").parent().parent().parent() | ||
| 103 | - .removeClass('success_download'); | ||
| 104 | - $("#<?= $field?>_img_block").parent().parent().find('.admin-ava-wr').remove(); | ||
| 105 | - | ||
| 106 | - $("#<?=$field?>_buttons_block").remove(); | ||
| 107 | - var old_url = $('#<?=$field?>_old_img').val(); | ||
| 108 | - var new_url = $('#<?=$field?>_new_img').val(); | ||
| 109 | - $.post( | ||
| 110 | - "/file/uploader/delete-image", {old_img : new_url}, function() | ||
| 111 | - { | ||
| 112 | - } | ||
| 113 | - ); | ||
| 114 | - <?php | ||
| 115 | - if($remover) { | ||
| 116 | - echo "$(\"#{$field}_picture_link\").val(''); | ||
| 117 | - $('#{$field}_img_block').find('img').remove();"; | ||
| 118 | - } else { | ||
| 119 | - echo "$(\"#{$field}_picture_link\").val(old_url); | ||
| 120 | - if(old_url.length<=1){ | ||
| 121 | - $('#{$field}_img_block').find('img').remove() | ||
| 122 | - } | ||
| 123 | - else { | ||
| 124 | - $('#{$field}_img_block').find('img').attr('src',old_url); | ||
| 125 | - }"; | ||
| 126 | - }; | ||
| 127 | - ?> | ||
| 128 | - } | ||
| 129 | - ); | ||
| 130 | - }); | ||
| 131 | -</script> | ||
| 132 | - | ||
| 133 | -<?php else:?> | ||
| 134 | - | ||
| 135 | - <span class="btn btn-success fileinput-button uploader-button"> | ||
| 136 | - <i class="glyphicon glyphicon-plus"></i> | ||
| 137 | - <span><?=$name?></span> | ||
| 138 | - | ||
| 139 | - <?= Html::activeFileInput( new \common\models\ImageSizerForm(),'file',['id'=>$field, 'data-url'=>Yii::$app->getUrlManager()->createUrl('file/uploader/download-photo'), 'multiple'=> 'multiple' ]);?> | ||
| 140 | - </span> | ||
| 141 | - | ||
| 142 | - <?= Html::activeHiddenInput( $model,$field,['id' => "{$field}_picture_link"]) ?> | ||
| 143 | - | ||
| 144 | - | ||
| 145 | - <input type="hidden" name="ImageSizerForm[multi]" value="true"/> | ||
| 146 | - | ||
| 147 | - <div id="<?= $field?>_img_block"> | ||
| 148 | - <?php | ||
| 149 | - | ||
| 150 | - foreach($this->context->getGallery() as $image){ | ||
| 151 | - echo $this->render('_gallery_item', [ 'item' => ['image'=>$image]]); | ||
| 152 | - } | ||
| 153 | - ?> | ||
| 154 | - </div> | ||
| 155 | - <script> | ||
| 156 | - $(function(){ | ||
| 157 | - | ||
| 158 | - $("#<?= $field?>").fileupload({ | ||
| 159 | - dataType: 'json', | ||
| 160 | - formData: {size:'<?= json_encode($size)?>', multi: 1}, | ||
| 161 | - done: function (e, data) { | ||
| 162 | - var img = data.result.view; | ||
| 163 | - var block = $("#<?= $field?>_img_block"); | ||
| 164 | - block.append(img); | ||
| 165 | - var gallery = $("#<?= $field?>_picture_link"); | ||
| 166 | - gallery.val(gallery.val()+data.result.link+','); | ||
| 167 | - } | ||
| 168 | - }); | ||
| 169 | - $('body').on('click','.delete-gallery-item', function(){ | ||
| 170 | - var url = $(this).data('url'); | ||
| 171 | - $(this).parent('.gallery_image').remove(); | ||
| 172 | - var gallery = $("#<?= $field?>_picture_link"); | ||
| 173 | - var urls = gallery.val(); | ||
| 174 | - gallery.val(urls.replace(url+',', "")); | ||
| 175 | - $.post( "/file/uploader/delete-image",{old_img: url}, function( data ) { | ||
| 176 | - $( ".result" ).html( data ); | ||
| 177 | - }); | ||
| 178 | - }) | ||
| 179 | - | ||
| 180 | - }) | ||
| 181 | - </script> | ||
| 182 | - | ||
| 183 | -<?php endif;?> | ||
| 184 | -</div> | ||
| 185 | \ No newline at end of file | 0 | \ No newline at end of file |
frontend/controllers/AccountsController.php
| @@ -70,6 +70,7 @@ | @@ -70,6 +70,7 @@ | ||
| 70 | 'portfolio-delete' => [ 'POST' ], | 70 | 'portfolio-delete' => [ 'POST' ], |
| 71 | 'projects-delete' => [ 'POST' ], | 71 | 'projects-delete' => [ 'POST' ], |
| 72 | 'blog-delete' => [ 'POST' ], | 72 | 'blog-delete' => [ 'POST' ], |
| 73 | + 'gallery-cover' => [ 'POST' ], | ||
| 73 | ], | 74 | ], |
| 74 | ], | 75 | ], |
| 75 | ]; | 76 | ]; |
| @@ -1198,4 +1199,14 @@ | @@ -1198,4 +1199,14 @@ | ||
| 1198 | } | 1199 | } |
| 1199 | } | 1200 | } |
| 1200 | 1201 | ||
| 1202 | + | ||
| 1203 | + public function actionGalleryCover() | ||
| 1204 | + { | ||
| 1205 | + $gallery_id = Yii::$app->request->post('gallery_id'); | ||
| 1206 | + | ||
| 1207 | + $cover = Gallery::find()->select('cover')->where(['gallery_id'=>$gallery_id])->column(); | ||
| 1208 | + die($cover[0]); | ||
| 1209 | + | ||
| 1210 | + } | ||
| 1211 | + | ||
| 1201 | } | 1212 | } |
frontend/views/accounts/_blog_form.php
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | */ | 4 | */ |
| 5 | use common\components\Request; | 5 | use common\components\Request; |
| 6 | use common\models\Blog; | 6 | use common\models\Blog; |
| 7 | - use common\widgets\ImageUploader; | 7 | + use common\modules\file\widgets\ImageUploader; |
| 8 | use mihaildev\ckeditor\CKEditor; | 8 | use mihaildev\ckeditor\CKEditor; |
| 9 | use mihaildev\elfinder\ElFinder; | 9 | use mihaildev\elfinder\ElFinder; |
| 10 | use yii\helpers\Html; | 10 | use yii\helpers\Html; |
frontend/views/accounts/_gallery_form.php
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | use common\components\Request; | 6 | use common\components\Request; |
| 7 | use common\models\Gallery; | 7 | use common\models\Gallery; |
| 8 | use common\models\User; | 8 | use common\models\User; |
| 9 | - use common\widgets\ImageUploader; | 9 | + use common\modules\file\widgets\ImageUploader; |
| 10 | use yii\helpers\Html; | 10 | use yii\helpers\Html; |
| 11 | use yii\widgets\ActiveForm; | 11 | use yii\widgets\ActiveForm; |
| 12 | 12 |
frontend/views/accounts/_portfolio_form.php
| @@ -8,8 +8,9 @@ | @@ -8,8 +8,9 @@ | ||
| 8 | use common\models\Option; | 8 | use common\models\Option; |
| 9 | use common\models\Portfolio; | 9 | use common\models\Portfolio; |
| 10 | use common\models\Specialization; | 10 | use common\models\Specialization; |
| 11 | - use common\widgets\ImageUploader; | ||
| 12 | - use mihaildev\ckeditor\CKEditor; | 11 | + use common\modules\file\widgets\ImageUploader; |
| 12 | +use common\modules\file\widgets\ImageUploaderInput; | ||
| 13 | +use mihaildev\ckeditor\CKEditor; | ||
| 13 | use yii\helpers\ArrayHelper; | 14 | use yii\helpers\ArrayHelper; |
| 14 | use yii\helpers\Html; | 15 | use yii\helpers\Html; |
| 15 | use yii\widgets\ActiveForm; | 16 | use yii\widgets\ActiveForm; |
| @@ -96,9 +97,7 @@ | @@ -96,9 +97,7 @@ | ||
| 96 | 97 | ||
| 97 | <div class="input-blocks-wrapper admin-avatar admin-blog-min-img admin-portfolio-foto"> | 98 | <div class="input-blocks-wrapper admin-avatar admin-blog-min-img admin-portfolio-foto"> |
| 98 | <div style="font-size: 13px;color: inherit;font-weight: 700;">Фото главное</div> | 99 | <div style="font-size: 13px;color: inherit;font-weight: 700;">Фото главное</div> |
| 99 | - <?= ImageUploader::widget([ | ||
| 100 | - 'model' => $portfolio, | ||
| 101 | - 'field' => 'cover', | 100 | + <?= $form->field($portfolio, 'cover')->widget(ImageUploaderInput::className(),[ |
| 102 | 'size' => [ | 101 | 'size' => [ |
| 103 | [ | 102 | [ |
| 104 | 'width' => 720, | 103 | 'width' => 720, |
| @@ -224,6 +223,19 @@ | @@ -224,6 +223,19 @@ | ||
| 224 | $('body').on('click', '.admin-portfolio-foto #cover_remove_img',function(){ | 223 | $('body').on('click', '.admin-portfolio-foto #cover_remove_img',function(){ |
| 225 | bottomButton() | 224 | bottomButton() |
| 226 | }) | 225 | }) |
| 227 | - } | ||
| 228 | - ) | 226 | + |
| 227 | + | ||
| 228 | + $('#portfolio-gallery_id').change(function(){ | ||
| 229 | + var gallery_id = $(this).val(); | ||
| 230 | + $.post( "/accounts/gallery-cover", {gallery_id:gallery_id}, function( data ) { | ||
| 231 | + if(!($('#cover_old_img').val().length)){ | ||
| 232 | + $('#cover_picture_link').val(data); | ||
| 233 | + var newimg=document.createElement("img"); | ||
| 234 | + newimg.setAttribute("src",data); | ||
| 235 | + | ||
| 236 | + $('#cover_img_block .admin-avatar-pattern').append(newimg); | ||
| 237 | + } | ||
| 238 | + }); | ||
| 239 | + }); | ||
| 240 | + }); | ||
| 229 | </script> | 241 | </script> |
frontend/views/accounts/_projects_form.php
| @@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
| 10 | use common\models\Payment; | 10 | use common\models\Payment; |
| 11 | use common\models\Project; | 11 | use common\models\Project; |
| 12 | use common\models\Specialization; | 12 | use common\models\Specialization; |
| 13 | - use common\widgets\ImageUploader; | 13 | + use common\modules\file\widgets\ImageUploader; |
| 14 | use kartik\select2\Select2; | 14 | use kartik\select2\Select2; |
| 15 | use mihaildev\ckeditor\CKEditor; | 15 | use mihaildev\ckeditor\CKEditor; |
| 16 | use yii\helpers\Html; | 16 | use yii\helpers\Html; |
frontend/views/accounts/_team_form.php
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | */ | 6 | */ |
| 7 | use common\components\Request; | 7 | use common\components\Request; |
| 8 | use common\models\Team; | 8 | use common\models\Team; |
| 9 | - use common\widgets\ImageUploader; | 9 | + use common\modules\file\widgets\ImageUploader; |
| 10 | use kartik\select2\Select2; | 10 | use kartik\select2\Select2; |
| 11 | use yii\helpers\Html; | 11 | use yii\helpers\Html; |
| 12 | use yii\web\JsExpression; | 12 | use yii\web\JsExpression; |
frontend/views/accounts/description.php
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | use common\models\CompanyInfo; | 7 | use common\models\CompanyInfo; |
| 8 | use common\models\User; | 8 | use common\models\User; |
| 9 | use common\models\UserInfo; | 9 | use common\models\UserInfo; |
| 10 | - use common\widgets\ImageUploader; | 10 | + use common\modules\file\widgets\ImageUploader; |
| 11 | use mihaildev\ckeditor\CKEditor; | 11 | use mihaildev\ckeditor\CKEditor; |
| 12 | use yii\helpers\Html; | 12 | use yii\helpers\Html; |
| 13 | use yii\widgets\ActiveForm; | 13 | use yii\widgets\ActiveForm; |
frontend/views/company/gallery.php
| @@ -12,6 +12,8 @@ use yii\widgets\ListView; | @@ -12,6 +12,8 @@ use yii\widgets\ListView; | ||
| 12 | $this->params['company'] = $company; | 12 | $this->params['company'] = $company; |
| 13 | $this->title = 'My Yii Application'; | 13 | $this->title = 'My Yii Application'; |
| 14 | ?> | 14 | ?> |
| 15 | + | ||
| 16 | +<?php if(count($videos)){?> | ||
| 15 | <div class="video-performer-wrapper style"> | 17 | <div class="video-performer-wrapper style"> |
| 16 | <div class="gallery-title">Видео: <?= count($videos)?></div> | 18 | <div class="gallery-title">Видео: <?= count($videos)?></div> |
| 17 | <div class="slider-video-wr"> | 19 | <div class="slider-video-wr"> |
| @@ -35,6 +37,7 @@ $this->title = 'My Yii Application'; | @@ -35,6 +37,7 @@ $this->title = 'My Yii Application'; | ||
| 35 | 37 | ||
| 36 | 38 | ||
| 37 | </div> | 39 | </div> |
| 40 | +<?php } ?> | ||
| 38 | <div class="gallery-performer-wrapper style"> | 41 | <div class="gallery-performer-wrapper style"> |
| 39 | <div class="gallery-performer-margin"> | 42 | <div class="gallery-performer-margin"> |
| 40 | <?= | 43 | <?= |
frontend/views/layouts/admin.php
| @@ -17,93 +17,107 @@ $this->beginContent('@app/views/layouts/main.php'); | @@ -17,93 +17,107 @@ $this->beginContent('@app/views/layouts/main.php'); | ||
| 17 | <div class="login-right-column"> | 17 | <div class="login-right-column"> |
| 18 | <div class="admin-my-page">Моя страница</div> | 18 | <div class="admin-my-page">Моя страница</div> |
| 19 | <?php | 19 | <?php |
| 20 | - echo Menu::widget([ | ||
| 21 | - 'options' => [ | ||
| 22 | - 'class' => 'menu-admin', | 20 | + |
| 21 | + $item = [ | ||
| 22 | + [ | ||
| 23 | + 'label' => 'Учетные данные', | ||
| 24 | + 'url' => ['accounts/general'], | ||
| 25 | + 'options' => ['class' => 'admin-menu-icons admin-menu-ico-1',], | ||
| 26 | + ], | ||
| 27 | + [ | ||
| 28 | + 'label' => 'Контакты', | ||
| 29 | + 'url' => ['accounts/contacts'], | ||
| 30 | + ], | ||
| 31 | + [ | ||
| 32 | + 'label' => 'Услуги', | ||
| 33 | + 'url' => ['accounts/service'], | ||
| 34 | + ], | ||
| 35 | + | ||
| 36 | + [ | ||
| 37 | + 'label' => 'Описание', | ||
| 38 | + 'url' => ['accounts/description'], | ||
| 39 | + ], | ||
| 40 | + | ||
| 41 | + | ||
| 42 | + | ||
| 43 | + [ | ||
| 44 | + 'label' => 'Вакансии', | ||
| 45 | + 'url' => ['accounts/vacancy'], | ||
| 46 | + 'active' => preg_match('/^vacancy.*$/', $this->context->action->id)?true:false, | ||
| 47 | + ], | ||
| 48 | + [ | ||
| 49 | + 'label' => 'Ваши проекты', | ||
| 50 | + 'url' => ['accounts/projects'], | ||
| 51 | + 'active' => preg_match('/^projects.*$/', $this->context->action->id)?true:false, | ||
| 52 | + ], | ||
| 53 | + [ | ||
| 54 | + 'label' => 'Портфолио', | ||
| 55 | + 'url' => ['accounts/portfolio'], | ||
| 56 | + 'active' => preg_match('/^portfolio.*$/', $this->context->action->id)?true:false, | ||
| 57 | + ], | ||
| 58 | + | ||
| 59 | + [ | ||
| 60 | + 'label' => 'Блог', | ||
| 61 | + 'url' => ['accounts/blog'], | ||
| 62 | + 'active' => preg_match('/^blog.*$/', $this->context->action->id)?true:false, | ||
| 63 | + ], | ||
| 64 | + [ | ||
| 65 | + 'label' => 'Галерея Изображения', | ||
| 66 | + 'url' => ['accounts/gallery'], | ||
| 67 | + 'active' => preg_match('/^gallery(?!-video).*$/', $this->context->action->id)?true:false, | ||
| 68 | + ], | ||
| 69 | + [ | ||
| 70 | + 'label' => 'Галерея Видео', | ||
| 71 | + 'url' => ['accounts/gallery-video'], | ||
| 72 | + ], | ||
| 73 | + [ | ||
| 74 | + 'label' => 'Сообщения', | ||
| 75 | + 'url' => ['chat/list'], | ||
| 76 | + 'options' => ['class' => 'admin-menu-icons admin-menu-ico-2',], | ||
| 77 | + ], | ||
| 78 | + [ | ||
| 79 | + 'label' => 'Уведомления о проектах', | ||
| 80 | + 'url' => ['/projects'], | ||
| 81 | + ], | ||
| 82 | + [ | ||
| 83 | + 'label' => 'Закладки', | ||
| 84 | + 'url' => ['accounts/bookmarks'], | ||
| 85 | + 'options' => ['class' => 'admin-menu-icons admin-menu-ico-3',], | ||
| 86 | + ], | ||
| 87 | + [ | ||
| 88 | + 'label' => 'Настройка аккаунта', | ||
| 89 | + 'url' => ['accounts/setting'], | ||
| 90 | + 'options' => ['class' => 'admin-menu-icons admin-menu-ico-4',], | ||
| 23 | ], | 91 | ], |
| 24 | - 'activeCssClass' => 'active-menu-admin', | ||
| 25 | - 'items' => [ | ||
| 26 | - [ | ||
| 27 | - 'label' => 'Учетные данные', | ||
| 28 | - 'url' => ['accounts/general'], | ||
| 29 | - 'options' => ['class' => 'admin-menu-icons admin-menu-ico-1',], | ||
| 30 | - ], | ||
| 31 | - [ | ||
| 32 | - 'label' => 'Контакты', | ||
| 33 | - 'url' => ['accounts/contacts'], | ||
| 34 | - ], | ||
| 35 | - [ | ||
| 36 | - 'label' => 'Услуги', | ||
| 37 | - 'url' => ['accounts/service'], | ||
| 38 | - ], | ||
| 39 | - [ | ||
| 40 | - 'label' => 'Трудовой стаж', | ||
| 41 | - 'url' => ['accounts/employment'], | ||
| 42 | - ], | ||
| 43 | - [ | ||
| 44 | - 'label' => 'Дополнительные навыки', | ||
| 45 | - 'url' => ['accounts/add-skills'], | ||
| 46 | - ], | ||
| 47 | - [ | ||
| 48 | - 'label' => 'Описание', | ||
| 49 | - 'url' => ['accounts/description'], | ||
| 50 | - ], | ||
| 51 | 92 | ||
| 93 | + ]; | ||
| 94 | + | ||
| 95 | + if(\Yii::$app->user->identity->type == 1){ | ||
| 96 | + array_push($item, | ||
| 97 | + | ||
| 98 | + [ | ||
| 99 | + 'label' => 'Трудовой стаж', | ||
| 100 | + 'url' => ['accounts/employment'], | ||
| 101 | + ], | ||
| 102 | + [ | ||
| 103 | + 'label' => 'Дополнительные навыки', | ||
| 104 | + 'url' => ['accounts/add-skills'], | ||
| 105 | + ] | ||
| 106 | + | ||
| 107 | + ); | ||
| 108 | + } else if(\Yii::$app->user->identity->type == 2) { | ||
| 109 | + array_push($item, | ||
| 52 | [ | 110 | [ |
| 53 | 'label' => 'Команда', | 111 | 'label' => 'Команда', |
| 54 | 'url' => ['accounts/team'], | 112 | 'url' => ['accounts/team'], |
| 55 | 'active' => preg_match('/^team.*$/', $this->context->action->id)?true:false, | 113 | 'active' => preg_match('/^team.*$/', $this->context->action->id)?true:false, |
| 56 | - ], | 114 | + ] |
| 115 | + ); | ||
| 57 | 116 | ||
| 58 | - [ | ||
| 59 | - 'label' => 'Вакансии', | ||
| 60 | - 'url' => ['accounts/vacancy'], | ||
| 61 | - 'active' => preg_match('/^vacancy.*$/', $this->context->action->id)?true:false, | ||
| 62 | - ], | ||
| 63 | - [ | ||
| 64 | - 'label' => 'Ваши проекты', | ||
| 65 | - 'url' => ['accounts/projects'], | ||
| 66 | - 'active' => preg_match('/^projects.*$/', $this->context->action->id)?true:false, | ||
| 67 | - ], | ||
| 68 | - [ | ||
| 69 | - 'label' => 'Портфолио', | ||
| 70 | - 'url' => ['accounts/portfolio'], | ||
| 71 | - 'active' => preg_match('/^portfolio.*$/', $this->context->action->id)?true:false, | ||
| 72 | - ], | 117 | + } |
| 118 | + | ||
| 119 | + array_push($item, | ||
| 73 | 120 | ||
| 74 | - [ | ||
| 75 | - 'label' => 'Блог', | ||
| 76 | - 'url' => ['accounts/blog'], | ||
| 77 | - 'active' => preg_match('/^blog.*$/', $this->context->action->id)?true:false, | ||
| 78 | - ], | ||
| 79 | - [ | ||
| 80 | - 'label' => 'Галерея Изображения', | ||
| 81 | - 'url' => ['accounts/gallery'], | ||
| 82 | - 'active' => preg_match('/^gallery(?!-video).*$/', $this->context->action->id)?true:false, | ||
| 83 | - ], | ||
| 84 | - [ | ||
| 85 | - 'label' => 'Галерея Видео', | ||
| 86 | - 'url' => ['accounts/gallery-video'], | ||
| 87 | - ], | ||
| 88 | - [ | ||
| 89 | - 'label' => 'Сообщения', | ||
| 90 | - 'url' => ['chat/list'], | ||
| 91 | - 'options' => ['class' => 'admin-menu-icons admin-menu-ico-2',], | ||
| 92 | - ], | ||
| 93 | - [ | ||
| 94 | - 'label' => 'Уведомления о проектах', | ||
| 95 | - 'url' => ['/projects'], | ||
| 96 | - ], | ||
| 97 | - [ | ||
| 98 | - 'label' => 'Закладки', | ||
| 99 | - 'url' => ['accounts/bookmarks'], | ||
| 100 | - 'options' => ['class' => 'admin-menu-icons admin-menu-ico-3',], | ||
| 101 | - ], | ||
| 102 | - [ | ||
| 103 | - 'label' => 'Настройка аккаунта', | ||
| 104 | - 'url' => ['accounts/setting'], | ||
| 105 | - 'options' => ['class' => 'admin-menu-icons admin-menu-ico-4',], | ||
| 106 | - ], | ||
| 107 | [ | 121 | [ |
| 108 | 'label' => 'На сайт', | 122 | 'label' => 'На сайт', |
| 109 | 'url' => \Yii::$app->user->identity->type == 1 ? ['performer/common', 'performer_id'=>\Yii::$app->user->id] : ['company/common', 'company_id'=>\Yii::$app->user->id], | 123 | 'url' => \Yii::$app->user->identity->type == 1 ? ['performer/common', 'performer_id'=>\Yii::$app->user->id] : ['company/common', 'company_id'=>\Yii::$app->user->id], |
| @@ -112,8 +126,18 @@ $this->beginContent('@app/views/layouts/main.php'); | @@ -112,8 +126,18 @@ $this->beginContent('@app/views/layouts/main.php'); | ||
| 112 | 'label' => 'Выход', | 126 | 'label' => 'Выход', |
| 113 | 'options' => ['class'=>'logout-li'], | 127 | 'options' => ['class'=>'logout-li'], |
| 114 | 'url' => ['/site/logout'] | 128 | 'url' => ['/site/logout'] |
| 115 | - ], | 129 | + ] |
| 130 | + | ||
| 131 | + ); | ||
| 132 | + | ||
| 133 | + | ||
| 134 | + | ||
| 135 | + echo Menu::widget([ | ||
| 136 | + 'options' => [ | ||
| 137 | + 'class' => 'menu-admin', | ||
| 116 | ], | 138 | ], |
| 139 | + 'activeCssClass' => 'active-menu-admin', | ||
| 140 | + 'items' => $item | ||
| 117 | ]); | 141 | ]); |
| 118 | ?> | 142 | ?> |
| 119 | </div> | 143 | </div> |