Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev

This commit is contained in:
Albert Santoni 2015-10-19 15:23:57 -04:00
commit da6e613a24

View file

@ -81,18 +81,11 @@ $pages = array(
array( array(
'label' => "<i class='icon-signal icon-white'></i>"._("Analytics"), 'label' => "<i class='icon-signal icon-white'></i>"._("Analytics"),
'module' => 'default', 'module' => 'default',
'controller' => 'listenerstat', 'controller' => 'playouthistory',
'action' => 'index', 'action' => 'index',
'resource' => 'listenerstat', 'resource' => 'playouthistory',
'title' => 'Analytics', 'title' => 'Analytics',
'pages' => array( 'pages' => array(
array(
'label' => _('Listener Stats'),
'module' => 'default',
'controller' => 'listenerstat',
'action' => 'index',
'resource' => 'listenerstat'
),
array( array(
'label' => _('Playout History'), 'label' => _('Playout History'),
'module' => 'default', 'module' => 'default',
@ -106,7 +99,14 @@ $pages = array(
'controller' => 'playouthistorytemplate', 'controller' => 'playouthistorytemplate',
'action' => 'index', 'action' => 'index',
'resource' => 'playouthistorytemplate' 'resource' => 'playouthistorytemplate'
) ),
array(
'label' => _('Listener Stats'),
'module' => 'default',
'controller' => 'listenerstat',
'action' => 'index',
'resource' => 'listenerstat'
),
) )
), ),
array( array(