diff --git a/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl b/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl
deleted file mode 100644
index ff73b365..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl
+++ /dev/null
@@ -1,231 +0,0 @@
-<@ms.html5>
- <@ms.nav title="文章管理" back=true>
- <#if article.basicId == 0>
- <@ms.saveButton id="saveUpdate" value="保存"/>
- <#else>
- <@ms.updateButton id="saveUpdate" value="更新"/>
- #if>
- @ms.nav>
- <@ms.panel>
- <@ms.form isvalidation=true name="articleForm" action="${managerPath}/cms/article/${action}.do">
- <@ms.text name="basicTitle" colSm="2" width="400" label="文章标题" title="文章标题" size="5" placeholder="请输入文章标题" value="${article.basicTitle?default('')}" validation={"maxlength":"300","required":"true", "data-bv-notempty-message":"文章标题不能为空","data-bv-stringlength-message":"标题在300个字符以内!", "data-bv-notempty-message":"必填项目"}/>
- <@ms.text name="basicSort" colSm="2" width="200" label="自定义顺序" title="自定义顺序" size="5" placeholder="请输入文章顺序" value="${article.basicSort?c?default(0)}" validation={"data-bv-between":"true","required":"true", "data-bv-between-message":"自定义顺序必须大于0","data-bv-between-min":"0", "data-bv-between-max":"99999999","data-bv-notempty-message":"自定义顺序不能为空"}/>
- <#if articleType?has_content>
- <@ms.checkboxlist colSm="2" name="checkbox" label="文章属性" list=articleType listKey="dictValue" listValue="dictLabel" />
- #if>
- <@ms.radio name="basicDisplay"
- list=[{"id":"0","value":"是"},{"id":"1","value":"否"}] value="${article.basicDisplay?c?default()}"
- listKey="id" listValue="value" label="是否显示" help="选择否后前端将不显示,需要重新生成才有效果"
- />
- <@ms.formRow colSm="2" label="文章缩略图" width="400" >
- <@ms.uploadImg path="${websiteId}/article" inputName="basicThumbnails" size="1" msg="提示:文章缩略图,支持jpg格式" imgs="${article.basicThumbnails?default('')}" />
- @ms.formRow>
- <@ms.text name="articleSource" colSm="2" width="200" label="文章来源" title="文章来源" size="5" placeholder="请输入文章来源" value="${article.articleSource?default('')}" validation={"maxlength":"300", "data-bv-stringlength-message":"文章来源在300个字符以内!"} />
- <@ms.text name="articleAuthor" colSm="2" width="200" label="文章作者" title="文章作者" size="5" placeholder="请输入文章作者" value="${article.articleAuthor?default('')}" validation={"maxlength":"12", "data-bv-stringlength-message":"文章作者在12个字符以内!"} />
- <#if !isEditCategory>
- <@ms.formRow colSm="2" label="所属栏目" width="300">
- <#if categoryTitle=="">
- <@ms.treeInput treeId="inputTree" json="${listColumn?default('')}" jsonId="categoryId" jsonPid="categoryCategoryId" jsonName="categoryTitle" inputName="basicCategoryId" inputValue="${categoryId}" buttonText="选择栏目" clickZtreeId="clickZtreeId(event,treeId,treeNode);" expandAll="true" showIcon="true"/>
- <#else>
- <@ms.treeInput treeId="inputTree" json="${listColumn?default('')}" jsonId="categoryId" jsonPid="categoryCategoryId" jsonName="categoryTitle" inputName="basicCategoryId" inputValue="${categoryId}" buttonText="${(categoryTitle)!}" clickZtreeId="clickZtreeId(event,treeId,treeNode);" expandAll="true" showIcon="true"/>
- #if>
- @ms.formRow>
- #if>
- <@ms.hidden id="basicDateTime" name="basicDateTime" value=""/>
- <@ms.date id="articleDateTime" name="articleDateTime" time=true label="发布时间" single=true readonly="readonly" width="300" value="${(article.basicDateTime?default(.now))?string('yyyy-MM-dd HH:mm')}" validation={"required":"true", "data-bv-notempty-message":"必填项目"} placeholder="点击该框选择时间段" />
- <@ms.textarea colSm="2" name="basicDescription" label="描述" wrap="Soft" rows="4" size="" value="${article.basicDescription?default('')}" placeholder="请输入对该文章的简短描述,以便用户查看文章简略" validation={"maxlength":"400","data-bv-stringlength-message":"文章描述在400个字符以内!"}/>
- <@ms.textarea colSm="2" name="articleKeyword" label="关键字" wrap="Soft" rows="4" size="" placeholder="请输入文章关键字" value="${article.articleKeyword?default('')}" validation={"maxlength":"155", "data-bv-stringlength-message":"文章作者在155个字符以内!"}/>
-
-
-
- <@ms.hidden name="articleTypeJson" />
- <@ms.editor colSm="2" name="articleContent" label="文章内容" content="${article.articleContent?default('')}" appId="${appId?default(0)}"/>
- <@ms.hidden name="modelId" value="${Session.model_id_session?default('0')}" />
- @ms.form>
- @ms.panel>
-@ms.html5>
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/article/article_main.ftl b/src/main/webapp/WEB-INF/manager/cms/article/article_main.ftl
deleted file mode 100644
index ab8dd801..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/article/article_main.ftl
+++ /dev/null
@@ -1,163 +0,0 @@
-<@ms.html5>
- <@ms.nav title="文章列表">@ms.nav>
- <@ms.searchForm name="searchForm" action="">
- <#if articleTypeList?has_content>
- <@ms.select label="文章属性" default="全部" value="a" name="articleType" id="forumSelect" list=articleTypeList listValue="dictLabel" listKey="dictValue" value="${articleType?default('')}"/>
- <#else>
- <@ms.select label="文章属性" name="articleType" id="forumSelect" value="" list=["默认属性"] />
- #if>
- <@ms.text label="文章标题" name="basicTitle" value="" title="请输入文章标题" placeholder="请输入文章标题" />
- <@ms.searchFormButton>
- <@ms.queryButton id="submitSearch" />
- @ms.searchFormButton>
- @ms.searchForm>
-
- <@ms.panelNavBtnGroup>
- <@shiro.hasPermission name="article:save"><@ms.panelNavBtnAdd title=""/>@shiro.hasPermission>
- <@shiro.hasPermission name="article:del"><@ms.panelNavBtnDel title=""/>@shiro.hasPermission>
- @ms.panelNavBtnGroup>
-
- <@ms.panel>
-
- @ms.panel>
-@ms.html5>
-
-<@ms.modal modalName="delete" title="删除文章">
- <@ms.modalBody>
- 确定要删除所选的文章吗?
- @ms.modalBody>
- <@ms.modalButton>
- <@ms.button class="btn btn-danger rightDelete" value="确定"/>
- @ms.modalButton>
-@ms.modal>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/manager/cms/article/index.ftl b/src/main/webapp/WEB-INF/manager/cms/article/index.ftl
deleted file mode 100644
index 5158ca3e..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/article/index.ftl
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-<#include "/include/macro.ftl"/>
-<#include "/include/meta.ftl"/>
-
-
-<@ms.content>
- <@ms.contentMenu>
-
- <#if listColumn?has_content>
- <@ms.tree treeId="inputTree" json="${listColumn?default('')}" addNodesName="全部" jsonId="categoryId" jsonPid="categoryCategoryId" jsonName="categoryTitle" showIcon="true" expandAll="true" getZtreeId="getZtreeId(event,treeId,treeNode);" />
- <#else>
- <@ms.nodata content="暂无栏目"/>
- #if>
-
- @ms.contentMenu>
- <@ms.contentBody width="85%" style="overflow-y: hidden;">
- <@ms.contentPanel style="margin:0;padding:0;overflow-y: hidden;">
-
- @ms.contentPanel>
- @ms.contentBody>
-@ms.content>
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
index 570b17eb..81c0e8c1 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
@@ -37,7 +37,7 @@
- {{"{ms:global.url/}"+scope.row.categoryPath+"/index.html"}}
+ {{"{ms:global.url/}"+scope.row.categoryPath+"/index.html"}}
@@ -138,6 +138,14 @@ var indexVue = new Vue({
}
}, 500);
},
+ copyUrl: function(){
+ var clipboard = new ClipboardJS('.copyBtn');
+ var self = this;
+ clipboard.on('success', function (e) {
+ self.$message.success('链接数据已保存到剪切板');
+ clipboard.destroy();
+ });
+ },
//分类列表选中
handleSelectionChange:function(val){
this.selectionList = val;
diff --git a/src/main/webapp/WEB-INF/manager/cms/column/shiro-button.ftl b/src/main/webapp/WEB-INF/manager/cms/column/shiro-button.ftl
deleted file mode 100644
index 118fbc08..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/column/shiro-button.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-<@shiro.hasPermission name="cms:column:save"><@ms.addButton id="addColumnBtn"/>@shiro.hasPermission>
-<@shiro.hasPermission name="cms:column:del"><@ms.delButton id="delColumnBtn"/>@shiro.hasPermission>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/column/shiro-update.ftl b/src/main/webapp/WEB-INF/manager/cms/column/shiro-update.ftl
deleted file mode 100644
index e51e0179..00000000
--- a/src/main/webapp/WEB-INF/manager/cms/column/shiro-update.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-<@shiro.hasPermission name="cms:column:update">
-var url = "${managerPath}/${model?default("")}/column/"+row.categoryId+"/edit.do?modelId=${Session.model_id_session?default(0)}&modelTitle=${Session.model_title_session?default('')}";
-return "" + value + "";
-@shiro.hasPermission>
-<@shiro.lacksPermission name="cms:column:update">
-return value;
-@shiro.lacksPermission>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/index.ftl b/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
index 1ac2aac8..c58edd33 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
@@ -11,7 +11,7 @@