Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder

Browse source 
Conflicts:
	airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
This commit is contained in:
Duncan Sommerville 2015-08-21 11:09:07 -04:00
commit 48f1c5b9a4
12 changed files with 133 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/controllers/BillingController.php
View file

@ -22,7 +22,6 @@ class BillingController extends Zend_Controller_Action {
public function upgradeAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
$CC_CONFIG = Config::getConfig();
@ -211,7 +210,6 @@ class BillingController extends Zend_Controller_Action {
public function clientAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
$CC_CONFIG = Config::getConfig();
@ -264,7 +262,6 @@ class BillingController extends Zend_Controller_Action {
public function invoicesAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
$CC_CONFIG = Config::getConfig();

2
airtime_mvc/application/controllers/DashboardController.php
View file

@ -108,13 +108,11 @@ class DashboardController extends Zend_Controller_Action
public function helpAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Help');
}
public function aboutAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Help');
$this->view->airtime_version = Application_Model_Preference::GetAirtimeVersion();
}

2
airtime_mvc/application/controllers/EmbeddablewidgetsController.php
View file

@ -10,7 +10,6 @@ class EmbeddableWidgetsController extends Zend_Controller_Action
public function playerAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Widgets');
$CC_CONFIG = Config::getConfig();
@ -34,7 +33,6 @@ class EmbeddableWidgetsController extends Zend_Controller_Action
public function scheduleAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Widgets');
$apiEnabled = Application_Model_Preference::GetAllow3rdPartyApi();

1
airtime_mvc/application/controllers/ListenerstatController.php
View file

@ -17,7 +17,6 @@ class ListenerstatController extends Zend_Controller_Action
$request = $this->getRequest();
$baseUrl = Application_Common_OsPath::getBaseDir();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
$this->view->headScript()->appendFile($baseUrl.'js/flot/jquery.flot.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

1
airtime_mvc/application/controllers/PlayouthistoryController.php
View file

@ -24,7 +24,6 @@ class PlayouthistoryController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest());

2
airtime_mvc/application/controllers/PlayouthistorytemplateController.php
View file

@ -18,7 +18,6 @@ class PlayouthistorytemplateController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/template.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
@ -35,7 +34,6 @@ class PlayouthistorytemplateController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Analytics');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/playouthistory/configuretemplate.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

2
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -24,7 +24,6 @@ class PreferenceController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig();
$request = $this->getRequest();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
$baseUrl = Application_Common_OsPath::getBaseDir();
@ -146,7 +145,6 @@ class PreferenceController extends Zend_Controller_Action
$request = $this->getRequest();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
$baseUrl = Application_Common_OsPath::getBaseDir();

2
airtime_mvc/application/controllers/UserController.php
View file

@ -23,7 +23,6 @@ class UserController extends Zend_Controller_Action
$request = $this->getRequest();
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
$baseUrl = Application_Common_OsPath::getBaseDir();
@ -125,7 +124,6 @@ class UserController extends Zend_Controller_Action
public function editUserAction()
{
$this->_helper->layout->setLayout("page-sub-menu");
Zend_Layout::getMvcInstance()->assign('parent_page', 'Settings');
session_start(); //Reopen session for writing.