Skip to content

Commit

Permalink
Update menu
Browse files Browse the repository at this point in the history
  • Loading branch information
kiwi-commerce committed Jun 13, 2018
1 parent 99738e5 commit 598bd28
Show file tree
Hide file tree
Showing 10 changed files with 435 additions and 9 deletions.
64 changes: 64 additions & 0 deletions Block/Adminhtml/System/Config/Fieldset/Hint.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?php
/**
* KiwiCommerce
*
* Do not edit or add to this file if you wish to upgrade to newer versions in the future.
* If you wish to customise this module for your needs.
* Please contact us https://kiwicommerce.co.uk/contacts.
*
* @category KiwiCommerce
* @package KiwiCommerce_AdminActivity
* @copyright Copyright (C) 2018 Kiwi Commerce Ltd (https://kiwicommerce.co.uk/)
* @license https://kiwicommerce.co.uk/magento2-extension-license/
*/

namespace KiwiCommerce\AdminActivity\Block\Adminhtml\System\Config\Fieldset;

use \Magento\Backend\Block\Template;
use \Magento\Framework\Data\Form\Element\Renderer\RendererInterface;

/**
* Class Hint
* @package KiwiCommerce\AdminActivity\Block\Adminhtml\System\Config\Fieldset
*/
class Hint extends Template implements RendererInterface
{
/**
* @var \Magento\Framework\Module\ModuleList
*/
private $moduleList;

/**
* Class constructor.
* @param Template\Context $context
* @param \Magento\Framework\Module\ModuleList $moduleList
* @param array $data
*/
public function __construct(
Template\Context $context,
\Magento\Framework\Module\ModuleList $moduleList,
array $data = []
) {
$this->_template = 'KiwiCommerce_AdminActivity::system/config/fieldset/hint.phtml';
parent::__construct($context, $data);
$this->moduleList = $moduleList;
}

/**
* @param \Magento\Framework\Data\Form\Element\AbstractElement $element
* @return string
*/
public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
{
$_element = $element;
return $this->toHtml();
}

/**
* @return mixed
*/
public function getModuleVersion()
{
return $this->moduleList->getOne('KiwiCommerce_AdminActivity')['setup_version'];
}
}
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Magento 2 - Admin Activity by Kiwi Commerce
## Magento 2 - Admin Activity by KiwiCommerce

### Overview
- Easily track every admin activity like add, edit, delete, print, view, mass update etc.
Expand All @@ -9,16 +9,16 @@

### **Installation**

1. Install using Composer
1. Composer Installation
- Navigate to your Magento root folder<br />
`cd path_to_the_magento_root_directory`<br />
- Then run the following command<br />
`composer require kiwicommerce/module-admin-activity`<br/>
- Make sure that composer finished the installation without errors.

2. Install manually
2. Command Line Installation
- Backup your web directory and database.
- Download Admin Activity Log installation package from <a href="https://github.com/kiwicommerce/magento2-admin-activity/releases/download/v1.0.2/kiwicommerce-admin-activity-v102.zip">here</a>.
- Download Admin Activity Log installation package from <a href="https://github.com/kiwicommerce/magento2-admin-activity/releases/download/v1.0.3/kiwicommerce-admin-activity-v103.zip">here</a>.
- Upload contents of the Admin Activity Log installation package to your Magento root directory.
- Navigate to your Magento root folder<br />
`cd path_to_the_magento_root_directory`<br />
Expand All @@ -32,7 +32,7 @@
`php bin/magento setup:static-content:deploy`<br />
`php bin/magento cache:flush`

Find More details on <a href="https://kiwicommerce.co.uk/extensions/magento2-admin-activity/" target="_blank">Kiwi Commerce</a>
Find More details on <a href="https://kiwicommerce.co.uk/extensions/magento2-admin-activity/" target="_blank">KiwiCommerce</a>

## Where will it appear in the Admin Panel

Expand Down Expand Up @@ -77,4 +77,5 @@ We love answering questions or doubts simply ask us in issue section. We're look

- Follow us <a href="https://twitter.com/KiwiCommerce">@KiwiCommerce</a>
- <a href="mailto:[email protected]">Email Us</a>
- Have a look at our <a href="https://kiwicommerce.co.uk/docs/">documentation</a>
- Have a look at our <a href="https://kiwicommerce.co.uk/docs/admin-activity/">documentation</a>

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "kiwicommerce/module-admin-activity",
"description": "Magento 2 - Admin Activity",
"type": "magento2-module",
"version": "1.0.2",
"version": "1.0.3",
"license": [
"OSL-3.0"
],
Expand Down
5 changes: 4 additions & 1 deletion etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
<system>
<tab id="kiwicommerce" translate="label" sortOrder="9999">
<label>KiwiCommerce Extentions</label>
<label><![CDATA[<span class="kiwiCommerce-logo">KiwiCommerce Extensions</span>]]></label>
</tab>
<section id="admin_activity" translate="label" sortOrder="130" showInDefault="1" showInWebsite="0" showInStore="0">
<class>separator-top</class>
<label>Admin Activity</label>
<tab>kiwicommerce</tab>
<resource>KiwiCommerce_AdminActivity::activityConfig</resource>
<group id="hint" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="1">
<frontend_model>KiwiCommerce\AdminActivity\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
</group>
<group id="general" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
<label>General Configuration</label>
<field id="enable" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="KiwiCommerce_AdminActivity" setup_version="1.0.2"/>
<module name="KiwiCommerce_AdminActivity" setup_version="1.0.3"/>
</config>
24 changes: 24 additions & 0 deletions view/adminhtml/templates/system/config/fieldset/hint.phtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php
/**
* KiwiCommerce
*
* Do not edit or add to this file if you wish to upgrade to newer versions in the future.
* If you wish to customise this module for your needs.
* Please contact us https://kiwicommerce.co.uk/contacts.
*
* @category KiwiCommerce
* @package KiwiCommerce_AdminActivity
* @copyright Copyright (C) 2018 Kiwi Commerce Ltd (https://kiwicommerce.co.uk/)
* @license https://kiwicommerce.co.uk/magento2-extension-license/
*/
?>

<div style="background:#EAF0EE;border:1px solid #CCCCCC;margin-bottom:10px;padding:11px 0 0 10px;">
<h4>
<img style="padding-left: 15px;" src="<?php echo $block->getViewFileUrl('KiwiCommerce_AdminActivity::images/kiwicommerce-logo.svg') ?>"/><br><br>
<div style="padding-left: 15px;">
<p> <strong style="color:#EA7601;"><?php echo __('Admin Activity (ver.') ?><?php echo $this->getModuleVersion() ?><?php echo __(') - Developed by') ?></strong> <a style="color:#EA7601;" target="_blank" href="https://kiwicommerce.co.uk/"><strong>KiwiCommerce</strong></a></p>
<p><?php echo __('For technical support ') ?> <a style="color:#EA7601;" href="https://kiwicommerce.co.uk/extension-support" target="_blank"><?php echo __('Contact Us') ?></a> <?php echo __('or email us at') ?> <a style="color:#EA7601;" href="mailto:[email protected]" target="_blank"><?php echo __('[email protected]') ?></a></p>
</div>
</h4>
</div>
14 changes: 14 additions & 0 deletions view/adminhtml/web/css/source/_module.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/**
* KiwiCommerce
*
* Do not edit or add to this file if you wish to upgrade to newer versions in the future.
* If you wish to customise this module for your needs.
* Please contact us https://kiwicommerce.co.uk/contacts.
*
* @category KiwiCommerce
* @package KiwiCommerce_AdminActivity
* @copyright Copyright (C) 2018 Kiwi Commerce Ltd (https://kiwicommerce.co.uk/)
* @license https://kiwicommerce.co.uk/magento2-extension-license/
*/

@import 'module/_menu.less';
19 changes: 19 additions & 0 deletions view/adminhtml/web/css/source/module/_menu.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* KiwiCommerce
*
* Do not edit or add to this file if you wish to upgrade to newer versions in the future.
* If you wish to customise this module for your needs.
* Please contact us https://kiwicommerce.co.uk/contacts.
*
* @category KiwiCommerce
* @package KiwiCommerce_AdminActivity
* @copyright Copyright (C) 2018 Kiwi Commerce Ltd (https://kiwicommerce.co.uk/)
* @license https://kiwicommerce.co.uk/magento2-extension-license/
*/

.kiwiCommerce-logo {
background-image: url('KiwiCommerce_AdminActivity::images/kiwicommerce-icon.svg');
background-size: auto 20px;
background-repeat: no-repeat;
padding-left: 25px;
}
Loading

0 comments on commit 598bd28

Please sign in to comment.