init

noumo · Mar 23, 2015 · 79ad26b · 79ad26b
1 parent 867d231
commit 79ad26b
Show file tree

Hide file tree

Showing 21 changed files with 320 additions and 242 deletions.
diff --git a/behaviors/SeoBehavior.php b/behaviors/SeoBehavior.php
@@ -47,6 +47,11 @@ public function afterDelete()
         }
     }
 
+    public function getSeo()
+    {
+        return $this->owner->hasOne(SeoText::className(), ['item_id' => $this->owner->primaryKey()[0]])->where(['model' => get_class($this->owner)]);
+    }
+
     public function getSeo_h1()
     {
         return $this->seoText->h1;

diff --git a/components/API.php b/components/API.php
@@ -25,19 +25,6 @@ public static function __callStatic($method, $params)
         return call_user_func_array([self::$classes[$name], 'api_' . $method], $params);
     }
 
-    public static function cache($key, $duration, $callable)
-    {
-        $cache = Yii::$app->cache;
-        if($cache->exists($key)){
-            $data = $cache->get($key);
-        }
-        else{
-            $data = $callable();
-            $cache->set($key, $data, $duration);
-        }
-        return $data;
-    }
-
     public function wrapLiveEdit($text, $path, $tag = 'span')
     {
         return '<'.$tag.' class="easyiicms-edit" data-edit="/admin/'.$this->module.'/'.$path.'">'.$text.'</'.$tag.'>';

diff --git a/components/ApiObject.php b/components/ApiObject.php
@@ -0,0 +1,46 @@
+<?php
+namespace yii\easyii\components;
+
+use Yii;
+use yii\easyii\helpers\GD;
+use yii\easyii\helpers\Image;
+use yii\easyii\helpers\Upload;
+use yii\helpers\FileHelper;
+use yii\widgets\LinkPager;
+
+class ApiObject extends \yii\base\Object
+{
+    public $source = [];
+    public $adp;
+    private $_seo;
+
+    public function __construct($model){
+        if(isset($model->seo)){
+            $this->_seo = $model->seo;
+        }
+
+        foreach($model->attributes as $attribute => $value){
+            if($this->canSetProperty($attribute)){
+                $this->{$attribute} = $value;
+            } else {
+                $this->source[$attribute] = $value;
+            }
+        }
+    }
+
+    public function thumb($width = null, $height = null, $crop = true)
+    {
+        if($this->image && ($width || $height)){
+            return Image::thumb(Yii::getAlias('@webroot') . $this->image, $width, $height, $crop);
+        }
+        return '';
+    }
+
+    public function getPages(){
+        return $this->adp ? LinkPager::widget(['pagination' => $this->adp->pagination]) : '';
+    }
+
+    public function seo($attribute){
+        return (!empty($this->_seo) && isset($this->_seo->{$attribute})) ? $this->_seo->{$attribute} : '';
+    }
+}
diff --git a/components/NSActiveQuery.php b/components/NSActiveQuery.php
@@ -0,0 +1,19 @@
+<?php
+namespace yii\easyii\components;
+
+use creocoder\nestedsets\NestedSetsQueryBehavior;
+
+class NSActiveQuery extends ActiveQuery
+{
+    public function behaviors() {
+        return [
+            NestedSetsQueryBehavior::className(),
+        ];
+    }
+
+    public function sort()
+    {
+        $this->orderBy('order_num DESC, lft ASC');
+        return $this;
+    }
+}
diff --git a/components/NSActiveRecord.php b/components/NSActiveRecord.php
@@ -0,0 +1,10 @@
+<?php
+namespace yii\easyii\components;
+
+class NSActiveRecord extends ActiveRecord
+{
+    public static function find()
+    {
+        return new NSActiveQuery(get_called_class());
+    }
+}
diff --git a/composer.json b/composer.json
@@ -24,6 +24,7 @@
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
         "yiisoft/yii2-swiftmailer": "*",
+        "creocoder/yii2-nested-sets": "0.9.*",
         "bower-asset/fancybox": "*",
         "bower-asset/jquery.switcher": "*"
     },

diff --git a/helpers/Image.php b/helpers/Image.php
@@ -39,22 +39,39 @@ static function createThumbnail($fileName, $width, $height = null, $crop = true)
         return self::copyResizedImage($fileName, $thumbFile, $width, $height, $crop) ? Upload::getLink($thumbFile) : false;
     }
 
+    static function thumb($filename, $width = null, $height = null, $crop = true)
+    {
+        if(file_exists($filename))
+        {
+            $info = pathinfo($filename);
+            $thumbName = $info['filename'] . '-' . md5( filemtime($filename) . (int)$width . (int)$height . (int)$crop ) . '.' . $info['extension'];
+            $thumbFile = Yii::getAlias('@webroot') . DIRECTORY_SEPARATOR . Upload::$UPLOADS_DIR . DIRECTORY_SEPARATOR . 'thumbs' . DIRECTORY_SEPARATOR . $thumbName;
+            $thumbWebFile = '/' . Upload::$UPLOADS_DIR . '/thumbs/' . $thumbName;
+            if(file_exists($thumbFile)){
+                return $thumbWebFile;
+            }
+            elseif(FileHelper::createDirectory(dirname($thumbFile), 0777) && self::copyResizedImage($filename, $thumbFile, $width, $height, $crop)){
+                return $thumbWebFile;
+            }
+        }
+        return '';
+    }
+
     static function copyResizedImage($inputFile, $outputFile, $width, $height = null, $crop = true)
     {
         if (extension_loaded('gd'))
         {
             $image = new GD($inputFile);
 
             if($height) {
-                if($crop){
+                if($width && $crop){
                     $image->cropThumbnail($width, $height);
                 } else {
                     $image->resize($width, $height);
                 }
             } else {
                 $image->resize($width);
             }
-
             return $image->save($outputFile);
         }
         elseif(extension_loaded('imagick'))

diff --git a/helpers/Upload.php b/helpers/Upload.php
@@ -10,7 +10,7 @@
 
 class Upload
 {
-    static $UPLOADS_DIR = 'uploads';
+    public static $UPLOADS_DIR = 'uploads';
 
     public static function file(UploadedFile $fileInstance, $dir = '', $namePostfix = true)
     {

diff --git a/media/css/admin.css b/media/css/admin.css
@@ -150,6 +150,18 @@ html{
     color: #fff;
 }
 
+#admin-body .actions li i{
+    margin-right: 8px;
+}
+#admin-body .actions .glyphicon-menu-hamburger{
+    cursor: pointer;
+    font-size: 15px;
+    color: #777;
+}
+#admin-body .actions .glyphicon-menu-hamburger:hover{
+    color: #337ab7;
+}
+
 /*--------------- HELPERS ---------------*/
 
 h4{
@@ -163,7 +175,7 @@ h4 b{
 }
 
 .confirm-delete{
-    color: #a94442;
+    color: #a94442 !important;
 }
 .color-red{
     color: #a94442;

diff --git a/messages/ru/admin.php b/messages/ru/admin.php
@@ -48,7 +48,12 @@
     'Update' => 'Обновить',
     'Move up' => 'Переместить выше',
     'Move down' => 'Переместить ниже',
+    'Delete' => 'Удалить',
+    'Turn On' => 'Включить',
+    'Turn Off' => 'Выключить',
+    'Add subcategory' => 'Добавить подкатегорию',
     'Anti-spam check' => 'Проверка на спам',
+    'Actions' => 'Действия',
 
     'Not found' => 'Не найдено',
     'Create error. {0}' => 'Ошибка при создании. {0}',