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
15e4341f
Commit
15e4341f
authored
Feb 09, 2017
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed pug linting issues
parent
3566a78c
Show whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
74 additions
and
83 deletions
+74
-83
.pug-lintrc.json
.pug-lintrc.json
+1
-1
login.pug
views/auth/login.pug
+4
-4
alerts.pug
views/common/alerts.pug
+1
-1
footer.pug
views/common/footer.pug
+0
-1
header.pug
views/common/header.pug
+7
-9
error-forbidden.pug
views/error-forbidden.pug
+0
-0
error-notexist.pug
views/error-notexist.pug
+0
-0
error.pug
views/error.pug
+0
-0
layout.pug
views/layout.pug
+0
-0
admin-createuser.pug
views/modals/admin-createuser.pug
+5
-6
admin-deleteuser.pug
views/modals/admin-deleteuser.pug
+2
-3
create-discard.pug
views/modals/create-discard.pug
+0
-0
create.pug
views/modals/create.pug
+1
-1
edit-discard.pug
views/modals/edit-discard.pug
+0
-0
editor-codeblock.pug
views/modals/editor-codeblock.pug
+3
-4
editor-file.pug
views/modals/editor-file.pug
+20
-21
editor-image.pug
views/modals/editor-image.pug
+25
-26
editor-link.pug
views/modals/editor-link.pug
+0
-0
editor-video.pug
views/modals/editor-video.pug
+2
-3
move.pug
views/modals/move.pug
+1
-1
_layout.pug
views/pages/admin/_layout.pug
+0
-0
profile.pug
views/pages/admin/profile.pug
+1
-1
settings.pug
views/pages/admin/settings.pug
+0
-0
stats.pug
views/pages/admin/stats.pug
+0
-0
users-edit.pug
views/pages/admin/users-edit.pug
+0
-0
users.pug
views/pages/admin/users.pug
+0
-0
create.pug
views/pages/create.pug
+0
-0
edit.pug
views/pages/edit.pug
+0
-0
source.pug
views/pages/source.pug
+0
-0
view.pug
views/pages/view.pug
+0
-0
welcome.pug
views/pages/welcome.pug
+1
-1
No files found.
.pug-lintrc.json
View file @
15e4341f
...
...
@@ -9,7 +9,7 @@
"requireLowerCaseTags"
:
true
,
"requireSpaceAfterCodeOperator"
:
true
,
"requireStrictEqualityOperators"
:
true
,
"validateAttributeQuoteMarks"
:
true
,
"validateAttributeQuoteMarks"
:
"'"
,
"validateAttributeSeparator"
:
", "
,
"validateDivTags"
:
true
,
"validateIndentation"
:
2
...
...
views/auth/login.pug
View file @
15e4341f
...
...
@@ -28,7 +28,7 @@ html
body
#bg
each bg in _.sampleSize([1, 2, 3],3)
div(style="background-image:url(/images/bg_" + bg + ".jpg);"
)
div(style='background-image:url(/images/bg_' + bg + '.jpg);'
)
#root
h1= appconfig.title
h2 Login required
...
...
@@ -49,15 +49,15 @@ html
else
span Log in using...
if appconfig.auth.microsoft && appconfig.auth.microsoft.enabled
button.ms(onclick="window.location.assign('/login/ms')"
)
button.ms(onclick='window.location.assign("/login/ms")'
)
i.fa.fa-windows
span Microsoft Account
if appconfig.auth.google && appconfig.auth.google.enabled
button.google(onclick="window.location.assign('/login/google')"
)
button.google(onclick='window.location.assign("/login/google")'
)
i.fa.fa-google
span Google ID
if appconfig.auth.facebook && appconfig.auth.facebook.enabled
button.facebook(onclick="window.location.assign('/login/facebook')"
)
button.facebook(onclick='window.location.assign("/login/facebook")'
)
i.fa.fa-facebook
span Facebook
#copyright
...
...
views/common/alerts.pug
View file @
15e4341f
#alerts
ul
template(v-for="aItem in children"
, track-by='_uid')
template(v-for='aItem in children'
, track-by='_uid')
li(v-bind:class='aItem.class')
button(v-on:click='acknowledge(aItem._uid)')
strong {{ aItem.title }}
...
...
views/common/footer.pug
View file @
15e4341f
...
...
@@ -6,4 +6,3 @@ footer.footer
ul
li: a(href='/')= t('footer.home')
li: a(href='#root')= t('footer.top')
views/common/header.pug
View file @
15e4341f
...
...
@@ -10,7 +10,7 @@
.nav-center
block rootNavCenter
.nav-item
p.control(v-bind:class="{ 'is-loading': searchload > 0 }"
)
p.control(v-bind:class='{ "is-loading": searchload > 0 }'
)
input.input#search-input(type='text', v-model='searchq', @keyup.esc='closeSearch', @keyup.down='moveDownSearch', @keyup.up='moveUpSearch', @keyup.enter='moveSelectSearch', debounce='400', placeholder='Search...')
span.nav-toggle
span
...
...
@@ -20,17 +20,15 @@
block rootNavRight
i.nav-item#notifload
transition(name="searchresults-anim", enter-active-class="slideInDown", leave-active-class="fadeOutUp"
)
transition(name='searchresults-anim', enter-active-class='slideInDown', leave-active-class='fadeOutUp'
)
.searchresults.animated(v-show='searchactive', v-cloak, style={'display':'none'})
p.searchresults-label Search Results
ul.searchresults-list
li(v-if="searchres.length === 0"
)
li(v-if='searchres.length === 0'
)
a: em No results matching your query
li(v-for='sres in searchres', v-bind:class="{ 'is-active': searchmovekey === 'res.' + sres._id }"
)
a(v-bind:href="'/' + sres._id"
) {{ sres.title }}
li(v-for='sres in searchres', v-bind:class='{ "is-active": searchmovekey === "res." + sres._id }'
)
a(v-bind:href='"/" + sres._id'
) {{ sres.title }}
p.searchresults-label(v-if='searchsuggest.length > 0') Did you mean...?
ul.searchresults-list(v-if='searchsuggest.length > 0')
li(v-for='sug in searchsuggest', v-bind:class="{ 'is-active': searchmovekey === 'sug.' + sug }")
a(v-on:click="useSuggestion(sug)") {{ sug }}
li(v-for='sug in searchsuggest', v-bind:class='{ "is-active": searchmovekey === "sug." + sug }')
a(v-on:click='useSuggestion(sug)') {{ sug }}
views/error-forbidden.pug
View file @
15e4341f
views/error-notexist.pug
View file @
15e4341f
views/error.pug
View file @
15e4341f
views/layout.pug
View file @
15e4341f
views/modals/admin-createuser.pug
View file @
15e4341f
...
...
@@ -17,17 +17,17 @@
option(value='windowslive') Microsoft Account
option(value='google') Google ID
option(value='facebook') Facebook
section(v-if="provider=='local'"
)
section(v-if='provider=="local"'
)
label.label Password:
p.control.is-fullwidth
input.input(type='password', placeholder='', v-model='password')
span.help.is-red.is-hidden This password is invalid!
section(v-if="provider=='local'"
)
section(v-if='provider=="local"'
)
label.label Full Name:
p.control.is-fullwidth
input.input(type='text', placeholder='e.g. John Doe', v-model='name')
span.help.is-red.is-hidden This name is invalid!
footer
a.button.is-grey.is-outlined(v-on:click="cancel") Discard
a.button.is-blue(v-on:click="create", v-if="provider=='local'") Create User
a.button.is-blue(v-on:click="create", v-if="provider!='local'") Authorize User
\ No newline at end of file
a.button.is-grey.is-outlined(v-on:click='cancel') Discard
a.button.is-blue(v-on:click='create', v-if='provider=="local"') Create User
a.button.is-blue(v-on:click='create', v-if='provider!="local"') Authorize User
views/modals/admin-deleteuser.pug
View file @
15e4341f
...
...
@@ -6,5 +6,5 @@
section
span Are you sure you want to delete this user account? This action cannot be undone!
footer
a.button.is-grey.is-outlined(v-on:click="cancel") Abort
a.button.is-red(v-on:click="deleteUser") Delete
\ No newline at end of file
a.button.is-grey.is-outlined(v-on:click='cancel') Abort
a.button.is-red(v-on:click='deleteUser') Delete
views/modals/create-discard.pug
View file @
15e4341f
views/modals/create.pug
View file @
15e4341f
...
...
@@ -7,7 +7,7 @@
section
label.label Enter the new document path:
p.control.is-fullwidth
input.input(type='text', placeholder='page-name')#txt-create-prompt
input.input#txt-create-prompt(type='text', placeholder='page-name')
span.help.is-danger.is-hidden This document path is invalid!
footer
a.button.is-grey.is-outlined.btn-create-prompt Discard
...
...
views/modals/edit-discard.pug
View file @
15e4341f
views/modals/editor-codeblock.pug
View file @
15e4341f
...
...
@@ -14,10 +14,10 @@
.model-sidebar-content
p.control.is-fullwidth
select(v-model='modeSelected')
option(v-for="mode in modes"
v-bind:value='mode.name') {{ mode.caption }}
option(v-for='mode in modes',
v-bind:value='mode.name') {{ mode.caption }}
.column.ace-container
#codeblock-editor
footer
a.button.is-grey.is-outlined(v-on:click="cancel") Discard
a.button.is-green(v-on:click="insertCode") Insert Code Block
\ No newline at end of file
a.button.is-grey.is-outlined(v-on:click='cancel') Discard
a.button.is-green(v-on:click='insertCode') Insert Code Block
views/modals/editor-file.pug
View file @
15e4341f
...
...
@@ -6,41 +6,41 @@
header.is-green
span Insert File
p.modal-notify(v-bind:class="{ 'is-active': isLoading }"
)
p.modal-notify(v-bind:class='{ "is-active": isLoading }'
)
span {{ isLoadingText }}
i
.modal-toolbar.is-green
a.button(v-on:click="newFolder"
)
a.button(v-on:click='newFolder'
)
i.fa.fa-folder
span New Folder
a.button#btn-editor-file-upload
i.fa.fa-upload
span Upload File
label
input(type="file"
, multiple)
input(type='file'
, multiple)
section.is-gapless
.columns.is-stretched
.column.is-one-quarter.modal-sidebar.is-green(style={'max-width':'350px'})
.model-sidebar-header Folders
ul.model-sidebar-list
li(v-for="fld in folders"
)
a(v-on:click="selectFolder(fld)", v-bind:class="{ 'is-active': currentFolder === fld }"
)
li(v-for='fld in folders'
)
a(v-on:click='selectFolder(fld)', v-bind:class='{ "is-active": currentFolder === fld }'
)
i.icon-folder2
span / {{ fld }}
.column.editor-modal-file-choices
figure(v-for="fl in files", v-bind:class="{ 'is-active': currentFile === fl._id }", v-on:click="selectFile(fl._id)", v-bind:data-uid="fl._id"
)
figure(v-for='fl in files', v-bind:class='{ "is-active": currentFile === fl._id }', v-on:click='selectFile(fl._id)', v-bind:data-uid='fl._id'
)
i(class='icon-file')
span: strong {{ fl.filename }}
span {{ fl.mime }}
span {{ fl.filesize | filesize }}
em(v-show="files.length < 1"
)
em(v-show='files.length < 1'
)
i.icon-marquee-minus
| This folder is empty.
footer
a.button.is-grey.is-outlined(v-on:click="cancel"
) Discard
a.button.is-green(v-on:click="insertFileLink"
) Insert Link to File
a.button.is-grey.is-outlined(v-on:click='cancel'
) Discard
a.button.is-green(v-on:click='insertFileLink'
) Insert Link to File
.modal.is-superimposed(v-bind:class="{ 'is-active': newFolderShow }"
)
.modal.is-superimposed(v-bind:class='{ "is-active": newFolderShow }'
)
.modal-background
.modal-container
.modal-content
...
...
@@ -48,13 +48,13 @@
section
label.label Enter the new folder name:
p.control.is-fullwidth
input.input#txt-editor-file-newfoldername(type='text', placeholder='folder name', v-model='newFolderName', v-on:keyup.enter="newFolderCreate", v-on:keyup.esc="newFolderDiscard"
)
span.help.is-danger(v-show="newFolderError"
) This folder name is invalid!
input.input#txt-editor-file-newfoldername(type='text', placeholder='folder name', v-model='newFolderName', v-on:keyup.enter='newFolderCreate', v-on:keyup.esc='newFolderDiscard'
)
span.help.is-danger(v-show='newFolderError'
) This folder name is invalid!
footer
a.button.is-grey.is-outlined(v-on:click="newFolderDiscard"
) Discard
a.button.is-light-blue(v-on:click="newFolderCreate"
) Create
a.button.is-grey.is-outlined(v-on:click='newFolderDiscard'
) Discard
a.button.is-light-blue(v-on:click='newFolderCreate'
) Create
.modal.is-superimposed(v-bind:class="{ 'is-active': renameFileShow }"
)
.modal.is-superimposed(v-bind:class='{ "is-active": renameFileShow }'
)
.modal-background
.modal-container
.modal-content
...
...
@@ -65,10 +65,10 @@
input.input#txt-editor-file-rename(type='text', placeholder='filename', v-model='renameFileFilename')
span.help.is-danger.is-hidden This filename is invalid!
footer
a.button.is-grey.is-outlined(v-on:click="renameFileDiscard"
) Discard
a.button.is-light-blue(v-on:click="renameFileGo"
) Rename
a.button.is-grey.is-outlined(v-on:click='renameFileDiscard'
) Discard
a.button.is-light-blue(v-on:click='renameFileGo'
) Rename
.modal.is-superimposed(v-bind:class="{ 'is-active': deleteFileShow }"
)
.modal.is-superimposed(v-bind:class='{ "is-active": deleteFileShow }'
)
.modal-background
.modal-container
.modal-content
...
...
@@ -76,5 +76,5 @@
section
span Are you sure you want to delete #[strong {{deleteFileFilename}}]?
footer
a.button.is-grey.is-outlined(v-on:click="deleteFileWarn(false)") Discard
a.button.is-red(v-on:click="deleteFileGo") Delete
\ No newline at end of file
a.button.is-grey.is-outlined(v-on:click='deleteFileWarn(false)') Discard
a.button.is-red(v-on:click='deleteFileGo') Delete
views/modals/editor-image.pug
View file @
15e4341f
...
...
@@ -6,19 +6,19 @@
header.is-green
span Insert Image
p.modal-notify(v-bind:class="{ 'is-active': isLoading }"
)
p.modal-notify(v-bind:class='{ "is-active": isLoading }'
)
span {{ isLoadingText }}
i
.modal-toolbar.is-green
a.button(v-on:click="newFolder"
)
a.button(v-on:click='newFolder'
)
i.fa.fa-folder
span New Folder
a.button#btn-editor-image-upload
i.fa.fa-upload
span Upload Image
label
input(type="file"
, multiple)
a.button(v-on:click="fetchFromUrl"
)
input(type='file'
, multiple)
a.button(v-on:click='fetchFromUrl'
)
i.fa.fa-download
span Fetch from URL
section.is-gapless
...
...
@@ -26,8 +26,8 @@
.column.is-one-quarter.modal-sidebar.is-green(style={'max-width':'350px'})
.model-sidebar-header Folders
ul.model-sidebar-list
li(v-for="fld in folders"
)
a(v-on:click="selectFolder(fld)", v-bind:class="{ 'is-active': currentFolder === fld }"
)
li(v-for='fld in folders'
)
a(v-on:click='selectFolder(fld)', v-bind:class='{ "is-active": currentFolder === fld }'
)
i.icon-folder2
span / {{ fld }}
.model-sidebar-header Alignment
...
...
@@ -39,18 +39,18 @@
option(value='right') Right
option(value='logo') Page Logo
.column.editor-modal-image-choices
figure(v-for="img in images", v-bind:class="{ 'is-active': currentImage === img._id }", v-on:click="selectImage(img._id)", v-bind:data-uid="img._id"
)
img(v-bind:src="'/uploads/t/' + img._id + '.png'"
)
figure(v-for='img in images', v-bind:class='{ "is-active": currentImage === img._id }', v-on:click='selectImage(img._id)', v-bind:data-uid='img._id'
)
img(v-bind:src='"/uploads/t/" + img._id + ".png"'
)
span: strong {{ img.basename }}
span {{ img.filesize | filesize }}
em(v-show="images.length < 1"
)
em(v-show='images.length < 1'
)
i.icon-marquee-minus
| This folder is empty.
footer
a.button.is-grey.is-outlined(v-on:click="cancel"
) Discard
a.button.is-green(v-on:click="insertImage"
) Insert Image
a.button.is-grey.is-outlined(v-on:click='cancel'
) Discard
a.button.is-green(v-on:click='insertImage'
) Insert Image
.modal.is-superimposed(v-bind:class="{ 'is-active': newFolderShow }"
)
.modal.is-superimposed(v-bind:class='{ "is-active": newFolderShow }'
)
.modal-background
.modal-container
.modal-content
...
...
@@ -58,13 +58,13 @@
section
label.label Enter the new folder name:
p.control.is-fullwidth
input.input#txt-editor-image-newfoldername(type='text', placeholder='folder name', v-model='newFolderName', v-on:keyup.enter="newFolderCreate", v-on:keyup.esc="newFolderDiscard"
)
span.help.is-danger(v-show="newFolderError"
) This folder name is invalid!
input.input#txt-editor-image-newfoldername(type='text', placeholder='folder name', v-model='newFolderName', v-on:keyup.enter='newFolderCreate', v-on:keyup.esc='newFolderDiscard'
)
span.help.is-danger(v-show='newFolderError'
) This folder name is invalid!
footer
a.button.is-grey.is-outlined(v-on:click="newFolderDiscard"
) Discard
a.button.is-light-blue(v-on:click="newFolderCreate"
) Create
a.button.is-grey.is-outlined(v-on:click='newFolderDiscard'
) Discard
a.button.is-light-blue(v-on:click='newFolderCreate'
) Create
.modal.is-superimposed(v-bind:class="{ 'is-active': fetchFromUrlShow }"
)
.modal.is-superimposed(v-bind:class='{ "is-active": fetchFromUrlShow }'
)
.modal-background
.modal-container
.modal-content
...
...
@@ -75,10 +75,10 @@
input.input#txt-editor-image-fetchurl(type='text', placeholder='http://www.example.com/some-image.png', v-model='fetchFromUrlURL')
span.help.is-danger.is-hidden This URL path is invalid!
footer
a.button.is-grey.is-outlined(v-on:click="fetchFromUrlDiscard"
) Discard
a.button.is-light-blue(v-on:click="fetchFromUrlGo"
) Fetch
a.button.is-grey.is-outlined(v-on:click='fetchFromUrlDiscard'
) Discard
a.button.is-light-blue(v-on:click='fetchFromUrlGo'
) Fetch
.modal.is-superimposed(v-bind:class="{ 'is-active': renameImageShow }"
)
.modal.is-superimposed(v-bind:class='{ "is-active": renameImageShow }'
)
.modal-background
.modal-container
.modal-content
...
...
@@ -89,10 +89,10 @@
input.input#txt-editor-image-rename(type='text', placeholder='filename', v-model='renameImageFilename')
span.help.is-danger.is-hidden This filename is invalid!
footer
a.button.is-grey.is-outlined(v-on:click="renameImageDiscard"
) Discard
a.button.is-light-blue(v-on:click="renameImageGo"
) Rename
a.button.is-grey.is-outlined(v-on:click='renameImageDiscard'
) Discard
a.button.is-light-blue(v-on:click='renameImageGo'
) Rename
.modal.is-superimposed(v-bind:class="{ 'is-active': deleteImageShow }"
)
.modal.is-superimposed(v-bind:class='{ "is-active": deleteImageShow }'
)
.modal-background
.modal-container
.modal-content
...
...
@@ -100,5 +100,5 @@
section
span Are you sure you want to delete #[strong {{deleteImageFilename}}]?
footer
a.button.is-grey.is-outlined(v-on:click="deleteImageWarn(false)") Discard
a.button.is-red(v-on:click="deleteImageGo") Delete
\ No newline at end of file
a.button.is-grey.is-outlined(v-on:click='deleteImageWarn(false)') Discard
a.button.is-red(v-on:click='deleteImageGo') Delete
views/modals/editor-link.pug
View file @
15e4341f
views/modals/editor-video.pug
View file @
15e4341f
...
...
@@ -24,5 +24,5 @@
i.icon-video
span Any standard MP4 file
footer
a.button.is-grey.is-outlined(v-on:click="cancel") Discard
a.button.is-green(v-on:click="insertVideo") Insert Video
\ No newline at end of file
a.button.is-grey.is-outlined(v-on:click='cancel') Discard
a.button.is-green(v-on:click='insertVideo') Insert Video
views/modals/move.pug
View file @
15e4341f
...
...
@@ -7,7 +7,7 @@
section
label.label Enter the new document path:
p.control.is-fullwidth
input.input(type='text', placeholder='page-name')#txt-move-prompt
input.input#txt-move-prompt(type='text', placeholder='page-name')
span.help.is-red.is-hidden This document path is invalid or not allowed!
span.note Note that moving or renaming documents can lead to broken links. Make sure to edit any page that links to this document afterwards!
footer
...
...
views/pages/admin/_layout.pug
View file @
15e4341f
views/pages/admin/profile.pug
View file @
15e4341f
...
...
@@ -12,7 +12,7 @@ block adminContent
label.label Email
p.control.is-fullwidth
input.input(type='text', placeholder='Email', value=user.email, disabled)
if user.provider
== 'local'
if user.provider =
== 'local'
section
label.label Password
p.control.is-fullwidth
...
...
views/pages/admin/settings.pug
View file @
15e4341f
views/pages/admin/stats.pug
View file @
15e4341f
views/pages/admin/users-edit.pug
View file @
15e4341f
views/pages/admin/users.pug
View file @
15e4341f
views/pages/create.pug
View file @
15e4341f
views/pages/edit.pug
View file @
15e4341f
views/pages/source.pug
View file @
15e4341f
views/pages/view.pug
View file @
15e4341f
views/pages/welcome.pug
View file @
15e4341f
...
...
@@ -10,7 +10,7 @@ block content
#page-type-welcome
.container
.welcome
img(src='/favicons/android-icon-144x144.png',
alt='Wiki.js')
img(src='/favicons/android-icon-144x144.png',
alt='Wiki.js')
h1 Welcome to your Wiki.js!
h2 Let's get started and create the home page.
a.button.is-indigo(href='/create/home') Create Home Page
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