mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some IE issues with settings page (#10819)

Browse Source
This commit is contained in:
Tony Murray
2019-11-17 05:14:16 +00:00
committed by GitHub
parent 138dc24f64
commit 3aa594bed1
8 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/js/bootstrap.js vendored
View File

@@ -53,3 +53,7 @@ if (token) {
// cluster: process.env.MIX_PUSHER_APP_CLUSTER,
// encrypted: true
// });
// Polyfills
require('es6-object-assign/auto');

8
resources/js/components/LibrenmsSetting.vue
View File

@@ -24,11 +24,11 @@
<template>
<div :class="['form-group', 'has-feedback', setting.class, feedback]">
<label :for="setting.name" class="col-sm-5 control-label" v-tooltip="setting.name">
<label :for="setting.name" class="col-sm-5 control-label" v-tooltip="{ content: setting.name }">
{{ getDescription() }}
<span v-if="setting.units !== null">({{ setting.units }})</span>
</label>
<div class="col-sm-5" v-tooltip="setting.disabled ? $t('settings.readonly') : false">
<div class="col-sm-5" v-tooltip="{ content: setting.disabled ? $t('settings.readonly') : false }">
<component :is="getComponent()"
:value="value"
:name="setting.name"
@@ -42,8 +42,8 @@
<span class="form-control-feedback"></span>
</div>
<div class="col-sm-2">
<button :style="{'opacity': showResetToDefault()?1:0}" @click="resetToDefault" class="btn btn-default" type="button" v-tooltip="$t('Reset to default')"><i class="fa fa-refresh"></i></button>
<button :style="{'opacity': showUndo()?1:0}" @click="resetToInitial" class="btn btn-primary" type="button" v-tooltip="$t('Undo')"><i class="fa fa-undo"></i></button>
<button :style="{'opacity': showResetToDefault()?1:0}" @click="resetToDefault" class="btn btn-default" type="button" v-tooltip="{ content: $t('Reset to default') }"><i class="fa fa-refresh"></i></button>
<button :style="{'opacity': showUndo()?1:0}" @click="resetToInitial" class="btn btn-primary" type="button" v-tooltip="{ content: $t('Undo') }"><i class="fa fa-undo"></i></button>
<div v-if="hasHelp()" v-tooltip="{content: getHelp(), trigger: 'hover click'}" class="fa fa-fw fa-lg fa-question-circle"></div>
</div>
</div>

8
resources/js/components/LibrenmsSettings.vue
View File

@@ -163,12 +163,12 @@
// sort groups
let sorted = {};
for (const group_key of Object.keys(groups).sort()) {
Object.keys(groups).sort().forEach(group_key => {
sorted[group_key] = {};
for (const section_key of Object.keys(groups[group_key]).sort()) {
Object.keys(groups[group_key]).sort().forEach(section_key => {
sorted[group_key][section_key] = _.sortBy(groups[group_key][section_key], 'order').map(a => a.name);
}
}
});
});
return sorted;
}