diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-01-30 14:36:17 +0100 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-01-30 14:36:17 +0100 |
| commit | 66cab77b6d83980d260cd35556d2759089d2971b (patch) | |
| tree | ccf3767afba89f90ea82bd0805f23eb189956b53 /settings/templates/apps.php | |
| parent | 389c4e84153893a04310876ef70943cad53ee3e7 (diff) | |
| parent | 5761bd771f4142394a00083712b63e77f8976946 (diff) | |
| download | nextcloud-server-66cab77b6d83980d260cd35556d2759089d2971b.tar.gz nextcloud-server-66cab77b6d83980d260cd35556d2759089d2971b.zip | |
merge master
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
Diffstat (limited to 'settings/templates/apps.php')
| -rw-r--r-- | settings/templates/apps.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 7b5eaea9cd1..bbd5de1fcbd 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -3,9 +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> + <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"><?php echo $l->t('Add your App');?></a> <a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a> @@ -29,7 +29,7 @@ <p class="description"></p> <img src="" class="preview" /> <p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p> - <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p> + <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p> <input class="enable hidden" type="submit" /> <input class="update hidden" type="submit" value="<?php echo($l->t('Update')); ?>" /> </div> |