move public links to a subentry of files

diff --git a/apps/files_publiclink/admin.php b/apps/files_publiclink/admin.php
index 8187039c3a622bb6c9a0d8c9d547fdd20c0b491a..c095cf144092313b25207746316d8ee777de52fe 100644 (file)
--- a/apps/files_publiclink/admin.php
+++ b/apps/files_publiclink/admin.php
@@ -46,7 +46,7 @@ if(isset($_SERVER['HTTPS'])) {
 
 
 // return template
-$tmpl = new OC_Template( "files_publiclink", "admin", "admin" );
+$tmpl = new OC_Template( "files_publiclink", "admin", "user" );
 $tmpl->assign( 'links', OC_PublicLink::getLinks());
 $tmpl->assign('baseUrl',$baseUrl);
 $tmpl->printPage();

diff --git a/apps/files_publiclink/appinfo/app.php b/apps/files_publiclink/appinfo/app.php
index 314a3bf896aa4bdb82218a785b891fcd1cd60019..28a398f7278005ca31e95ce8e2eb8b516efaf76d 100644 (file)
--- a/apps/files_publiclink/appinfo/app.php
+++ b/apps/files_publiclink/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 
-OC_App::addSettingsPage( array( "id" => "files_publiclink_administration", "order" => 1, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links", "icon" => OC_Helper::imagePath( "files_publiclink", "share.png" )));
+OC_App::addNavigationSubEntry('files_index', array( "id" => "files_publiclink_administration", "order" => 1, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links", "icon" => OC_Helper::imagePath( "files_publiclink", "share.png" )));
 
 
 ?>

diff --git a/files/css/files.css b/files/css/files.css
index 4aaca82f124c1471cd7433c178bc0957649b28d7..d7d681e66a36e7852397b6f58da8503bcd08fb86 100644 (file)
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -48,4 +48,4 @@ table td.filename form { float:left; font-size:.85em; }
 .selectedActions a:hover, a.file_action:hover { background:#fff; -moz-box-shadow:0 0 10px #fff; -webkit-box-shadow:0 0 10px #fff; box-shadow:0 0 10px #fff; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
 
 /* add breadcrumb divider to the File item in navigation panel */
-#plugins li:first-child { background-position:15.7em 0px; background-repeat:no-repeat; background-image:url("/owncloud/core/img/breadcrumb-divider-start.png"); width:15.7em; padding-right:11px; }
+#plugins>ul>li:first-child { background-position:15.7em 0px; background-repeat:no-repeat; background-image:url("/owncloud/core/img/breadcrumb-divider-start.png"); width:15.7em; padding-right:11px; }