summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-06-25 05:02:01 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-06-25 05:02:01 +0200
commitc3130919c2fa67caa5d7d52124b20388633c5cfa (patch)
treefa0528d40d592050933c3f88a1f8c549da751b80 /settings
parent052bd8efbb39096867fdb2c0922b77f468a45ef9 (diff)
downloadnextcloud-server-c3130919c2fa67caa5d7d52124b20388633c5cfa.tar.gz
nextcloud-server-c3130919c2fa67caa5d7d52124b20388633c5cfa.zip
Allow direct link to app.
Diffstat (limited to 'settings')
-rw-r--r--settings/apps.php2
-rw-r--r--settings/js/apps.js9
-rw-r--r--settings/templates/apps.php4
3 files changed, 14 insertions, 1 deletions
diff --git a/settings/apps.php b/settings/apps.php
index f85b28158f5..f4ae8b8d977 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -93,6 +93,8 @@ usort($apps, 'app_sort');
$tmpl = new OC_Template( "settings", "apps", "user" );
$tmpl->assign('apps',$apps, false);
+$appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
+$tmpl->assign('appid',$appid);
$tmpl->printPage();
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 224076aba43..cfef894c6fb 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -73,4 +73,13 @@ $(document).ready(function(){
}
}
});
+
+ if(appid) {
+ var item = $('#leftcontent li[data-id="'+appid+'"]');
+ if(item) {
+ item.trigger('click');
+ item.addClass('active');
+ $('#leftcontent').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
+ }
+ }
});
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index c620f796e06..b9beedca151 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -3,7 +3,9 @@
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/?>
-
+<script type='text/javascript'>
+ var appid = '<?php echo $_['appid']; ?>';
+</script>
<div id="controls">
<a class="button" target="_blank" href="http://owncloud.org/dev/writing-apps/"><?php echo $l->t('Add your App');?></a>
</div>