kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
Merge branch '1012-long-instance-name-overlapping-next-column-in-footer' into 'develop'
Resolve "long instance name overlapping next column in footer" Closes #1012 See merge request funkwhale/funkwhale!992merge-requests/1042/head
commit
424b9f133a
|
@ -0,0 +1 @@
|
||||||
|
Changed footer to use instance name if available, and append ellipses if instance URL/Name is too long (#1012)
|
|
@ -3,8 +3,11 @@
|
||||||
<div class="ui container">
|
<div class="ui container">
|
||||||
<div class="ui stackable equal height stackable grid">
|
<div class="ui stackable equal height stackable grid">
|
||||||
<section class="four wide column">
|
<section class="four wide column">
|
||||||
<h4 class="ui header">
|
<h4 v-if="podName" class="ui header ellipsis">
|
||||||
<translate translate-context="Footer/About/Title" :translate-params="{instanceName: instanceHostname}" >About %{instanceName}</translate>
|
<translate translate-context="Footer/About/Title" :translate-params="{instanceName: podName}" >About %{instanceName}</translate>
|
||||||
|
</h4>
|
||||||
|
<h4 v-else class="ui header ellipsis">
|
||||||
|
<translate translate-context="Footer/About/Title" :translate-params="{instanceUrl: instanceHostname}" >About %{instanceUrl}</translate>
|
||||||
</h4>
|
</h4>
|
||||||
<div class="ui link list">
|
<div class="ui link list">
|
||||||
<router-link class="item" to="/about">
|
<router-link class="item" to="/about">
|
||||||
|
@ -71,13 +74,18 @@
|
||||||
import Vue from "vue"
|
import Vue from "vue"
|
||||||
import { mapState } from "vuex"
|
import { mapState } from "vuex"
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
import _ from '@/lodash'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: ["version"],
|
props: ["version"],
|
||||||
computed: {
|
computed: {
|
||||||
...mapState({
|
...mapState({
|
||||||
messages: state => state.ui.messages
|
messages: state => state.ui.messages,
|
||||||
|
nodeinfo: state => state.instance.nodeinfo,
|
||||||
}),
|
}),
|
||||||
|
podName() {
|
||||||
|
return _.get(this.nodeinfo, 'metadata.nodeName')
|
||||||
|
},
|
||||||
instanceHostname() {
|
instanceHostname() {
|
||||||
let url = this.$store.state.instance.instanceUrl
|
let url = this.$store.state.instance.instanceUrl
|
||||||
let parser = document.createElement("a")
|
let parser = document.createElement("a")
|
||||||
|
|
Ładowanie…
Reference in New Issue