diff options
author | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-09-28 18:44:17 +0200 |
---|---|---|
committer | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-09-28 18:44:17 +0200 |
commit | 61c4f9b3c8377e5275b05ce318bcbc285ebfcddf (patch) | |
tree | 6ea54e638b9f60cd2214e651091248b86713f904 /apps/media | |
parent | 59d4ddd9051c5aaf80140484767ff274d3ce6630 (diff) | |
parent | 8d14c489ebb058f362fb3f675db511d228042e89 (diff) | |
download | nextcloud-server-61c4f9b3c8377e5275b05ce318bcbc285ebfcddf.tar.gz nextcloud-server-61c4f9b3c8377e5275b05ce318bcbc285ebfcddf.zip |
Merge branch 'master' of gitorious.org:owncloud/owncloud
Diffstat (limited to 'apps/media')
-rw-r--r-- | apps/media/appinfo/app.php | 1 | ||||
-rw-r--r-- | apps/media/settings.php | 6 | ||||
-rw-r--r-- | apps/media/templates/settings.php | 7 |
3 files changed, 14 insertions, 0 deletions
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php index 0d36217bd4d..dd1a830a94b 100644 --- a/apps/media/appinfo/app.php +++ b/apps/media/appinfo/app.php @@ -25,6 +25,7 @@ $l=new OC_L10N('media'); require_once('apps/media/lib_media.php'); OC_Util::addScript('media','loader'); +OC_APP::registerPersonal('media','settings'); OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' )); diff --git a/apps/media/settings.php b/apps/media/settings.php new file mode 100644 index 00000000000..133440a9af6 --- /dev/null +++ b/apps/media/settings.php @@ -0,0 +1,6 @@ +<?php + +$tmpl = new OC_Template( 'media', 'settings'); + +return $tmpl->fetchPage(); +?> diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php new file mode 100644 index 00000000000..70ee6dbc1ea --- /dev/null +++ b/apps/media/templates/settings.php @@ -0,0 +1,7 @@ +<form id="mediaform"> + <fieldset class="personalblock"> + <strong>Media</strong><br /> + Ampache URL: + <?php echo OC_Helper::linkTo('apps/media', 'tomahawk.php', null, true); ?><br /> + </fieldset> +</form> |