Merge branch 'saas-dev' into soundcloud

This commit is contained in:
Duncan Sommerville 2015-06-15 11:03:37 -04:00
commit 706d7db2b2
20 changed files with 172 additions and 45 deletions

View file

@ -36,6 +36,13 @@ $pages = array(
'action' => 'index',
'resource' => 'schedule'
),
array(
'label' => _('Radio Page'),
'uri' => '/',
'resource' => '',
'pages' => array(
)
),
array(
'label' => _('System'),
'uri' => '#',
@ -81,7 +88,7 @@ $pages = array(
'resource' => 'listenerstat'
),
array(
'label' => _('Widgets'),
'label' => _('Embeddable Widgets'),
'module' => 'default',
'controller' => 'embeddablewidgets',
'action' => 'index'