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
514d31a4
Commit
514d31a4
authored
Apr 12, 2020
by
NGPixel
Committed by
Nicolas Giard
Apr 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: hide sidebar option
parent
a33691d6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
3 deletions
+24
-3
admin-rendering.vue
client/components/admin/admin-rendering.vue
+7
-1
nav-sidebar.vue
client/themes/default/components/nav-sidebar.vue
+4
-0
page.vue
client/themes/default/components/page.vue
+7
-2
definition.yml
server/modules/rendering/markdown-core/definition.yml
+5
-0
page.pug
server/views/page.pug
+1
-0
No files found.
client/components/admin/admin-rendering.vue
View file @
514d31a4
...
@@ -199,7 +199,13 @@ export default {
...
@@ -199,7 +199,13 @@ export default {
query
:
renderersQuery
,
query
:
renderersQuery
,
fetchPolicy
:
'network-only'
,
fetchPolicy
:
'network-only'
,
update
:
(
data
)
=>
{
update
:
(
data
)
=>
{
let
renderers
=
_
.
cloneDeep
(
data
.
rendering
.
renderers
).
map
(
str
=>
({...
str
,
config
:
str
.
config
.
map
(
cfg
=>
({...
cfg
,
value
:
JSON
.
parse
(
cfg
.
value
)}))}))
let
renderers
=
_
.
cloneDeep
(
data
.
rendering
.
renderers
).
map
(
str
=>
({
...
str
,
config
:
_
.
sortBy
(
str
.
config
.
map
(
cfg
=>
({
...
cfg
,
value
:
JSON
.
parse
(
cfg
.
value
)
})),
[
t
=>
t
.
value
.
order
])
}))
// Build tree
// Build tree
const
graph
=
new
DepGraph
({
circular
:
true
})
const
graph
=
new
DepGraph
({
circular
:
true
})
const
rawCores
=
_
.
filter
(
renderers
,
[
'dependsOn'
,
null
]).
map
(
core
=>
{
const
rawCores
=
_
.
filter
(
renderers
,
[
'dependsOn'
,
null
]).
map
(
core
=>
{
...
...
client/themes/default/components/nav-sidebar.vue
View file @
514d31a4
...
@@ -64,6 +64,10 @@ export default {
...
@@ -64,6 +64,10 @@ export default {
mode
:
{
mode
:
{
type
:
String
,
type
:
String
,
default
:
'browse'
default
:
'browse'
},
navMode
:
{
type
:
String
,
default
:
'MIXED'
}
}
},
},
data
()
{
data
()
{
...
...
client/themes/default/components/page.vue
View file @
514d31a4
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
v-app(v-scroll='upBtnScroll', :dark='darkMode', :class='$vuetify.rtl ? `is-rtl` : `is-ltr`')
v-app(v-scroll='upBtnScroll', :dark='darkMode', :class='$vuetify.rtl ? `is-rtl` : `is-ltr`')
nav-header
nav-header
v-navigation-drawer(
v-navigation-drawer(
v-if='navMode !== `NONE`'
:class='darkMode ? `grey darken-4-d4` : `primary`'
:class='darkMode ? `grey darken-4-d4` : `primary`'
dark
dark
app
app
...
@@ -12,9 +13,9 @@
...
@@ -12,9 +13,9 @@
:right='$vuetify.rtl'
:right='$vuetify.rtl'
)
)
vue-scroll(:ops='scrollStyle')
vue-scroll(:ops='scrollStyle')
nav-sidebar(:color='darkMode ? `grey darken-4-d4` : `primary`', :items='sidebar')
nav-sidebar(:color='darkMode ? `grey darken-4-d4` : `primary`', :items='sidebar'
, :nav-mode='navMode'
)
v-fab-transition
v-fab-transition
(v-if='navMode !== `NONE`')
v-btn(
v-btn(
fab
fab
color='primary'
color='primary'
...
@@ -345,6 +346,10 @@ export default {
...
@@ -345,6 +346,10 @@ export default {
sidebar
:
{
sidebar
:
{
type
:
Array
,
type
:
Array
,
default
:
()
=>
[]
default
:
()
=>
[]
},
navMode
:
{
type
:
String
,
default
:
'MIXED'
}
}
},
},
data
()
{
data
()
{
...
...
server/modules/rendering/markdown-core/definition.yml
View file @
514d31a4
...
@@ -11,26 +11,31 @@ props:
...
@@ -11,26 +11,31 @@ props:
default
:
true
default
:
true
title
:
Allow HTML
title
:
Allow HTML
hint
:
Enable HTML tags in content
hint
:
Enable HTML tags in content
order
:
1
linkify
:
linkify
:
type
:
Boolean
type
:
Boolean
default
:
true
default
:
true
title
:
Automatically convert links
title
:
Automatically convert links
hint
:
Links will automatically be converted to clickable links.
hint
:
Links will automatically be converted to clickable links.
order
:
2
linebreaks
:
linebreaks
:
type
:
Boolean
type
:
Boolean
default
:
true
default
:
true
title
:
Automatically convert line breaks
title
:
Automatically convert line breaks
hint
:
Add linebreaks within paragraphs.
hint
:
Add linebreaks within paragraphs.
order
:
3
typographer
:
typographer
:
type
:
Boolean
type
:
Boolean
default
:
false
default
:
false
title
:
Typographer
title
:
Typographer
hint
:
Enable some language-neutral replacement + quotes beautification
hint
:
Enable some language-neutral replacement + quotes beautification
order
:
4
quotes
:
quotes
:
type
:
String
type
:
String
default
:
English
default
:
English
title
:
Quotes style
title
:
Quotes style
hint
:
When typographer is enabled. Double + single quotes replacement pairs. e.g. «»„“ for Russian, „“‚‘ for German, etc.
hint
:
When typographer is enabled. Double + single quotes replacement pairs. e.g. «»„“ for Russian, „“‚‘ for German, etc.
order
:
5
enum
:
enum
:
-
Chinese
-
Chinese
-
English
-
English
...
...
server/views/page.pug
View file @
514d31a4
...
@@ -22,6 +22,7 @@ block body
...
@@ -22,6 +22,7 @@ block body
:toc=page.toc
:toc=page.toc
:page-id=page.id
:page-id=page.id
:sidebar=sidebar
:sidebar=sidebar
nav-mode=config.nav.mode
)
)
template(slot='contents')
template(slot='contents')
div(v-pre)!= page.render
div(v-pre)!= page.render
...
...
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