Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
b5b19133
Unverified
Commit
b5b19133
authored
Mar 17, 2023
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: footer override markdown inline parsing
parent
51e5f426
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
admin-general.vue
client/components/admin/admin-general.vue
+1
-0
nav-footer.vue
client/themes/default/components/nav-footer.vue
+12
-1
No files found.
client/components/admin/admin-general.vue
View file @
b5b19133
...
@@ -88,6 +88,7 @@
...
@@ -88,6 +88,7 @@
:label='$t(`admin:general.footerOverride`)'
:label='$t(`admin:general.footerOverride`)'
v-model='config.footerOverride'
v-model='config.footerOverride'
prepend-icon='mdi-page-layout-footer'
prepend-icon='mdi-page-layout-footer'
append-icon='mdi-language-markdown'
persistent-hint
persistent-hint
:hint='$t(`admin:general.footerOverrideHint`)'
:hint='$t(`admin:general.footerOverrideHint`)'
)
)
...
...
client/themes/default/components/nav-footer.vue
View file @
b5b19133
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
v-footer.justify-center(:color='bgColor', inset)
v-footer.justify-center(:color='bgColor', inset)
.caption.grey--text(:class='$vuetify.theme.dark ? `text--lighten-1` : `text--darken-1`')
.caption.grey--text(:class='$vuetify.theme.dark ? `text--lighten-1` : `text--darken-1`')
template(v-if='footerOverride')
template(v-if='footerOverride')
span
{{
footerOverride
}}
|
span
(v-html='footerOverrideRender + ` | `')
template(v-else-if='company && company.length > 0 && contentLicense !== ``')
template(v-else-if='company && company.length > 0 && contentLicense !== ``')
span(v-if='contentLicense === `alr`')
{{
$t
(
'common:footer.copyright'
,
{
company
:
company
,
year
:
currentYear
,
interpolation
:
{
escapeValue
:
false
}
}
)
}}
|&
nbsp
;
span(v-if='contentLicense === `alr`')
{{
$t
(
'common:footer.copyright'
,
{
company
:
company
,
year
:
currentYear
,
interpolation
:
{
escapeValue
:
false
}
}
)
}}
|&
nbsp
;
span
(
v
-
else
)
{{
$t
(
'common:footer.license'
,
{
company
:
company
,
license
:
$t
(
'common:license.'
+
contentLicense
),
interpolation
:
{
escapeValue
:
false
}
}
)
}}
|&
nbsp
;
span
(
v
-
else
)
{{
$t
(
'common:footer.license'
,
{
company
:
company
,
license
:
$t
(
'common:license.'
+
contentLicense
),
interpolation
:
{
escapeValue
:
false
}
}
)
}}
|&
nbsp
;
...
@@ -11,6 +11,13 @@
...
@@ -11,6 +11,13 @@
<
script
>
<
script
>
import
{
get
}
from
'vuex-pathify'
import
{
get
}
from
'vuex-pathify'
import
MarkdownIt
from
'markdown-it'
const
md
=
new
MarkdownIt
({
html
:
false
,
breaks
:
false
,
linkify
:
true
}
)
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -32,6 +39,10 @@ export default {
...
@@ -32,6 +39,10 @@ export default {
company
:
get
(
'site/company'
),
company
:
get
(
'site/company'
),
contentLicense
:
get
(
'site/contentLicense'
),
contentLicense
:
get
(
'site/contentLicense'
),
footerOverride
:
get
(
'site/footerOverride'
),
footerOverride
:
get
(
'site/footerOverride'
),
footerOverrideRender
()
{
if
(
!
this
.
footerOverride
)
{
return
''
}
return
md
.
renderInline
(
this
.
footerOverride
)
}
,
bgColor
()
{
bgColor
()
{
if
(
!
this
.
$vuetify
.
theme
.
dark
)
{
if
(
!
this
.
$vuetify
.
theme
.
dark
)
{
return
this
.
color
return
this
.
color
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment