Merge branch 'saas' into saas-dev

This commit is contained in:
Duncan Sommerville 2015-07-06 16:54:39 -04:00
commit 999f03ea1e
2 changed files with 30 additions and 10 deletions

View file

@ -146,9 +146,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$baseUrl = Application_Common_OsPath::getBaseDir();
$view->headLink(array('rel' => 'icon',
'href' => $baseUrl . 'favicon.ico?' . $CC_CONFIG['airtime_version'],
'type' => 'image/x-icon'), 'PREPEND')
$view->headLink(array('rel' => 'icon', 'href' => $baseUrl . 'favicon.ico?' . $CC_CONFIG['airtime_version'], 'type' => 'image/x-icon'), 'PREPEND')
->appendStylesheet($baseUrl . 'css/bootstrap.css?' . $CC_CONFIG['airtime_version'])
->appendStylesheet($baseUrl . 'css/redmond/jquery-ui-1.8.8.custom.css?' . $CC_CONFIG['airtime_version'])
->appendStylesheet($baseUrl . 'css/pro_dropdown_3.css?' . $CC_CONFIG['airtime_version'])