diff --git a/src/dede/content_list.php b/src/dede/content_list.php
index 3ee7d661..0d84fe85 100755
--- a/src/dede/content_list.php
+++ b/src/dede/content_list.php
@@ -191,11 +191,11 @@ if($cid != 0)
if($arcrank != '')
{
$whereSql .= " AND arc.arcrank = '$arcrank' ";
- $CheckUserSend = "";
+ $CheckUserSend = "";
}
else
{
- $CheckUserSend = "";
+ $CheckUserSend = "";
}
$orderby = empty($orderby) ? 'id' : preg_replace("#[^a-z0-9]#", "", $orderby);
diff --git a/src/dede/content_sg_list.php b/src/dede/content_sg_list.php
index 7085b247..b05c4474 100755
--- a/src/dede/content_sg_list.php
+++ b/src/dede/content_sg_list.php
@@ -76,11 +76,11 @@ if($cid!=0) $whereSql .= " AND arc.typeid in (".GetSonIds($cid).")";
if($arcrank!='')
{
$whereSql .= " AND arc.arcrank = '$arcrank' ";
- $CheckUserSend = "";
+ $CheckUserSend = "";
}
else
{
- $CheckUserSend = "";
+ $CheckUserSend = "";
}
$query = "SELECT arc.aid,arc.aid as id,arc.typeid,arc.arcrank,arc.flag,arc.senddate,arc.channel,arc.title,arc.mid,arc.click,tp.typename,ch.typename as channelname
diff --git a/src/dede/dialog/select_images.php b/src/dede/dialog/select_images.php
index a00d27b3..429e3a80 100755
--- a/src/dede/dialog/select_images.php
+++ b/src/dede/dialog/select_images.php
@@ -62,7 +62,7 @@ if (!empty($noeditor))
图片浏览器
-
+
diff --git a/src/dede/dialog/select_soft.php b/src/dede/dialog/select_soft.php
index 6f1379f1..f615761e 100755
--- a/src/dede/dialog/select_soft.php
+++ b/src/dede/dialog/select_soft.php
@@ -51,7 +51,7 @@ if (!empty($noeditor))
软件管理器
-
+
diff --git a/src/dede/dialog/select_templets.php b/src/dede/dialog/select_templets.php
index cacf97e2..00d80c40 100755
--- a/src/dede/dialog/select_templets.php
+++ b/src/dede/dialog/select_templets.php
@@ -40,7 +40,7 @@ if(empty($comeback))
模板管理器
-
+
diff --git a/src/dede/inc/inc_menu_map.php b/src/dede/inc/inc_menu_map.php
index 3054b30f..cf240409 100755
--- a/src/dede/inc/inc_menu_map.php
+++ b/src/dede/inc/inc_menu_map.php
@@ -114,7 +114,6 @@ $menusMain = "
-
diff --git a/src/dede/js/album.js b/src/dede/js/album.js
index d4103a9a..ecce8262 100755
--- a/src/dede/js/album.js
+++ b/src/dede/js/album.js
@@ -11,11 +11,11 @@
function checkSubmitAlb() {
if (document.form1.title.value == '') {
- alert("档案标题不能为空!");
+ ShowMsg("档案标题不能为空!");
return false;
}
if (document.form1.typeid.value == 0) {
- alert("请选择档案的主类别!");
+ ShowMsg("请选择档案的主类别!");
return false;
}
document.form1.imagebody.value = $Obj('copyhtml').innerHTML;
diff --git a/src/dede/js/main.js b/src/dede/js/main.js
index 2a1adaa6..1bbec8dc 100755
--- a/src/dede/js/main.js
+++ b/src/dede/js/main.js
@@ -192,7 +192,6 @@ function InitPage() {
if (selsource) { selsource.onmousedown = function (e) { SelectSource(e); } }
if (selwriter) { selwriter.onmousedown = function (e) { SelectWriter(e); } }
if (titlechange) { titlechange.onchange = function (e) { TestHasTitle(e); } }
- if (colorbt) { colorbt.onmousedown = function (e) { ShowColor2(e); } }
}
function OpenMyWin(surl) {
@@ -783,7 +782,7 @@ $(document).ready(function () {
}, 500);
}
- if (typeof $.daterangepicker !== "undefined") {
+ if ($.fn.daterangepicker) {
$('.datepicker').daterangepicker({
"singleDatePicker": true,
"autoApply": true,
diff --git a/src/dede/js/story.js b/src/dede/js/story.js
deleted file mode 100755
index d7b5cc58..00000000
--- a/src/dede/js/story.js
+++ /dev/null
@@ -1,163 +0,0 @@
-
\ No newline at end of file
diff --git a/src/dede/templets/album_add.htm b/src/dede/templets/album_add.htm
index 4921e857..78f18e8a 100755
--- a/src/dede/templets/album_add.htm
+++ b/src/dede/templets/album_add.htm
@@ -10,6 +10,7 @@
+
@@ -19,7 +20,6 @@
-
+
-
+
+
-
-
-
-
-
- 栏目管理 >> 增加栏目 |
-
- |
-
-
- |
-
-
-
+
-
+
+
+
+ 栏目描述: |
+ |
+
+
-
-
- 说明:栏目内容是替代原来栏目单独页的更灵活的一种方式,可在栏目模板中用{dede:field.content/}调用,通常用于企业简介之类的用途。 |
-
-
-
+
+
+
+ 说明:栏目内容是替代原来栏目单独页的更灵活的一种方式,可在栏目模板中用{dede:field.content/}调用,通常用于企业简介之类的用途。 |
+
+
+
- |
-
-
+ |
+
+
-
+
+
-
-
+
+
-
+
+
\ No newline at end of file
diff --git a/src/dede/templets/catalog_add_quick.htm b/src/dede/templets/catalog_add_quick.htm
index 9330f10a..864debf5 100755
--- a/src/dede/templets/catalog_add_quick.htm
+++ b/src/dede/templets/catalog_add_quick.htm
@@ -1,273 +1,316 @@
-
+
+
-
-栏目管理--快速创建栏目
-
-
+
-
-
+
+
+
+
+
+
+
-
-
+
+