diff options
author | Jakob Sack <kde@jakobsack.de> | 2011-07-30 08:56:08 +0200 |
---|---|---|
committer | Jakob Sack <kde@jakobsack.de> | 2011-07-30 08:56:08 +0200 |
commit | 924cd17f2ed18dcc860a5e15543c3fc835203c4c (patch) | |
tree | d80ac3ce11c141c648492a6914dd1daad88929a2 | |
parent | 51e00d074cf4f1481c96f6a18da9c8ab7f412393 (diff) | |
download | nextcloud-server-924cd17f2ed18dcc860a5e15543c3fc835203c4c.tar.gz nextcloud-server-924cd17f2ed18dcc860a5e15543c3fc835203c4c.zip |
Icewind destroyed my changes :-(
-rw-r--r-- | apps/media/appinfo/app.php | 12 | ||||
-rw-r--r-- | apps/media/index.php | 22 |
2 files changed, 17 insertions, 17 deletions
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php index d611e59eb31..b29b842d23a 100644 --- a/apps/media/appinfo/app.php +++ b/apps/media/appinfo/app.php @@ -28,8 +28,8 @@ if(OC_App::getCurrentApp()=='files'){ OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' )); -OC_APP::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_HELPER::linkTo( 'media', 'index.php' ), 'icon' => OC_HELPER::imagePath( 'media', 'media.png' ), 'name' => 'Media' )); -OC_APP::addSettingsPage( array( 'id' => 'media_settings', 'order' => 5, 'href' => OC_HELPER::linkTo( 'media', 'settings.php' ), 'name' => 'Media', 'icon' => OC_HELPER::imagePath( 'media', 'media.png' ))); +OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'media', 'media.png' ), 'name' => 'Media' )); +OC_App::addSettingsPage( array( 'id' => 'media_settings', 'order' => 5, 'href' => OC_Helper::linkTo( 'media', 'settings.php' ), 'name' => 'Media', 'icon' => OC_Helper::imagePath( 'media', 'media.png' ))); // add subnavigations $entry = array( @@ -38,26 +38,26 @@ $entry = array( 'href' => '#playlist', 'name' => 'Playlist' ); -OC_APP::addNavigationSubEntry( "media_index", $entry); +OC_App::addNavigationSubEntry( "media_index", $entry); $entry = array( 'id' => "media_collection", 'order'=>1, 'href' => '#collection', 'name' => 'Collection' ); -OC_APP::addNavigationSubEntry( "media_index", $entry); +OC_App::addNavigationSubEntry( "media_index", $entry); // $entry = array( // 'id' => "media_recent", // 'order'=>1, // 'href' => '#recent', // 'name' => 'Most Recent' // ); -// OC_APP::addNavigationSubEntry( "media_index", $entry); +// OC_App::addNavigationSubEntry( "media_index", $entry); // $entry = array( // 'id' => "media_mostplayer", // 'order'=>1, // 'href' => '#mostplayed', // 'name' => 'Most Played' // ); -// OC_APP::addNavigationSubEntry( "media_index", $entry); +// OC_App::addNavigationSubEntry( "media_index", $entry); ?> diff --git a/apps/media/index.php b/apps/media/index.php index 0fe7c12f63c..43423d27de6 100644 --- a/apps/media/index.php +++ b/apps/media/index.php @@ -33,21 +33,21 @@ 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','playlist'); -OC_UTIL::addScript('media','collection'); -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','music'); -OC_APP::setActiveNavigationEntry( 'media_playlist' ); +OC_App::setActiveNavigationEntry( 'media_playlist' ); $tmpl = new OC_Template( 'media', 'music', 'user' ); -$player = new OC_TEMPLATE( 'media', 'player'); -$playlist = new OC_TEMPLATE( 'media', 'playlist'); -$collection= new OC_TEMPLATE( 'media', 'collection'); +$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()); |