Skip to content

Commit

Permalink
Update copyrights, fix menu dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-wdmg committed Jul 6, 2023
1 parent 59866e0 commit 776d24d
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 19 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.1.0 (2023-07-06)
* Update copyrights, fix menu dashboard

## 1.0.1 (2020-07-01)
* Update dependencies, README.md

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 Views
*
* @category Module
* @version 1.0.1
* @version 1.1.0
* @author Alexsander Vyshnyvetskyy <[email protected]>
* @link https://github.com/wdmg/yii2-views
* @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;
use wdmg\views\components\Views;
Expand Down Expand Up @@ -51,7 +52,7 @@ class Module extends BaseModule
/**
* @var string the module version
*/
private $version = "1.0.1";
private $version = "1.1.0";

/**
* @var integer, priority of initialization
Expand All @@ -76,15 +77,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 fa-fw fa-eye',
'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 @@
[![Progress](https://img.shields.io/badge/required-Yii2_v2.0.40-blue.svg)](https://packagist.org/packages/yiisoft/yii2)
[![Progress](https://img.shields.io/badge/required-Yii2_v2.0.35-blue.svg)](https://packagist.org/packages/yiisoft/yii2)
[![Github all releases](https://img.shields.io/github/downloads/wdmg/yii2-views/total.svg)](https://GitHub.com/wdmg/yii2-views/releases/)
[![GitHub version](https://badge.fury.io/gh/wdmg/yii2-views.svg)](https://github.com/wdmg/yii2-views)
![Progress](https://img.shields.io/badge/progress-ready_to_use-green.svg)
Expand All @@ -11,11 +11,11 @@ System of accounting user views.

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/)

# 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)
* [Yii2 Users](https://github.com/wdmg/yii2-users) module (optionaly)

Expand Down Expand Up @@ -94,9 +94,6 @@ Use the `Module::dashboardNavItems()` method of the module to generate a navigat
?>

# Status and version [ready to use]
* v.1.1.0 - Update copyrights, fix menu dashboard
* v.1.0.1 - Update dependencies, README.md
* v.1.0.0 - Added component for set/get views counter
* v.0.0.12 - Update README.md and dependencies
* v.0.0.11 - Fixed deprecated class declaration
* v.0.0.10 - Added extra options to composer.json and navbar menu icon
* v.0.0.9 - Added choice param for non interactive mode
* v.1.0.0 - Added component for set/get views counter
2 changes: 1 addition & 1 deletion commands/InitController.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function actionIndex($params = null)
'║ ║'. "\n" .
'║ VIEWS MODULE, v.'.$version.''. "\n" .
'║ by Alexsander Vyshnyvetskyy ║'. "\n" .
'║ (c) 2019-2021 W.D.M.Group, Ukraine ║'. "\n" .
'║ (c) 2019-2023 W.D.M.Group, Ukraine ║'. "\n" .
'║ ║'. "\n" .
'╚════════════════════════════════════════════════╝';
echo $name = $this->ansiFormat($welcome . "\n\n", Console::FG_GREEN);
Expand Down
3 changes: 1 addition & 2 deletions components/Views.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
* Yii2 Views
*
* @category Component
* @version 1.0.1
* @author Alexsander Vyshnyvetskyy <[email protected]>
* @link https://github.com/wdmg/yii2-views
* @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
*
*/
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"keywords": ["yii2", "yii2-views", "views", "wdmg"],
"type": "yii2-extension",
"license": "MIT",
"version": "1.0.1",
"version": "1.1.0",
"homepage": "https://github.com/wdmg/yii2-views",
"support": {
"source": "https://github.com/wdmg/yii2-views",
Expand All @@ -21,7 +21,7 @@
}
],
"require": {
"yiisoft/yii2": "^2.0.40",
"yiisoft/yii2": "^2.0.35",
"wdmg/yii2-base": "^1.2.4",
"wdmg/yii2-selectinput": "^1.0.9",
"wdmg/yii2-helpers": "^1.3.2"
Expand Down
Binary file modified docs/images/yii2-views.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 776d24d

Please sign in to comment.