diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2014-07-05 13:39:25 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2014-07-05 13:39:25 +0200 |
| commit | 485be909ff10d151fd5ddfe8e0709f50db611882 (patch) | |
| tree | 495fc7ffd7b519d9ee19bfc5f0c70aee03a28b9e /settings | |
| parent | 2327d41b11e11ca0553c829b5d7adeb0f000a474 (diff) | |
| download | nextcloud-server-485be909ff10d151fd5ddfe8e0709f50db611882.tar.gz nextcloud-server-485be909ff10d151fd5ddfe8e0709f50db611882.zip | |
improvements for uninstall button
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/apps.js | 12 | ||||
| -rw-r--r-- | settings/templates/apps.php | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 4cd7520caa7..3f9a9eab17a 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -84,12 +84,12 @@ OC.Settings.Apps = OC.Settings.Apps || { page.find('input.update').hide(); } - if (app.removable !== false) { - page.find('input.uninstall').show(); - page.find('input.uninstall').data('appid', app.id); - page.find('input.uninstall').attr('value', t('settings', 'Uninstall App')); + if (app.removable !== false && app.active === false) { + page.find('a.uninstall').show(); + page.find('a.uninstall').data('appid', app.id); + page.find('a.uninstall').attr('value', t('settings', 'Uninstall App')); } else { - page.find('input.uninstall').hide(); + page.find('a.uninstall').hide(); } page.find('input.enable').show(); @@ -371,7 +371,7 @@ $(document).ready(function(){ OC.Settings.Apps.updateApp(appid, element); } }); - $('#app-content input.uninstall').click(function(){ + $('#app-content a.uninstall').click(function(){ var element = $(this); var appid=$(this).data('appid'); if(appid) { diff --git a/settings/templates/apps.php b/settings/templates/apps.php index b35eda4350c..29fda0ed243 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -53,7 +53,7 @@ print_unescaped($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 p($l->t('Update')); ?>" /> - <input class="uninstall hidden" type="submit" value="<?php p($l->t('Uninstall')); ?>"/> + <a class="uninstall hidden" href="#"><?php p($l->t('Uninstall')); ?></a> <br /> <input class="hidden" type="checkbox" id="groups_enable"/> <label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label> |