Skip to content

Commit

Permalink
Merge pull request #75 from benfreke/1.5.1
Browse files Browse the repository at this point in the history
Release 1.5.1
  • Loading branch information
benfreke authored May 14, 2017
2 parents 5a0ab66 + f72b729 commit d92bce9
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 35 deletions.
46 changes: 24 additions & 22 deletions Plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
class Plugin extends PluginBase
{

/**
* Returns information about this plugin.
*
Expand All @@ -18,10 +17,11 @@ class Plugin extends PluginBase
public function pluginDetails()
{
return [
'name' => 'benfreke.menumanager::lang.plugin.name',
'name' => 'benfreke.menumanager::lang.plugin.name',
'description' => 'benfreke.menumanager::lang.plugin.description',
'author' => 'Ben Freke',
'icon' => 'icon-list-alt'
'author' => 'Ben Freke',
'icon' => 'icon-list-alt',
'homepage' => 'https://github.com/benfreke/oc-menumanager-plugin',
];
}

Expand All @@ -34,34 +34,37 @@ public function registerNavigation()
{
return [
'menumanager' => [
'label' => 'benfreke.menumanager::lang.menu.name',
'url' => Backend::url('benfreke/menumanager/menus'),
'icon' => 'icon-list-alt',
'label' => 'benfreke.menumanager::lang.menu.name',
'url' => Backend::url('benfreke/menumanager/menus'),
'icon' => 'icon-list-alt',
'permissions' => ['benfreke.menumanager.*'],
'order' => 500,
'order' => 500,
'sideMenu' => [
'edit' => [
'edit' => [
'label' => 'benfreke.menumanager::lang.menu.editmenu',
'icon' => 'icon-list-alt',
'url' => Backend::url('benfreke/menumanager/menus'),
'permissions' => ['benfreke.menumanager.access_menumanager']
'icon' => 'icon-list-alt',
'url' => Backend::url('benfreke/menumanager/menus'),
'permissions' => ['benfreke.menumanager.access_menumanager'],
],
'reorder' => [
'label' => 'benfreke.menumanager::lang.menu.reordermenu',
'icon' => 'icon-exchange',
'url' => Backend::url('benfreke/menumanager/menus/reorder'),
'permissions' => ['benfreke.menumanager.access_menumanager']
]
]
]
'icon' => 'icon-exchange',
'url' => Backend::url('benfreke/menumanager/menus/reorder'),
'permissions' => ['benfreke.menumanager.access_menumanager'],
],
],
],
];
}

public function registerPermissions()
{
return array(
'benfreke.menumanager.access_menumanager' => ['label' => 'Manage menu', 'tab' => 'MenuManager']
);
return [
'benfreke.menumanager.access_menumanager' => [
'label' => 'benfreke.menumanager::lang.access.label',
'tab' => 'benfreke.menumanager::lang.plugin.name',
],
];
}

/**
Expand All @@ -75,5 +78,4 @@ public function registerComponents()
'\BenFreke\MenuManager\Components\Menu' => 'menu',
];
}

}
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ A component is included to output the menu in pages/partials/layout. It can incl

## Versions ##

**Currently 1.5.0**
**Currently 1.5.1**

### 1.5.1

- Add homepage for plugin details, thanks [@gegor85](https://github.com/gergo85)
- Added a couple of missing translations

### 1.5.0

Expand Down
27 changes: 15 additions & 12 deletions lang/en/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,22 @@
return [
'plugin' => [
'name' => 'Menu Manager',
'description' => 'Plugin to enable management of menus within October CMS.'
'description' => 'Plugin to enable management of menus within October CMS.',
],
'access' => [
'label' => 'Manage Menus',
],
'menu' => [
'name' => 'Menus',
'description' => 'Displays a menu on the page.',
'editmenu' => 'Edit Menus',
'reordermenu' => 'Reorder Menus'
'reordermenu' => 'Reorder Menus',
],
'misc' => [
'menu' => 'Menu',
'newmenu' => 'New Menu',
'manageorder' => 'Manage Menu Order',
'returntomenus' => 'Return to Menus'
'returntomenus' => 'Return to Menus',
],
'form' => [
'create' => 'Create a Menu item',
Expand All @@ -24,7 +27,7 @@
'flashcreate' => 'Menu has been created',
'flashupdate' => 'Menu updated',
'flashdelete' => 'Menu deleted',
'manage' => 'Manage Menus'
'manage' => 'Manage Menus',
],
'create' => [
'menus' => 'Menus',
Expand All @@ -34,22 +37,22 @@
'cancel' => 'Cancel',
'or' => 'or',
'return' => 'Return to menus list',
'nolink' => 'No page link'
'nolink' => 'No page link',
],
'update' => [
'saving' => 'Saving Menu...',
'save' => 'Save',
'saveclose' => 'Save and Close',
'deleting' => 'Deleting Menu...',
'reallydelete' => 'Do you really want to delete this menu?'
'reallydelete' => 'Do you really want to delete this menu?',
],
'modeldata' => [
'title' => 'Title',
'enabled' => 'Enabled',
'url' => 'Page linked to',
'parameters' => 'Parameters',
'query' => 'Query String',
'description' => 'Description'
'description' => 'Description',
],
'modeldataform' => [
'title' => 'Title',
Expand All @@ -72,12 +75,12 @@
'parameterscomment' => '{ "slug" : "my-page-slug" }',
'querystr' => 'Extra non-OctoberCMS query string parameters (they will be automatically escaped)',
'querystrcomment' => 'e.g "param1=foo&param2=http://www.google.com"',
'url' => 'URL'
'url' => 'URL',
],
'component' => [
'start' => [
'title' => 'Parent Node',
'description' => 'The parent node to get the children of'
'description' => 'The parent node to get the children of',
],
'activenode' => [
'description' => 'The active page. Set to "default" for the current page to be set as active',
Expand All @@ -93,7 +96,7 @@
],
'secondaryclasses' => [
'title' => 'Secondary Classes',
'description' => 'The parent node to get the children of'
'description' => 'The parent node to get the children of',
],
'tertiaryclasses' => [
'description' => 'Classes to add to the secondary ul tags',
Expand All @@ -102,6 +105,6 @@
'numberoflevels' => [
'description' => 'How many levels of menu to output',
'title' => 'Depth',
]
]
],
],
];
2 changes: 2 additions & 0 deletions updates/version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@
- Merged PR to fix re-order errors. Thanks @CptMeatball
1.5.0:
- Fixed bugs preventing postgres and sqlite support
1.5.1:
- Added homepage to plugin information. Thanks @gergo85

0 comments on commit d92bce9

Please sign in to comment.