Revert "Merge branch 'ryerson-history'"

This reverts commit a554c6f72c, reversing
changes made to 2a0c9769aa.
This commit is contained in:
Naomi Aro 2013-09-23 11:00:43 +02:00
parent a554c6f72c
commit c8b73850b9
200 changed files with 5491 additions and 41784 deletions

View file

@ -20,7 +20,7 @@ $pages = array(
'module' => 'default',
'controller' => 'Plupload',
'action' => 'index',
'resource' => 'plupload'
'resource' => 'plupload'
),
array(
'label' => _('Library'),
@ -79,6 +79,13 @@ $pages = array(
'action' => 'index',
'resource' => 'systemstatus'
),
array(
'label' => _('Playout History'),
'module' => 'default',
'controller' => 'playouthistory',
'action' => 'index',
'resource' => 'playouthistory'
),
array(
'label' => _('Listener Stats'),
'module' => 'default',
@ -88,27 +95,6 @@ $pages = array(
)
)
),
array(
'label' => _('History'),
'uri' => '#',
'resource' => 'playouthistory',
'pages' => array(
array(
'label' => _('Playout History'),
'module' => 'default',
'controller' => 'playouthistory',
'action' => 'index',
'resource' => 'playouthistory'
),
array(
'label' => _('History Templates'),
'module' => 'default',
'controller' => 'playouthistorytemplate',
'action' => 'index',
'resource' => 'playouthistorytemplate'
),
)
),
array(
'label' => _('Help'),
'uri' => '#',