From 507799f9e02e8f418c003309ad519b3ad8289801 Mon Sep 17 00:00:00 2001 From: xushubieli Date: Mon, 31 Oct 2022 11:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A8=A1=E6=9D=BF=E5=A4=B4?= =?UTF-8?q?=E9=83=A8=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/templets/album_add.htm | 4 +- src/admin/templets/album_edit.htm | 4 +- src/admin/templets/archives_add.htm | 4 +- src/admin/templets/archives_sg_add.htm | 2 +- src/admin/templets/archives_sg_edit.htm | 2 +- src/admin/templets/article_add.htm | 4 +- src/admin/templets/article_edit.htm | 4 +- src/admin/templets/catalog_add.htm | 8 +- src/admin/templets/catalog_add_quick.htm | 4 +- src/admin/templets/catalog_edit.htm | 8 +- src/admin/templets/content_i_list.htm | 2 +- src/admin/templets/member_pmone.htm | 2 +- src/admin/templets/soft_edit.htm | 4 +- src/admin/templets/spec_add.htm | 2 +- src/admin/templets/spec_edit.htm | 2 +- src/admin/templets/sys_data_replace.htm | 4 +- src/static/web/css/style.css | 2 +- src/static/web/css/user.css | 7 +- src/static/web/img/color.htm | 2 +- src/static/web/img/colornew.htm | 2 +- src/theme/plus/car.htm | 14 +- src/theme/plus/carbuyaction.htm | 10 +- src/theme/plus/download_links_templet.htm | 4 +- src/theme/plus/flink-add.htm | 14 +- src/theme/plus/flink-list.htm | 6 +- src/theme/plus/heightsearch.htm | 8 +- src/theme/plus/list_diyform.htm | 6 +- src/theme/plus/post_diyform.htm | 8 +- src/theme/plus/recommend.htm | 6 +- src/theme/plus/shops_action_payment.htm | 4 +- src/theme/plus/view_diyform.htm | 4 +- src/theme/plus/view_msg.htm | 4 +- src/theme/plus/view_msg_catalog.htm | 4 +- src/theme/plus/vote.htm | 4 +- src/theme/templet-filelist.inc | 4 +- src/theme/templets/article_article.htm | 5 +- src/theme/templets/article_default.htm | 5 +- src/theme/templets/article_default_sg.htm | 5 +- src/theme/templets/article_image.htm | 13 +- src/theme/templets/article_infos.htm | 5 +- src/theme/templets/article_shop.htm | 5 +- src/theme/templets/article_soft.htm | 5 +- src/theme/templets/article_spec.htm | 5 +- src/theme/templets/{footer.htm => foot.htm} | 5 +- src/theme/templets/{header.htm => head.htm} | 14 +- src/theme/templets/index.htm | 5 +- src/theme/templets/index_article.htm | 5 +- src/theme/templets/index_default.htm | 5 +- src/theme/templets/index_default_sg.htm | 5 +- src/theme/templets/index_image.htm | 5 +- src/theme/templets/index_infos.htm | 5 +- src/theme/templets/index_shop.htm | 5 +- src/theme/templets/index_soft.htm | 5 +- src/theme/templets/list_article.htm | 5 +- src/theme/templets/list_default.htm | 5 +- src/theme/templets/list_default_sg.htm | 5 +- src/theme/templets/list_free.htm | 5 +- src/theme/templets/list_image.htm | 5 +- src/theme/templets/list_infos.htm | 9 +- src/theme/templets/list_shop.htm | 5 +- src/theme/templets/list_soft.htm | 5 +- src/theme/templets/list_spec.htm | 5 +- src/theme/templets/search.htm | 5 +- src/theme/templets/singlepage.htm | 5 +- src/theme/templets/tag.htm | 5 +- src/theme/templets/taglist.htm | 5 +- .../header.htm => theme/templets/top.htm} | 4 +- .../templets/widget_article_feedback.htm | 6 +- src/user/ajax_feedback.php | 6 +- src/user/album_add.php | 2 +- src/user/album_edit.php | 2 +- src/user/archives_add.php | 2 +- src/user/archives_edit.php | 2 +- src/user/archives_sg_add.php | 2 +- src/user/archives_sg_edit.php | 2 +- src/user/article_add.php | 2 +- src/user/article_edit.php | 2 +- src/user/soft_add.php | 2 +- src/user/soft_edit.php | 2 +- src/user/templets/album_add.htm | 85 ++++++----- src/user/templets/album_edit.htm | 132 +++++++++--------- src/user/templets/archives_add.htm | 40 +++--- src/user/templets/archives_edit.htm | 18 ++- src/user/templets/archives_sg_add.htm | 40 +++--- src/user/templets/archives_sg_edit.htm | 16 +-- src/user/templets/article_add.htm | 46 +++--- src/user/templets/article_edit.htm | 24 ++-- src/user/templets/buy.htm | 20 +-- src/user/templets/buy_action_payment.htm | 12 +- src/user/templets/content_list.htm | 14 +- src/user/templets/content_sg_list.htm | 12 +- src/user/templets/edit_baseinfo.htm | 10 +- src/user/templets/edit_email.htm | 6 +- src/user/templets/edit_face.htm | 6 +- src/user/templets/footer.htm | 37 ----- src/user/templets/index-notlogin.htm | 28 ++-- src/user/templets/index.htm | 11 +- src/user/templets/info.htm | 4 +- src/user/templets/login.htm | 26 ++-- src/user/templets/mypay.htm | 10 +- src/user/templets/mystow.htm | 4 +- src/user/templets/operation.htm | 8 +- src/user/templets/pm-main.htm | 6 +- src/user/templets/reg-new.htm | 28 ++-- src/user/templets/resetpassword.htm | 24 ++-- src/user/templets/resetpassword2.htm | 30 ++-- src/user/templets/resetpassword3.htm | 18 +-- src/user/templets/shops_action_payment.htm | 2 +- src/user/templets/shops_orders.htm | 10 +- src/user/templets/shops_products.htm | 8 +- src/user/templets/soft_add.htm | 77 +++++----- src/user/templets/soft_edit.htm | 62 ++++---- src/user/templets/top_login.htm | 14 -- src/user/templets/win_templet.htm | 4 +- 114 files changed, 582 insertions(+), 695 deletions(-) rename src/theme/templets/{footer.htm => foot.htm} (74%) rename src/theme/templets/{header.htm => head.htm} (71%) rename src/{user/templets/header.htm => theme/templets/top.htm} (65%) delete mode 100644 src/user/templets/footer.htm delete mode 100644 src/user/templets/top_login.htm diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index b1f2cfba..e0237160 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -177,7 +177,7 @@ echo ""; ?> - + - + diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 03ec8cfb..e4973cc7 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -174,7 +174,7 @@ echo $typeOptions; echo ''; ?> - + 消费金币： @@ -193,7 +193,7 @@ - + diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 7a547052..42e9f130 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -162,7 +162,7 @@ echo ""; ?> - + - + diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index d2271bc0..a4dd2a30 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -115,7 +115,7 @@ echo $typeOptions; echo ""; ?> - + diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index 2a9af81f..d0cc4c2c 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -115,7 +115,7 @@ echo $typeOptions; echo ""; ?> - + diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index e0769fe3..b16d7aae 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -177,7 +177,7 @@ echo ""; ?> - + - + diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index d932c3b1..34d976c9 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -161,7 +161,7 @@ echo $typeOptions; echo ""; ?> - + 消费金币： @@ -178,7 +178,7 @@ - + diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index c4384a1a..942a8e6f 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -308,7 +308,7 @@ - 栏目交叉： 仅适用列表栏目 + 栏目交叉： 仅适用列表栏目 @@ -366,7 +366,7 @@ - + @@ -402,7 +402,7 @@ 文档命名规则： - + @@ -424,7 +424,7 @@ 列表命名规则： - + diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index 74ba55bf..739f7df1 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -172,7 +172,7 @@ 文档命名规则： - + @@ -183,7 +183,7 @@ 列表命名规则： - + diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index 53f67520..7133aadf 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -253,7 +253,7 @@ - 栏目交叉： 仅适用列表栏目 + 栏目交叉： 仅适用列表栏目 @@ -315,7 +315,7 @@ - + @@ -351,7 +351,7 @@ 文档命名规则： - + @@ -373,7 +373,7 @@ 列表命名规则： - + diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index 12485456..cc565bc8 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -79,7 +79,7 @@

- + {dede:field.title/} {dede:field.flag function='IsCommendArchives(@me)'/}

时间：{dede:field.senddate function='GetDateTimeMk(@me)'/} diff --git a/src/admin/templets/member_pmone.htm b/src/admin/templets/member_pmone.htm index c339721f..6d5874c8 100644 --- a/src/admin/templets/member_pmone.htm +++ b/src/admin/templets/member_pmone.htm @@ -39,7 +39,7 @@ - + diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index f94a035f..2a148c3f 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -165,7 +165,7 @@ echo $typeOptions; echo ""; ?> - + @@ -182,7 +182,7 @@ +
发送到： 填写用户登录的id（网址uid=后面跟着的id） 填写用户登录的id（网址uid=后面跟着的id）
标题： 消费金币： -
diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index 540e444a..8ab1a94f 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -184,7 +184,7 @@ echo $typeOptions; echo ""; ?> - + diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index ae74b915..efbb7ae5 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -188,7 +188,7 @@ echo $typeOptions; echo ""; ?> - + diff --git a/src/admin/templets/sys_data_replace.htm b/src/admin/templets/sys_data_replace.htm index 870b8643..44e88d68 100644 --- a/src/admin/templets/sys_data_replace.htm +++ b/src/admin/templets/sys_data_replace.htm @@ -109,8 +109,8 @@ 安全确认码： - - + + diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 73c0998f..58fbcda6 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -361,7 +361,7 @@ ul.items > li .source { font-size:14px } .nav-link { - padding:0; + padding:0 10px; height:36px; line-height:36px } diff --git a/src/static/web/css/user.css b/src/static/web/css/user.css index 5c176f91..3a1a0105 100644 --- a/src/static/web/css/user.css +++ b/src/static/web/css/user.css @@ -11,13 +11,8 @@ main.login-from { width:430px; background:#fff } -.login-area .btnLogin { - margin-left:0!important; - padding:.5rem; - width:100% -} .login-area small.des { - color:#B5B5B5 + color:#b5b5b5 } .login-area .licence a { color:#28a745 diff --git a/src/static/web/img/color.htm b/src/static/web/img/color.htm index cae08f43..47eed35e 100644 --- a/src/static/web/img/color.htm +++ b/src/static/web/img/color.htm @@ -11,7 +11,7 @@ window.close(); } - +
diff --git a/src/static/web/img/colornew.htm b/src/static/web/img/colornew.htm index ed256bc5..6d5251da 100644 --- a/src/static/web/img/colornew.htm +++ b/src/static/web/img/colornew.htm @@ -1,4 +1,4 @@ -
   
+
diff --git a/src/theme/plus/car.htm b/src/theme/plus/car.htm index 48e3e1e5..70a03907 100644 --- a/src/theme/plus/car.htm +++ b/src/theme/plus/car.htm @@ -10,7 +10,7 @@ - +

购物车

@@ -56,11 +56,11 @@
共 {dede:var.carts.cart_count/} 件商品，合计: {dede:var.carts.price_count/} 元
- - - - - + + + + +
@@ -69,7 +69,7 @@ - + - +

商品购买

@@ -160,21 +160,21 @@
- +
   
验证码 - - 验证码 + +
- + - +
@@ -66,20 +66,20 @@ 验证码： - - 验证码 + + - - + +
- + \ No newline at end of file diff --git a/src/theme/plus/flink-list.htm b/src/theme/plus/flink-list.htm index 358e5322..3f371310 100644 --- a/src/theme/plus/flink-list.htm +++ b/src/theme/plus/flink-list.htm @@ -10,7 +10,7 @@ - +
@@ -49,6 +49,6 @@
- + \ No newline at end of file diff --git a/src/theme/plus/heightsearch.htm b/src/theme/plus/heightsearch.htm index 31e95d0b..92469113 100644 --- a/src/theme/plus/heightsearch.htm +++ b/src/theme/plus/heightsearch.htm @@ -9,7 +9,7 @@ - +
@@ -92,8 +92,8 @@ @@ -101,6 +101,6 @@
- + \ No newline at end of file diff --git a/src/theme/plus/list_diyform.htm b/src/theme/plus/list_diyform.htm index 13d9880c..73b8847c 100644 --- a/src/theme/plus/list_diyform.htm +++ b/src/theme/plus/list_diyform.htm @@ -10,7 +10,7 @@ - +
@@ -67,6 +67,6 @@
- + \ No newline at end of file diff --git a/src/theme/plus/post_diyform.htm b/src/theme/plus/post_diyform.htm index 6f1900e3..8aaf1a68 100644 --- a/src/theme/plus/post_diyform.htm +++ b/src/theme/plus/post_diyform.htm @@ -10,7 +10,7 @@ - +

name;?>发布

@@ -24,13 +24,13 @@
- - + +
- - + +
- + \ No newline at end of file diff --git a/src/theme/plus/recommend.htm b/src/theme/plus/recommend.htm index 32238d9b..4e8dd692 100644 --- a/src/theme/plus/recommend.htm +++ b/src/theme/plus/recommend.htm @@ -9,7 +9,7 @@ - +
推荐：
@@ -31,12 +31,12 @@
- +
- + \ No newline at end of file diff --git a/src/theme/plus/shops_action_payment.htm b/src/theme/plus/shops_action_payment.htm index 3156106b..0e08efd0 100644 --- a/src/theme/plus/shops_action_payment.htm +++ b/src/theme/plus/shops_action_payment.htm @@ -10,7 +10,7 @@ - +

商品购买

@@ -64,6 +64,6 @@
- + \ No newline at end of file diff --git a/src/theme/plus/view_diyform.htm b/src/theme/plus/view_diyform.htm index 7790b34b..bc120d74 100644 --- a/src/theme/plus/view_diyform.htm +++ b/src/theme/plus/view_diyform.htm @@ -10,7 +10,7 @@ - +

name;?>详细内容

@@ -46,6 +46,6 @@
- + \ No newline at end of file diff --git a/src/theme/plus/view_msg.htm b/src/theme/plus/view_msg.htm index 62e9cb39..06b7a5b0 100644 --- a/src/theme/plus/view_msg.htm +++ b/src/theme/plus/view_msg.htm @@ -10,7 +10,7 @@ - +
@@ -36,6 +36,6 @@
- + \ No newline at end of file diff --git a/src/theme/plus/view_msg_catalog.htm b/src/theme/plus/view_msg_catalog.htm index d1b38c17..e286bb72 100644 --- a/src/theme/plus/view_msg_catalog.htm +++ b/src/theme/plus/view_msg_catalog.htm @@ -10,7 +10,7 @@ - +
@@ -31,6 +31,6 @@
- + \ No newline at end of file diff --git a/src/theme/plus/vote.htm b/src/theme/plus/vote.htm index 8fd1c7f1..6d786149 100644 --- a/src/theme/plus/vote.htm +++ b/src/theme/plus/vote.htm @@ -10,7 +10,7 @@ - +

@@ -25,6 +25,6 @@
- + \ No newline at end of file diff --git a/src/theme/templet-filelist.inc b/src/theme/templet-filelist.inc index 1596d33d..d23505b4 100644 --- a/src/theme/templet-filelist.inc +++ b/src/theme/templet-filelist.inc @@ -1,5 +1,5 @@ -header.htm,列表页头部模板 -footer.htm,列表页底部模板 +head.htm,列表页头部模板 +foot.htm,列表页底部模板 index.htm,主页模板 ajaxfeedback.htm,评论模板 article_article.htm,文档内容页模板 diff --git a/src/theme/templets/article_article.htm b/src/theme/templets/article_article.htm index a6bd434f..beef7e82 100644 --- a/src/theme/templets/article_article.htm +++ b/src/theme/templets/article_article.htm @@ -17,7 +17,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -74,7 +75,7 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -90,7 +91,7 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -100,10 +101,10 @@ else if (@me==2) { @me = "
- 原始图片 - 上一张 - 下一张 - 自动 / 暂停播放 + 原始图片 + 上一张 + 下一张 + 自动 / 暂停播放
"; } else { @@ -161,7 +162,7 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -115,6 +116,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/index_article.htm b/src/theme/templets/index_article.htm index 654c059b..c3d3338a 100644 --- a/src/theme/templets/index_article.htm +++ b/src/theme/templets/index_article.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -62,6 +63,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/index_default.htm b/src/theme/templets/index_default.htm index 654c059b..c3d3338a 100644 --- a/src/theme/templets/index_default.htm +++ b/src/theme/templets/index_default.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -62,6 +63,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/index_default_sg.htm b/src/theme/templets/index_default_sg.htm index a131beca..267b235c 100644 --- a/src/theme/templets/index_default_sg.htm +++ b/src/theme/templets/index_default_sg.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -62,6 +63,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/index_image.htm b/src/theme/templets/index_image.htm index e1bf7e8e..05b76dfe 100644 --- a/src/theme/templets/index_image.htm +++ b/src/theme/templets/index_image.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -71,6 +72,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/index_infos.htm b/src/theme/templets/index_infos.htm index a131beca..267b235c 100644 --- a/src/theme/templets/index_infos.htm +++ b/src/theme/templets/index_infos.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -62,6 +63,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/index_shop.htm b/src/theme/templets/index_shop.htm index 654c059b..c3d3338a 100644 --- a/src/theme/templets/index_shop.htm +++ b/src/theme/templets/index_shop.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -62,6 +63,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/index_soft.htm b/src/theme/templets/index_soft.htm index 654c059b..c3d3338a 100644 --- a/src/theme/templets/index_soft.htm +++ b/src/theme/templets/index_soft.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -62,6 +63,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/list_article.htm b/src/theme/templets/list_article.htm index 0a31c249..a737791d 100644 --- a/src/theme/templets/list_article.htm +++ b/src/theme/templets/list_article.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -60,6 +61,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/list_default.htm b/src/theme/templets/list_default.htm index 8a06dbbc..ff80fd6d 100644 --- a/src/theme/templets/list_default.htm +++ b/src/theme/templets/list_default.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -60,6 +61,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/list_default_sg.htm b/src/theme/templets/list_default_sg.htm index 6ac744ab..e8ef5628 100644 --- a/src/theme/templets/list_default_sg.htm +++ b/src/theme/templets/list_default_sg.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -60,6 +61,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/list_free.htm b/src/theme/templets/list_free.htm index cb250954..b1ce9ce7 100644 --- a/src/theme/templets/list_free.htm +++ b/src/theme/templets/list_free.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -48,6 +49,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/list_image.htm b/src/theme/templets/list_image.htm index 1a1b4295..2d4d0d7a 100644 --- a/src/theme/templets/list_image.htm +++ b/src/theme/templets/list_image.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -57,6 +58,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/list_infos.htm b/src/theme/templets/list_infos.htm index 2c886caa..04827564 100644 --- a/src/theme/templets/list_infos.htm +++ b/src/theme/templets/list_infos.htm @@ -14,7 +14,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -88,8 +89,8 @@
- - + + {/dede:infoguide}
@@ -100,6 +101,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/list_shop.htm b/src/theme/templets/list_shop.htm index 512ee63f..4be225a9 100644 --- a/src/theme/templets/list_shop.htm +++ b/src/theme/templets/list_shop.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -59,6 +60,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/list_soft.htm b/src/theme/templets/list_soft.htm index ecd1ef1b..84dc2e2d 100644 --- a/src/theme/templets/list_soft.htm +++ b/src/theme/templets/list_soft.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -60,6 +61,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/list_spec.htm b/src/theme/templets/list_spec.htm index 569e8026..df330fdb 100644 --- a/src/theme/templets/list_spec.htm +++ b/src/theme/templets/list_spec.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -59,6 +60,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/search.htm b/src/theme/templets/search.htm index 9269abac..8925cd90 100644 --- a/src/theme/templets/search.htm +++ b/src/theme/templets/search.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -56,6 +57,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/singlepage.htm b/src/theme/templets/singlepage.htm index 6f627b20..bf33c0fe 100644 --- a/src/theme/templets/singlepage.htm +++ b/src/theme/templets/singlepage.htm @@ -13,7 +13,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -39,6 +40,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/tag.htm b/src/theme/templets/tag.htm index 7a489758..ec4db6ee 100644 --- a/src/theme/templets/tag.htm +++ b/src/theme/templets/tag.htm @@ -15,7 +15,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -72,6 +73,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/theme/templets/taglist.htm b/src/theme/templets/taglist.htm index 778013a4..dae514cb 100644 --- a/src/theme/templets/taglist.htm +++ b/src/theme/templets/taglist.htm @@ -14,7 +14,8 @@ - {dede:include filename='header.htm'/} + {dede:include filename='top.htm'/} + {dede:include filename='head.htm'/}
@@ -58,6 +59,6 @@
- {dede:include filename='footer.htm'/} + {dede:include filename='foot.htm'/} \ No newline at end of file diff --git a/src/user/templets/header.htm b/src/theme/templets/top.htm similarity index 65% rename from src/user/templets/header.htm rename to src/theme/templets/top.htm index 6d885cdf..36f19c97 100644 --- a/src/user/templets/header.htm +++ b/src/theme/templets/top.htm @@ -3,8 +3,8 @@
diff --git a/src/theme/templets/widget_article_feedback.htm b/src/theme/templets/widget_article_feedback.htm index e7dc33a3..e112a26e 100644 --- a/src/theme/templets/widget_article_feedback.htm +++ b/src/theme/templets/widget_article_feedback.htm @@ -15,8 +15,8 @@
@@ -28,7 +28,7 @@
- +
diff --git a/src/user/ajax_feedback.php b/src/user/ajax_feedback.php index 04e6a2ae..5420803a 100755 --- a/src/user/ajax_feedback.php +++ b/src/user/ajax_feedback.php @@ -12,10 +12,10 @@ if ($myurl == '') exit(''); else { $uid = $cfg_ml->M_LoginID; $face = $cfg_ml->fields['face'] == '' ? $GLOBALS['cfg_memberurl'].'/images/nopic.gif' : $cfg_ml->fields['face']; - echo "用户名：{$cfg_ml->M_UserName} 匿名评论\r\n"; + echo "用户名：{$cfg_ml->M_UserName} 匿名评论\r\n"; if ($cfg_feedback_ck == 'Y') { - echo "验证码："; - echo "验证码\r\n"; + echo "验证码："; + echo "验证码\r\n"; } } ?> \ No newline at end of file diff --git a/src/user/album_add.php b/src/user/album_add.php index 0b9ccbe7..ec940a67 100755 --- a/src/user/album_add.php +++ b/src/user/album_add.php @@ -155,7 +155,7 @@ else if ($dopost == 'save') { if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "请选择您的后续操作：继续发布图集查看图集修改图集已发布图集管理"; + $msg = "请选择您的后续操作：继续发布图集查看图集修改图集已发布图集管理"; $wintitle = "成功发布图集"; $wecome_info = "图集管理::发布图集"; $win = new OxWindow(); diff --git a/src/user/album_edit.php b/src/user/album_edit.php index cffc067a..516504d7 100755 --- a/src/user/album_edit.php +++ b/src/user/album_edit.php @@ -128,7 +128,7 @@ else if ($dopost == 'save') { $artUrl = MakeArt($aid, TRUE); if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid"; //返回成功信息 - $msg = "请选择您的后续操作：发布新图集修改图集查看图集管理图集 "; + $msg = "请选择您的后续操作：发布新图集修改图集查看图集管理图集 "; //提交后返回提交页面 $wintitle = "成功修改图集"; $wecome_info = "图集管理::修改图集"; diff --git a/src/user/archives_add.php b/src/user/archives_add.php index 044d1aff..0f8037fc 100755 --- a/src/user/archives_add.php +++ b/src/user/archives_add.php @@ -127,7 +127,7 @@ else if ($dopost == 'save') { } ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "请选择您的后续操作：继续发布文档查看文档修改文档已发布文档管理"; + $msg = "请选择您的后续操作：继续发布文档查看文档修改文档已发布文档管理"; $wintitle = "成功发布文档"; $wecome_info = "内容管理::发布文档"; $win = new OxWindow(); diff --git a/src/user/archives_edit.php b/src/user/archives_edit.php index 117dbb9d..cd6cee0e 100755 --- a/src/user/archives_edit.php +++ b/src/user/archives_edit.php @@ -96,7 +96,7 @@ else if ($dopost == 'save') { $artUrl = MakeArt($aid, TRUE); if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid"; //返回成功信息 - $msg = "请选择您的后续操作：发布新文档修改文档查看文档管理文档"; + $msg = "请选择您的后续操作：发布新文档修改文档查看文档管理文档"; $wintitle = "成功修改文档"; $wecome_info = "内容管理::修改文档"; $win = new OxWindow(); diff --git a/src/user/archives_sg_add.php b/src/user/archives_sg_add.php index 236fd631..90c80fe3 100755 --- a/src/user/archives_sg_add.php +++ b/src/user/archives_sg_add.php @@ -157,7 +157,7 @@ else if ($dopost == 'save') { if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "请选择您的后续操作：继续发布文档查看文档修改文档已发布文档管理"; + $msg = "请选择您的后续操作：继续发布文档查看文档修改文档已发布文档管理"; $wintitle = "成功发布文档"; $wecome_info = "内容管理::发布文档"; $win = new OxWindow(); diff --git a/src/user/archives_sg_edit.php b/src/user/archives_sg_edit.php index 46cab4d9..b122aa5c 100755 --- a/src/user/archives_sg_edit.php +++ b/src/user/archives_sg_edit.php @@ -112,7 +112,7 @@ else if ($dopost == 'save') { $artUrl = MakeArt($aid, true); if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$aid"; //返回成功信息 - $msg = "请选择您的后续操作：发布新内容查看修改查看内容管理内容"; + $msg = "请选择您的后续操作：发布新内容查看修改查看内容管理内容"; $wintitle = "成功修改内容"; $wecome_info = "内容管理::修改内容"; $win = new OxWindow(); diff --git a/src/user/article_add.php b/src/user/article_add.php index 65b5367a..f85b4ca5 100755 --- a/src/user/article_add.php +++ b/src/user/article_add.php @@ -114,7 +114,7 @@ else if ($dopost == 'save') { if ($artUrl == '') $artUrl = $cfg_phpurl."/view.php?aid=$arcID"; ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "请选择您的后续操作：继续发布文档查看文档修改文档已发布文档管理"; + $msg = "请选择您的后续操作：继续发布文档查看文档修改文档已发布文档管理"; $wintitle = "成功发布文档"; $wecome_info = "文档管理::发布文档"; $win = new OxWindow(); diff --git a/src/user/article_edit.php b/src/user/article_edit.php index 3b5a0225..f1fb268f 100755 --- a/src/user/article_edit.php +++ b/src/user/article_edit.php @@ -101,7 +101,7 @@ else if ($dopost == 'save') { $artUrl = $cfg_phpurl."/view.php?aid=$aid"; } //返回成功信息 - $msg = "请选择您的后续操作：发布新文档查看修改查看文档管理文档"; + $msg = "请选择您的后续操作：发布新文档查看修改查看文档管理文档"; $wintitle = "成功修改文档"; $wecome_info = "文档管理::修改文档"; $win = new OxWindow(); diff --git a/src/user/soft_add.php b/src/user/soft_add.php index b3e1b619..081544f7 100755 --- a/src/user/soft_add.php +++ b/src/user/soft_add.php @@ -172,7 +172,7 @@ else if ($dopost == 'save') { } ClearMyAddon($arcID, $title); //返回成功信息 - $msg = "请选择您的后续操作：继续发布软件查看软件修改软件已发布软件管理"; + $msg = "请选择您的后续操作：继续发布软件查看软件修改软件已发布软件管理"; $wintitle = "成功发布文档"; $wecome_info = "软件管理::发布软件"; $win = new OxWindow(); diff --git a/src/user/soft_edit.php b/src/user/soft_edit.php index c5fc478b..fbde2aec 100755 --- a/src/user/soft_edit.php +++ b/src/user/soft_edit.php @@ -170,7 +170,7 @@ else if ($dopost == 'save') { $artUrl = $cfg_phpurl."/view.php?aid=$aid"; } //返回成功信息 - $msg = "请选择您的后续操作：发布新软件查看修改查看软件管理软件"; + $msg = "请选择您的后续操作：发布新软件查看修改查看软件管理软件"; $wintitle = "成功修改软件"; $wecome_info = "软件管理::修改软件"; $win = new OxWindow(); diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm index 6554d187..008372ba 100755 --- a/src/user/templets/album_add.htm +++ b/src/user/templets/album_add.htm @@ -12,12 +12,12 @@ - +
-
+
@@ -40,7 +40,7 @@
- +
@@ -67,53 +67,48 @@
- +
+ + + + +
+ + + + + +
+
+ + 图片数目： + （最大60幅） +
+
+ + M_ID === 0){ ?> - -
- - - - -

- - - - -

-

-

- - 图片数目： - （最大60幅） -

-

-

- -

- M_ID === 0){ - ?> -
- -
- - 验证码 -
+
+ +
+ +
- -

- - -

+
+ +
+ +
@@ -123,6 +118,6 @@
- + \ No newline at end of file diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index 587e5c54..4045d94a 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -12,12 +12,12 @@ - +
-
+
@@ -44,7 +44,7 @@
- +
@@ -77,69 +77,65 @@ //自定义字段 PrintAutoFieldsEdit($row['fieldset'],$addRow,'autofield'); ?> - -
- - - - -

- - - - -

每页图片数：
-

-

- - 图片数目： - （最大60幅） -

-

-

- CTags)) - { - foreach($dtp->CTags as $ctag){ - if ($ctag->GetName()=="img"){ - ?> - - - - -
显示隐藏图片[]的选框
- - - - - - - - - - - - -
图片
本地上传： -
- -
简介：
- Clear(); - ?> -

- -

- - -

+ + + + +
+ + + + +
每页图片数：
+
+
+ + 图片数目： + （最大60幅） +
+
+ CTags)) + { + foreach($dtp->CTags as $ctag){ + if ($ctag->GetName()=="img"){ + ?> + + + + +
显示隐藏图片[]的选框
+ + + + + + + + + + + + +
图片
本地上传： +
+ +
简介：
+ Clear(); + ?> +

+ +
+ +
@@ -149,6 +145,6 @@
- + \ No newline at end of file diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm index 77675f91..e0a97e8e 100755 --- a/src/user/templets/archives_add.htm +++ b/src/user/templets/archives_add.htm @@ -11,12 +11,12 @@ - +
-
+
@@ -38,7 +38,7 @@
- +
@@ -72,23 +72,21 @@ //自定义字段 PrintAutoFieldsAdd(stripslashes($cInfos['fieldset']),'autofield'); ?> -
- M_ID === 0){ - ?> -
- -
- - 验证码 -
+ M_ID === 0){ + ?> +
+ +
+ +
- -

- - -

+
+ +
+ +
@@ -98,7 +96,7 @@
- + - +
@@ -49,7 +49,7 @@ - 发布 + 发布
@@ -83,14 +83,14 @@ if ($fields['arcrank']<0 || $dtime - $fields['senddate'] < $maxtime) { ?> - 修改 - 删除 + 修改 + 删除 无操作"; + echo "无操作"; } ?> - 预览 + 预览 {/dede:datalist} @@ -104,6 +104,6 @@
- + \ No newline at end of file diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm index e4f1789b..85b9203b 100755 --- a/src/user/templets/content_sg_list.htm +++ b/src/user/templets/content_sg_list.htm @@ -22,7 +22,7 @@ - +
@@ -49,7 +49,7 @@ - 发布 + 发布
@@ -79,9 +79,9 @@ - 修改 - 删除 - 预览 + 修改 + 删除 + 预览 {/dede:datalist} @@ -95,6 +95,6 @@
- + \ No newline at end of file diff --git a/src/user/templets/edit_baseinfo.htm b/src/user/templets/edit_baseinfo.htm index eac2d3d8..bd9bb8be 100755 --- a/src/user/templets/edit_baseinfo.htm +++ b/src/user/templets/edit_baseinfo.htm @@ -11,7 +11,7 @@ - +
@@ -137,13 +137,13 @@
- - 验证码 + +
-
+
@@ -152,7 +152,7 @@
- + - - - - \ No newline at end of file diff --git a/src/user/templets/index-notlogin.htm b/src/user/templets/index-notlogin.htm index 2274b465..f654d7ca 100755 --- a/src/user/templets/index-notlogin.htm +++ b/src/user/templets/index-notlogin.htm @@ -4,44 +4,38 @@ <?php echo $cfg_webname;?>-会员登录 - + - +
- + \ No newline at end of file diff --git a/src/user/templets/index.htm b/src/user/templets/index.htm index fdfb986c..318c8170 100755 --- a/src/user/templets/index.htm +++ b/src/user/templets/index.htm @@ -11,10 +11,9 @@ - +
-
- +
M_MbType;?>
-

M_LoginID;?>

-

积分：M_Scores;?> 金币：M_Money;?> 充值

+

M_LoginID;?>

+

积分：M_Scores;?> 金币：M_Money;?> 充值

@@ -111,6 +110,6 @@
- + \ No newline at end of file diff --git a/src/user/templets/info.htm b/src/user/templets/info.htm index 299a99d6..097baffd 100644 --- a/src/user/templets/info.htm +++ b/src/user/templets/info.htm @@ -1,14 +1,14 @@
- +
M_MbType;?>用户

M_LoginID;?>

积分：M_Scores;?> - 金币：M_Money;?> 充值 + 金币：M_Money;?> 充值
  • diff --git a/src/user/templets/login.htm b/src/user/templets/login.htm index 9995bc35..f654d7ca 100755 --- a/src/user/templets/login.htm +++ b/src/user/templets/login.htm @@ -4,14 +4,14 @@ <?php echo $cfg_webname;?>-会员登录 - + - +
    - + \ No newline at end of file diff --git a/src/user/templets/mypay.htm b/src/user/templets/mypay.htm index 4c389a1f..4d583e65 100755 --- a/src/user/templets/mypay.htm +++ b/src/user/templets/mypay.htm @@ -11,7 +11,7 @@ - +
    @@ -28,7 +28,7 @@ - ID + id 标题 消费金币 消费时间 @@ -52,8 +52,8 @@ {/dede:datalist} - - + + @@ -67,7 +67,7 @@
    - + - +
    @@ -108,7 +108,7 @@
    @@ -117,7 +117,7 @@
- + - +
-
+

找回密码第一步还没注册

+
+
- -
-
-
-
- -
-
-
-
- - 验证码 + +
@@ -74,11 +66,11 @@
- +
- + \ No newline at end of file diff --git a/src/user/templets/resetpassword2.htm b/src/user/templets/resetpassword2.htm index cc2eb87c..32cb7e34 100755 --- a/src/user/templets/resetpassword2.htm +++ b/src/user/templets/resetpassword2.htm @@ -11,45 +11,31 @@ - +
-
+

找回密码第二步还没注册

-
-
- -
-
+
-
-
- -
-
+
-
- -
-
-
-
- -
+
- +
+
- + \ No newline at end of file diff --git a/src/user/templets/resetpassword3.htm b/src/user/templets/resetpassword3.htm index eebf302e..ea8385da 100755 --- a/src/user/templets/resetpassword3.htm +++ b/src/user/templets/resetpassword3.htm @@ -11,10 +11,10 @@ - +
-
+

找回密码第三步还没注册

@@ -23,22 +23,18 @@
+
- + +
-
-
- - 验证码 -
-
- +
- + \ No newline at end of file diff --git a/src/user/templets/shops_action_payment.htm b/src/user/templets/shops_action_payment.htm index cb83b085..dff3c5b8 100755 --- a/src/user/templets/shops_action_payment.htm +++ b/src/user/templets/shops_action_payment.htm @@ -11,7 +11,7 @@ - +
商品购买
diff --git a/src/user/templets/shops_orders.htm b/src/user/templets/shops_orders.htm index 86eb5f4e..d83e4096 100755 --- a/src/user/templets/shops_orders.htm +++ b/src/user/templets/shops_orders.htm @@ -11,7 +11,7 @@ - +
@@ -37,7 +37,7 @@
- +
@@ -67,8 +67,8 @@ {/dede:datalist} - - + + @@ -82,7 +82,7 @@
- + - +
-
+
@@ -60,7 +60,7 @@
- +
@@ -176,42 +176,39 @@ //自定义字段 PrintAutoFieldsAdd(stripslashes($cInfos['fieldset']),'autofield'); ?> -
-
- -
-
-

- - - 服务器名称： -

-

- - - - （最多为12个链接） -

- - M_ID === 0){ - ?> -
- -
- - 验证码 -
+
+ +
+
+
+ + + 服务器名称： +
+
+ + + + （最多为12个链接） +
+ + M_ID === 0){ + ?> +
+ +
+ +
- -

- - -

+
+ +
+ +
@@ -221,7 +218,7 @@
- + - +
-
+
@@ -63,7 +63,7 @@
- +
@@ -186,37 +186,35 @@ //自定义字段 PrintAutoFieldsEdit(stripslashes($cInfos['fieldset']),$addRow,'autofield'); ?> -
-
- -
+
+ +
-
-
-

- - - 服务器名称： -

-

- - - - (最多为12个链接） -

- -

- - -

+
+
+ + + 服务器名称： +
+
+ + + + (最多为12个链接） +
+ +
+ +
@@ -226,7 +224,7 @@
- +