aboutsummaryrefslogtreecommitdiffstats
path: root/apps/media/index.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-07-29 23:53:22 +0200
committerRobin Appelman <icewind1991@gmail.com>2011-07-29 23:55:54 +0200
commit94e25ecb0c2dcd895fb080b3b2cf296d58676e17 (patch)
tree509057b6d0e6264c610279c38a24268e6e49abc5 /apps/media/index.php
parentbafd684eb694ed0bd86b46ff7cd36382c1cebc34 (diff)
downloadnextcloud-server-94e25ecb0c2dcd895fb080b3b2cf296d58676e17.tar.gz
nextcloud-server-94e25ecb0c2dcd895fb080b3b2cf296d58676e17.zip
Some much needed interface work on the media player
Diffstat (limited to 'apps/media/index.php')
-rw-r--r--apps/media/index.php22
1 files changed, 15 insertions, 7 deletions
diff --git a/apps/media/index.php b/apps/media/index.php
index 152c4583412..bd994e06341 100644
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -33,18 +33,26 @@ if( !OC_User::isLoggedIn()){
require_once('lib_collection.php');
require_once('lib_scanner.php');
-OC_Util::addScript('media','player');
-OC_Util::addScript('media','music');
-OC_Util::addScript('media','jquery.jplayer.min');
-OC_Util::addStyle('media','player');
-OC_Util::addStyle('media','music');
+OC_UTIL::addScript('media','player');
+OC_UTIL::addScript('media','music');
+OC_UTIL::addScript('media','playlist');
+OC_UTIL::addScript('media','collection');
+OC_UTIL::addScript('media','jquery.jplayer.min');
+OC_UTIL::addStyle('media','player');
+OC_UTIL::addStyle('media','playlist');
+OC_UTIL::addStyle('media','music');
-OC_App::setActiveNavigationEntry( 'media_index' );
+OC_APP::setActiveNavigationEntry( 'media_playlist' );
$tmpl = new OC_Template( 'media', 'music', 'user' );
-$player = new OC_Template( 'media', 'player');
+$player = new OC_TEMPLATE( 'media', 'player');
+$playlist = new OC_TEMPLATE( 'media', 'playlist');
+$collection= new OC_TEMPLATE( 'media', 'collection');
+
$tmpl->assign('player',$player->fetchPage());
+$tmpl->assign('playlist',$playlist->fetchPage());
+$tmpl->assign('collection',$collection->fetchPage());
$tmpl->printPage();
?>