diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index 6e358a14..23b5addb 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -404,7 +404,7 @@ public class LoginController extends BaseController{ CookieUtils.setCookie(response, "skinName_" + loginInfo.getId(), skinName); return REDIRECT + adminPath + "/index"; } - return "modules/sys/sysSwitchSkin"; + return "modules/sys/switchSkin"; } /** diff --git a/modules/core/src/main/resources/views/modules/sys/dictDataForm.html b/modules/core/src/main/resources/views/modules/sys/dictDataForm.html deleted file mode 100644 index 67308a41..00000000 --- a/modules/core/src/main/resources/views/modules/sys/dictDataForm.html +++ /dev/null @@ -1,142 +0,0 @@ -<% layout('/layouts/default.html', {title: '字典数据管理', libs: ['validate']}){ %> -
-
-
-
- ${text(dictData.isNewRecord ? '新增字典' : '编辑字典')}（${dictData.dictType}） -
-
- -
-
- <#form:form id="inputForm" model="${dictData}" action="${ctx}/sys/dictData/save" method="post" class="form-horizontal"> -
-
${text('基本信息')}
-
-
-
- -
- <#form:treeselect id="parent" title="${text('上级字典')}" - path="parent.id" labelPath="parent.dictLabelOrig" - url="${ctx}/sys/dictData/treeData?excludeCode=${dictData.id}&dictType=${dictData.dictType}&isShowNameOrig=true" - class="" allowClear="true" canSelectRoot="true" canSelectParent="true" isReturnValue="false"/> -
-
-
-
- <#form:hidden path="dictCode"/> - <#form:hidden path="dictType"/> -
-
-
- -
- <#form:input path="dictLabelOrig" maxlength="100" class="form-control required "/> -
-
-
-
-
- -
- <#form:input path="dictValue" maxlength="100" class="form-control required "/> -
-
-
-
-
-
-
- -
- <#form:input path="treeSort" maxlength="10" class="form-control required digits"/> -
-
-
-
-
- -
- <#form:radio path="isSys" dictType="sys_yes_no" class="form-control required " /> -
-
-
-
-
-
-
- -
- <#form:input path="description" maxlength="500" class="form-control "/> -
-
-
-
-
${text('其它信息')}
-
-
-
- -
- <#form:input path="cssStyle" maxlength="500" class="form-control "/> -
-
-
-
-
- -
- <#form:input path="cssClass" maxlength="500" class="form-control "/> -
-
-
-
-
-
-
- -
- <#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/> -
-
-
-
- <#form:extend collapsed="true" /> -
-
-
-
- <% if (hasPermi('sys:dictData:edit')){ %> -   - <% } %> - -
-
-
- -
-
-<% } %> - \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/dictDataList.html b/modules/core/src/main/resources/views/modules/sys/dictDataList.html deleted file mode 100644 index 63644b54..00000000 --- a/modules/core/src/main/resources/views/modules/sys/dictDataList.html +++ /dev/null @@ -1,102 +0,0 @@ -<% layout('/layouts/default.html', {title: '字典数据管理', libs: ['dataGrid']}){ %> -
-
-
-
- ${text('字典数据')}（${dictData.dictType}） -
-
- ${text('查询')} - ${text('刷新')} - ${text('展开')} - ${text('折叠')} - <% if(hasPermi('sys:dictData:edit')){ %> - ${text('新增')} - <% } %> -
-
-
- <#form:form id="searchForm" model="${dictData}" action="${ctx}/sys/dictData/listData" method="post" class="form-inline " - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="dictLabelOrig" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:input path="dictValue" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:input path="dictType" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:select path="isSys" dictType="sys_yes_no" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> -
-
-
- - -
- -
-
-
-
-<% } %> - \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/dictTypeForm.html b/modules/core/src/main/resources/views/modules/sys/dictTypeForm.html deleted file mode 100644 index 38926b16..00000000 --- a/modules/core/src/main/resources/views/modules/sys/dictTypeForm.html +++ /dev/null @@ -1,90 +0,0 @@ -<% layout('/layouts/default.html', {title: '字典类型管理', libs: ['validate']}){ %> -
-
-
-
- ${text(dictType.isNewRecord ? '新增字典类型' : '编辑字典类型')} -
-
- -
-
- <#form:form id="inputForm" model="${dictType}" action="${ctx}/sys/dictType/save" method="post" class="form-horizontal"> -
-
${text('基本信息')}
- <#form:hidden path="id"/> -
-
-
- -
- <#form:input path="dictName" maxlength="100" class="form-control required "/> -
-
-
-
-
-
-
- -
- <#form:input path="dictType" maxlength="100" class="form-control required abc" - remote="${ctx}/sys/dictType/checkDictType?oldDictType=${dictType.dictType}" - data-msg-remote="${text('字典类型已存在')}"/> -
-
-
-
-
-
-
- -
- <#form:radio path="isSys" dictType="sys_yes_no" class="form-control required " /> -
-
-
-
-
-
-
- -
- <#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/> -
-
-
-
-
-
-
-
- <% if (hasPermi('sys:dictType:edit')){ %> -   - <% } %> - -
-
-
- -
-
-<% } %> - diff --git a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html deleted file mode 100644 index 6a6a321d..00000000 --- a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html +++ /dev/null @@ -1,94 +0,0 @@ -<% layout('/layouts/default.html', {title: '字典管理', libs: ['dataGrid']}){ %> -
-
-
-
- ${text('字典管理')} -
-
- ${text('查询')} - <% if(hasPermi('sys:dictType:edit')){ %> - ${text('新增')} - <% } %> -
-
-
- <#form:form id="searchForm" model="${dictType}" action="${ctx}/sys/dictType/listData" method="post" class="form-inline " - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="dictName" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:input path="dictType_like" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:select path="isSys" dictType="sys_yes_no" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> -
-
-
- - -
- -
-
-
-
-
-<% } %> - \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html b/modules/core/src/main/resources/views/modules/sys/switchSkin.html similarity index 100% rename from modules/core/src/main/resources/views/modules/sys/sysSwitchSkin.html rename to modules/core/src/main/resources/views/modules/sys/switchSkin.html diff --git a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysDesktop.html similarity index 100% rename from modules/core/src/main/resources/views/modules/sys/sysDesktop.html rename to modules/core/src/main/resources/views/themes/default/modules/sys/sysDesktop.html