opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

Fix some IE issues with settings page (#10819)

This commit is contained in:
Tony Murray 2019-11-17 05:14:16 +00:00 committed by GitHub
parent 138dc24f64
commit 3aa594bed1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/js/app.js
View File

File diff suppressed because one or more lines are too long

2
html/js/vendor.js
View File

File diff suppressed because one or more lines are too long

4
html/mix-manifest.json
View File

@ -1,8 +1,8 @@
{
"/js/app.js": "/js/app.js?id=a3314d8fe69b9133f906",
"/js/app.js": "/js/app.js?id=d074dd82ac08dba78c44",
"/css/app.css": "/css/app.css?id=17e56994706c74ee9663",
"/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e",
"/js/vendor.js": "/js/vendor.js?id=dc98201378abb0b1bb08",
"/js/vendor.js": "/js/vendor.js?id=00c1d21ecfea78860e09",
"/js/lang/de.js": "/js/lang/de.js?id=18b0b0e06813d1afed92",
"/js/lang/en.js": "/js/lang/en.js?id=a31a978859a3e4fe73c7",
"/js/lang/fr.js": "/js/lang/fr.js?id=07da32f987ba907e1f7f",

5
package-lock.json generated
View File

@ -3152,6 +3152,11 @@
"is-symbol": "^1.0.2"
}
},
"es6-object-assign": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
"integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw="
},
"es6-templates": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz",

1
package.json
View File

@ -24,6 +24,7 @@
"vue-template-compiler": "^2.6.10"
},
"dependencies": {
"es6-object-assign": "^1.1.0",
"v-tooltip": "^2.0.2",
"vue-i18n": "^8.14.1",
"vue-js-toggle-button": "^1.3.2",

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;
}