mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9469 from owncloud/replace_uninstall_button_with_link 

improvements for uninstall button
This commit is contained in:
Morris Jobke 2014-07-06 23:56:44 +02:00
parent 694bcc6813 485be909ff
commit d3e65bc974
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
settings/js/apps.js
View File

@ -84,12 +84,12 @@ OC.Settings.Apps = OC.Settings.Apps || {
page.find('input.update').hide(); page.find('input.update').hide();
} }
if (app.removable !== false) { if (app.removable !== false && app.active === false) {
page.find('input.uninstall').show(); page.find('a.uninstall').show();
page.find('input.uninstall').data('appid', app.id); page.find('a.uninstall').data('appid', app.id);
page.find('input.uninstall').attr('value', t('settings', 'Uninstall App')); page.find('a.uninstall').attr('value', t('settings', 'Uninstall App'));
} else { } else {
page.find('input.uninstall').hide(); page.find('a.uninstall').hide();
} }
page.find('input.enable').show(); page.find('input.enable').show();
@ -371,7 +371,7 @@ $(document).ready(function(){
OC.Settings.Apps.updateApp(appid, element); OC.Settings.Apps.updateApp(appid, element);
} }
}); });
$('#app-content input.uninstall').click(function(){ $('#app-content a.uninstall').click(function(){
var element = $(this); var element = $(this);
var appid=$(this).data('appid'); var appid=$(this).data('appid');
if(appid) { if(appid) {

2
settings/templates/apps.php
View File

@ -53,7 +53,7 @@
print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p> print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
<input class="enable hidden" type="submit" /> <input class="enable hidden" type="submit" />
<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" /> <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 /> <br />
<input class="hidden" type="checkbox" id="groups_enable"/> <input class="hidden" type="checkbox" id="groups_enable"/>
<label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label> <label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label>