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

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source 
Conflicts:
	application/controllers/LibraryController.php
	application/controllers/SearchController.php
This commit is contained in:
naomiaro 2011-01-06 01:05:34 -05:00
commit d9e8e1641a
76 changed files with 238 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

10
application/controllers/SearchController.php
View file

@ -43,9 +43,9 @@ class SearchController extends Zend_Controller_Action
public function indexAction()
{
$this->_helper->layout->setLayout('search');
$this->view->headScript()->appendFile('/js/campcaster/onready/search.js','text/javascript');
$this->_helper->layout->setLayout('search');
$this->view->headScript()->appendFile('/js/airtime/onready/search.js','text/javascript');
$this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
$this->view->headLink()->appendStylesheet('/css/contextmenu.css');
@ -56,8 +56,8 @@ class SearchController extends Zend_Controller_Action
public function displayAction()
{
$this->view->headScript()->appendFile('/js/campcaster/library/advancedsearch.js','text/javascript');
//$this->view->headLink()->appendStylesheet('/css/library_search.css');
$this->view->headScript()->appendFile('/js/airtime/library/advancedsearch.js','text/javascript');
$this->view->headLink()->appendStylesheet('/css/library_search.css');
$this->_helper->viewRenderer->setResponseSegment('search');