Chuyaoyuan/Jiscuss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标签调整，优化

Browse Source
This commit is contained in:
yaoyuan2.chu
2020-11-11 23:39:08 +08:00
parent 16a0e65627
commit ae0650fac4
46 changed files with 769 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/application.yml
+17 -10
View File
@@ -1,22 +1,29 @@
#mysql 配置
#h2 配置
spring:
cache:
type: ehcache
ehcache:
config: classpath:ehcache.xml
jpa:
database: MYSQL
generate-ddl: false
show-sql: true
hibernate:
ddl-auto: update
ddl-auto: none
h2:
console:
path: /h2-console
enabled: true
settings:
web-allow-others: true
datasource:
url: jdbc:mysql://127.0.0.1:3306/jiscuss?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&autoReconnect=true&useSSL=false
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
platform: h2
url: jdbc:h2:~/testjiscuss
username: sa
password:
schema: classpath:schema.sql
data: classpath:data.sql
driver-class-name: org.h2.Driver
type: com.alibaba.druid.pool.DruidDataSource
tomcat:
init-s-q-l: SET NAMES utf8mb4
druid:
min-idle: 2
initial-size: 5
@@ -27,7 +34,7 @@ spring:
filter:
stat:
enabled: true
db-type: mysql
db-type: h2
log-slow-sql: true
slow-sql-millis: 2000
# 监控过滤器
src/main/resources/data.sql
+1 -1
View File
@@ -45,7 +45,7 @@ insert into discussion
values (11, '测试主题11', '测试内容3测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试',null,null,null,null,null,null,null,1,null,null,null,null,null,null,null);
insert into tag
values (1, '测试标签1',null,null,null,null,null,null,null,null,null,null);
values (1, '测试标签1',null,null,'edit',null,null,null,null,null,null,null);
insert into post
src/main/resources/static/js/user/system.js
+13 -14
View File
@@ -20,7 +20,7 @@ $("#upPage").click(function () {
let page = pageNum - 1
window.location.href = pageUrl + "?pageNum=" + page;
} else {
massage('已经是首页!','warn', '');
massage('已经是首页!', 'warn', '');
}
});
@@ -32,25 +32,23 @@ $("#nextPage").click(function () {
let page = pageNum + 1
window.location.href = pageUrl + "?pageNum=" + page;
} else {
massage('已经是尾页!','warn', '');
massage('已经是尾页!', 'warn', '');
}
});
$("#createNewDiccuss2").click(function () {
console.log("点击 createNewDiccuss2");
console.log(username);
if (username && username != null) {
layx.iframe('createNewDiccussContent','新建主题','./newDiscussionsPage',{
shadable:0.8,
layx.iframe('createNewDiccussContent', '新建主题', './newDiscussionsPage', {
shadable: 0.8,
event: {
ondestroy: {
before: function (layxWindow, winform, inside, escKey) {
massage('操作成功!','success', '')
massage('操作成功!', 'success', '')
console.log(new Date() + "关闭之前~")
console.log(winform);
console.log("=============分割线===============")
@@ -58,7 +56,7 @@ $("#createNewDiccuss2").click(function () {
after: function () {
location.reload();
console.log(new Date() + "关闭之后~")
massage('操作成功!','success', '')
massage('操作成功!', 'success', '')
console.log("=============分割线===============")
}
}
@@ -66,20 +64,21 @@ $("#createNewDiccuss2").click(function () {
});
} else {
massage('您未登录，请先登录!','error', '');
massage('您未登录，请先登录!', 'error', '');
}
});
function onTags(data) {
console.log('123');
console.log(data);
console.log('点击标签跳转' + data);
if (username && username != null) {
window.location.href = '/main?tag=' + data
} else {
window.location.href = '/?tag=' + data
}
}
$('#menu')
.sticky({
context: '#container'
src/main/resources/templates/admin/login.ftl
+5 -5
View File
@@ -7,14 +7,14 @@
</head>
<body>
<h2>后台管理登录页</h2>
<form id="loginForm" action="/login" method="post">
<h2>后台管理登录页</h2>
<form id="loginForm" action="/login" method="post">
用户名：<input type="text" id="username" name="username"><br/><br/>
密&nbsp;&nbsp;&nbsp;码：<input type="password" id="password" name="password"><br/><br/>
<!-- <button id="loginBtn" type="submit">登录</button> -->
<!-- <button id="loginBtn" type="submit">登录</button> -->
<button id="loginBtn" type="button">登录</button>
</form>
</form>
<script src="http://libs.baidu.com/jquery/2.1.4/jquery.min.js"></script>
<script type="text/javascript">
src/main/resources/templates/comm/header.ftl
+4 -7
View File
@@ -1,4 +1,4 @@
<div class="ui main menu" >
<div class="ui main menu" id="menu">
<div class="ui container">
<div href="/" class="header borderless item">
<img class="logo" src="static/assets/images/logo.png">
@@ -10,9 +10,7 @@
更多
<i class="dropdown icon"></i>
<div class="menu transition hidden" tabindex="-1">
<div class="item">行为</div>
<div class="item">另一个行为</div>
<div class="item">其他东西</div>
<a class=" item " href="/user">用户页</a>
<div class="divider"></div>
<div class="item">分割链接</div>
<div class="divider"></div>
@@ -28,7 +26,7 @@
</div>
<div class="item" id="userlogin">
<#if username??>
<form class="ui large form" action="/logout" id="logoutForm" method="post" style="display: none;">
<form class="ui large form" action="/logout" id="logoutForm" method="post" style="display: none;">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
</form>
${username} &nbsp;&nbsp;<a href="javascript:document.getElementById('logoutForm').submit();">注销</a>
@@ -40,5 +38,4 @@
</div>
</div>
<script type="text/javascript" charset="UTF-8" src="/static/js/user/header.js"></script>
<script type="text/javascript" charset="UTF-8" src="/static/js/user/header.js"></script>
src/main/resources/templates/comm/page.ftl
+6 -6
View File
@@ -13,7 +13,7 @@
<i class="left chevron icon"></i>
</a>
<#-- <li class="page-item"><span class="page-link">共条${totalrecords}记录&nbsp;&nbsp;第${page}页/共${totalpages}页</span></li>-->
<a class="item" ><span >共条${totalrecords}记录&nbsp;&nbsp;第${page}页/共${totalpages}页</span></a>
<a class="item"><span>共条${totalrecords}记录&nbsp;&nbsp;第${page}页/共${totalpages}页</span></a>
<#--startpage:起始页码就是page，endpage:结束页码，showfirstpage是否显示首页按钮，showlastpage：是否显示末页按钮，showpre是否显示前...，shownext是否显示后...-->
<#assign startpage = page,endpage=10,showfirstpage=false,showlastpage=false,showpre=false,shownext=false,prepage = 1,nextpage=11>
@@ -50,27 +50,27 @@
<#--首页-->
<#if showfirstpage>
<#-- <li class="page-item"><span><a class="page-link" href="${url}&pageNum=1">首页</a></span></li>-->
<#-- <li class="page-item"><span><a class="page-link" href="${url}&pageNum=1">首页</a></span></li>-->
<a class="item" href="${url}&pageNum=1">首页</a>
</#if>
<#--前面的...-->
<#if showpre>
<#-- <li class="page-item"><span><a class="page-link" href="${url}&page=${prepage}">...</a></span></li>-->
<#-- <li class="page-item"><span><a class="page-link" href="${url}&page=${prepage}">...</a></span></li>-->
<a class="item" href="${url}&pageNum=${prepage}">...</a>
</#if>
<#--显示的页码按钮-->
<#list startpage..endpage as p>
<#-- <li class="page-item <#if p == page>active</#if>"><span><a class="page-link" href="${url}&pageNum=${p}">${p}</a></span></li>-->
<#-- <li class="page-item <#if p == page>active</#if>"><span><a class="page-link" href="${url}&pageNum=${p}">${p}</a></span></li>-->
<a class="item" style=" <#if p == page>background-color: #7d827d;</#if>" href="${url}&pageNum=${p}">${p}</a>
</#list>
<#--后面的...-->
<#if shownext>
<#-- <li class="page-item"><span><a class="page-link" href="${url}&pageNum=${nextpage}">...</a></span></li>-->
<#-- <li class="page-item"><span><a class="page-link" href="${url}&pageNum=${nextpage}">...</a></span></li>-->
<a class="item" href="${url}&pageNum=${nextpage}">...</a>
</#if>
<#--显示尾页-->
<#if showlastpage>
<#-- <li class="page-item"><span><a class="page-link" href="${url}&pageNum=${totalpages}">末页</a></span></li>-->
<#-- <li class="page-item"><span><a class="page-link" href="${url}&pageNum=${totalpages}">末页</a></span></li>-->
<a class="item" href="${url}&pageNum=${totalpages}">末页</a>
</#if>
</#macro>
src/main/resources/templates/discussions.ftl
+1 -1
View File
@@ -20,7 +20,7 @@
<i class="close icon"></i>
<div class="header">欢迎来到这里</div>
<ul class="list">
<li>JAVA + DISCUSS = JISCUSS 。${posts?size}</li>
<li>JAVA + DISCUSS = JISCUSS 。</li>
<li>简单的，易用的JAVA论坛。</li>
<li>请享受发帖回帖带来的乐趣吧！</li>
</ul>
src/main/resources/templates/index.ftl
+97 -47
View File
@@ -32,7 +32,8 @@
<div class="ui four column grid">
<div class="widescreen large screen computer tablet only four wide column">
<div class="fluid ui animated fade primary button" tabindex="0" id="createNewDiccuss2" style=" margin-bottom: 20px;">
<div class="fluid ui animated fade primary button" tabindex="0" id="createNewDiccuss2"
style=" margin-bottom: 20px;">
<div class="visible content">
<i class="pen square icon"></i>创建新帖
</div>
@@ -41,12 +42,12 @@
</div>
</div>
<div class="ui modal createNewDiccuss" id = "createNewDiccussContent">
<div class="ui modal createNewDiccuss" id="createNewDiccussContent">
<i class="close icon"></i>
<div class="header">
创建新帖
</div>
<div class=" content" >
<div class=" content">
<form class="ui form">
<div class="field">
@@ -64,9 +65,9 @@
</div>
<div class="field">
<#-- <button class="ui teal button" id="newtags">新增标签</button>-->
<#-- <a href="/login" id="loginmodel">登录&nbsp;&nbsp;&&nbsp;&nbsp;注册</a>-->
&nbsp;<a onclick="onNewtags()">新增标签</a>
<#-- <button class="ui teal button" id="newtags">新增标签</button>-->
<#-- <a href="/login" id="loginmodel">登录&nbsp;&nbsp;&&nbsp;&nbsp;注册</a>-->
&nbsp;<a onclick="onNewtags()">新增标签</a>
</div>
<div class="field" id="createNewtagsDiv" style="display:none">
@@ -74,11 +75,11 @@
<input type="text" placeholder="标签名" id="tagsname">
</div>
<div class="two fields" id="tagDescriptionDiv" style="display:none">
<div class="field" >
<div class="field">
<label>描述</label>
<input type="text" placeholder="描述" id="tagdescription">
</div>
<div class="field" >
<div class="field">
<label>父标签</label>
<select class="ui fluid dropdown" id="parentTag">
<#list allTags as tag>
@@ -95,19 +96,58 @@
<i class="dropdown icon"></i>
<div class="default text">选择颜色</div>
<div class="menu">
<div class="item" data-value="red"><div class="ui red empty circular label"></div>红色</div>
<div class="item" data-value="orange"><div class="ui orange empty circular label"></div>橙色</div>
<div class="item" data-value="yellow"><div class="ui yellow empty circular label"></div>黄色</div>
<div class="item" data-value="olive"><div class="ui olive empty circular label"></div>橄榄绿</div>
<div class="item" data-value="green"><div class="ui green empty circular label"></div>纯绿</div>
<div class="item" data-value="teal"><div class="ui teal empty circular label"></div>水鸭蓝</div>
<div class="item" data-value="blue"><div class="ui blue empty circular label"></div>纯蓝</div>
<div class="item" data-value="violet"><div class="ui violet empty circular label"></div>紫罗兰</div>
<div class="item" data-value="purple"><div class="ui purple empty circular label"></div>纯紫</div>
<div class="item" data-value="pink"><div class="ui pink empty circular label"></div>粉红</div>
<div class="item" data-value="brown"><div class="ui brown empty circular label"></div>棕色</div>
<div class="item" data-value="grey"><div class="ui grey empty circular label"></div>灰色</div>
<div class="item" data-value="black"><div class="ui black empty circular label"></div>黑色</div>
<div class="item" data-value="red">
<div class="ui red empty circular label"></div>
红色
</div>
<div class="item" data-value="orange">
<div class="ui orange empty circular label"></div>
橙色
</div>
<div class="item" data-value="yellow">
<div class="ui yellow empty circular label"></div>
黄色
</div>
<div class="item" data-value="olive">
<div class="ui olive empty circular label"></div>
橄榄绿
</div>
<div class="item" data-value="green">
<div class="ui green empty circular label"></div>
纯绿
</div>
<div class="item" data-value="teal">
<div class="ui teal empty circular label"></div>
水鸭蓝
</div>
<div class="item" data-value="blue">
<div class="ui blue empty circular label"></div>
纯蓝
</div>
<div class="item" data-value="violet">
<div class="ui violet empty circular label"></div>
紫罗兰
</div>
<div class="item" data-value="purple">
<div class="ui purple empty circular label"></div>
纯紫
</div>
<div class="item" data-value="pink">
<div class="ui pink empty circular label"></div>
粉红
</div>
<div class="item" data-value="brown">
<div class="ui brown empty circular label"></div>
棕色
</div>
<div class="item" data-value="grey">
<div class="ui grey empty circular label"></div>
灰色
</div>
<div class="item" data-value="black">
<div class="ui black empty circular label"></div>
黑色
</div>
</div>
</div>
</div>
@@ -124,8 +164,12 @@
<div class="item" data-value="fax"><i class="fax"></i>fax</div>
<div class="item" data-value="bug"><i class="bug"></i>bug</div>
<div class="item" data-value="keyboard"><i class="keyboard"></i>keyboard</div>
<div class="item" data-value="folder open outline"><i class="folder open outline"></i>folder open outline</div>
<div class="item" data-value="comment outline"><i class="comment outline"></i>comment outline</div>
<div class="item" data-value="folder open outline"><i
class="folder open outline"></i>folder open outline
</div>
<div class="item" data-value="comment outline"><i class="comment outline"></i>comment
outline
</div>
</div>
</div>
</div>
@@ -145,7 +189,7 @@
</div>
</div>
<#-- <div class="ui section divider"></div>-->
<#-- <div class="ui section divider"></div>-->
<div class="ui card red ">
<div class="content">
@@ -153,28 +197,31 @@
</div>
<div class="content">
<div class="ui ordered list">
<div class="item">
<i class="folder icon"></i>
<div class="content">
<div class="header">test</div>
<div class="description">test files for test</div>
<div class="list">
<div class="item">
<i class="folder icon"></i>
<div class="content">
<div class="header">test2</div>
<div class="description">Test2 site's test</div>
</div>
</div>
</div>
</div>
</div>
<#list allTags as tags>
<div class="item">
<i class="icon ${tags.icon} ${tags.color}"></i>
<div class="content">
<a class="header" onclick="onTags(${tags.id})">${tags.name}</a>
<div class="description">${tags.description}</div>
<div class="list">
<#list allChildTags as childTags>
<#if childTags.parentId == tags.id>
<div class="item">
<i class="icon ${childTags.icon} ${childTags.color}"></i>
<div class="content">
<a class="header"
onclick="onTags(${childTags.id})">${childTags.name}</a>
<div class="description">${childTags.description}</div>
</div>
</div>
</#if>
</#list>
</div>
</div>
</div>
</#list>
@@ -249,20 +296,20 @@
<div class="ui secondary menu">
<#if username??>
<a class="item ${typeAll}" href="/main?type=all">
<a class="item ${typeAll}" href="/main?type=all">
<i class="icon mail"></i>
最新回复
<div class="floating ui red label">1</div>
</a>
<a class="item ${typeHot}" href="/main?type=hot">热门</a>
<a class="item ${typeHot}" href="/main?type=hot">热门</a>
<a class="item ${typeNew}" href="/main?type=new">新帖</a>
<#else>
<a class="item ${typeAll}" href="/?type=all" > <i class="icon mail"></i>
<a class="item ${typeAll}" href="/?type=all"> <i class="icon mail"></i>
最新回复
<div class="floating ui red label">1</div>
</a>
<a class="item ${typeHot}" href="/?type=hot">热门</a>
<a class="item ${typeNew}" href="/?type=new">新帖</a>
<a class="item ${typeNew}" href="/?type=new">新帖</a>
</#if>
</div>
@@ -295,7 +342,8 @@
${discussions.content}
</div>
<div class="meta">
<div class=" description "><i class="edit icon"></i> <a><b>${discussions.username}</b></a>&nbsp;&nbsp;•&nbsp;&nbsp;
<div class=" description "><i class="edit icon"></i>
<a><b>${discussions.username}</b></a>&nbsp;&nbsp;•&nbsp;&nbsp;
<i class="reply icon"></i>最后由 <a><b>${discussions.usernameLast}</b></a>
回复于${discussions.lastTime}.
</div>
@@ -344,7 +392,8 @@
${discussions.content}
</div>
<div class="meta">
<div class=" description "><i class="edit icon"></i> <a><b>${discussions.username}</b></a>&nbsp;&nbsp;•&nbsp;&nbsp;
<div class=" description "><i class="edit icon"></i>
<a><b>${discussions.username}</b></a>&nbsp;&nbsp;•&nbsp;&nbsp;
<i class="reply icon"></i>最后由 <a><b>${discussions.usernameLast}</b></a>
回复于${discussions.lastTime}.
</div>
@@ -392,7 +441,8 @@
${discussions.content}
</div>
<div class="meta">
<div class=" description "><i class="edit icon"></i> <a><b>${discussions.username}</b></a>&nbsp;&nbsp;•&nbsp;&nbsp;
<div class=" description "><i class="edit icon"></i>
<a><b>${discussions.username}</b></a>&nbsp;&nbsp;•&nbsp;&nbsp;
<i class="reply icon"></i>最后由 <a><b>${discussions.usernameLast}</b></a>
回复于${discussions.lastTime}.
</div>
src/main/resources/templates/login.ftl
+1 -1
View File
@@ -68,7 +68,7 @@
$(document).ready(function () {
<#if msg??>
$('#msgId').show();
$('#msgId').show();
</#if>
});
src/main/resources/templates/newdiccuss.ftl
+32 -31
View File
@@ -15,35 +15,35 @@
</head>
<body>
<div class="ui container" id="container">
<div class=" content" >
<form class="ui form">
<div class=" content">
<form class="ui form">
<div class="field">
<label>标题</label>
<input type="text" placeholder="标题" id="discussionstitle">
</div>
<div class="field">
<label>选择标签</label>
<select multiple="" class="ui fluid dropdown" id="selectTag">
<option value="">选择标签</option>
<#list allTags as tag>
<option value="${tag.id}">${tag.name}</option>
</#list>
</select>
</div>
<div class="field">
&nbsp;<button class="ui teal button" onclick="onNewtags()">新增标签</button>
</div>
<div class="field">
<label>标题</label>
<input type="text" placeholder="标题" id="discussionstitle">
</div>
<div class="field">
<label>选择标签</label>
<select multiple="" class="ui fluid dropdown" id="selectTag">
<option value="">选择标签</option>
<#list allTags as tag>
<option value="${tag.id}">${tag.name}</option>
</#list>
</select>
</div>
<div class="field">
&nbsp;<button class="ui teal button" onclick="onNewtags()">新增标签</button>
</div>
<div class="field">
<label>内容</label>
<textarea id="discussionsContent"></textarea>
</div>
<div class="field">
<label>内容</label>
<textarea id="discussionsContent"></textarea>
</div>
<div class="ui fluid large blue button" id="newDiscussions">提交内容</div>
</form>
</div>
<div class="ui fluid large blue button" id="newDiscussions">提交内容</div>
</form>
</div>
</div>
<script type="text/javascript" charset="UTF-8" src="/static/js/comm/util.js"></script>
@@ -57,15 +57,16 @@
$(document).ready(function () {
tinymce.init({
selector: '#discussionsContent',
height: 280, // 高度
});
});
function onNewtags() {
parent.layx.iframe('createNewTagContent','新建标签','./newTagPage',{
alwaysOnTop:true,
shadable:true,
width:380,
height:500
parent.layx.iframe('createNewTagContent', '新建标签', './newTagPage', {
alwaysOnTop: true,
shadable: true,
width: 380,
height: 500
});
}
@@ -106,7 +107,7 @@
// parent.layx.destroy('createNewTagContent'); // 方法一（推荐）
// location.reload();
} else {
massage(data.msg,'error', '');
massage(data.msg, 'error', '');
return false;
}
}
src/main/resources/templates/newtag.ftl
+106 -63
View File
@@ -15,74 +15,117 @@
<body>
<div class="ui container" id="container">
<div class=" content" >
<div class=" content">
<form class="ui form">
<div class="field" >
<label>标签名</label>
<input type="text" placeholder="标签名" id="tagsname">
</div>
<div class="two fields" >
<div class="field" >
<label>描述</label>
<input type="text" placeholder="描述" id="tagdescription">
</div>
<div class="field" >
<label>父标签</label>
<select class="ui fluid dropdown" id="parentTag">
<option value="">选择父标签</option>
<#list allTags as tag>
<option value="${tag.id}">${tag.name}</option>
</#list>
</select>
</div>
</div>
<div class="two fields" >
<div class="field">
<label>选择颜色</label>
<div class="ui fluid search selection dropdown">
<input type="hidden" id="tagColor">
<i class="dropdown icon"></i>
<div class="default text">选择颜色</div>
<div class="menu">
<div class="item" data-value="red"><div class="ui red empty circular label"></div>红色</div>
<div class="item" data-value="orange"><div class="ui orange empty circular label"></div>橙色</div>
<div class="item" data-value="yellow"><div class="ui yellow empty circular label"></div>黄色</div>
<div class="item" data-value="olive"><div class="ui olive empty circular label"></div>橄榄绿</div>
<div class="item" data-value="green"><div class="ui green empty circular label"></div>纯绿</div>
<div class="item" data-value="teal"><div class="ui teal empty circular label"></div>水鸭蓝</div>
<div class="item" data-value="blue"><div class="ui blue empty circular label"></div>纯蓝</div>
<div class="item" data-value="violet"><div class="ui violet empty circular label"></div>紫罗兰</div>
<div class="item" data-value="purple"><div class="ui purple empty circular label"></div>纯紫</div>
<div class="item" data-value="pink"><div class="ui pink empty circular label"></div>粉红</div>
<div class="item" data-value="brown"><div class="ui brown empty circular label"></div>棕色</div>
<div class="item" data-value="grey"><div class="ui grey empty circular label"></div>灰色</div>
<div class="item" data-value="black"><div class="ui black empty circular label"></div>黑色</div>
<label>标签名</label>
<input type="text" placeholder="标签名" id="tagsname">
</div>
<div class="two fields">
<div class="field">
<label>描述</label>
<input type="text" placeholder="描述" id="tagdescription">
</div>
<div class="field">
<label>父标签</label>
<select class="ui fluid dropdown" id="parentTag">
<option value="">选择父标签</option>
<#list allTags as tag>
<option value="${tag.id}">${tag.name}</option>
</#list>
</select>
</div>
</div>
<div class="two fields">
<div class="field">
<label>选择颜色</label>
<div class="ui fluid search selection dropdown">
<input type="hidden" id="tagColor">
<i class="dropdown icon"></i>
<div class="default text">选择颜色</div>
<div class="menu">
<div class="item" data-value="red">
<div class="ui red empty circular label"></div>
红色
</div>
<div class="item" data-value="orange">
<div class="ui orange empty circular label"></div>
橙色
</div>
<div class="item" data-value="yellow">
<div class="ui yellow empty circular label"></div>
黄色
</div>
<div class="item" data-value="olive">
<div class="ui olive empty circular label"></div>
橄榄绿
</div>
<div class="item" data-value="green">
<div class="ui green empty circular label"></div>
纯绿
</div>
<div class="item" data-value="teal">
<div class="ui teal empty circular label"></div>
水鸭蓝
</div>
<div class="item" data-value="blue">
<div class="ui blue empty circular label"></div>
纯蓝
</div>
<div class="item" data-value="violet">
<div class="ui violet empty circular label"></div>
紫罗兰
</div>
<div class="item" data-value="purple">
<div class="ui purple empty circular label"></div>
纯紫
</div>
<div class="item" data-value="pink">
<div class="ui pink empty circular label"></div>
粉红
</div>
<div class="item" data-value="brown">
<div class="ui brown empty circular label"></div>
棕色
</div>
<div class="item" data-value="grey">
<div class="ui grey empty circular label"></div>
灰色
</div>
<div class="item" data-value="black">
<div class="ui black empty circular label"></div>
黑色
</div>
</div>
</div>
</div>
<div class="field">
<label>选择图标</label>
<div class="ui fluid search selection dropdown">
<input type="hidden" id="tagIcon">
<i class="dropdown icon"></i>
<div class="default text">选择图标</div>
<div class="menu">
<div class="item" data-value="bullhorn"><i class="bullhorn"></i>bullhorn</div>
<div class="item" data-value="coffee"><i class="coffee"></i>coffee</div>
<div class="item" data-value="edit"><i class="edit"></i>edit</div>
<div class="item" data-value="fax"><i class="fax"></i>fax</div>
<div class="item" data-value="bug"><i class="bug"></i>bug</div>
<div class="item" data-value="keyboard"><i class="keyboard"></i>keyboard</div>
<div class="item" data-value="folder open outline"><i class="folder open outline"></i>folder
open outline
</div>
<div class="item" data-value="comment outline"><i class="comment outline"></i>comment
outline
</div>
</div>
</div>
</div>
</div>
<div class="field">
<label>选择图标</label>
<div class="ui fluid search selection dropdown">
<input type="hidden" id="tagIcon">
<i class="dropdown icon"></i>
<div class="default text">选择图标</div>
<div class="menu">
<div class="item" data-value="bullhorn"><i class="bullhorn"></i>bullhorn</div>
<div class="item" data-value="coffee"><i class="coffee"></i>coffee</div>
<div class="item" data-value="edit"><i class="edit"></i>edit</div>
<div class="item" data-value="fax"><i class="fax"></i>fax</div>
<div class="item" data-value="bug"><i class="bug"></i>bug</div>
<div class="item" data-value="keyboard"><i class="keyboard"></i>keyboard</div>
<div class="item" data-value="folder open outline"><i class="folder open outline"></i>folder open outline</div>
<div class="item" data-value="comment outline"><i class="comment outline"></i>comment outline</div>
</div>
</div>
<a class="ui teal button" id="commitnewtags">保存</a>
<a class="ui grey button" id="cancelnewtags">取消</a>
</div>
</div>
<div class="field" >
<a class="ui teal button" id="commitnewtags">保存</a>
<a class="ui grey button" id="cancelnewtags">取消</a>
</div>
</form>
</div>
@@ -136,11 +179,11 @@
console.log(data);
if (data.flag) {
parent.layx.reloadFrame('createNewDiccussContent');
massage(name + ',添加成功!', 'success','');
massage(name + ',添加成功!', 'success', '');
top.layx.destroy('createNewTagContent'); // 方法二
} else {
massage(name + ',添加失败!', 'error','');
massage(name + ',添加失败!', 'error', '');
}
}
});
src/main/resources/templates/register.ftl
+1 -1
View File
@@ -37,7 +37,7 @@
<div class="ui stacked segment">
<div class="required field">
<label>用户名</label>
<input type="text" name="username" placeholder="用户名">
<input type="text" name="username" placeholder="用户名">
</div>
<div class="required field">
<label>邮箱地址</label>
src/main/resources/templates/user.ftl
+3 -3
View File
@@ -28,13 +28,13 @@
<a class="item ${like}" href="/user?type=like">喜欢收藏</a>
</div>
<div class="ui bottom attached tab segment ${discussion}" >
<div class="ui bottom attached tab segment ${discussion}">
主题...
</div>
<div class="ui bottom attached tab segment ${change}" >
<div class="ui bottom attached tab segment ${change}">
动态...
</div>
<div class="ui bottom attached tab segment ${like}" >
<div class="ui bottom attached tab segment ${like}">
喜欢收藏...
</div>
</div>