Page MenuHomePhorge
Files F85832165

No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/components/admin_modal/tabs/general_tab.js b/src/components/admin_modal/tabs/general_tab.js
index 8c166f19af..68b0ac4b97 100644
--- a/src/components/admin_modal/tabs/general_tab.js
+++ b/src/components/admin_modal/tabs/general_tab.js
@@ -1,33 +1,33 @@
import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
import ChoiceSetting from '../settings_modal/helpers/choice_setting.vue'
import IntegerSetting from '../settings_modal/helpers/integer_setting.vue'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faGlobe
} from '@fortawesome/free-solid-svg-icons'
library.add(
faGlobe
)
const GeneralTab = {
components: {
BooleanSetting,
ChoiceSetting,
- IntegerSetting,
+ IntegerSetting
},
computed: {
mergedConfig () {
console.log(this.$store.state)
return this.$store.state
}
},
methods: {
changeDefaultScope (value) {
this.$store.dispatch('setProfileOption', { name: 'defaultScope', value })
}
}
}
export default GeneralTab
diff --git a/src/components/settings_modal/helpers/draft_buttons.vue b/src/components/settings_modal/helpers/draft_buttons.vue
index 0d99da132f..53ddc9b4ad 100644
--- a/src/components/settings_modal/helpers/draft_buttons.vue
+++ b/src/components/settings_modal/helpers/draft_buttons.vue
@@ -1,102 +1,102 @@
<!-- this is a helper exclusive to Setting components -->
<!-- TODO make it reusable -->
<template>
<span
class="DraftButtons"
>
<Popover
trigger="hover"
:trigger-attrs="{ 'aria-label': $t('settings.commit_value_tooltip') }"
>
<template #trigger>
&nbsp;
<button
- v-if="$parent.isDirty"
- class="button button-default btn"
- type="button"
- :title="$t('settings.commit_value')"
- @click="$parent.commitDraft"
+ v-if="$parent.isDirty"
+ class="button button-default btn"
+ type="button"
+ :title="$t('settings.commit_value')"
+ @click="$parent.commitDraft"
>
- {{ $t('settings.commit_value') }}
+ {{ $t('settings.commit_value') }}
</button>
</template>
<template #content>
<div class="modified-tooltip">
{{ $t('settings.commit_value_tooltip') }}
</div>
</template>
</Popover>
<Popover
trigger="hover"
:trigger-attrs="{ 'aria-label': $t('settings.reset_value_tooltip') }"
>
<template #trigger>
&nbsp;
<button
- v-if="$parent.isDirty"
- class="button button-default btn"
- type="button"
- :title="$t('settings.reset_value')"
- @click="$parent.reset"
+ v-if="$parent.isDirty"
+ class="button button-default btn"
+ type="button"
+ :title="$t('settings.reset_value')"
+ @click="$parent.reset"
>
- {{ $t('settings.reset_value') }}
+ {{ $t('settings.reset_value') }}
</button>
</template>
<template #content>
<div class="modified-tooltip">
{{ $t('settings.reset_value_tooltip') }}
</div>
</template>
</Popover>
<Popover
trigger="hover"
:trigger-attrs="{ 'aria-label': $t('settings.hard_reset_value_tooltip') }"
>
<template #trigger>
&nbsp;
<button
- v-if="$parent.canHardReset"
- class="button button-default btn"
- type="button"
- :title="$t('settings.hard_reset_value')"
- @click="$parent.hardReset"
+ v-if="$parent.canHardReset"
+ class="button button-default btn"
+ type="button"
+ :title="$t('settings.hard_reset_value')"
+ @click="$parent.hardReset"
>
- {{ $t('settings.hard_reset_value') }}
+ {{ $t('settings.hard_reset_value') }}
</button>
</template>
<template #content>
<div class="modified-tooltip">
{{ $t('settings.hard_reset_value_tooltip') }}
</div>
</template>
</Popover>
</span>
</template>
<script>
import Popover from 'src/components/popover/popover.vue'
import { library } from '@fortawesome/fontawesome-svg-core'
import { faWrench } from '@fortawesome/free-solid-svg-icons'
library.add(
faWrench
)
export default {
components: { Popover },
props: ['changed']
}
</script>
<style lang="scss">
.DraftButtons {
display: inline-block;
position: relative;
}
.draft-tooltip {
margin: 0.5em 1em;
min-width: 10em;
text-align: center;
}
</style>

File Metadata

Mime Type
text/x-diff
Expires
Mon, Nov 2, 5:08 AM (15 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1803602
Default Alt Text
(4 KB)

Event Timeline