Skip to content

Commit

Permalink
Update copyrights, fix nav menu
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-wdmg committed Jun 29, 2023
1 parent 1ebc669 commit f853c96
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 16 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Changelog
=========

## 1.3.0 (2023-06-29)
* Update copyrights, fix nav menu

## 1.2.0 (2020-10-06)
* Bugfix, CLI disabled by default
* Uupdate dependencies
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 - 2020 W.D.M.Group, Ukraine
Copyright (c) 2019 - 2023 W.D.M.Group, Ukraine

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
24 changes: 19 additions & 5 deletions Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
* Yii2 Terminal
*
* @category Module
* @version 1.2.0
* @version 1.3.0
* @author Alexsander Vyshnyvetskyy <[email protected]>
* @link https://github.com/wdmg/yii2-terminal
* @copyright Copyright (c) 2019 - 2021 W.D.M.Group, Ukraine
* @copyright Copyright (c) 2019 - 2023 W.D.M.Group, Ukraine
* @license https://opensource.org/licenses/MIT Massachusetts Institute of Technology (MIT) License
*
*/

use wdmg\helpers\ArrayHelper;
use Yii;
use wdmg\base\BaseModule;

Expand Down Expand Up @@ -92,7 +93,7 @@ class Module extends BaseModule
/**
* @var string the module version
*/
private $version = "1.2.0";
private $version = "1.3.0";

/**
* @var integer, priority of initialization
Expand All @@ -117,15 +118,28 @@ public function init()
/**
* {@inheritdoc}
*/
public function dashboardNavItems($options = false)
public function dashboardNavItems($options = null)
{
$items = [
'label' => $this->name,
'url' => [$this->routePrefix . '/'. $this->id],
'icon' => 'fa-terminal',
'active' => in_array(\Yii::$app->controller->module->id, [$this->id])
];
return $items;

if (!is_null($options)) {

if (isset($options['count'])) {
$items['label'] .= '<span class="badge badge-default float-right">' . $options['count'] . '</span>';
unset($options['count']);
}

if (is_array($options))
$items = ArrayHelper::merge($items, $options);

}

return $items;
}

/**
Expand Down
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Yii2](https://img.shields.io/badge/required-Yii2_v2.0.40-blue.svg)](https://packagist.org/packages/yiisoft/yii2)
[![Yii2](https://img.shields.io/badge/required-Yii2_v2.0.35-blue.svg)](https://packagist.org/packages/yiisoft/yii2)
[![Downloads](https://img.shields.io/packagist/dt/wdmg/yii2-terminal.svg)](https://packagist.org/packages/wdmg/yii2-terminal)
[![Packagist Version](https://img.shields.io/packagist/v/wdmg/yii2-terminal.svg)](https://packagist.org/packages/wdmg/yii2-terminal)
![Progress](https://img.shields.io/badge/progress-ready_to_use-green.svg)
Expand All @@ -11,7 +11,7 @@ Running console commands from a browser.

This module is an integral part of the [Butterfly.СMS](https://butterflycms.com/) content management system, but can also be used as an standalone extension.

Copyrights (c) 2019-2021 [W.D.M.Group, Ukraine](https://wdmg.com.ua/)
Copyrights (c) 2019-2023 [W.D.M.Group, Ukraine](https://wdmg.com.ua/)

# Usecase
Use the `--` prefix to pass arguments at the command time and a space as the argument / value separator.
Expand All @@ -21,15 +21,12 @@ For example:

# Requirements
* PHP 5.6 or higher
* Yii2 v.2.0.40 and newest
* Yii2 v.2.0.35 and newest
* [Yii2 Base](https://github.com/wdmg/yii2-base) module (required)
* [jQuery Terminal Emulator](https://github.com/jcubic/jquery.terminal) (required)
* [jQuery UI](https://github.com/components/jqueryui) (required)

# Status and version [ready to use]
* v.1.3.0 - Update copyrights, fix nav menu
* v.1.2.0 - CLI disabled by default. Bugfix, update dependencies
* v.1.1.3 - Update README.md and dependencies
* v.1.1.2 - Up to date dependencies
* v.1.1.1 - Fixed deprecated class declaration
* v.1.1.0 - Added base path and CLI support, customize stylesheets, added resize and draggable
* v.1.0.1 - Added ajax render for modal etc.
* v.1.1.3 - Update README.md and dependencies
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"keywords": ["yii2", "yii2-terminal", "terminal", "webshell", "wdmg"],
"type": "yii2-extension",
"license": "MIT",
"version": "1.2.0",
"version": "1.3.0",
"homepage": "https://github.com/wdmg/yii2-terminal",
"support": {
"source": "https://github.com/wdmg/yii2-terminal",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yii2-terminal-assets",
"version": "1.2.0",
"version": "1.3.0",
"description": "Terminal Module Assets",
"main": "Gruntfile.js",
"scripts": {
Expand Down

0 comments on commit f853c96

Please sign in to comment.