Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
62c872b2
Unverified
Commit
62c872b2
authored
Feb 10, 2019
by
Liang Ding
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/3.0.0-dev' into 3.0.0-dev
parents
ff02041b
88c7acb5
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
274 additions
and
263 deletions
+274
-263
src/main/webapp/admin/admin-article.ftl
src/main/webapp/admin/admin-article.ftl
+1
-1
src/main/webapp/admin/admin-label.ftl
src/main/webapp/admin/admin-label.ftl
+1
-0
src/main/webapp/js/admin/article.js
src/main/webapp/js/admin/article.js
+4
-9
src/main/webapp/js/admin/userList.js
src/main/webapp/js/admin/userList.js
+267
-252
src/main/webapp/skins
src/main/webapp/skins
+1
-1
No files found.
src/main/webapp/admin/admin-article.ftl
View file @
62c872b2
...
...
@@ -79,7 +79,7 @@
<span id="postToCommunityPanel">
<label class="checkbox">
<input id="postToCommunity" type="checkbox" />
<input id="postToCommunity" type="checkbox"
checked="checked"
/>
<a href="https://hacpai.com/article/1546941897596" target="_blank">${syncToCommunityLabel}</a>
</label>
</span>
...
...
src/main/webapp/admin/admin-label.ftl
View file @
62c872b2
...
...
@@ -25,6 +25,7 @@
};
var Label = {
"uploadMsg": '${uploadMsg}',
"uploadToken": "${uploadToken}",
"uploadURL": "${uploadURL}",
"markedAvailable": ${markedAvailable?c},
...
...
src/main/webapp/js/admin/article.js
View file @
62c872b2
...
...
@@ -156,7 +156,7 @@ admin.article = {
if
(
$
(
'
#articleThumbnail
'
).
prop
(
'
checked
'
))
{
var
bgImage
=
$
(
'
.thumbnail__img
'
).
css
(
'
background-image
'
)
articleContent
=
'

+
articleContent
=
'

.
replace
(
'
w/768
'
,
'
w/960
'
).
replace
(
'
h/432
'
,
'
h/540
'
)
+
'
)
\n\n
'
+
articleContent
}
...
...
@@ -334,19 +334,12 @@ admin.article = {
$
(
'
#unSubmitArticle
'
).
hide
()
$
(
'
#saveArticle
'
).
show
()
}
if
(
this
.
status
.
articleHadBeenPublished
)
{
$
(
'
#postToCommunityPanel
'
).
hide
()
}
else
{
$
(
'
#postToCommunityPanel
'
).
show
()
}
}
else
{
$
(
'
#submitArticle
'
).
show
()
$
(
'
#unSubmitArticle
'
).
hide
()
$
(
'
#saveArticle
'
).
show
()
$
(
'
#postToCommunityPanel
'
).
show
()
}
$
(
'
#postToCommunity
'
).
attr
(
'
checked
'
,
'
checked
'
)
},
/**
* @description 清除发布文章页面的输入框的内容
...
...
@@ -393,6 +386,8 @@ admin.article = {
$
(
this
).
addClass
(
'
selected
'
)
})
$
(
'
#tipMsg
'
).
text
(
Label
.
uploadMsg
)
// For tag auto-completion
$
.
ajax
({
// Gets all tags
url
:
latkeConfig
.
servePath
+
'
/console/tags
'
,
...
...
@@ -623,7 +618,7 @@ admin.register.article = {
admin
.
editors
.
abstractEditor
.
setContent
(
''
)
admin
.
editors
.
articleEditor
.
setContent
(
''
)
$
(
'
#loadMsg
'
).
text
(
''
)
$
(
'
#tipMsg
'
).
text
(
''
)
$
(
'
#tipMsg
'
).
text
(
Label
.
uploadMsg
)
},
}
...
...
src/main/webapp/js/admin/userList.js
View file @
62c872b2
This diff is collapsed.
Click to expand it.
skins
@
2248d258
Subproject commit
bb908f197414ccdff6c24ed282ccc018efd5cebc
Subproject commit
2248d25866e509e090ab43c4a653f9646419d376
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