diff options
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/apps.js | 12 | ||||
| -rw-r--r-- | settings/js/log.js | 1 |
2 files changed, 7 insertions, 6 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/js/log.js b/settings/js/log.js index 5832c698ad5..197fef907a0 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -56,6 +56,7 @@ OC.Log={ row.append(messageTd); var timeTd=$('<td/>'); + timeTd.addClass('date'); if(isNaN(entry.time)){ timeTd.text(entry.time); } else { |