Skip to content

S
solo-1
Commit f965d4f4 authored by Liang's avatar Liang
Browse files
Options

💄 fixed #12400

parent 9723647f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 646 additions and 863 deletions
src/main/webapp/admin-about.ftl
View file @ f965d4f4
......@@ -2,19 +2,19 @@
<div class="module-header">
<h2>${aboutLabel}</h2>
</div>
<div class="module-body padding12">
<div class="module-body padding12 fn__flex">
<div class="about-logo">
<a href="https://b3log.org" target="_blank">
<img width="128" src="${staticServePath}/images/logo.png" alt="Solo" title="Solo" />
</a>
</div>
<div class="left content-reset" style="margin-left: 20px;">
<div class="left content-reset about__panel" style="margin-left: 20px;">
<div id="aboutLatest" class="about-margin left">
${checkingVersionLabel}
</div>
<iframe src="https://ghbtns.com/github-btn.html?user=b3log&repo=solo&type=star&count=true&size=large"
frameborder="0" scrolling="0" width="160px" height="30px"
frameborder="0" scrolling="0" width="160px" height="30px" class="about__iframe"
style="margin: 21px 0 0 20px;border: 0"
class="left"></iframe>
<div class="clear"></div>
......
src/main/webapp/admin-article.ftl
View file @ f965d4f4
......@@ -6,10 +6,14 @@
<div>
<label>${content1Label}</label>
<div class="right">
<label for="articleThumbnail">${useTumbnailLabel}</label>
<input type="checkbox" id="articleThumbnail" onclick="$('.article__thumbnail').slideToggle()" />
<label for="articleThumbnail" style="margin-bottom: 0">
${useTumbnailLabel}
<input type="checkbox" style="vertical-align: middle;"
id="articleThumbnail" onclick="$('.article__thumbnail').slideToggle()" />
</label>
</div>
<div class="article__thumbnail fn-clear">
<div class="clear"></div>
<div class="article__thumbnail">
<div class="thumbnail__img"></div>
<button id="articleThumbnailBtn">${chageLabel}</button>
</div>
......@@ -20,7 +24,7 @@
</div>
<div>
<label>${tags1WithTips1Label}</label>
<div class="fn__flex">
<div class="tag__select">
<input id="tag" type="text"/>
</div>
</div>
......@@ -32,10 +36,10 @@
</div>
<div class="fn__flex">
<div class="fn__flex fn__flex1" style="align-items: center">
<label for="permalink" style="margin-bottom: 0">${permalink1Label}</label>
<label for="permalink" class="permalink__label" style="margin-bottom: 0">${permalink1Label}</label>
<input id="permalink" class="fn__flex1" type="text" style="margin: 0 12px 0 6px;" />
</div>
<div class="right">
<div class="right viewpwd__panel">
<label for="viewPwd">${articleViewPwd1Label}</label>
<input id="viewPwd" type="text" style="width: 156px" />
</div>
......@@ -48,7 +52,7 @@
<button id="articleSign3">${signLabel}3</button>
<button id="articleSign0">${noSignLabel}</button>
</span>
<div class="right">
<div class="right article-commentable__panel">
<label for="articleCommentable" style="margin: 13px 0 0 0">${allowComment1Label}</label>
<input type="checkbox" id="articleCommentable" checked="checked" />
<span id="postToCommunityPanel" class="none">
......
src/main/webapp/admin-category-list.ftl
View file @ f965d4f4
......@@ -3,102 +3,32 @@
<div id="categoryPagination" class="margin12 right"></div>
</div>
<div class="clear"></div>
<table class="form" width="100%" cellpadding="0px" cellspacing="9px">
<thead>
<tr>
<th style="text-align: left" colspan="2">
${addCategoryLabel}
</th>
</tr>
</thead>
<tbody>
<tr>
<th width="48px">
<div class="form form__no-table">
${addCategoryLabel}
<label for="categoryName">${linkTitle1Label}</label>
</th>
<td>
<input id="categoryName" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="categoryURI">URI：</label>
</th>
<td>
<input id="categoryURI" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="categoryDesc">${linkDescription1Label}</label>
</th>
<td>
<input id="categoryDesc" type="text"/>
</td>
</tr>
<tr>
<th
<label for="categoryTags">${tags1Label}</label>
</th>
<td class="fn__flex">
<span class="tag__select">
<input id="categoryTags" type="text"/>
</td>
</tr>
<tr>
<td colspan="2" align="right">
<button onclick="admin.categoryList.add();">${saveLabel}</button>
</td>
</tr>
</tbody>
</table>
<div id="categoryUpdate" class="none">
<table class="form" width="100%" cellpadding="0px" cellspacing="9px">
<thead>
<tr>
<th style="text-align: left" colspan="2">
${updateCategoryLabel}
</th>
</tr>
</thead>
<tbody>
<tr>
<th width="48px">
</span><br>
<button onclick="admin.categoryList.add();" class="right">${saveLabel}</button>
<div class="clear"></div>
</div>
<div id="categoryUpdate" class="none form__no-table form">
${updateCategoryLabel}
<label for="categoryNameUpdate">${linkTitle1Label}</label>
</th>
<td>
<input id="categoryNameUpdate" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="categoryURIUpdate">URI：</label>
</th>
<td>
<input id="categoryURIUpdate" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="categoryDescUpdate">${linkDescription1Label}</label>
</th>
<td>
<input id="categoryDescUpdate" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="categoryTagsUpdate">${tags1Label}</label>
</th>
<td>
<input id="categoryTagsUpdate" type="text"/>
</td>
</tr>
<tr>
<td colspan="2" align="right">
<button onclick="admin.categoryList.update();">${updateLabel}</button>
</td>
</tr>
</tbody>
</table>
<input id="categoryTagsUpdate" type="text"/> <br><br>
<button onclick="admin.categoryList.update();" class="right">${updateLabel}</button>
<div class="clear"></div>
</div>
${plugins}
src/main/webapp/admin-index.ftl
View file @ f965d4f4
......@@ -24,7 +24,8 @@
<a href="${servePath}" target="_blank" class="hover">
Solo
</a>
<span class="icon-unordered-list top__menu none"
onclick="admin.toggleMenu()"></span>
<span class="right">
<a href="${servePath}" title='${indexLabel}'>
<div class="avatar" style="background-image: url(${gravatar})"></div>
......@@ -126,6 +127,7 @@
</li>
</ul>
</div>
<div class="tabs__bg" onclick="admin.toggleMenu()"></div>
<div id="tabsPanel">
<div id="tabsPanel_main" class="none"></div>
<div id="tabsPanel_article" class="none"></div>
......
src/main/webapp/admin-link-list.ftl
View file @ f965d4f4
......@@ -3,86 +3,26 @@
<div id="linkPagination" class="margin12 right"></div>
</div>
<div class="clear"></div>
<table class="form" width="100%" cellpadding="0px" cellspacing="9px">
<thead>
<tr>
<th style="text-align: left" colspan="2">
${addLinkLabel}
</th>
</tr>
</thead>
<tbody>
<tr>
<th width="48px">
${linkTitle1Label}
</th>
<td>
<div class="form form__no-table">
${addLinkLabel}
<label>${linkTitle1Label}</label>
<input id="linkTitle" type="text"/>
</td>
</tr>
<tr>
<th>
${url1Label}
</th>
<td>
<label>${url1Label}</label>
<input id="linkAddress" type="text"/>
</td>
</tr>
<tr>
<th>
${linkDescription1Label}
</th>
<td>
<input id="linkDescription" type="text"/>
</td>
</tr>
<tr>
<td colspan="2" align="right">
<button onclick="admin.linkList.add();">${saveLabel}</button>
</td>
</tr>
</tbody>
</table>
<div id="updateLink" class="none">
<table class="form" width="100%" cellpadding="0px" cellspacing="9px">
<thead>
<tr>
<th style="text-align: left" colspan="2">
${updateLinkLabel}
</th>
</tr>
</thead>
<tbody>
<tr>
<th width="48px">
${linkTitle1Label}
</th>
<td>
<label>${linkDescription1Label}</label>
<input id="linkDescription" type="text"/> <br><br>
<button onclick="admin.linkList.add();" class="right">${saveLabel}</button>
<div class="clear"></div>
</div>
<div id="updateLink" class="none form form__no-table">
${updateLinkLabel}
<label>${linkTitle1Label}</label>
<input id="linkTitleUpdate" type="text"/>
</td>
</tr>
<tr>
<th>
${url1Label}
</th>
<td>
<label>${url1Label}</label>
<input id="linkAddressUpdate" type="text"/>
</td>
</tr>
<tr>
<th>
${linkDescription1Label}
</th>
<td>
<input id="linkDescriptionUpdate" type="text"/>
</td>
</tr>
<tr>
<td colspan="2" align="right">
<button onclick="admin.linkList.update();">${updateLabel}</button>
</td>
</tr>
</tbody>
</table>
<label>${linkDescription1Label}</label>
<input id="linkDescriptionUpdate" type="text"/><br><br>
<button onclick="admin.linkList.update();" class="right">${updateLabel}</button>
<div class="clear"></div>
</div>
${plugins}
\ No newline at end of file
src/main/webapp/admin-others.ftl
View file @ f965d4f4
......@@ -13,32 +13,13 @@
</ul>
</div>
<div id="tabOthersPanel" class="sub-tabs-main">
<div id="tabOthersPanel_email">
<table class="form" width="98%" cellpadding="0" cellspacing="9px">
<tbody>
<tr>
<th width="90px" valign="top">
<div id="tabOthersPanel_email" class="form form__no-table">
<label for="replayEmailTemplateTitle">${emailSubject1Label}</label>
</th>
<td>
<input id="replayEmailTemplateTitle" type="text" />
</td>
</tr>
<tr>
<th valign="top">
<input id="replayEmailTemplateTitle" type="text"/>
<label for="replayEmailTemplateBody">${emailContent1Label}</label>
</th>
<td>
<textarea rows="9" id="replayEmailTemplateBody"></textarea>
</td>
</tr>
<tr>
<td colspan="3" align="right">
<button onclick="admin.others.update()">${updateLabel}</button>
</td>
</tr>
</tbody>
</table>
<textarea rows="9" id="replayEmailTemplateBody"></textarea><br><br>
<button onclick="admin.others.update()" class="right">${updateLabel}</button>
<div class="clear"></div>
<div class="content-reset">
${replayEmailExplanationLabel}
</div>
......
src/main/webapp/admin-page-list.ftl
View file @ f965d4f4
......@@ -26,7 +26,7 @@
<option value="_parent">${targetParentLabel}</option>
<option value="_top">${targetTopLabel}</option>
</select>&nbsp;&nbsp;&nbsp;&nbsp;
<label>${type1Label}</label>
<label class="page-list__label">${type1Label}</label>
<button data-type="link" class="selected fn-type">${pageLinkLabel}</button>
<button data-type="page" class="fn-type">${pageLabel}</button>
</div>
......
src/main/webapp/admin-preference.ftl
View file @ f965d4f4
This diff is collapsed.
src/main/webapp/admin-user-list.ftl
View file @ f965d4f4
......@@ -3,118 +3,34 @@
<div id="userPagination" class="margin12 right"></div>
</div>
<div class="clear"></div>
<table class="form" width="100%" cellpadding="0px" cellspacing="9px">
<thead>
<tr>
<th style="text-align: left" colspan="2">
${addUserLabel}
</th>
</tr>
</thead>
<tbody>
<tr>
<th width="48px">
<div class="form form__no-table">
${addUserLabel}
<label for="userName">${commentName1Label}</label>
</th>
<td>
<input id="userName" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="userEmail">${commentEmail1Label}</label>
</th>
<td>
<input id="userEmail" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="userURL">${userURL1Label}</label>
</th>
<td>
<input id="userURL" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="userPassword">${userPassword1Label}</label>
</th>
<td>
<input id="userPassword" type="password" autocomplete="new-password"/>
</td>
</tr>
<tr>
<th>
<label for="userAvatar">${userAvatar1Label}</label>
</th>
<td>
<input id="userAvatar" type="text"/>
</td>
</tr>
<tr>
<td colspan="2" align="right">
<button onclick="admin.userList.add();">${saveLabel}</button>
</td>
</tr>
</tbody>
</table>
<div id="userUpdate" class="none">
<table class="form" width="100%" cellpadding="0px" cellspacing="9px">
<thead>
<tr>
<th style="text-align: left" colspan="2">
${updateUserLabel}
</th>
</tr>
</thead>
<tbody>
<tr>
<th width="48px">
<input id="userAvatar" type="text"/><br><br>
<button onclick="admin.userList.add();" class="right">${saveLabel}</button>
<div class="clear"></div>
</div>
<div id="userUpdate" class="none form form__table">
${updateUserLabel}
<label for="userNameUpdate">${commentName1Label}</label>
</th>
<td>
<input id="userNameUpdate" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="userEmailUpdate">${commentEmail1Label}</label>
</th>
<td>
<input id="userEmailUpdate" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="userURLUpdate">${userURL1Label}</label>
</th>
<td>
<input id="userURLUpdate" type="text"/>
</td>
</tr>
<tr>
<th>
<label for="userPasswordUpdate">${userPassword1Label}</label>
</th>
<td>
<input id="userPasswordUpdate" type="password"/>
</td>
</tr>
<tr>
<th>
<label for="userAvatarUpdate">${userAvatar1Label}</label>
</th>
<td>
<input id="userAvatarUpdate" type="text"/>
</td>
</tr>
<tr>
<td colspan="2" align="right">
<button onclick="admin.userList.update();">${updateLabel}</button>
</td>
</tr>
</tbody>
</table>
<input id="userAvatarUpdate" type="text"/> <br><br>
<button onclick="admin.userList.update();" class="right">${updateLabel}</button>
<div class="clear"></div>
</div>
${plugins}
src/main/webapp/css/default-admin.css
View file @ f965d4f4
This diff is collapsed.
src/main/webapp/js/admin/admin.js
View file @ f965d4f4
......@@ -17,7 +17,7 @@
* @description index for admin
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.1.3.2, Mar 31, 2017
* @version 1.2.0.0, Apr 5, 2018
*/
var Admin = function () {
this.register = {};
......@@ -36,6 +36,15 @@ $.extend(Admin.prototype, {
logout: function () {
window.location.href = latkeConfig.servePath + "/logout?goto=" + latkeConfig.servePath;
},
toggleMenu: function () {
if ($('#tabs').css('left') === '-240px') {
$('#tabs').css('left', 0);
$('.tabs__bg').show();
} else {
$('#tabs').css('left', '-240px');
$('.tabs__bg').hide();
}
},
/**
* @description 清除提示
*/
......
src/main/webapp/js/admin/articleList.js
View file @ f965d4f4
......@@ -18,7 +18,7 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.2.5, Aug 23, 2016
* @version 1.0.2.6, Apr 5, 2018
*/
/* article-list 相关操作 */
......@@ -50,7 +50,7 @@ admin.articleList = {
index: "articleViewCount",
style: "padding-left: 12px;"
}, {
text: Label.createDateLabel,
text: Label.dateLabel,
index: "date",
width: 90,
style: "padding-left: 12px;"
......
src/main/webapp/js/admin/categoryList.js
View file @ f965d4f4
......@@ -60,7 +60,7 @@ admin.categoryList = {
$("#categoryUpdate").dialog({
width: 700,
height: 260,
height: 358,
"modal": true,
"hideFooter": true
});
......
src/main/webapp/js/admin/commentList.js
View file @ f965d4f4
......@@ -35,17 +35,16 @@ admin.commentList = {
this.tablePagination.buildTable([{
text: Label.commentContentLabel,
index: "content",
minWidth: 300,
minWidth: 174,
style: "padding-left: 12px;"
}, {
text: Label.authorLabel,
index: "title",
width: 230,
style: "padding-left: 12px;"
}, {
text: Label.dateLabel,
index: "date",
width: 90,
width: 60,
style: "padding-left: 12px;"
}]);
this.tablePagination.initPagination();
......
src/main/webapp/js/admin/draftList.js
View file @ f965d4f4
......@@ -18,7 +18,7 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.4, Feb 23, 2013
* @version 1.0.1.5, Apr 5, 2018
*/
/* draft-list 相关操作 */
......@@ -50,7 +50,7 @@ admin.draftList = {
index: "articleViewCount",
style: "padding-left: 12px;"
}, {
text: Label.createDateLabel,
text: Label.dateLabel,
index: "date",
width: 90,
style: "padding-left: 12px;"
......
src/main/webapp/js/admin/linkList.js
View file @ f965d4f4
......@@ -18,7 +18,7 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.1.4, Apr 9, 2017
* @version 1.1.1.5, Apr 5, 2018
*/
/* link-list 相关操作 */
......@@ -60,7 +60,7 @@ admin.linkList = {
$("#updateLink").dialog({
width: 700,
height: 210,
height: 290,
"modal": true,
"hideFooter": true
});
......
src/main/webapp/js/admin/pageList.js
View file @ f965d4f4
......@@ -18,7 +18,7 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.2.3.6, Sep 21, 2017
* @version 1.2.3.7, Apr 5, 2018
*/
/* page-list 相关操作 */
......@@ -50,7 +50,7 @@ admin.pageList = {
style: "padding-left: 12px;",
text: Label.permalinkLabel,
index: "pagePermalink",
minWidth: 300
minWidth: 100
}, {
style: "padding-left: 12px;",
text: Label.openMethodLabel,
......
src/main/webapp/js/admin/pluginList.js
View file @ f965d4f4
......@@ -18,7 +18,7 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.4, May 28, 2013
* @version 1.0.1.5, Apr 5, 2018
*/
/* plugin-list 相关操作 */
......@@ -42,7 +42,7 @@ admin.pluginList = {
style: "padding-left: 12px;",
text: Label.statusLabel,
index: "status",
minWidth: 180
minWidth: 80
}, {
style: "padding-left: 12px;",
text: Label.authorLabel,
......
src/main/webapp/js/admin/userList.js
View file @ f965d4f4
......@@ -18,7 +18,7 @@
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.1.7, Oct 17, 2015
* @version 1.1.1.8, Apr 5, 2018
*/
/* user-list 相关操作 */
......@@ -59,7 +59,7 @@ admin.userList = {
$("#userUpdate").dialog({
width: 700,
height: 300,
height: 360,
"modal": true,
"hideFooter": true
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment