模态框跟换为layx，代码优化，新建帖子时可新建标签
This commit is contained in:
yaoyuan2.chu
@@ -14,10 +14,18 @@
|
||||
src="https://lib.baomitu.com/tinymce/5.1.1/tinymce.min.js"></script>
|
||||
|
||||
<#--toastr-->
|
||||
<link crossorigin="anonymous" integrity="sha384-YzEqZ2pBV0i9OmlTyoz75PqwTR8If8GsXBv7HLQclEVqIC3VxIt98/U94ES6CJTR"
|
||||
href="https://lib.baomitu.com/toastr.js/2.1.4/toastr.min.css" rel="stylesheet">
|
||||
<#--<link crossorigin="anonymous" integrity="sha384-YzEqZ2pBV0i9OmlTyoz75PqwTR8If8GsXBv7HLQclEVqIC3VxIt98/U94ES6CJTR"-->
|
||||
<#-- href="https://lib.baomitu.com/toastr.js/2.1.4/toastr.min.css" rel="stylesheet">-->
|
||||
|
||||
<#--<script crossorigin="anonymous" integrity="sha384-VDls8ImYGI8SwVxpmjX2Bn27U2TcNodzTNROTusVEWO55+lmL+H9NczoQJk6mwZR"-->
|
||||
<#-- src="https://lib.baomitu.com/toastr.js/2.1.4/toastr.min.js"></script>-->
|
||||
|
||||
<#--layx-->
|
||||
<link href="static/layx/layx.min.css?b14794a8a3baf3e8b58e" rel="stylesheet">
|
||||
|
||||
<script type="text/javascript" src="static/layx/layx.min.js?b14794a8a3baf3e8b58e"></script>
|
||||
|
||||
<script type="text/javascript" charset="UTF-8" src="/static/js/comm/util.js"></script>
|
||||
|
||||
<script crossorigin="anonymous" integrity="sha384-VDls8ImYGI8SwVxpmjX2Bn27U2TcNodzTNROTusVEWO55+lmL+H9NczoQJk6mwZR"
|
||||
src="https://lib.baomitu.com/toastr.js/2.1.4/toastr.min.js"></script>
|
||||
|
||||
|
||||
|
||||
@@ -45,10 +45,4 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
function massage(msg,type){
|
||||
// window.alert(msg);
|
||||
toastr.info(msg)
|
||||
|
||||
}
|
||||
</script>
|
||||
@@ -1,4 +1,4 @@
|
||||
<div class="ui main menu" id="menu">
|
||||
<div class="ui main menu" >
|
||||
<div class="ui container">
|
||||
<div href="/" class="header borderless item">
|
||||
<img class="logo" src="static/assets/images/logo.png">
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
<i class="settings icon"></i>
|
||||
<div class="content">
|
||||
${discussions.title}
|
||||
<div class="sub header">某某标签分类</div>
|
||||
<#list tags as tag>
|
||||
<div class="sub header">${tag.name}</div>
|
||||
</#list>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<div class="ui container" id="container">
|
||||
<div class="ui info message">
|
||||
<i class="close icon"></i>
|
||||
<div class="header">欢迎来到这里，${data},当前页主题数： ${allDiscussions?size} ，主题页数：${pageDiscussions?size}
|
||||
<div class="header">欢迎来到这里，${data} ，当前页主题数： ${allDiscussions?size} ，主题页数：${pageDiscussions?size}
|
||||
，标签数 ${allTags?size} </div>
|
||||
<ul class="list">
|
||||
<li>JAVA + DISCUSS = JISCUSS 。</li>
|
||||
@@ -30,10 +30,9 @@
|
||||
|
||||
<h3 class="ui center aligned header"></h3>
|
||||
<div class="ui four column grid">
|
||||
<div
|
||||
class="widescreen large screen computer tablet only four wide column">
|
||||
<div class="widescreen large screen computer tablet only four wide column">
|
||||
|
||||
<div class="fluid ui animated fade primary button" tabindex="0" id='createNewDiccuss'>
|
||||
<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>
|
||||
@@ -42,12 +41,12 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ui modal createNewDiccuss">
|
||||
<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">
|
||||
@@ -65,26 +64,28 @@
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<button class="ui teal button" id="newtags">新增标签</button>
|
||||
<#-- <button class="ui teal button" id="newtags">新增标签</button>-->
|
||||
<#-- <a href="/login" id="loginmodel">登录 & 注册</a>-->
|
||||
<a onclick="onNewtags()">新增标签</a>
|
||||
</div>
|
||||
|
||||
<div class="field" id="createNewtagsDiv" style="display:none">
|
||||
<label>标签名</label>
|
||||
<input type="text" placeholder="标签名" id="tagsname">
|
||||
</div>
|
||||
<div class="two fields">
|
||||
<div class="field" id="tagDescriptionDiv" style="display:none">
|
||||
<label>描述</label>
|
||||
<input type="text" placeholder="描述" id="tagdescription">
|
||||
</div>
|
||||
<div class="field" id="parentTagDiv" style="display:none">
|
||||
<label>父标签</label>
|
||||
<select class="ui fluid dropdown" id="parentTag">
|
||||
<#list allTags as tag>
|
||||
<option value="{tag.id}">{tag.name}</option>
|
||||
</#list>
|
||||
</select>
|
||||
</div>
|
||||
<div class="two fields" id="tagDescriptionDiv" style="display:none">
|
||||
<div class="field" >
|
||||
<label>描述</label>
|
||||
<input type="text" placeholder="描述" id="tagdescription">
|
||||
</div>
|
||||
<div class="field" >
|
||||
<label>父标签</label>
|
||||
<select class="ui fluid dropdown" id="parentTag">
|
||||
<#list allTags as tag>
|
||||
<option value="{tag.id}">{tag.name}</option>
|
||||
</#list>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="two fields" id="colorIconDiv" style="display:none">
|
||||
<div class="field">
|
||||
@@ -144,7 +145,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ui section divider"></div>
|
||||
<#-- <div class="ui section divider"></div>-->
|
||||
|
||||
<div class="ui card red ">
|
||||
<div class="content">
|
||||
@@ -155,74 +156,19 @@
|
||||
<div class="item">
|
||||
<i class="folder icon"></i>
|
||||
<div class="content">
|
||||
<div class="header">src</div>
|
||||
<div class="description">Source files for project</div>
|
||||
<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">site</div>
|
||||
<div class="description">Your site's theme</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item">
|
||||
<i class="blue folder icon"></i>
|
||||
<div class="content">
|
||||
<div class="header">themes</div>
|
||||
<div class="description">Packaged theme files</div>
|
||||
<div class="list">
|
||||
<div class="item">
|
||||
<i class="folder icon"></i>
|
||||
<div class="content">
|
||||
<div class="header">default</div>
|
||||
<div class="description">Default packaged theme</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item">
|
||||
<i class="folder icon"></i>
|
||||
<div class="content">
|
||||
<div class="header">my_theme</div>
|
||||
<div class="description">Packaged themes are also available in
|
||||
this folder
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item">
|
||||
<i class="file icon"></i>
|
||||
<div class="content">
|
||||
<a class="header">theme.config</a>
|
||||
<div class="description">Config file for setting packaged themes</div>
|
||||
<div class="header">test2</div>
|
||||
<div class="description">Test2 site's test</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item">
|
||||
<i class="red folder icon"></i>
|
||||
<div class="content">
|
||||
<a class="header">dist</a>
|
||||
<div class="description">Compiled CSS and JS files</div>
|
||||
<div class="list">
|
||||
<div class="item">
|
||||
<i class="folder icon"></i>
|
||||
<div class="content">
|
||||
<a class="header">components</a>
|
||||
<div class="description">Individual component CSS and JS</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item">
|
||||
<i class="file icon red"></i>
|
||||
<div class="content">
|
||||
<div class="header">semantic.json</div>
|
||||
<div class="description">Contains build settings for gulp</div>
|
||||
</div>
|
||||
</div>
|
||||
<#list allTags as tags>
|
||||
<div class="item">
|
||||
<i class="icon ${tags.icon} ${tags.color}"></i>
|
||||
@@ -281,13 +227,13 @@
|
||||
<div class="ui two buttons">
|
||||
<div class="ui basic red button">
|
||||
<div class="ui mini statistic">
|
||||
<div class="value">1</div>
|
||||
<div class="value"> ${allUser?size}</div>
|
||||
<div class="label">用户数</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui basic green button">
|
||||
<div class="ui mini statistic">
|
||||
<div class="value">10</div>
|
||||
<div class="value"> ${allDiscussions?size}</div>
|
||||
<div class="label">发帖数</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -297,20 +243,31 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div
|
||||
class="widescreen large screen computer tablet only twelve wide column">
|
||||
<div class="widescreen large screen computer tablet only twelve wide column">
|
||||
|
||||
<div id="context2">
|
||||
<div class="ui secondary menu">
|
||||
<a class="item active" data-tab="fourth"> <i class="icon mail"></i>
|
||||
最新回复
|
||||
<div class="floating ui red label">22</div>
|
||||
</a> <a class="item "
|
||||
data-tab="fifth">热门</a> <a class="item " data-tab="sixth">新帖</a>
|
||||
</div>
|
||||
<div class="ui active tab segment" data-tab="fourth">
|
||||
<div class="ui large feed">
|
||||
|
||||
<#if username??>
|
||||
<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 ${typeNew}" href="/main?type=new">新帖</a>
|
||||
<#else>
|
||||
<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>
|
||||
</#if>
|
||||
|
||||
</div>
|
||||
<div class="ui ${typeAll} tab segment" data-tab="fourth">
|
||||
<div class="ui large feed">
|
||||
<#list allDiscussions as discussions>
|
||||
<div class="event">
|
||||
<div class="label">
|
||||
@@ -323,15 +280,14 @@
|
||||
</a>
|
||||
|
||||
<div class="date">
|
||||
3 days ago
|
||||
${discussions.startTime}
|
||||
</div>
|
||||
<div class="nullright">
|
||||
<a class="ui teal label">
|
||||
标签1
|
||||
</a>
|
||||
<a class="ui purple label">
|
||||
标签2
|
||||
</a>
|
||||
<#list discussions.tagList as tags>
|
||||
<a class="ui ${tags.color} label">
|
||||
${tags.name}
|
||||
</a>
|
||||
</#list>
|
||||
</div>
|
||||
</div>
|
||||
<div class="extra text"
|
||||
@@ -339,109 +295,122 @@
|
||||
${discussions.content}
|
||||
</div>
|
||||
<div class="meta">
|
||||
<div class=" description "><i class="edit icon"></i> <a><b>用户1</b></a> •
|
||||
<i class="reply icon"></i>最后由 <a><b>${discussions.last_user_id}</b></a>
|
||||
回复于10 hours ago.
|
||||
<div class=" description "><i class="edit icon"></i> <a><b>${discussions.username}</b></a> •
|
||||
<i class="reply icon"></i>最后由 <a><b>${discussions.usernameLast}</b></a>
|
||||
回复于${discussions.lastTime}.
|
||||
</div>
|
||||
</div>
|
||||
<div class="nullright meta">
|
||||
<a class="like ">
|
||||
<i class="like icon"></i> 11 喜欢
|
||||
<i class="like icon"></i> ${discussions.likeCount} 喜欢
|
||||
</a>
|
||||
<a class="comment ">
|
||||
<i class="comment icon"></i> 22 回复
|
||||
<i class="comment icon"></i> ${discussions.commentsCount} 回复
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui fitted divider"></div>
|
||||
</#list>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ui ${typeHot} tab segment" data-tab="fifth">
|
||||
<div class="ui large feed">
|
||||
<#list allDiscussions as discussions>
|
||||
<div class="event">
|
||||
<div class="label">
|
||||
<img src="static/assets/images/logo.png">
|
||||
</div>
|
||||
<div class="content">
|
||||
<div class="summary">
|
||||
<a href="/getdiscussionsbyid?id=${discussions.id}">
|
||||
${discussions.title}
|
||||
</a>
|
||||
|
||||
<div class="date">
|
||||
${discussions.startTime}
|
||||
</div>
|
||||
<div class="nullright">
|
||||
<#list discussions.tagList as tags>
|
||||
<a class="ui ${tags.color} label">
|
||||
${tags.name}
|
||||
</a>
|
||||
</#list>
|
||||
</div>
|
||||
</div>
|
||||
<div class="extra text"
|
||||
style="width: 300px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
|
||||
${discussions.content}
|
||||
</div>
|
||||
<div class="meta">
|
||||
<div class=" description "><i class="edit icon"></i> <a><b>${discussions.username}</b></a> •
|
||||
<i class="reply icon"></i>最后由 <a><b>${discussions.usernameLast}</b></a>
|
||||
回复于${discussions.lastTime}.
|
||||
</div>
|
||||
</div>
|
||||
<div class="nullright meta">
|
||||
<a class="like ">
|
||||
<i class="like icon"></i> ${discussions.likeCount} 喜欢
|
||||
</a>
|
||||
<a class="comment ">
|
||||
<i class="comment icon"></i> ${discussions.commentsCount} 回复
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui fitted divider"></div>
|
||||
</#list>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui ${typeNew} tab segment" data-tab="sixth">
|
||||
<div class="ui large feed">
|
||||
<#list allDiscussions as discussions>
|
||||
<div class="event">
|
||||
<div class="label">
|
||||
<img src="static/assets/images/logo.png">
|
||||
</div>
|
||||
<div class="content">
|
||||
<div class="summary">
|
||||
<a href="/getdiscussionsbyid?id=${discussions.id}">
|
||||
${discussions.title}
|
||||
</a>
|
||||
|
||||
<div class="date">
|
||||
${discussions.startTime}
|
||||
</div>
|
||||
<div class="nullright">
|
||||
<#list discussions.tagList as tags>
|
||||
<a class="ui ${tags.color} label">
|
||||
${tags.name}
|
||||
</a>
|
||||
</#list>
|
||||
</div>
|
||||
</div>
|
||||
<div class="extra text"
|
||||
style="width: 300px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
|
||||
${discussions.content}
|
||||
</div>
|
||||
<div class="meta">
|
||||
<div class=" description "><i class="edit icon"></i> <a><b>${discussions.username}</b></a> •
|
||||
<i class="reply icon"></i>最后由 <a><b>${discussions.usernameLast}</b></a>
|
||||
回复于${discussions.lastTime}.
|
||||
</div>
|
||||
</div>
|
||||
<div class="nullright meta">
|
||||
<a class="like ">
|
||||
<i class="like icon"></i> ${discussions.likeCount} 喜欢
|
||||
</a>
|
||||
<a class="comment ">
|
||||
<i class="comment icon"></i> ${discussions.commentsCount} 回复
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui fitted divider"></div>
|
||||
</#list>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="ui tab segment" data-tab="fifth">
|
||||
<div class="ui divided items">
|
||||
<div class="item">
|
||||
<div class="ui tiny image">
|
||||
<img src="static/assets/images/logo.png">
|
||||
</div>
|
||||
<div class="content">
|
||||
|
||||
<h4 class="header">置顶测试帖222</h4>
|
||||
<div class="meta">
|
||||
<span class="cinema">测试广场 14</span>
|
||||
</div>
|
||||
<div class="description">
|
||||
<p>123234324</p>
|
||||
</div>
|
||||
<div class="extra">
|
||||
<div class="ui label">IMAX</div>
|
||||
<div class="ui label">
|
||||
<i class="globe icon"></i> 附加的留言
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class="ui tiny image">
|
||||
<img src="static/assets/images/logo.png">
|
||||
</div>
|
||||
<div class="content">
|
||||
<a class="header">龙猫</a>
|
||||
<div class="meta">
|
||||
<span class="cinema">测试帖1111</span>
|
||||
</div>
|
||||
<div class="description">
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="extra">
|
||||
<div class="ui right floated primary button">
|
||||
Jiscuss测试内容，测试内容 <i class="right chevron icon"></i>
|
||||
</div>
|
||||
<div class="ui label">限制的</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item">
|
||||
<div class=" ui tiny image">
|
||||
<img src="static/assets/images/logo.png">
|
||||
</div>
|
||||
<div class="content">
|
||||
<a class="header">测试帖子</a>
|
||||
<div class="meta">
|
||||
<span class="cinema">xxx于什么时候最新回复</span>
|
||||
</div>
|
||||
<div class="meta">
|
||||
<span class="cinema">IFC2222222。。。。</span>
|
||||
</div>
|
||||
<div class="description">
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="extra">
|
||||
<div class="mini ui right floated labeled button" tabindex="0">
|
||||
<div class="mini ui red button">
|
||||
<i class="heart icon"></i> 喜欢
|
||||
</div>
|
||||
<a class="ui basic red left pointing label"> 1,048 </a>
|
||||
</div>
|
||||
<div class="mini ui right floated labeled button" tabindex="0">
|
||||
<div class=" mini ui basic blue button">
|
||||
<i class="fork icon"></i>评论
|
||||
</div>
|
||||
<a class="ui basic left pointing blue label"> 1,048 </a>
|
||||
</div>
|
||||
<div class="ui label">限制的2</div>
|
||||
<div class="ui label">限制的3</div>
|
||||
<div class="ui label">限制的4</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui tab segment" data-tab="sixth">6</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -512,12 +481,12 @@
|
||||
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<div class="ui button" data-tooltip="预留" data-position="top center">
|
||||
预留
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<#include "comm/footer.ftl"/>
|
||||
<script type="text/javascript">
|
||||
|
||||
|
||||
@@ -2,16 +2,7 @@
|
||||
<html>
|
||||
<title>Jiscuss Demo</title>
|
||||
<head>
|
||||
<!-- <link rel="stylesheet" type="text/css" href="static/semanticui/semantic.css"> -->
|
||||
<!-- <script src="static/jquery/jquery-3.4.1.min.js"></script> -->
|
||||
<!-- <script src="static/semanticui/semantic.min.js"></script> -->
|
||||
<link crossorigin="anonymous" integrity="sha384-ATvSpJEmy1egycrmomcFxVn4Z0A6rfjwlzDQrts/1QRerQhR9EEpEYtdysLpQPuQ"
|
||||
href="https://lib.baomitu.com/semantic-ui/2.4.1/semantic.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" type="text/css" href="/static/semanticui/my.css">
|
||||
<script crossorigin="anonymous" integrity="sha384-vk5WoKIaW/vJyUAd9n/wmopsmNhiy+L2Z+SBxGYnUkunIxVxAv/UtMOhba/xskxh"
|
||||
src="https://lib.baomitu.com/jquery/3.4.1/jquery.min.js"></script>
|
||||
<script crossorigin="anonymous" integrity="sha384-6urqf2sgCGDfIXcoxTUOVIoQV+jFr/Zuc4O2wCRS6Rnd8w0OJ17C4Oo3PuXu8ZtF"
|
||||
src="https://lib.baomitu.com/semantic-ui/2.4.1/semantic.min.js"></script>
|
||||
<#include "comm/commjs.ftl"/>
|
||||
|
||||
<style type="text/css">
|
||||
body {
|
||||
@@ -69,7 +60,7 @@
|
||||
</form>
|
||||
|
||||
<div class="ui message">
|
||||
<a href="/"><——Jiscuss首页</a> 新用户？ <a href="login.php#">注册</a>
|
||||
<a href="/"><——Jiscuss首页</a> 新用户？ <a href="/register">注册</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<title>新建主题页</title>
|
||||
<head>
|
||||
<!-- <link rel="stylesheet" type="text/css" href="static/semanticui/semantic.css"> -->
|
||||
<!-- <script src="static/jquery/jquery-3.4.1.min.js"></script> -->
|
||||
<!-- <script src="static/semanticui/semantic.min.js"></script> -->
|
||||
|
||||
<!-- default header name is X-CSRF-TOKEN -->
|
||||
<meta name="_csrf" content="${_csrf.token}"/>
|
||||
<meta name="_csrf_header" content="${_csrf.headerName}"/>
|
||||
|
||||
<#include "comm/commjs.ftl"/>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<div class="ui container" id="container">
|
||||
<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">
|
||||
<button class="ui teal button" onclick="onNewtags()">新增标签</button>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="field">
|
||||
<label>内容</label>
|
||||
<textarea id="discussionsContent"></textarea>
|
||||
</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>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
$('.ui.dropdown')
|
||||
.dropdown()
|
||||
;
|
||||
|
||||
$(document).ready(function () {
|
||||
tinymce.init({
|
||||
selector: '#discussionsContent',
|
||||
});
|
||||
});
|
||||
|
||||
function onNewtags() {
|
||||
parent.layx.iframe('createNewTagContent','新建标签','./newTagPage',{
|
||||
alwaysOnTop:true,
|
||||
shadable:true,
|
||||
width:380,
|
||||
height:500
|
||||
});
|
||||
}
|
||||
|
||||
$("#newDiscussions").click(function () {
|
||||
|
||||
var token = $("meta[name='_csrf']").attr("content");
|
||||
var header = $("meta[name='_csrf_header']").attr("content");
|
||||
console.warn(header)
|
||||
console.warn(token)
|
||||
debugger
|
||||
var title = $("#discussionstitle").val();
|
||||
var tag = $("#selectTag").val();
|
||||
console.warn(tag)
|
||||
let tagStr = tag.join(",")
|
||||
console.log(tagStr)
|
||||
console.log(tinyMCE.editors[0].getContent());
|
||||
var content = tinyMCE.editors[0].getContent();
|
||||
console.log(title);
|
||||
console.log(content);
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "/newDiscussions",
|
||||
data: JSON.stringify({
|
||||
title: title,
|
||||
content: content,
|
||||
tag: tagStr
|
||||
}),
|
||||
contentType: 'application/json',
|
||||
beforeSend: function (request) {
|
||||
request.setRequestHeader(header, token); // 添加 CSRF Token
|
||||
},
|
||||
dataType: "JSON",
|
||||
success: function (data) {
|
||||
debugger
|
||||
console.log(data);
|
||||
if (data.flag) {
|
||||
top.layx.destroy('createNewDiccussContent');
|
||||
// parent.layx.destroy('createNewTagContent'); // 方法一（推荐）
|
||||
// location.reload();
|
||||
} else {
|
||||
massage(data.msg,'error', '');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,161 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<title>新建标签页</title>
|
||||
<head>
|
||||
<!-- <link rel="stylesheet" type="text/css" href="static/semanticui/semantic.css"> -->
|
||||
<!-- <script src="static/jquery/jquery-3.4.1.min.js"></script> -->
|
||||
<!-- <script src="static/semanticui/semantic.min.js"></script> -->
|
||||
|
||||
<!-- default header name is X-CSRF-TOKEN -->
|
||||
<meta name="_csrf" content="${_csrf.token}"/>
|
||||
<meta name="_csrf_header" content="${_csrf.headerName}"/>
|
||||
<#include "comm/commjs.ftl"/>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="ui container" id="container">
|
||||
<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>
|
||||
</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" >
|
||||
<a class="ui teal button" id="commitnewtags">保存</a>
|
||||
<a class="ui grey button" id="cancelnewtags">取消</a>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" charset="UTF-8" src="/static/js/comm/util.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
$('.ui.dropdown')
|
||||
.dropdown()
|
||||
;
|
||||
$(document).ready(function () {
|
||||
|
||||
});
|
||||
|
||||
$("#commitnewtags").click(function () {
|
||||
|
||||
var header = $("meta[name='_csrf_header']").attr("content");
|
||||
var token = $("meta[name='_csrf']").attr("content");
|
||||
|
||||
var name = $("#tagsname").val();
|
||||
|
||||
var tagColor = $("#tagColor").val();
|
||||
var tagIcon = $("#tagIcon").val();
|
||||
var parentTag = $("#parentTag").val();
|
||||
|
||||
var tagdescription = $("#tagdescription").val();
|
||||
|
||||
console.log(tagColor);
|
||||
console.log(tagIcon);
|
||||
console.log(parentTag);
|
||||
console.log(tagdescription);
|
||||
console.log(name);
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "/newtags",
|
||||
data: JSON.stringify({
|
||||
name: name,
|
||||
color: tagColor,
|
||||
icon: tagIcon,
|
||||
description: tagdescription,
|
||||
parentId: parentTag
|
||||
}),
|
||||
contentType: 'application/json',
|
||||
beforeSend: function (xhr) {
|
||||
xhr.setRequestHeader(header, token);
|
||||
},
|
||||
dataType: "JSON",
|
||||
success: function (data) {
|
||||
console.log(data);
|
||||
if (data.flag) {
|
||||
parent.layx.reloadFrame('createNewDiccussContent');
|
||||
massage(name + ',添加成功!', 'success','');
|
||||
|
||||
top.layx.destroy('createNewTagContent'); // 方法二
|
||||
} else {
|
||||
massage(name + ',添加失败!', 'error','');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
$("#cancelnewtags").click(function () {
|
||||
// layx.destroy(id);
|
||||
// parent.layx.destroy('createNewTagContent'); // 方法一（推荐）
|
||||
top.layx.destroy('createNewTagContent'); // 方法二
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,94 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<title>Jiscuss Demo</title>
|
||||
<head>
|
||||
<#include "comm/commjs.ftl"/>
|
||||
|
||||
<style type="text/css">
|
||||
body {
|
||||
background-color: #DADADA;
|
||||
}
|
||||
|
||||
body > .grid {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.image {
|
||||
margin-top: -100px;
|
||||
}
|
||||
|
||||
.column {
|
||||
max-width: 450px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="ui middle aligned center aligned grid">
|
||||
<div class="column">
|
||||
<h2 class="ui blue image header">
|
||||
<img src="static/assets/images/logo.png" class="image">
|
||||
<div class="content">
|
||||
注册账号
|
||||
</div>
|
||||
</h2>
|
||||
<form class="ui large form" action="/registerDo" method="post">
|
||||
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
|
||||
<div class="ui stacked segment">
|
||||
<div class="required field">
|
||||
<label>用户名</label>
|
||||
<input type="text" name="username" placeholder="用户名">
|
||||
</div>
|
||||
<div class="required field">
|
||||
<label>邮箱地址</label>
|
||||
<input type="text" name="email" placeholder="邮箱地址">
|
||||
</div>
|
||||
<div class="required field">
|
||||
<label>密码</label>
|
||||
<input type="text" name="password" placeholder="密码">
|
||||
</div>
|
||||
<div class="required field">
|
||||
<label>确认密码</label>
|
||||
<input type="text" name="password2" placeholder="确认密码">
|
||||
</div>
|
||||
|
||||
<div class="required inline field">
|
||||
<div class="ui checkbox">
|
||||
<input type="checkbox" tabindex="0" class="hidden">
|
||||
<label>我同意Jiscuss条款</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field" id="msgId" style="display:none">
|
||||
<div class="ui pointing red basic label">
|
||||
${msg}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button class="ui fluid large blue button" type="submit">注册</button>
|
||||
</div>
|
||||
|
||||
<div class="ui error message"></div>
|
||||
|
||||
</form>
|
||||
|
||||
<div class="ui message">
|
||||
<a href="/"><——Jiscuss首页</a> 已有用户？ <a href="/login">登陆</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$('.ui.checkbox')
|
||||
.checkbox()
|
||||
;
|
||||
$(document).ready(function () {
|
||||
<#if msg??>
|
||||
$('#msgId').show();
|
||||
</#if>
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
@@ -1,108 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<title>Jiscuss Demo</title>
|
||||
<head>
|
||||
<!-- <link rel="stylesheet" type="text/css" href="static/semanticui/semantic.css"> -->
|
||||
<!-- <script src="static/jquery/jquery-3.4.1.min.js"></script> -->
|
||||
<!-- <script src="static/semanticui/semantic.min.js"></script> -->
|
||||
|
||||
<!-- default header name is X-CSRF-TOKEN -->
|
||||
<meta name="_csrf" content="${_csrf.token}"/>
|
||||
<meta name="_csrf_header" content="${_csrf.headerName}"/>
|
||||
|
||||
<#include "comm/commjs.ftl"/>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
||||
<div class="ui fixed inverted menu">
|
||||
<div class="ui container">
|
||||
<a href="fixed.php#" class="header item">
|
||||
<img class="logo" src="assets/images/logo.png">
|
||||
项目名
|
||||
</a>
|
||||
<a href="fixed.php#" class="item">主页</a>
|
||||
<div class="ui simple dropdown item">
|
||||
Dropdown <i class="dropdown icon"></i>
|
||||
<div class="menu">
|
||||
<a class="item" href="fixed.php#">链接选项</a>
|
||||
<a class="item" href="fixed.php#">链接选项</a>
|
||||
<div class="divider"></div>
|
||||
<div class="header">标题项</div>
|
||||
<div class="item">
|
||||
<i class="dropdown icon"></i>
|
||||
子菜单
|
||||
<div class="menu">
|
||||
<a class="item" href="fixed.php#">链接选项</a>
|
||||
<a class="item" href="fixed.php#">链接选项</a>
|
||||
</div>
|
||||
</div>
|
||||
<a class="item" href="fixed.php#">链接选项</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ui main text container">
|
||||
<h1 class="ui header">Semantic UI Fixed Template</h1>
|
||||
<p>This is a basic fixed menu template using fixed size containers.</p>
|
||||
<p>A text container is used for the main container, which is useful for single column layouts</p>
|
||||
<img class="wireframe" src="assets/images/wireframe/media-paragraph.png">
|
||||
<img class="wireframe" src="assets/images/wireframe/paragraph.png">
|
||||
<img class="wireframe" src="assets/images/wireframe/paragraph.png">
|
||||
<img class="wireframe" src="assets/images/wireframe/paragraph.png">
|
||||
<img class="wireframe" src="assets/images/wireframe/paragraph.png">
|
||||
<img class="wireframe" src="assets/images/wireframe/paragraph.png">
|
||||
<img class="wireframe" src="assets/images/wireframe/paragraph.png">
|
||||
</div>
|
||||
|
||||
<div class="ui inverted vertical footer segment">
|
||||
<div class="ui center aligned container">
|
||||
<div class="ui stackable inverted divided grid">
|
||||
<div class="three wide column">
|
||||
<h4 class="ui inverted header">Group 1</h4>
|
||||
<div class="ui inverted link list">
|
||||
<a href="fixed.php#" class="item">Link One</a>
|
||||
<a href="fixed.php#" class="item">Link Two</a>
|
||||
<a href="fixed.php#" class="item">Link Three</a>
|
||||
<a href="fixed.php#" class="item">Link Four</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="three wide column">
|
||||
<h4 class="ui inverted header">Group 2</h4>
|
||||
<div class="ui inverted link list">
|
||||
<a href="fixed.php#" class="item">Link One</a>
|
||||
<a href="fixed.php#" class="item">Link Two</a>
|
||||
<a href="fixed.php#" class="item">Link Three</a>
|
||||
<a href="fixed.php#" class="item">Link Four</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="three wide column">
|
||||
<h4 class="ui inverted header">Group 3</h4>
|
||||
<div class="ui inverted link list">
|
||||
<a href="fixed.php#" class="item">Link One</a>
|
||||
<a href="fixed.php#" class="item">Link Two</a>
|
||||
<a href="fixed.php#" class="item">Link Three</a>
|
||||
<a href="fixed.php#" class="item">Link Four</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="seven wide column">
|
||||
<h4 class="ui inverted header">Footer Header</h4>
|
||||
<p>Extra space for a call to action inside the footer that could help re-engage users.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ui inverted section divider"></div>
|
||||
<img src="assets/images/logo.png" class="ui centered mini image">
|
||||
<div class="ui horizontal inverted small divided link list">
|
||||
<a class="item" href="fixed.php#">Site Map</a>
|
||||
<a class="item" href="fixed.php#">Contact Us</a>
|
||||
<a class="item" href="fixed.php#">Terms and Conditions</a>
|
||||
<a class="item" href="fixed.php#">Privacy Policy</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,118 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<title>用户详情页</title>
|
||||
<head>
|
||||
<!-- <link rel="stylesheet" type="text/css" href="static/semanticui/semantic.css"> -->
|
||||
<!-- <script src="static/jquery/jquery-3.4.1.min.js"></script> -->
|
||||
<!-- <script src="static/semanticui/semantic.min.js"></script> -->
|
||||
<meta name="_csrf" content="${_csrf.token}"/>
|
||||
<meta name="_csrf_header" content="${_csrf.headerName}"/>
|
||||
<#include "comm/commjs.ftl"/>
|
||||
</head>
|
||||
<body>
|
||||
<#include "comm/header.ftl"/>
|
||||
|
||||
<div class="ui container" id="container">
|
||||
<h1>用户1的个人主页</h1>
|
||||
|
||||
<h2 class="ui dividing header">详情</h2>
|
||||
|
||||
<div class="ui vertical stripe segment">
|
||||
<#-- <div class="ui middle aligned stackable grid container">-->
|
||||
<div class="ui internally celled grid">
|
||||
<div class="row">
|
||||
<div class="eight wide column">
|
||||
<div class="ui secondary menu">
|
||||
<a class="item ${discussion}" href="/user?type=discussion">主题</a>
|
||||
<a class="item ${change}" href="/user?type=change">动态</a>
|
||||
<a class="item ${like}" href="/user?type=like">喜欢收藏</a>
|
||||
|
||||
</div>
|
||||
<div class="ui bottom attached tab segment ${discussion}" >
|
||||
主题...
|
||||
</div>
|
||||
<div class="ui bottom attached tab segment ${change}" >
|
||||
动态...
|
||||
</div>
|
||||
<div class="ui bottom attached tab segment ${like}" >
|
||||
喜欢收藏...
|
||||
</div>
|
||||
</div>
|
||||
<div class="six wide right floated column">
|
||||
<div class="ui link cards">
|
||||
<div class="card">
|
||||
<div class="image">
|
||||
<img src="static/assets/images/logo.png">
|
||||
</div>
|
||||
<div class="content">
|
||||
<div class="header">Matt Giampietro</div>
|
||||
<div class="meta">
|
||||
<a>Friends</a>
|
||||
</div>
|
||||
<div class="description">
|
||||
Matthew is an interior designer living in New York.
|
||||
</div>
|
||||
</div>
|
||||
<div class="extra content">
|
||||
<span class="right floated">
|
||||
Joined in 2013
|
||||
</span>
|
||||
<span>
|
||||
<i class="user icon"></i>
|
||||
75 Friends
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="center aligned column">
|
||||
<button class="ui basic button" id="userButton">
|
||||
<i class="icon user"></i>
|
||||
小按钮·点下试试
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<#include "comm/footer.ftl"/>
|
||||
|
||||
<#-- <div class="ui bottom vertical inverted sidebar labeled icon menu" id="userButtonsidebar">-->
|
||||
<div class="ui bottom item three labeled icon sidebar menu scale down" id="userButtonsidebar">
|
||||
<#-- <div class="ui bottom demo inverted nine item labeled icon sidebar menu scale down visible" style="">-->
|
||||
|
||||
<a class="item">
|
||||
<i class="home icon"></i>
|
||||
主题
|
||||
</a>
|
||||
<a class="item">
|
||||
<i class="block layout icon"></i>
|
||||
动态
|
||||
</a>
|
||||
<a class="item">
|
||||
<i class="smile icon"></i>
|
||||
喜欢收藏
|
||||
</a>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
|
||||
$(document).ready(function () {
|
||||
<#if username??>
|
||||
setusername('${username}');
|
||||
console.log('已经登陆：' + username);
|
||||
</#if>
|
||||
<#--setDiscussionsId('${discussions.id}');-->
|
||||
|
||||
$('#userTab')
|
||||
.tab()
|
||||
;
|
||||
});
|
||||
|
||||
</script>
|
||||
<script type="text/javascript" charset="UTF-8" src="/static/js/user/user.js"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -1,20 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<head lang="en">
|
||||
<meta charset="UTF-8"/>
|
||||
<title></title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Hello World</h1>
|
||||
123123123123
|
||||
123132666
|
||||
<br/>
|
||||
<p>
|
||||
welcome ${data} to freemarker!
|
||||
</p>
|
||||
123132666
|
||||
<p>
|
||||
welcome ${msg} to freemarker!
|
||||
</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user