diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/apps.php | 2 | ||||
| -rw-r--r-- | settings/js/apps-custom.php | 4 | ||||
| -rw-r--r-- | settings/templates/apps.php | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/settings/apps.php b/settings/apps.php index 384e92bfbb7..b6426a31c97 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -26,10 +26,8 @@ OC_App::loadApps(); // Load the files we need OC_Util::addStyle( "settings", "settings" ); -OC_Util::addScript( "settings", "apps" ); OC_App::setActiveNavigationEntry( "core_apps" ); - function app_sort( $a, $b ) { if ($a['active'] != $b['active']) { diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php index e0e7a2d6c79..9ec2a758ee3 100644 --- a/settings/js/apps-custom.php +++ b/settings/js/apps-custom.php @@ -21,4 +21,6 @@ $combinedApps = OC_App::listAllApps(); foreach($combinedApps as $app) { echo("appData_".$app['id']."=".json_encode($app)); echo("\n"); -}
\ No newline at end of file +} + +echo ("var appid =\"".$_GET['appid']."\";");
\ No newline at end of file diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 98b0e6c725c..d418b9a66a1 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -3,7 +3,8 @@ * This file is licensed under the Affero General Public License version 3 or later. * See the COPYING-README file. */?> - <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('apps_custom');?>"></script> + <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('apps_custom');?>?appid=<?php echo $_['appid']; ?>"></script> + <script type="text/javascript" src="<?php echo OC_Helper::linkTo('settings/js', 'apps.js');?>"></script> <div id="controls"> <a class="button" target="_blank" href="http://owncloud.org/dev/apps/getting-started/"><?php echo $l->t('Add your App');?></a> |