From 68f1932eee3e5976f9d5864e3ddb8ec042aa31d7 Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Wed, 25 Jul 2018 17:56:18 +0000 Subject: [webapp/settings] Added tabs and design to the settings page. --- webapp/src/assets/styles.css | 4 ++ webapp/src/components/SettingsModule.vue | 66 ++++++++++++++++++++++++-------- webapp/src/store/global.js | 4 +- 3 files changed, 57 insertions(+), 17 deletions(-) diff --git a/webapp/src/assets/styles.css b/webapp/src/assets/styles.css index 9bb1355..c18db49 100644 --- a/webapp/src/assets/styles.css +++ b/webapp/src/assets/styles.css @@ -35,4 +35,8 @@ html { padding: 0 5px; margin: 0 -5px; flex: 1 +} + +.element-container { + padding: 26px; } \ No newline at end of file diff --git a/webapp/src/components/SettingsModule.vue b/webapp/src/components/SettingsModule.vue index 2d3b781..ed23cc9 100644 --- a/webapp/src/components/SettingsModule.vue +++ b/webapp/src/components/SettingsModule.vue @@ -4,40 +4,81 @@ "darkTheme": "Dark Theme", "coloredTabs": "Colored tabpanels", "clipped": "Show menu under the top bar", - "mini": "Show icons in collapsed menu" + "mini": "Show icons in collapsed menu", + "language": "Language", + "general": "General", + "generalSettings": "General settings", + "appearance": "Appearance" }, "de": { "darkTheme": "Dunkles Design", "coloredTabs": "Tab-Panels einfärben", "clipped": "Menü an die Hauptleiste andocken", - "mini": "Symbole im eingeklappten Menü anzeigen" + "mini": "Symbole im eingeklappten Menü anzeigen", + "language": "Sprache", + "general": "Allgemein", + "generalSettings": "Allgemeine Einstellungen", + "appearance": "Aussehen" } } diff --git a/webapp/src/components/BackendModuleEditDynamicFields.vue b/webapp/src/components/BackendModuleEditDynamicFields.vue new file mode 100644 index 0000000..eae6357 --- /dev/null +++ b/webapp/src/components/BackendModuleEditDynamicFields.vue @@ -0,0 +1,73 @@ + +{ + "en": { + }, + "de": { + } +} + + + + + + + diff --git a/webapp/src/components/BackendModuleTable.vue b/webapp/src/components/BackendModuleTable.vue index 2ca15b3..a0e59e4 100644 --- a/webapp/src/components/BackendModuleTable.vue +++ b/webapp/src/components/BackendModuleTable.vue @@ -104,15 +104,15 @@ export default { // Set to start the loading animation. item.loading = true // Test the credential connection. - this.$http('/api/backends/checkConnection?id=' + this.backendId, { + this.$http('/api/backends/checkConnection?id=' + item.id, { headers: { 'Cache-Control': 'no-cache' } }).then(response => { - if (response.data.status === 'success') { + if (response.data.success) { // Set the button color to green if success. item.connection = 'success' - } else if (response.data.status === 'error') { + } else { // Set the button color to red if error. item.connection = 'error' this.$store.commit('newSnackbar', response.data.msg) -- cgit v1.2.3-55-g7522