diff --git a/CodemirrorAsset.php b/CodemirrorAsset.php index 9d9cc3e..19bc4e6 100644 --- a/CodemirrorAsset.php +++ b/CodemirrorAsset.php @@ -1,17 +1,18 @@ + * @link http://skeeks.com/ + * @copyright 2010 SkeekS (СкикС) + * @date 05.06.2015 */ -namespace conquer\codemirror; +namespace skeeks\widget\codemirror; use yii\web\View; use yii\helpers\ArrayHelper; /** - * @author Andrey Borodulin - * @link http://codemirror.net/ + * Class CodemirrorAsset + * @package skeeks\widget\codemirror */ class CodemirrorAsset extends \yii\web\AssetBundle { diff --git a/CodemirrorWidget.php b/CodemirrorWidget.php index c59404e..8759b75 100644 --- a/CodemirrorWidget.php +++ b/CodemirrorWidget.php @@ -1,18 +1,20 @@ + * @link http://skeeks.com/ + * @copyright 2010 SkeekS (СкикС) + * @date 05.06.2015 */ -namespace conquer\codemirror; +namespace skeeks\widget\codemirror; use yii\helpers\Html; use yii\web\JsExpression; use yii\helpers\ArrayHelper; -use conquer\helpers\Json; +use yii\helpers\Json; /** - * @author Andrey Borodulin + * Class CodemirrorWidget + * @package skeeks\widget\codemirror */ class CodemirrorWidget extends \yii\widgets\InputWidget { diff --git a/LICENSE.md b/LICENSE.md index 9bf31e5..3f8848f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,21 +1,32 @@ -The MIT License (MIT) +The Yii framework is free software. It is released under the terms of +the following BSD License. -Copyright (c) 2015 Andrey Borodulin +Copyright © 2010 by SkeekS (http://www.skeeks.com) +All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name of Yii Software LLC nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/README.md b/README.md index c44ccc4..c573195 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ The preferred way to install this extension is through [composer](http://getcomp To install, either run ``` -$ php composer.phar require conquer/codemirror "*" +$ php composer.phar require skeeks/yii2-widget-codemirror "*" ``` or add ``` -"conquer/codemirror": "*" +"skeeks/yii2-widget-codemirror": "*" ``` to the ```require``` section of your `composer.json` file. @@ -26,7 +26,7 @@ to the ```require``` section of your `composer.json` file. ## Usage ```php -use conquer\codemirror\CodemirrorWidget; +use skeeks\widget\codemirror\CodemirrorWidget; $form->field($model, 'code')->widget( CodemirrorWidget::className(), @@ -40,7 +40,7 @@ $form->field($model, 'code')->widget( You can use ready-made presets, or create your own. To do this, specify the folder to your presets. ```php -use conquer\codemirror\CodemirrorWidget; +use skeeks\widget\codemirror\CodemirrorWidget; $form->field($model, 'code')->widget( CodemirrorWidget::className(), @@ -54,8 +54,8 @@ $form->field($model, 'code')->widget( In general, you can customize the widget directly specifying its properties. ```php -use conquer\codemirror\CodemirrorWidget; -use conquer\codemirror\CodemirrorAsset; +use skeeks\widget\codemirror\CodemirrorWidget; +use skeeks\widget\codemirror\CodemirrorAsset; $form->field($model, 'code')->widget( CodemirrorWidget::className(), diff --git a/composer.json b/composer.json index fde0804..e573923 100644 --- a/composer.json +++ b/composer.json @@ -1,31 +1,23 @@ { - "name": "conquer/codemirror", + "name": "skeeks/yii2-widget-codemirror", "description": "Yii2 codemirror widget", "keywords": ["yii2", "extension", "widget", "codemirror"], - "homepage": "https://github.com/borodulin/yii2-codemirror", + "homepage": "http://git.skeeks.com/skeeks/yii2-widget-codemirror", "type": "yii2-extension", - "license": "MIT", + "license": "BSD 3-Clause", "authors": [ { - "name": "Andrey Borodulin", - "email": "borodulin@gmail.com", - "homepage": "https://github.com/borodulin/yii2-codemirror" + "name": "Semenov Alexander", + "email": "semenov@skeeks.com" } ], - "extra": { - "branch-alias": { - "dev-master": "1.2.7.x-dev" - } - }, "require": { - "php": ">=5.4.0", "yiisoft/yii2": "*", - "conquer/helpers": "~1.0.0", "bower-asset/codemirror": "*" }, "autoload": { "psr-4": { - "conquer\\codemirror\\": "" + "skeeks\\widget\\codemirror\\": "" } } } diff --git a/presets/JavascriptPreset.php b/presets/JavascriptPreset.php index 1c825d3..0c92893 100644 --- a/presets/JavascriptPreset.php +++ b/presets/JavascriptPreset.php @@ -1,10 +1,11 @@ + * @link http://skeeks.com/ + * @copyright 2010 SkeekS (СкикС) + * @date 05.06.2015 */ -use conquer\codemirror\CodemirrorAsset; +use skeeks\widget\codemirror\CodemirrorAsset; return [ 'assets'=>[ diff --git a/presets/PhpPreset.php b/presets/PhpPreset.php index 0101b9d..cfa8ba6 100644 --- a/presets/PhpPreset.php +++ b/presets/PhpPreset.php @@ -1,10 +1,11 @@ + * @link http://skeeks.com/ + * @copyright 2010 SkeekS (СкикС) + * @date 05.06.2015 */ -use conquer\codemirror\CodemirrorAsset; +use skeeks\widget\codemirror\CodemirrorAsset; use yii\web\JsExpression; return [ 'assets'=>[