Commit 40ab364cd29fd5eefcc7f5d7147c5bb93416aed1
1 parent
9f4c3fde
Page
Showing
3 changed files
with
177 additions
and
65 deletions
Show diff stats
backend/config/main.php
| @@ -12,19 +12,20 @@ | @@ -12,19 +12,20 @@ | ||
| 12 | 'basePath' => dirname(__DIR__), | 12 | 'basePath' => dirname(__DIR__), |
| 13 | 'controllerNamespace' => 'backend\controllers', | 13 | 'controllerNamespace' => 'backend\controllers', |
| 14 | 'bootstrap' => [ 'log' ], | 14 | 'bootstrap' => [ 'log' ], |
| 15 | - 'controllerMap' => [ | 15 | + 'controllerMap' => [ |
| 16 | 'settings' => 'artweb\artbox\core\controllers\SettingsController', | 16 | 'settings' => 'artweb\artbox\core\controllers\SettingsController', |
| 17 | 'profile' => 'artweb\artbox\core\controllers\ProfileController', | 17 | 'profile' => 'artweb\artbox\core\controllers\ProfileController', |
| 18 | + 'page' => 'artweb\artbox\core\controllers\PageController', | ||
| 18 | ], | 19 | ], |
| 19 | 'modules' => [ | 20 | 'modules' => [ |
| 20 | 'imagemanager' => [ | 21 | 'imagemanager' => [ |
| 21 | - 'class' => 'noam148\imagemanager\Module', | ||
| 22 | - 'canUploadImage' => true, | ||
| 23 | - 'canRemoveImage' => function(){ | 22 | + 'class' => 'noam148\imagemanager\Module', |
| 23 | + 'canUploadImage' => true, | ||
| 24 | + 'canRemoveImage' => function () { | ||
| 24 | return true; | 25 | return true; |
| 25 | }, | 26 | }, |
| 26 | 'setBlameableBehavior' => false, | 27 | 'setBlameableBehavior' => false, |
| 27 | - 'cssFiles' => [ | 28 | + 'cssFiles' => [ |
| 28 | 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', | 29 | 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', |
| 29 | ], | 30 | ], |
| 30 | ], | 31 | ], |
| @@ -43,14 +44,14 @@ | @@ -43,14 +44,14 @@ | ||
| 43 | ], | 44 | ], |
| 44 | ], | 45 | ], |
| 45 | ], | 46 | ], |
| 46 | - 'filedb' => [ | 47 | + 'filedb' => [ |
| 47 | 'class' => 'yii2tech\filedb\Connection', | 48 | 'class' => 'yii2tech\filedb\Connection', |
| 48 | - 'path' => '@common/config', | 49 | + 'path' => '@common/config', |
| 49 | ], | 50 | ], |
| 50 | 'imagemanager' => [ | 51 | 'imagemanager' => [ |
| 51 | - 'class' => 'noam148\imagemanager\components\ImageManagerGetPath', | ||
| 52 | - 'mediaPath' => dirname(dirname(__DIR__)) . '/storage', | ||
| 53 | - 'cachePath' => 'assets/images', | 52 | + 'class' => 'noam148\imagemanager\components\ImageManagerGetPath', |
| 53 | + 'mediaPath' => dirname(dirname(__DIR__)) . '/storage', | ||
| 54 | + 'cachePath' => 'assets/images', | ||
| 54 | 'useFilename' => true, | 55 | 'useFilename' => true, |
| 55 | 'absoluteUrl' => false, | 56 | 'absoluteUrl' => false, |
| 56 | ], | 57 | ], |
composer.json
| 1 | { | 1 | { |
| 2 | - "name": "yiisoft/yii2-app-advanced", | ||
| 3 | - "description": "Yii 2 Advanced Project Template", | ||
| 4 | - "keywords": ["yii2", "framework", "advanced", "project template"], | ||
| 5 | - "homepage": "http://www.yiiframework.com/", | ||
| 6 | - "type": "project", | ||
| 7 | - "license": "BSD-3-Clause", | ||
| 8 | - "support": { | ||
| 9 | - "issues": "https://github.com/yiisoft/yii2/issues?state=open", | ||
| 10 | - "forum": "http://www.yiiframework.com/forum/", | ||
| 11 | - "wiki": "http://www.yiiframework.com/wiki/", | ||
| 12 | - "irc": "irc://irc.freenode.net/yii", | ||
| 13 | - "source": "https://github.com/yiisoft/yii2" | ||
| 14 | - }, | ||
| 15 | - "minimum-stability": "stable", | ||
| 16 | - "require": { | ||
| 17 | - "php": ">=5.4.0", | ||
| 18 | - "yiisoft/yii2": "~2.0.6", | ||
| 19 | - "yiisoft/yii2-bootstrap": "~2.0.0", | ||
| 20 | - "yiisoft/yii2-swiftmailer": "~2.0.0", | ||
| 21 | - "insolita/yii2-migration-generator": "~2.2", | ||
| 22 | - "yiister/yii2-gentelella": "~1.0", | ||
| 23 | - "hiqdev/yii2-asset-icheck": "1.0.2.5", | ||
| 24 | - "noam148/yii2-image-manager": "*", | ||
| 25 | - "yii2tech/filedb": "^1.0", | ||
| 26 | - "hiqdev/yii2-asset-pnotify": "^2.1", | ||
| 27 | - "yiisoft/yii2-imagine": "*" | ||
| 28 | - }, | ||
| 29 | - "require-dev": { | ||
| 30 | - "yiisoft/yii2-debug": "~2.0.0", | ||
| 31 | - "yiisoft/yii2-gii": "~2.0.0", | ||
| 32 | - "yiisoft/yii2-faker": "~2.0.0", | ||
| 33 | - | ||
| 34 | - "codeception/base": "^2.2.3", | ||
| 35 | - "codeception/verify": "~0.3.1" | ||
| 36 | - }, | ||
| 37 | - "config": { | ||
| 38 | - "process-timeout": 1800 | ||
| 39 | - }, | ||
| 40 | - "extra": { | ||
| 41 | - "asset-installer-paths": { | ||
| 42 | - "npm-asset-library": "vendor/npm", | ||
| 43 | - "bower-asset-library": "vendor/bower" | ||
| 44 | - } | ||
| 45 | - }, | ||
| 46 | - "scripts": { | ||
| 47 | - "post-install-cmd": "php init --env=Development --overwrite=n" | ||
| 48 | - }, | ||
| 49 | - "autoload": { | ||
| 50 | - "psr-4": { | ||
| 51 | - "artweb\\artbox\\core\\": "artweb/artbox-core/", | ||
| 52 | - "artweb\\artbox\\gentelella\\": "artweb/artbox-gentelella/" | ||
| 53 | - } | 2 | + "name": "yiisoft/yii2-app-advanced", |
| 3 | + "description": "Yii 2 Advanced Project Template", | ||
| 4 | + "keywords": [ | ||
| 5 | + "yii2", | ||
| 6 | + "framework", | ||
| 7 | + "advanced", | ||
| 8 | + "project template" | ||
| 9 | + ], | ||
| 10 | + "homepage": "http://www.yiiframework.com/", | ||
| 11 | + "type": "project", | ||
| 12 | + "license": "BSD-3-Clause", | ||
| 13 | + "support": { | ||
| 14 | + "issues": "https://github.com/yiisoft/yii2/issues?state=open", | ||
| 15 | + "forum": "http://www.yiiframework.com/forum/", | ||
| 16 | + "wiki": "http://www.yiiframework.com/wiki/", | ||
| 17 | + "irc": "irc://irc.freenode.net/yii", | ||
| 18 | + "source": "https://github.com/yiisoft/yii2" | ||
| 19 | + }, | ||
| 20 | + "minimum-stability": "stable", | ||
| 21 | + "require": { | ||
| 22 | + "php": ">=5.4.0", | ||
| 23 | + "yiisoft/yii2": "~2.0.6", | ||
| 24 | + "yiisoft/yii2-bootstrap": "~2.0.0", | ||
| 25 | + "yiisoft/yii2-swiftmailer": "~2.0.0", | ||
| 26 | + "insolita/yii2-migration-generator": "~2.2", | ||
| 27 | + "yiister/yii2-gentelella": "~1.0", | ||
| 28 | + "hiqdev/yii2-asset-icheck": "1.0.2.5", | ||
| 29 | + "noam148/yii2-image-manager": "*", | ||
| 30 | + "yii2tech/filedb": "^1.0", | ||
| 31 | + "hiqdev/yii2-asset-pnotify": "^2.1", | ||
| 32 | + "yiisoft/yii2-imagine": "*", | ||
| 33 | + "2amigos/yii2-tinymce-widget": "*" | ||
| 34 | + }, | ||
| 35 | + "require-dev": { | ||
| 36 | + "yiisoft/yii2-debug": "~2.0.0", | ||
| 37 | + "yiisoft/yii2-gii": "~2.0.0", | ||
| 38 | + "yiisoft/yii2-faker": "~2.0.0", | ||
| 39 | + "codeception/base": "^2.2.3", | ||
| 40 | + "codeception/verify": "~0.3.1" | ||
| 41 | + }, | ||
| 42 | + "config": { | ||
| 43 | + "process-timeout": 1800 | ||
| 44 | + }, | ||
| 45 | + "extra": { | ||
| 46 | + "asset-installer-paths": { | ||
| 47 | + "npm-asset-library": "vendor/npm", | ||
| 48 | + "bower-asset-library": "vendor/bower" | ||
| 54 | } | 49 | } |
| 50 | + }, | ||
| 51 | + "scripts": { | ||
| 52 | + "post-install-cmd": "php init --env=Development --overwrite=n" | ||
| 53 | + }, | ||
| 54 | + "autoload": { | ||
| 55 | + "psr-4": { | ||
| 56 | + "artweb\\artbox\\core\\": "artweb/artbox-core/", | ||
| 57 | + "artweb\\artbox\\gentelella\\": "artweb/artbox-gentelella/" | ||
| 58 | + } | ||
| 59 | + } | ||
| 55 | } | 60 | } |
composer.lock
| @@ -4,10 +4,70 @@ | @@ -4,10 +4,70 @@ | ||
| 4 | "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", | 4 | "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", |
| 5 | "This file is @generated automatically" | 5 | "This file is @generated automatically" |
| 6 | ], | 6 | ], |
| 7 | - "hash": "50bead4b144ecff641e219af923843cf", | ||
| 8 | - "content-hash": "8378306ade4a941663a7b7c576be312a", | 7 | + "hash": "372abdde08fd6123bb4e2d1719a5b96e", |
| 8 | + "content-hash": "a4388a61af3f169567e804b653d72990", | ||
| 9 | "packages": [ | 9 | "packages": [ |
| 10 | { | 10 | { |
| 11 | + "name": "2amigos/yii2-tinymce-widget", | ||
| 12 | + "version": "1.1.1", | ||
| 13 | + "source": { | ||
| 14 | + "type": "git", | ||
| 15 | + "url": "https://github.com/2amigos/yii2-tinymce-widget.git", | ||
| 16 | + "reference": "d58bad3ede450f86acd475fb4ecda982b980132b" | ||
| 17 | + }, | ||
| 18 | + "dist": { | ||
| 19 | + "type": "zip", | ||
| 20 | + "url": "https://api.github.com/repos/2amigos/yii2-tinymce-widget/zipball/d58bad3ede450f86acd475fb4ecda982b980132b", | ||
| 21 | + "reference": "d58bad3ede450f86acd475fb4ecda982b980132b", | ||
| 22 | + "shasum": "" | ||
| 23 | + }, | ||
| 24 | + "require": { | ||
| 25 | + "tinymce/tinymce": ">=4", | ||
| 26 | + "yiisoft/yii2": "~2.0.0" | ||
| 27 | + }, | ||
| 28 | + "require-dev": { | ||
| 29 | + "phpunit/phpunit": "4.*" | ||
| 30 | + }, | ||
| 31 | + "type": "yii2-extension", | ||
| 32 | + "extra": { | ||
| 33 | + "branch-alias": { | ||
| 34 | + "dev-master": "1.0-dev" | ||
| 35 | + }, | ||
| 36 | + "asset-installer-paths": { | ||
| 37 | + "bower-asset-library": "vendor/bower" | ||
| 38 | + } | ||
| 39 | + }, | ||
| 40 | + "autoload": { | ||
| 41 | + "psr-4": { | ||
| 42 | + "dosamigos\\tinymce\\": "src" | ||
| 43 | + } | ||
| 44 | + }, | ||
| 45 | + "notification-url": "https://packagist.org/downloads/", | ||
| 46 | + "license": [ | ||
| 47 | + "BSD-3-Clause" | ||
| 48 | + ], | ||
| 49 | + "authors": [ | ||
| 50 | + { | ||
| 51 | + "name": "2amigOS! Consulting Group", | ||
| 52 | + "email": "hola@2amigos.us", | ||
| 53 | + "homepage": "http://2amigos.us", | ||
| 54 | + "role": "Developer" | ||
| 55 | + } | ||
| 56 | + ], | ||
| 57 | + "description": "TinyMCE widget for Yii2.", | ||
| 58 | + "homepage": "http://yiiwheels.com/extension/tinymce-widget", | ||
| 59 | + "keywords": [ | ||
| 60 | + "2amigos", | ||
| 61 | + "extension", | ||
| 62 | + "tinymce", | ||
| 63 | + "widget", | ||
| 64 | + "yii", | ||
| 65 | + "yii 2", | ||
| 66 | + "yii2" | ||
| 67 | + ], | ||
| 68 | + "time": "2015-03-28 21:53:43" | ||
| 69 | + }, | ||
| 70 | + { | ||
| 11 | "name": "bower-asset/bootstrap", | 71 | "name": "bower-asset/bootstrap", |
| 12 | "version": "v3.3.7", | 72 | "version": "v3.3.7", |
| 13 | "source": { | 73 | "source": { |
| @@ -22,7 +82,7 @@ | @@ -22,7 +82,7 @@ | ||
| 22 | "shasum": "" | 82 | "shasum": "" |
| 23 | }, | 83 | }, |
| 24 | "require": { | 84 | "require": { |
| 25 | - "bower-asset/jquery": ">=1.9.1,<4.0" | 85 | + "bower-asset/jquery": ">=1.9.1,<=3" |
| 26 | }, | 86 | }, |
| 27 | "type": "bower-asset-library", | 87 | "type": "bower-asset-library", |
| 28 | "extra": { | 88 | "extra": { |
| @@ -1161,6 +1221,52 @@ | @@ -1161,6 +1221,52 @@ | ||
| 1161 | "time": "2017-02-13 07:52:53" | 1221 | "time": "2017-02-13 07:52:53" |
| 1162 | }, | 1222 | }, |
| 1163 | { | 1223 | { |
| 1224 | + "name": "tinymce/tinymce", | ||
| 1225 | + "version": "4.5.5", | ||
| 1226 | + "source": { | ||
| 1227 | + "type": "git", | ||
| 1228 | + "url": "https://github.com/tinymce/tinymce-dist.git", | ||
| 1229 | + "reference": "d6dda8ceadf741fce2cf808790080a589877d6e6" | ||
| 1230 | + }, | ||
| 1231 | + "dist": { | ||
| 1232 | + "type": "zip", | ||
| 1233 | + "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/d6dda8ceadf741fce2cf808790080a589877d6e6", | ||
| 1234 | + "reference": "d6dda8ceadf741fce2cf808790080a589877d6e6", | ||
| 1235 | + "shasum": "" | ||
| 1236 | + }, | ||
| 1237 | + "type": "component", | ||
| 1238 | + "extra": { | ||
| 1239 | + "component": { | ||
| 1240 | + "scripts": [ | ||
| 1241 | + "tinymce.js", | ||
| 1242 | + "plugins/*/plugin.js", | ||
| 1243 | + "themes/*/theme.js" | ||
| 1244 | + ], | ||
| 1245 | + "files": [ | ||
| 1246 | + "tinymce.min.js", | ||
| 1247 | + "plugins/*/plugin.min.js", | ||
| 1248 | + "themes/*/theme.min.js", | ||
| 1249 | + "skins/**" | ||
| 1250 | + ] | ||
| 1251 | + } | ||
| 1252 | + }, | ||
| 1253 | + "notification-url": "https://packagist.org/downloads/", | ||
| 1254 | + "license": [ | ||
| 1255 | + "LGPL-2.1" | ||
| 1256 | + ], | ||
| 1257 | + "description": "Web based JavaScript HTML WYSIWYG editor control.", | ||
| 1258 | + "homepage": "http://www.tinymce.com", | ||
| 1259 | + "keywords": [ | ||
| 1260 | + "editor", | ||
| 1261 | + "html", | ||
| 1262 | + "javascript", | ||
| 1263 | + "richtext", | ||
| 1264 | + "tinymce", | ||
| 1265 | + "wysiwyg" | ||
| 1266 | + ], | ||
| 1267 | + "time": "2017-03-07 13:29:55" | ||
| 1268 | + }, | ||
| 1269 | + { | ||
| 1164 | "name": "yii2tech/filedb", | 1270 | "name": "yii2tech/filedb", |
| 1165 | "version": "1.0.3", | 1271 | "version": "1.0.3", |
| 1166 | "source": { | 1272 | "source": { |