diff --git a/.gitignore b/.gitignore index 17e0e3cf..fa67896a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ src/freelist/ src/data/rss/* src/data/rssmap.html src/data/sitemap.html +src/data/js/ diff --git a/src/dede/css/frame.css b/src/dede/css/frame.css index 164966ba..2627ddf5 100755 --- a/src/dede/css/frame.css +++ b/src/dede/css/frame.css @@ -404,7 +404,7 @@ body.hidemenu .right { } .allmenu { - width: 700px; + width: 726px; background: #FFF; border: 4px solid #333; z-index: 999; @@ -419,7 +419,7 @@ body.hidemenu .right { } .allmenu .allmenu-box { - width: 686px; + width: 720px; margin: 0px auto; text-align: left; overflow: hidden; @@ -428,7 +428,7 @@ body.hidemenu .right { .maptop { float: left; - width: 107px; + width: 113px; overflow: hidden; padding-right: 3px; padding-left: 3px; @@ -462,7 +462,7 @@ body.hidemenu .right { .mapitem ul li { text-indent: 13px; - line-height: 19px; + line-height: 22px; background: url(../images/arrr.gif) 4px 6px no-repeat; } diff --git a/src/dede/images/albviewbg.gif b/src/dede/images/albviewbg.gif deleted file mode 100755 index bf057cc0..00000000 Binary files a/src/dede/images/albviewbg.gif and /dev/null differ diff --git a/src/dede/images/albviewbg.jpg b/src/dede/images/albviewbg.jpg new file mode 100644 index 00000000..ea376367 Binary files /dev/null and b/src/dede/images/albviewbg.jpg differ diff --git a/src/dede/makehtml_js_action.php b/src/dede/makehtml_js_action.php index 56d90c9c..d3af1166 100755 --- a/src/dede/makehtml_js_action.php +++ b/src/dede/makehtml_js_action.php @@ -18,10 +18,11 @@ if(empty($uptype)) $uptype = "all"; if($uptype == "all") { - $row = $dsql->GetOne("SELECT id FROM #@__arctype WHERE id>'$typeid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;"); + $row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE id>'$typeid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;"); if(!is_array($row)) { - echo "完成所有文件更新!"; + echo ""; + echo "
完成所有文件更新!
"; exit(); } else { $pv = new PartView($row['id']); @@ -35,8 +36,9 @@ if($uptype == "all") $pv = new PartView($typeid); $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/data/js/".$typeid.".js", 0); - echo "成功更新".$cfg_cmspath."/data/js/".$typeid.".js!"; - echo "预览:"; + echo ""; + echo "
成功更新".$cfg_cmspath."/data/js/".$typeid.".js!"; + echo "预览:
"; echo "
"; echo ""; exit(); diff --git a/src/dede/templets/album_add.htm b/src/dede/templets/album_add.htm index a22bcebc..2ef2b854 100755 --- a/src/dede/templets/album_add.htm +++ b/src/dede/templets/album_add.htm @@ -371,7 +371,7 @@ - +
diff --git a/src/dede/templets/album_edit.htm b/src/dede/templets/album_edit.htm index f3588916..4915d3c5 100755 --- a/src/dede/templets/album_edit.htm +++ b/src/dede/templets/album_edit.htm @@ -490,7 +490,7 @@ if($cfg_need_typeid2=='Y') {
- +