移除flash相关内容，增加bootstrap

src/dede/album_add.php

@@ -63,6 +63,7 @@ else if($dopost=='save')
     if(!isset($formhtml)) $formhtml = 0;
     if(!isset($formzip)) $formzip = 0;
     if(!isset($ddisfirst)) $ddisfirst = 0;
+    if(!isset($albums)) $albums = "";
     if(!isset($delzip)) $delzip = 0;
     if(empty($click)) $click = ($cfg_arc_click=='-1' ? mt_rand(50, 200) : $cfg_arc_click);
 
@@ -117,7 +118,21 @@ else if($dopost=='save')
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none',$picname,$ddisremote);
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
 
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
     //使用第一张图作为缩略图
     if($ddisfirst==1 && $litpic=='')
     {
@@ -126,7 +141,21 @@ else if($dopost=='save')
             $litpic = GetDDImage('ddfirst', $imgurl1, $isrm);
         }
     }
-    
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
 
     //生成文档ID
     $arcID = GetIndexKey($arcrank,$typeid,$sortrank,$channelid,$senddate,$adminid);
@@ -250,6 +279,28 @@ else if($dopost=='save')
         }
     }
 
+    if ($albums !== "") {
+        $albumsArr  = json_decode(stripslashes( $albums), true);
+
+        for ($i=0; $i <= count($albumsArr) - 1; $i++) { 
+            $album = $albumsArr[$i];
+            $data = explode( ',', $album['img'] );
+            $ntime = time();
+            $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+            CreateDir($savepath);
+            $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+            $fullUrl = $fullUrl.".png";
+            
+            file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+            $info = '';
+            $imginfos = GetImageSize($cfg_basedir.$fullUrl, $info);
+            $v = $fullUrl;
+            $imginfo =  !empty($album['txt']) ? $album['txt'] : '';
+            $imgurls .= "{dede:img ddimg='$v' text='$imginfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $v {/dede:img}\r\n";
+        }
+
+    }
+
     $imgurls = addslashes($imgurls);
     
     //处理body字段自动摘要、自动提取缩略图等

src/dede/album_edit.php

@@ -73,6 +73,7 @@ else if($dopost=='save')
     if(!isset($dellink)) $dellink = 0;
     if(!isset($autolitpic)) $autolitpic = 0;
     if(!isset($formhtml)) $formhtml = 0;
+    if(!isset($albums)) $albums = "";
     if(!isset($formzip)) $formzip = 0;
     if(!isset($ddisfirst)) $ddisfirst = 0;
     if(!isset($delzip)) $delzip = 0;
@@ -130,6 +131,21 @@ else if($dopost=='save')
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none', $picname, $ddisremote);
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
     
     //分析body里的内容
     $body = AnalyseHtmlBody($body, $description, $litpic, $keywords, 'htmltext');
@@ -329,6 +345,30 @@ else if($dopost=='save')
             $imgurls .= "{dede:img ddimg='$litpicname' text='$imginfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $v {/dede:img}\r\n";
         }
     }
+
+    if ($albums !== "") {
+        $albumsArr  = json_decode(stripslashes( $albums), true);
+
+        // var_dump($albumsArr);exit;
+
+        for ($i=0; $i <= count($albumsArr) - 1; $i++) { 
+            $album = $albumsArr[$i];
+            $data = explode( ',', $album['img'] );
+            $ntime = time();
+            $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+            CreateDir($savepath);
+            $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+            $fullUrl = $fullUrl.".png";
+            
+            file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+            $info = '';
+            $imginfos = GetImageSize($cfg_basedir.$fullUrl, $info);
+            $v = $fullUrl;
+            $imginfo =  !empty($album['txt']) ? $album['txt'] : '';
+            $imgurls .= "{dede:img ddimg='$v' text='$imginfo' width='".$imginfos[0]."' height='".$imginfos[1]."'} $v {/dede:img}\r\n";
+        }
+
+    }
     
     $imgurls = addslashes($imgurls);
 

src/dede/archives_add.php

@@ -57,6 +57,7 @@ else if($dopost=='save')
     $flag = isset($flags) ? join(',',$flags) : '';
     $notpost = isset($notpost) && $notpost == 1 ? 1: 0;
     if(empty($click)) $click = ($cfg_arc_click=='-1' ? mt_rand(50, 200) : $cfg_arc_click);
+    if(empty($litpic_b64)) $litpic_b64 = '';
 
     if(empty($typeid2)) $typeid2 = 0;
     if(!isset($autokey)) $autokey = 0;
@@ -117,6 +118,21 @@ else if($dopost=='save')
         $ddisremote = 0;
     }
     $litpic = GetDDImage('none',$picname,$ddisremote);
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
 
     //生成文档ID
     $arcID = GetIndexKey($arcrank,$typeid,$sortrank,$channelid,$senddate,$adminid);

src/dede/archives_edit.php

@@ -59,6 +59,7 @@ else if($dopost=='save')
     require_once(DEDEINC.'/oxwindow.class.php');
     $flag = isset($flags) ? join(',',$flags) : '';
     $notpost = isset($notpost) && $notpost == 1 ? 1: 0;
+    if(empty($litpic_b64)) $litpic_b64 = '';
     
     if(empty($typeid2)) $typeid2 = 0;
     if(!isset($autokey)) $autokey = 0;
@@ -117,6 +118,22 @@ else if($dopost=='save')
 
     $litpic = GetDDImage('none', $picname, $ddisremote);
 
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
+
     //分析处理附加表数据
     $inadd_f = '';
     $inadd_v = '';

src/dede/archives_sg_add.php

@@ -77,6 +77,7 @@ else if($dopost=='save')
     if(empty($flags)) $flag = '';
     else $flag = join(',', $flags);
     $senddate = time();
+    if(empty($litpic_b64)) $litpic_b64 = '';
     $title = cn_substrR($title,$cfg_title_maxlen);
     $isremote  = (empty($isremote)? 0  : $isremote);
     $serviterm=empty($serviterm)? "" : $serviterm;
@@ -88,7 +89,21 @@ else if($dopost=='save')
     if(empty($ddisremote)) $ddisremote = 0;
 
     $litpic = GetDDImage('none', $picname, $ddisremote);
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
 
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
     //生成文档ID
     $arcID = GetIndexKey($arcrank, $typeid, $senddate, $channelid, $senddate, $adminid);
 

src/dede/archives_sg_edit.php

@@ -79,6 +79,7 @@ else if($dopost=='save')
     $title = cn_substrR($title, $cfg_title_maxlen);
     $isremote  = (empty($isremote)? 0  : $isremote);
     $serviterm=empty($serviterm)? "" : $serviterm;
+    if(empty($litpic_b64)) $litpic_b64 = '';
     if(!TestPurview('a_Check,a_AccCheck,a_MyCheck')) $arcrank = -1;
 
     $adminid = $cuserLogin->getUserID();
@@ -86,7 +87,21 @@ else if($dopost=='save')
     //处理上传的缩略图
     if(empty($ddisremote)) $ddisremote = 0;
     $litpic = GetDDImage('none', $picname, $ddisremote);
-    
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
     //分析处理附加表数据
     $inadd_f = '';
     $inadd_v = '';

src/dede/article_add.php

@@ -16,6 +16,7 @@ if($dopost!='save')
     ClearMyAddon();
     $channelid = empty($channelid) ? 0 : intval($channelid);
     $cid = empty($cid) ? 0 : intval($cid);
+    if(empty($litpic_b64)) $litpic_b64 = '';
 
     if(empty($geturl)) $geturl = '';
     
@@ -123,6 +124,21 @@ else if($dopost=='save')
     }
     
     $litpic = GetDDImage('none', $picname, $ddisremote);
+    // 处理新的缩略图上传
+    if ($litpic_b64 != "") {
+        $data = explode( ',', $litpic_b64 );
+        $ntime = time();
+        $savepath = $ddcfg_image_dir.'/'.MyDate($cfg_addon_savetype, $ntime);
+        CreateDir($savepath);
+        $fullUrl = $savepath.'/'.dd2char(MyDate('mdHis', $ntime).$cuserLogin->getUserID().mt_rand(1000, 9999));
+        $fullUrl = $fullUrl.".png";
+        
+        file_put_contents($cfg_basedir.$fullUrl, base64_decode( $data[ 1 ] ));
+
+        // 加水印
+        WaterImg($cfg_basedir.$fullUrl, 'up');
+        $litpic = $fullUrl;
+    }
 
     //生成文档ID
     $arcID = GetIndexKey($arcrank,$typeid,$sortrank,$channelid,$senddate,$adminid);

src/dede/content_list.php

@@ -101,13 +101,7 @@ if(empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag))
     }
     // 缓存处理
     $sql = "SELECT COUNT(*) AS dd FROM `#@__arctiny` $tinyQuery ";
-    $cachekey = md5($sql);
-    $arr = GetCache('listcache', $cachekey);
-    if (empty($arr))
-    {
-        $arr = $dsql->GetOne($sql);
-        SetCache('listcache', $cachekey, $arr);
-    }
+    $arr = $dsql->GetOne($sql);
     $totalresult = $arr['dd'];
 }
 

src/dede/css/albumupload.css

@@ -0,0 +1,162 @@
+div.flash
+{
+	width:375px;
+	-moz-border-radius-topleft:5px;
+	-webkit-border-top-left-radius:5px;
+	-moz-border-radius-topright:5px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-bottomleft:5px;
+	-webkit-border-bottom-left-radius:5px;
+	-moz-border-radius-bottomright:5px;
+	-webkit-border-bottom-right-radius:5px;
+	border-color:#D9E4FF;
+	margin:10px 5px;
+}
+
+#btnSubmit
+{
+	margin:0 0 0 155px;
+}
+
+.progressWrapper
+{
+	width:357px;
+	overflow:hidden;
+}
+
+.progressContainer
+{
+	border:solid 1px #E8E8E8;
+	background-color:#F7F7F7;
+	overflow:hidden;
+	margin:5px;
+	padding:4px;
+}
+
+.message
+{
+	border:solid 1px #FD9;
+	background-color:#FFC;
+	overflow:hidden;
+	margin:1em 0;
+	padding:10px 20px;
+}
+
+.red
+{
+	border:solid 1px #B50000;
+	background-color:#FFEBEB;
+}
+
+.green
+{
+	border:solid 1px #DDF0DD;
+	background-color:#EBFFEB;
+}
+
+.blue
+{
+	border:solid 1px #CEE2F2;
+	background-color:#F0F5FF;
+}
+
+.progressName
+{
+	font-size:8pt;
+	font-weight:700;
+	color:#555;
+	width:323px;
+	height:14px;
+	text-align:left;
+	white-space:nowrap;
+	overflow:hidden;
+}
+
+.progressBarInProgress,.progressBarComplete,.progressBarError
+{
+	font-size:0;
+	width:0;
+	height:2px;
+	background-color:blue;
+	margin-top:2px;
+}
+
+.progressBarComplete
+{
+	width:100%;
+	background-color:green;
+	visibility:hidden;
+}
+
+.progressBarError
+{
+	width:100%;
+	background-color:red;
+	visibility:hidden;
+}
+
+.progressBarStatus
+{
+	margin-top:2px;
+	width:337px;
+	font-size:7pt;
+	font-family:Arial;
+	text-align:left;
+	white-space:nowrap;
+}
+
+a.progressCancel
+{
+	font-size:0;
+	display:block;
+	height:14px;
+	width:14px;
+	background-image:url(../images/cancelbutton.gif);
+	background-repeat:no-repeat;
+	background-position:-14px 0;
+	float:right;
+}
+
+a.progressCancel:hover
+{
+	background-position:0 0;
+}
+
+.swfupload
+{
+	vertical-align:top;
+}
+
+.albCt
+{
+	float:left;
+	width:244px;
+	height:150px;
+	margin-right:10px;
+	margin-bottom:10px;
+	border:1px dashed #AAD381;
+	background:#FAFFEE;
+	text-align:center;
+	padding:3px;
+}
+
+.albEdit
+{
+	height:180px;
+}
+
+.picinfo
+{
+	height:30px;
+	line-height:30px;
+	margin:10px 0;
+}
+
+.thumbnails img,.thumbnailsEdit img
+{
+	margin:5px;
+}
+
+.albCt img {
+	height: 100px!important;
+}

src/dede/css/swfupload.css

@@ -1 +0,0 @@
-div.flash{width:375px;margin:10px 5px;border-color:#D9E4FF;-moz-border-radius-topleft:5px;-webkit-border-top-left-radius:5px;-moz-border-radius-topright:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-bottomleft:5px;-webkit-border-bottom-left-radius:5px;-moz-border-radius-bottomright:5px;-webkit-border-bottom-right-radius:5px;}#btnSubmit{margin:0 0 0 155px;}.progressWrapper{width:357px;overflow:hidden;}.progressContainer{margin:5px;padding:4px;border:solid 1px #E8E8E8;background-color:#F7F7F7;overflow:hidden;}.message{margin:1em 0;padding:10px 20px;border:solid 1px #FFDD99;background-color:#FFFFCC;overflow:hidden;}.red{border:solid 1px #B50000;background-color:#FFEBEB;}.green{border:solid 1px #DDF0DD;background-color:#EBFFEB;}.blue{border:solid 1px #CEE2F2;background-color:#F0F5FF;}.progressName{font-size:8pt;font-weight:700;color:#555;width:323px;height:14px;text-align:left;white-space:nowrap;overflow:hidden;}.progressBarInProgress,.progressBarComplete,.progressBarError{font-size:0;width:0%;height:2px;background-color:blue;margin-top:2px;}.progressBarComplete{width:100%;background-color:green;visibility:hidden;}.progressBarError{width:100%;background-color:red;visibility:hidden;}.progressBarStatus{margin-top:2px;width:337px;font-size:7pt;font-family:Arial;text-align:left;white-space:nowrap;}a.progressCancel{font-size:0;display:block;height:14px;width:14px;background-image:url(../images/cancelbutton.gif);background-repeat:no-repeat;background-position:-14px 0px;float:right;}a.progressCancel:hover{background-position:0px 0px;}.swfupload{vertical-align:top;}.thumbnails img{margin:5px;}.thumbnailsEdit img{margin:5px;}.albCt{float:left;width:244px;height:150px;margin-right:10px;margin-bottom:10px;padding:3px;border:1px dashed #AAD381;background:#FAFFEE;text-align:center;}.albEdit{height:180px;}.picinfo{margin:10px 0 10px 0;height:30px;line-height:30px;}

src/dede/dialog/select_images.php

@@ -114,11 +114,17 @@ function ReturnImg(reimg)
 			 window.opener.document.getElementById('div<?php echo $v?>').style.height = '100px';
 		 }
 		 else
-			 window.opener.document.getElementById('div<?php echo $v?>').style.backgroundImage = "url("+reimg+")";
+             window.opener.document.getElementById('div<?php echo $v?>').style.backgroundImage = "url("+reimg+")";
+             
 	  }
 		else if(window.opener.document.getElementById('<?php echo $v?>')){
 			window.opener.document.getElementById('<?php echo $v?>').src = reimg;
-		}
+        }
+        // 适配新的缩略图
+        if (window.opener.document.getElementById('litPic')) 
+        {
+            window.opener.document.getElementById('litPic').src = reimg;
+        }
 		if(document.all) window.opener=true;
 	}
 	

src/dede/js/album.js

@@ -8,16 +8,30 @@
  * @link           http://www.dedecms.com
  */
 
-function checkSubmitAlb(){
-	if(document.form1.title.value==''){
-	    alert("档案标题不能为空！");
+
+function checkSubmitAlb() {
+	if (document.form1.title.value == '') {
+		alert("档案标题不能为空！");
 		return false;
 	}
-	if(document.form1.typeid.value==0){
+	if (document.form1.typeid.value == 0) {
 		alert("请选择档案的主类别！");
 		return false;
 	}
 	document.form1.imagebody.value = $Obj('copyhtml').innerHTML;
+
+	if ($("#thumbnails .albCt").length > 0) {
+		// 这里从thumbnails中取出图片元素信息
+		$("#thumbnails .albCt").each(function(){
+			albums.push({
+			"img" : $(this).find("img").attr("src"),
+			"txt" : $(this).find("input").val()
+			})
+		})
+	}
+
+	$("#albums").val(JSON.stringify(albums));
+
 	return true;
 }
 
@@ -44,7 +58,7 @@ function showZipField(formitem,zipid,upid){
 	    $Obj(zipid).style.display = 'block';
 		$Obj(upid).style.display = 'none';
 		//$Obj('handfield').style.display = 'none';
-		$Obj('formhtml').checked = false;
+		// $Obj('formhtml').checked = false;
 		$Obj('copyhtml').innerHTML = '';
 	} else {
 		$Obj(zipid).style.display = 'none';

src/dede/templets/ad_add.htm

@@ -5,7 +5,7 @@
 <title>增加广告</title>
 <link href="css/base.css" rel="stylesheet" type="text/css">
 <script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script src="../static/js/jquery/jquery.js" language="javascript" type="text/javascript"></script>
+<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
 <script language="javascript">
 function checkSubmit()
 {

src/dede/templets/album_edit.htm

@@ -4,112 +4,63 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>修改图片集</title>
 <style type="text/css">
-<!--
 body {
 	background-image: url(images/allbg.gif);
 }
--->
 </style>
+<link rel="stylesheet" href="../static/css/bootstrap.min.css">
+<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 <link href="css/base.css" rel="stylesheet" type="text/css">
-<link href="css/swfupload.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="../static/swfupload/swfupload.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
+<link href="css/albumupload.css" rel="stylesheet" type="text/css" />
+<script language="javascript" src="../static/js/jquery.js"></script>
 <script type="text/javascript" src="../static/js/dedeajax2.js"></script>
+<script type="text/javascript" src="js/calendar/calendar.js"></script>
 <script type="text/javascript" src="js/main.js"></script>
 <script type="text/javascript" src="js/album.js"></script>
 <script type="text/javascript" src="js/handlers.js"></script>
+<link href="../static/css/cropper.min.css" rel="stylesheet">
+<script src="../static/js/cropper.min.js"></script>
+<script src="../static/js/bootstrap.bundle.js"></script>
+<link rel="stylesheet" href="../static/css/jquery.fileupload.css">
 <script language="javascript" type="text/javascript">
-var swfu = null;
-var vcc = 0;
-function LoadTestDiv()
-{
-	var posLeft = 100; var posTop = 100;
-	var newobj = $Obj('_myhtml');
-	$Obj('imagebody').value = $Obj('copyhtml').innerHTML;
-	var dfstr = '粘贴到这里...';
-	if($Obj('imagebody').value.length <= dfstr.length)
-	{
-		alert('您还没有粘贴任何东西到编辑框哦！');
-		return;
-	}
-	if(!newobj){
-		newobj = document.createElement("DIV");
-		newobj.id = '_myhtml';
-		newobj.style.position='absolute';
-		newobj.className = "dlg2";
-		newobj.style.top = posTop;
-		newobj.style.left = posLeft;
-		document.body.appendChild(newobj);
-	}
-	else{
-		newobj.style.display = "block";
-	}
-	var myajax = new DedeAjax(newobj,false,true,'-','-','...');
-	var v = $Obj('imagebody').value;
-	vcc++;
-
-	<?php
-	if(strtolower(substr($cfg_soft_lang, 0, 3)) == 'utf') {
-		?>
-		//utf8
-		myajax.AddKeyUtf8('myhtml',v);
-		myajax.AddKeyUtf8('vcc',vcc);
-		myajax.SendPost2('album_testhtml.php');
-		<?php
-	}
-	elseif (strtolower(substr($cfg_soft_lang, 0, 2)) == 'gb') {
-		?>
-		//gbk
-		myajax.SendGet2("album_testhtml.php?vcc="+vcc+"&myhtml="+v);
-		<?php
-	}
-	?>
-	DedeXHTTP = null;
-}
-window.onload = function ()
-{
-			swfu = new SWFUpload(
-			{
-				// Backend Settings
-				upload_url: "swfupload.php",
-				post_params: {"PHPSESSID": "<?php echo session_id(); ?>", "dopost" : ""},
+    var swfu = null;
+    var vcc = 0;
+    var albums = [];
 
-				// File Upload Settings
-				file_size_limit : "2 MB",	// 2MB
-				file_types : "*.jpg; *.gif; *.png",
-				file_types_description : "选择 JPEG/GIF/PNG 格式图片",
-				file_upload_limit : "0",
+    $(document).ready(function () {
+      // 添加图片
+      $("#iptAlbumImages").change(function (event) {
+        var files = event.target.files;
+        for (var i = 0, f; f = files[i]; i++) {
+          // 如果不是图片忽略
+          if (!f.type.match('image.*')) {
+            continue;
+          }
 
-				file_queue_error_handler : fileQueueError,
-				file_dialog_complete_handler : fileDialogComplete,
-				upload_progress_handler : uploadProgress,
-				upload_error_handler : uploadError,
-				upload_success_handler : uploadSuccess,
-				upload_complete_handler : uploadComplete,
-
-				button_image_url : "../static/SmallSpyGlassWithTransperancy_17x18.png",
-				button_placeholder_id : "spanButtonPlaceholder",
-				button_width: 250,
-				button_height: 18,
-				button_text : '<span class="button">选择本地图片 <span class="buttonSmall">(单图最大为 2 MB，支持多选)</span></span>',
-				button_text_style : '.button { font-family: Helvetica, Arial, sans-serif; font-size: 12pt; } .buttonSmall { font-size: 10pt; }',
-				button_text_top_padding: 0,
-				button_text_left_padding: 18,
-				button_window_mode: SWFUpload.WINDOW_MODE.TRANSPARENT,
-				button_cursor: SWFUpload.CURSOR.HAND,
-				
-				// Flash Settings
-				flash_url : "../static/swfupload/swfupload.swf",
-
-				custom_settings : {
-					upload_target : "divFileProgressContainer"
-				},
-				
-				// Debug Settings
-				debug: false
-			});
-};
+          // 将图片渲染到浏览器
+          var reader = new FileReader();
+          reader.onload = (function (theFile) {
+            return function (e) {
+              litpicImgSrc = e.target.result;
+              addImage(litpicImgSrc, 0);
+            };
+          })(f);
+          reader.readAsDataURL(f);
+        }
+        $("#iptAlbumImages").val("");
+      });
+    });
 </script>
+<style>
+  img {
+    vertical-align: baseline;
+  }
+
+  input,
+  select {
+    height: auto !important;
+  }
+</style>
 </head>
 <body topmargin="8">
 <form name="form1" action="album_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmitAlb();">
@@ -117,6 +68,8 @@ window.onload = function ()
   <input type="hidden" name="id" value="<?php echo $aid?>" />
   <input type="hidden" name="imagebody" value="" />
   <input type="hidden" name="dopost" value="save" />
+  <input type="hidden" id="albums" name="albums" value="">
+  <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
     <tr>
       <td width="65%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a href="catalog_do.php?cid=<?php echo $arcRow["typeid"]?>&dopost=listArchives"><u>图集列表</u></a> &gt;&gt; 更改图集</td>
@@ -198,12 +151,23 @@ window.onload = function ()
       <td height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
             <td width="90" height="81">&nbsp;缩 略 图：<br/></td>
-            <td><input name="picname" type="text" id="picname" style="width:300px" value="<?php echo $arcRow["litpic"]?>">
-              <input type="button" name="Submit" value="浏览..." style="width:60" onClick="SelectImage('form1.picname','');">
-              <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg'/>
-              <input type='checkbox' class='np' name='ddisremote' value='1' />
-              远程 </td>
-            <td align="center"><img src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "images/pview.gif";?>" width="150" height="100" id="picview" name="picview"></td>
+            <td><input name="picname" type="text" id="picname" style="width:300px"
+              value="<?php echo $arcRow["litpic"]?>"><input type="button" name="Submit" value="浏览..."
+              style="width:70px" onClick="SelectImage('form1.picname','');">
+            <input type='checkbox' class='np' name='ddisremote' value='1'>
+            远程
+            <span class="btn btn-success fileinput-button">
+              <i class="glyphicon glyphicon-plus"></i>
+              选择图片
+              <input type="file" name="files[]" id="iptAddImages">
+            </span>
+            <button id="btnClearAll" type="button" class="btn btn-danger delete">
+              <i class="fa fa-trash-o"></i>
+              <span>清空</span>
+            </button> </td>
+            <td align="center"><img id="litPic"
+              src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "../static/defaultpic.gif";?>"
+              style="height: 80px"></td>
           </tr>
         </table></td>
     </tr>
@@ -464,8 +428,6 @@ if($cfg_need_typeid2=='Y') {
               手工上传
               <input name="formzip" class="np" type="checkbox" id="formzip" value="1" onClick="showZipField(this,'zipff','htmlfield');" />
               从ZIP压缩包中解压图片
-              <input name="formhtml" class="np" type="checkbox" id="formhtml" value="1" onClick="showHtmlField(this,'htmlfield','zipff');" />
-              网上复制图片 </td>
           </tr>
         </table></td>
     </tr>
@@ -546,7 +508,13 @@ if($cfg_need_typeid2=='Y') {
       <td height="24" colspan="4" class="bline" style="background:#F9FCEF;"><table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
             <td width="90">&nbsp;<b>增加新图片：</b></td>
-            <td><div style="display: inline; border: solid 1px #7FAAFF; background-color: #C5D9FF; padding: 2px;"> <span id="spanButtonPlaceholder"></span> </div></td>
+            <td>
+              <span class="btn btn-success fileinput-button">
+                <i class="glyphicon glyphicon-plus"></i>
+                选择本地图片（支持多选）
+                <input type="file" name="files[]" id="iptAlbumImages" multiple>
+              </span>
+            </td>
           </tr>
         </table></td>
     </tr>

src/dede/templets/archives_add.htm

@@ -1,49 +1,68 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>发布文档</title>
-<style type="text/css">
-<!--
-body { background-image: url(images/allbg.gif); }
--->
-</style>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script language="javascript" src="../static/js/jquery.min.js"></script>
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language='javascript' src="js/main.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script language="javascript">
-<!--
-function checkSubmit()
-{
-  if(document.form1.title.value==""){
-	   alert("<?php echo $cInfos['titlename']; ?>不能为空！");
-	   return false;
-  }
-  if(document.form1.typeid.value==0){
-	   alert("请选择档案的主栏目！");
-	   return false;
-  }
-}
--->
-</script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>发布文档</title>
+  <style type="text/css">
+    body {
+      background-image: url(images/allbg.gif);
+    }
+  </style>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="../static/js/dedeajax2.js"></script>
+  <script language='javascript' src="js/main.js"></script>
+  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
+  <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
+  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <script src="../static/js/cropper.min.js"></script>
+  <script language="javascript">
+    function checkSubmit() {
+      if (document.form1.title.value == "") {
+        alert("<?php echo $cInfos['titlename']; ?>不能为空！");
+        return false;
+      }
+      if (document.form1.typeid.value == 0) {
+        alert("请选择档案的主栏目！");
+        return false;
+      }
+    }
+  </script>
+  <style>
+    img {
+      vertical-align: baseline;
+    }
+
+    input,
+    select {
+      height: auto !important;
+    }
+  </style>
 </head>
+
 <body topmargin="8">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
     <tr>
-      <td width="65%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文档列表</u></a> &gt;&gt; 发布文档</td>
+      <td width="65%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
+          href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文档列表</u></a>
+        &gt;&gt; 发布文档</td>
       <td width="30%" align='right'><?php echo $backurl; ?><a href="catalog_main.php">[<u>栏目管理</u>]</a>&nbsp;</td>
     </tr>
   </table>
 
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
     <tr>
-      <td colspan="2" >
+      <td colspan="2">
         <table width="800" border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()"><u>高级参数</u></a></td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                onClick="ShowItem2()"><u>高级参数</u></a></td>
             <td>&nbsp;</td>
           </tr>
         </table>
@@ -53,43 +72,49 @@ function checkSubmit()
 
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
     <tr>
-      <td colspan="2"> <table height="24" border="0" cellpadding="0" cellspacing="0">
+      <td colspan="2">
+        <table height="24" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
             <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
           </tr>
-        </table></td>
+        </table>
+      </td>
     </tr>
   </table>
 
-<form name="form1" action="archives_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit()">
-  <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-  <input type="hidden" name="cid" value="<?php echo $cid?>" />
-  <input type="hidden" name="dopost" value="save" />
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;<?php echo $cInfos['titlename']; ?>：</td>
-            <td width='408'>
-            	<input name="title" type="text" id="title" value="" style="width:388px">
-             </td>
-            <td width="90">&nbsp;简略标题：</td>
-            <td>
-            	<input name="shorttitle" type="text" id="shorttitle" style="width:150px">
-            </td>
-          </tr>
-        </table>
-       </td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;自定义属性：</td>
-            <td>
-            	<?php
+  <form name="form1" action="archives_add.php" enctype="multipart/form-data" method="post"
+    onSubmit="return checkSubmit()">
+    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
+    <input type="hidden" name="cid" value="<?php echo $cid?>" />
+    <input type="hidden" name="dopost" value="save" />
+    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
+      style="border:1px solid #cfcfcf;background:#ffffff;">
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;<?php echo $cInfos['titlename']; ?>：</td>
+              <td width='408'>
+                <input name="title" type="text" id="title" value="" style="width:388px">
+              </td>
+              <td width="90">&nbsp;简略标题：</td>
+              <td>
+                <input name="shorttitle" type="text" id="shorttitle" style="width:150px">
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;自定义属性：</td>
+              <td>
+                <?php
             	$dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
             	$dsql->Execute();
             	while($trow = $dsql->GetObject())
@@ -100,64 +125,73 @@ function checkSubmit()
             		  echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'>{$trow->attname}[{$trow->att}]";
             	}
             	?>
-            </td>
-          </tr>
-        </table>
-       </td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline" id="redirecturltr" style="display:none">
-	   <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;跳转网址：</td>
-            <td>
-            	<input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="" />
-            </td>
-          </tr>
-       </table>
-       </td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;TAG标签：</td>
-          <td width="526">
-          	<input name="tags" type="text" id="tags" value="" style="width:300px" />(','号分开，单个标签小于12字节)
-          </td>
-          <td width="47">权重：</td>
-          <td width="122"><input name="weight" type="text" id="weight" style="width:50px" value="<?php echo $maxWright['cc'];?>" />(越小越靠前)</td>
-        </tr>
-      </table>
-      </td>
-    </tr>
-    <tr id="pictable" style='<?php if($cInfos['needpic']==0) echo 'display:none'; ?>'>
-      <td height="24" colspan="4" class="bline"> <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90"> &nbsp;缩 略 图：</td>
-            <td width="560">
-            	<table width="100%" border="0" cellspacing="1" cellpadding="1">
-                <tr>
-                  <td height="30">
-                  <input name="picname" type="text" id="picname" style="width:240px" />
-                  <input type="button"  value="本地上传" style="width:70px;cursor:pointer;" />
-                  <iframe name='uplitpicfra' id='uplitpicfra' src='' style='display:none'></iframe>
-                  <span class="litpic_span"><input name="litpic" type="file" id="litpic"  onChange="SeePicNew(this, 'divpicview', 'uplitpicfra', 165, 'archives_add.php');" size="1" class='np coolbg'/></span>
-                  <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;" onClick="SelectImage('form1.picname','small');" class='np coolbg'/>
-                  <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg'/>
-                  <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote'/>远程
-                  </td>
-                </tr>
-              </table>
-             </td>
-            <td width="150" align="center">
-            <div id='divpicview' class='divpre'></div>
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-
-    <?php if($cInfos['dfcid']>0)
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline" id="redirecturltr" style="display:none">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;跳转网址：</td>
+              <td>
+                <input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="400%" height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;TAG标签：</td>
+              <td width="526">
+                <input name="tags" type="text" id="tags" value="" style="width:300px" />(','号分开，单个标签小于12字节)
+              </td>
+              <td width="47">权重：</td>
+              <td width="122"><input name="weight" type="text" id="weight" style="width:50px"
+                  value="<?php echo $maxWright['cc'];?>" />(越小越靠前)</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr id="pictable" style='<?php if($cInfos['needpic']==0) echo 'display:none'; ?>'>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90"> &nbsp;缩 略 图：</td>
+              <td width="560">
+                <table width="100%" border="0" cellspacing="1" cellpadding="1">
+                  <tr>
+                    <td height="30">
+                      <input name="picname" type="text" id="picname" style="width:240px" />
+                      <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;"
+                        onClick="SelectImage('form1.picname','small');" class='np coolbg' />
+                      <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote' />远程
+                      <span class="btn btn-success fileinput-button">
+                        <i class="glyphicon glyphicon-plus"></i>
+                        选择图片
+                        <input type="file" name="files[]" id="iptAddImages">
+                      </span>
+                      <button id="btnClearAll" type="button" class="btn btn-danger delete">
+                        <i class="fa fa-trash-o"></i>
+                        <span>清空</span>
+                      </button>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+              <td align="center">
+                <!-- <div id='divpicview' class='divpre'></div> -->
+                <img id="litPic" src="../static/defaultpic.gif" style="height: 80px">
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <?php if($cInfos['dfcid']>0)
       {
       	echo "<input type='hidden' name='typeid' value='{$cInfos['dfcid']}' />\r\n";
       	echo "<input type='hidden' name='typeid2' value='0' />\r\n";
@@ -165,135 +199,152 @@ function checkSubmit()
       else
       {
       ?>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;文档主栏目：</td>
-          <td>
-			<span id='typeidct'>
-       <?php
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文档主栏目：</td>
+              <td>
+                <span id='typeidct'>
+                  <?php
           $typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
           echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
           echo "<option value='0'>请选择栏目...</option>\r\n";
           echo $typeOptions;
           echo "</select>";
 			?></span>
-			<img src='images/menusearch.gif' style='cursor:pointer;' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择' />
-			&nbsp;
-			<?php
+                <img src='images/menusearch.gif' style='cursor:pointer;'
+                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择' />
+                &nbsp;
+                <?php
 			if($cfg_need_typeid2=='Y')
 			{
 				echo "<a href='javascript:AddTypeid2();'>【<u>选择副栏目</u>】</a>";
 			}
 			?>
-			  <?php 
+                <?php 
      			 if($cfg_remote_site=='Y')
      			 {
-   				 ?> 　 
-     				 <input name="isremote" type="checkbox" id="isremote" value="1" <?php if($cfg_title_site=='Y') echo "checked";?>>是否同步远程发布  <?php GetFtp();?>     <?php
+   				 ?> 　
+                <input name="isremote" type="checkbox" id="isremote" value="1"
+                  <?php if($cfg_title_site=='Y') echo "checked";?>>是否同步远程发布 <?php GetFtp();?> <?php
      			 }
-    		?>  </td>
-        </tr>
-      </table>
-      </td>
-    </tr>
-    <tr id='typeid2tr' style='display:none'>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;文档副栏目：</td>
-          <td>
-          <span id='typeid2ct'></span><input type='text' name='typeid2' id='typeid2' value='' style='width:200px;' />
-          <img src='images/menusearch2.gif' style='cursor:pointer;' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt='选择副栏目' title='选择副栏目' />
-			    </td>
-        </tr>
-        </table>
-      </td>
-    </tr>
-   <?php } ?>
-    <tr>
-     <td><?php PrintAutoFieldsAdd($cInfos['fieldset']); ?></td>
-    </tr>
-    <tr>
-      <td width="100%" height="24">
-	  <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;附加选项：</td>
-            <td>
-            	<input name="remote" type="checkbox" class="np" id="remote" value="1"<?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?> />
-              下载远程图片和资源
-              <input name="dellink" type="checkbox" class="np" id="dellink" value="1"<?php if($cfg_arc_dellink=='Y') echo ' checked="1" '; ?> />
-              删除非站内链接
-              <input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1"<?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?> />
-              提取第一个图片为缩略图
-              <input type='checkbox' name='needwatermark' value='1' class='np' <?php if($photo_markup=='1') echo ' checked="1" '; ?> />
-              图片是否加水印
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
-  <!-- //高级参数 -->
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="adset" style="border:1px solid #cfcfcf;background:#ffffff;display:none">
-  <tr>
-   <td height="24" colspan="4" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90" height="22" width="240">&nbsp;评论选项：</td>
-          <td width="250">
-          <input type='radio' name='notpost' class='np' value='0' <?php if($cfg_feedback_forbid=='N') echo "checked='1' "; ?> />允许评论
-          &nbsp;
-          <input type='radio' name='notpost' class='np' value='1' <?php if($cfg_feedback_forbid=='Y') echo "checked='1' "; ?> />禁止评论
-          </td>
-          <td width="90">浏览次数：</td>
-          <td>
-          	<input type='text' name='click' value='<?php echo ($cfg_arc_click=='-1' ? mt_rand(50, 200) : $cfg_arc_click); ?>' style='width:100px;' />
-          </td>
-        </tr>
-      </table>
-    </td>
-   </tr>
-  <tr>
-      <td height="24" colspan="4" class="bline"> <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;文档来源：</td>
-            <td width="240"><input name="source" type="text" id="source" style="width:160px" value="" size="16">
-              <input name="selsource" type="button" id="selsource" value="选择"></td>
-            <td width="90">作　者：</td>
-            <td> <input name="writer" type="text" id="writer" style="width:120px" value="">
-              <input name="selwriter" type="button" id="selwriter" value="选择">            </td>
-          </tr>
-        </table>
-        <script language='javascript'>InitPage();</script> </td>
-    </tr>
-  <tr>
-  <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="22">&nbsp;文档排序：</td>
-            <td width="240"> <select name="sortup" id="sortup" style="width:150">
-                <option value="0" selected>默认排序</option>
-                <option value="7">置顶一周</option>
-                <option value="30">置顶一个月</option>
-                <option value="90">置顶三个月</option>
-                <option value="180">置顶半年</option>
-                <option value="360">置顶一年</option>
-              </select> </td>
-            <td width="90">标题颜色：</td>
-            <td>
-            	<input name="color" type="text" id="color" style="width:120px">
-              <input name="modcolor" type="button" id="modcolor" value="选取" onClick="ShowColor(event,this)">            </td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;阅读权限：</td>
-            <td width="240"> <select name="arcrank" id="arcrank" style="width:150px">
-                <?php
+    		?> </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr id='typeid2tr' style='display:none'>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文档副栏目：</td>
+              <td>
+                <span id='typeid2ct'></span><input type='text' name='typeid2' id='typeid2' value=''
+                  style='width:200px;' />
+                <img src='images/menusearch2.gif' style='cursor:pointer;'
+                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt='选择副栏目' title='选择副栏目' />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <?php } ?>
+      <tr>
+        <td><?php PrintAutoFieldsAdd($cInfos['fieldset']); ?></td>
+      </tr>
+      <tr>
+        <td width="100%" height="24">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;附加选项：</td>
+              <td>
+                <input name="remote" type="checkbox" class="np" id="remote" value="1"
+                  <?php if($cfg_rm_remote=='Y') echo ' checked="1" '; ?> />
+                下载远程图片和资源
+                <input name="dellink" type="checkbox" class="np" id="dellink" value="1"
+                  <?php if($cfg_arc_dellink=='Y') echo ' checked="1" '; ?> />
+                删除非站内链接
+                <input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1"
+                  <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?> />
+                提取第一个图片为缩略图
+                <input type='checkbox' name='needwatermark' value='1' class='np'
+                  <?php if($photo_markup=='1') echo ' checked="1" '; ?> />
+                图片是否加水印
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <!-- //高级参数 -->
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
+      style="border:1px solid #cfcfcf;background:#ffffff;display:none">
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="22" width="240">&nbsp;评论选项：</td>
+              <td width="250">
+                <input type='radio' name='notpost' class='np' value='0'
+                  <?php if($cfg_feedback_forbid=='N') echo "checked='1' "; ?> />允许评论
+                &nbsp;
+                <input type='radio' name='notpost' class='np' value='1'
+                  <?php if($cfg_feedback_forbid=='Y') echo "checked='1' "; ?> />禁止评论
+              </td>
+              <td width="90">浏览次数：</td>
+              <td>
+                <input type='text' name='click'
+                  value='<?php echo ($cfg_arc_click=='-1' ? mt_rand(50, 200) : $cfg_arc_click); ?>'
+                  style='width:100px;' />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文档来源：</td>
+              <td width="240"><input name="source" type="text" id="source" style="width:160px" value="" size="16">
+                <input name="selsource" type="button" id="selsource" value="选择"></td>
+              <td width="90">作　者：</td>
+              <td> <input name="writer" type="text" id="writer" style="width:120px" value="">
+                <input name="selwriter" type="button" id="selwriter" value="选择"> </td>
+            </tr>
+          </table>
+          <script language='javascript'>InitPage();</script>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="22">&nbsp;文档排序：</td>
+              <td width="240"> <select name="sortup" id="sortup" style="width:150">
+                  <option value="0" selected>默认排序</option>
+                  <option value="7">置顶一周</option>
+                  <option value="30">置顶一个月</option>
+                  <option value="90">置顶三个月</option>
+                  <option value="180">置顶半年</option>
+                  <option value="360">置顶一年</option>
+                </select> </td>
+              <td width="90">标题颜色：</td>
+              <td>
+                <input name="color" type="text" id="color" style="width:120px">
+                <input name="modcolor" type="button" id="modcolor" value="选取" onClick="ShowColor(event,this)"> </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;阅读权限：</td>
+              <td width="240"> <select name="arcrank" id="arcrank" style="width:150px">
+                  <?php
               $urank = $cuserLogin->getUserRank();
               $dsql->SetQuery("Select * from `#@__arcrank` where adminrank<='$urank'");
               $dsql->Execute();
@@ -302,85 +353,99 @@ function checkSubmit()
               	echo "     <option value='".$row->rank."'>".$row->membername."</option>\r\n";
               }
               ?>
-              </select> </td>
-            <td width="90">发布选项：</td>
-            <td>
-            	<input name="ishtml" type="radio" class="np" value="1" checked>
-              生成HTML
-              <input type="radio" name="ishtml" class="np" value="0">
-              仅动态浏览              </td>
-          </tr>
-        </table></td>
-    </tr>
+                </select> </td>
+              <td width="90">发布选项：</td>
+              <td>
+                <input name="ishtml" type="radio" class="np" value="1" checked>
+                生成HTML
+                <input type="radio" name="ishtml" class="np" value="0">
+                仅动态浏览 </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
 
-    <tr>
-      <td height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;发布时间：</td>
-          <td width="241"><?php
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;发布时间：</td>
+              <td width="241"><?php
 			$nowtime = GetDateTimeMk(time());
 			echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200\">";
-			?>          </td>
-          <td width="90">消费金币：</td>
-          <td width="379"><input name="money" type="text" id="money" value="0" size="10">          </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;关键字：</td>
-          <td width="448"><input type='text' name="keywords" id="keywords" style="width:80%" value="" /></td>
-          <td width="262"><input name="autokey" type="checkbox" onClick="ShowHide('keywords');"; class="np" id="autokey" value="1"<?php if($cfg_arc_autokeyword=='Y') echo ' checked'; ?>>
-自动获取，手动填写用","分开<br/>
-<input type="button" name="Submit" value="浏览..." style="width:56;height:20" onClick="SelectKeywords('form1.keywords');"></td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;内容摘要：</td>
-          <td width="449"><textarea name="description" rows="3" id="description" style="width:80%"></textarea></td>
-          <td width="261">&nbsp;</td>
-        </tr>
-      </table>
-      </td>
-  </tr>
+			?> </td>
+              <td width="90">消费金币：</td>
+              <td width="379"><input name="money" type="text" id="money" value="0" size="10"> </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
       <tr>
-      <td height="24" colspan="4">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;自定义文件名：</td>
-          <td width="449"><input type="text" name="filename" id="filename" />（不包括后缀名如.html等）</td>
-          <td width="261">&nbsp;</td>
-        </tr>
-      </table>
-      </td>
-  </tr>
-  </table>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;关键字：</td>
+              <td width="448"><input type='text' name="keywords" id="keywords" style="width:80%" value="" /></td>
+              <td width="262"><input name="autokey" type="checkbox" onClick="ShowHide('keywords');" ; class="np"
+                  id="autokey" value="1" <?php if($cfg_arc_autokeyword=='Y') echo ' checked'; ?>>
+                自动获取，手动填写用","分开<br />
+                <input type="button" name="Submit" value="浏览..." style="width:56;height:20"
+                  onClick="SelectKeywords('form1.keywords');"></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;内容摘要：</td>
+              <td width="449"><textarea name="description" rows="3" id="description" style="width:80%"></textarea></td>
+              <td width="261">&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;自定义文件名：</td>
+              <td width="449"><input type="text" name="filename" id="filename" />（不包括后缀名如.html等）</td>
+              <td width="261">&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
 
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none;">
-  <tr>
-    <td height="35">
-	<table width="98%" border="0" cellspacing="1" cellpadding="1">
-        <tr>
-          <td width="17%">&nbsp;</td>
-          <td width="83%"><table width="214" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td width="115">
-                    <input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np" border="0"  style="cursor:pointer; ">
-                </td>
-                <td width="99">
-                	<img src="images/button_reset.gif" width="60" height="22" border="0" onClick="location.reload();" style="cursor:pointer; ">
-                </td>
-              </tr>
-            </table></td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</form>
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
+      style="border:1px solid #cfcfcf;border-top:none;">
+      <tr>
+        <td height="35">
+          <table width="98%" border="0" cellspacing="1" cellpadding="1">
+            <tr>
+              <td width="17%">&nbsp;</td>
+              <td width="83%">
+                <table width="214" border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td width="115">
+                      <input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np"
+                        border="0" style="cursor:pointer; ">
+                    </td>
+                    <td width="99">
+                      <img src="images/button_reset.gif" width="60" height="22" border="0" onClick="location.reload();"
+                        style="cursor:pointer; ">
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </form>
 </body>
+
 </html>

src/dede/templets/archives_edit.htm

@@ -1,44 +1,63 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>更改文档</title>
-<style type="text/css">
-<!--
-body { background-image: url(images/allbg.gif); }
--->
-</style>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language="javascript" src="js/main.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script language="javascript">
-<!--
-function checkSubmit()
-{
-   if(document.form1.title.value==""){
-	 alert("<?php echo $cInfos['titlename']; ?>不能为空！");
-	 document.form1.title.focus();
-	 return false;
-  }
-}
--->
-</script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>更改文档</title>
+  <style type="text/css">
+    body {
+      background-image: url(images/allbg.gif);
+    }
+
+    img {
+      vertical-align: baseline;
+    }
+
+    input,
+    select {
+      height: auto !important;
+    }
+  </style>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <script src="../static/js/jquery.js"></script>
+  <script language="javascript" src="../static/js/dedeajax2.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
+  <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
+  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <script src="../static/js/cropper.min.js"></script>
+  <script language="javascript">
+    function checkSubmit() {
+      if (document.form1.title.value == "") {
+        alert("<?php echo $cInfos['titlename']; ?>不能为空！");
+        document.form1.title.focus();
+        return false;
+      }
+    }
+  </script>
 </head>
+
 <body topmargin="8">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
     <tr>
-      <td width="65%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文档列表</u></a> &gt;&gt; 更改文档</td>
+      <td width="65%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
+          href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文档列表</u></a>
+        &gt;&gt; 更改文档</td>
       <td width="30%" align='right'><?php echo $backurl; ?><a href="catalog_main.php">[<u>栏目管理</u>]</a>&nbsp;</td>
     </tr>
   </table>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1" >
+  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
     <tr>
       <td colspan="2">
         <table border="0" cellpadding="0" cellspacing="0">
           <tr>
             <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()"><u>高级参数</u></a></td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                onClick="ShowItem2()"><u>高级参数</u></a></td>
           </tr>
         </table>
       </td>
@@ -46,36 +65,46 @@ function checkSubmit()
   </table>
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
     <tr>
-      <td colspan="2"> <table height="24" border="0" cellpadding="0" cellspacing="0">
+      <td colspan="2">
+        <table height="24" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
             <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
           </tr>
-        </table></td>
+        </table>
+      </td>
     </tr>
   </table>
-<form name="form1" action="archives_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
-<input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-<input type="hidden" name="id" value="<?php echo $aid?>" />
-<input type="hidden" name="dopost" value="save" />
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
-    <tr>
-      <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;<?php echo $cInfos['titlename']; ?>：</td>
-          <td width='408'><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:388px">          </td>
-          <td width="90">&nbsp;简略标题：</td>
-          <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px" value="<?php echo $arcRow['shorttitle']; ?>">          </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;自定义属性：</td>
-          <td>
-            <?php
+  <form name="form1" action="archives_edit.php" enctype="multipart/form-data" method="post"
+    onSubmit="return checkSubmit();">
+    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
+    <input type="hidden" name="id" value="<?php echo $aid?>" />
+    <input type="hidden" name="dopost" value="save" />
+    <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
+      style="border:1px solid #cfcfcf;background:#ffffff;">
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;<?php echo $cInfos['titlename']; ?>：</td>
+              <td width='408'><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>"
+                  style="width:388px"> </td>
+              <td width="90">&nbsp;简略标题：</td>
+              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px"
+                  value="<?php echo $arcRow['shorttitle']; ?>"> </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="400%" height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;自定义属性：</td>
+              <td>
+                <?php
                 $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
                 $dsql->Execute();
                 while($trow = $dsql->GetObject())
@@ -88,57 +117,75 @@ function checkSubmit()
                     echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick} />{$trow->attname}[{$trow->att}]";
                 }
             ?>
-          </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td height="24" class="bline" id="redirecturltr" style="display:<?php echo (empty($addRow['redirecturl']) ? 'none' : 'block');?>">
-	   <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;跳转网址：</td>
-            <td>
-            	<input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="<?php echo $addRow['redirecturl']; ?>" />
-            </td>
-          </tr>
-       </table>
-       </td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;TAG标签：</td>
-          <td>
-          	<input name="tags" type="text" id="tags" value="<?php echo $tags; ?>" style="width:300px" />(','号分开，单个标签小于12字节)
-          </td>
-          <td width="40">权重：</td>
-          <td width="141"><input name="weight" type="text" id="weight" style="width:50px" value="<?php echo $arcRow['weight'];?>" /> 
-            (越小越靠前)</td>
-        </tr>
-      </table>
-      </td>
-    </tr>
-    <tr id="pictable" style='<?php if($cInfos['needpic']==0) echo 'display:none'; ?>'>
-      <td height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="81">
-            	&nbsp;缩 略 图：<br/>
-            	&nbsp;           </td>
-            <td width="500">
-             <input name="picname" type="text" id="picname" style="width:300px" value="<?php echo $arcRow["litpic"]?>"><input type="button" name="Submit" value="浏览..." style="width:70px" onClick="SelectImage('form1.picname','');">
-             <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg'/>
-             <input type='checkbox' class='np' name='ddisremote' value='1'>
-             远程
-             </td>
-            <td align="center">
-            <img src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "images/pview.gif";?>" width="150" height="100" id="picview" name="picview">
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-    <?php if($cInfos['dfcid']>0)
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline" id="redirecturltr"
+          style="display:<?php echo (empty($addRow['redirecturl']) ? 'none' : 'block');?>">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;跳转网址：</td>
+              <td>
+                <input name="redirecturl" type="text" id="redirecturl" style="width:300px"
+                  value="<?php echo $addRow['redirecturl']; ?>" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="400%" height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;TAG标签：</td>
+              <td>
+                <input name="tags" type="text" id="tags" value="<?php echo $tags; ?>"
+                  style="width:300px" />(','号分开，单个标签小于12字节)
+              </td>
+              <td width="40">权重：</td>
+              <td width="141"><input name="weight" type="text" id="weight" style="width:50px"
+                  value="<?php echo $arcRow['weight'];?>" />
+                (越小越靠前)</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr id="pictable" style='<?php if($cInfos['needpic']==0) echo 'display:none'; ?>'>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="81">
+                &nbsp;缩 略 图：<br />
+                &nbsp; </td>
+              <td width="560">
+                <input name="picname" type="text" id="picname" style="width:300px"
+                  value="<?php echo $arcRow["litpic"]?>"><input type="button" name="Submit" value="浏览..."
+                  style="width:70px" onClick="SelectImage('form1.picname','');">
+                <input type='checkbox' class='np' name='ddisremote' value='1'>
+                远程
+                <span class="btn btn-success fileinput-button">
+                  <i class="glyphicon glyphicon-plus"></i>
+                  选择图片
+                  <input type="file" name="files[]" id="iptAddImages">
+                </span>
+                <button id="btnClearAll" type="button" class="btn btn-danger delete">
+                  <i class="fa fa-trash-o"></i>
+                  <span>清空</span>
+                </button>
+              </td>
+              <td align="center">
+                <img id="litPic"
+                            src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "../static/defaultpic.gif";?>"
+                            style="height: 80px">
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <?php if($cInfos['dfcid']>0)
       {
       	echo "<input type='hidden' name='typeid' value='{$cInfos['dfcid']}' />\r\n";
       	echo "<input type='hidden' name='typeid2' value='' />\r\n";
@@ -146,132 +193,151 @@ function checkSubmit()
       else
       {
       ?>
-    <tr>
-      <td height="24" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;文档主栏目：</td>
-            <td>
-            <?php
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文档主栏目：</td>
+              <td>
+                <?php
             $typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
             echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
             if($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择栏目...</option>\r\n";
             echo $typeOptions;
             echo "</select>";
 			     ?>
-			     <img src='images/menusearch.gif' style='cursor:pointer' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择' />
-			      <?php 
+                <img src='images/menusearch.gif' style='cursor:pointer'
+                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择' />
+                <?php 
      			 if($cfg_remote_site=='Y')
      			 {
-   				 ?> 　 
-     				 <input name="isremote" type="checkbox" id="isremote" value="1" <?php if($cfg_title_site=='Y') echo "checked";?>>是否同步远程发布  <?php GetFtp();?>     <?php
+   				 ?> 　
+                <input name="isremote" type="checkbox" id="isremote" value="1"
+                  <?php if($cfg_title_site=='Y') echo "checked";?>>是否同步远程发布 <?php GetFtp();?> <?php
      			 }
-    		?>  </td>
-          </tr>
-      </table>
-      </td>
-    </tr>
-<?php
+    		?> </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <?php
 if($cfg_need_typeid2=='Y') {
 ?>
-    <tr>
-      <td height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;文档副栏目：</td>
-            <td>
-           <span id='typeid2ct'></span>
-           <input type='text' name='typeid2' id='typeid2' value='<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']); ?>' style='width:200px;' />
-           <img src='images/menusearch2.gif' style='cursor:pointer;' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2', '<?php echo $arcRow['typeid2']; ?>')" alt='选择副栏目' title='选择副栏目' />
-			     </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  <?php  }}  ?>
-    <tr>
-     <td>
-      <?php
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文档副栏目：</td>
+              <td>
+                <span id='typeid2ct'></span>
+                <input type='text' name='typeid2' id='typeid2'
+                  value='<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']); ?>' style='width:200px;' />
+                <img src='images/menusearch2.gif' style='cursor:pointer;'
+                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2', '<?php echo $arcRow['typeid2']; ?>')"
+                  alt='选择副栏目' title='选择副栏目' />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <?php  }}  ?>
+      <tr>
+        <td>
+          <?php
         PrintAutoFieldsEdit($cInfos['fieldset'],$addRow);
       ?>
-    </td>
-   </tr>
-    <tr>
-      <td width="400%" height="24">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;附加选项：</td>
-            <td>
-            	<input name="remote" type="checkbox" class="np" id="remote" value="1" checked>
-              下载远程图片和资源
-              <input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" checked>
-              提取第一个图片为缩略图            </td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
-  <!-- //高级参数 -->
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="adset" style="border:1px solid #cfcfcf;background:#ffffff;display:none">
-    <tr>
-   <td height="24" colspan="4" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90" height="22" width="240">&nbsp;评论选项：</td>
-          <td width="250">
-          <input type='radio' name='notpost' class='np' value='0'<?php if($arcRow['notpost']==0) echo " checked='1' "; ?>/>允许评论
-          &nbsp;
-          <input type='radio' name='notpost' class='np' value='1'<?php if($arcRow['notpost']==1) echo " checked='1' "; ?>/>禁止评论
-          </td>
-          <td width="90">浏览次数：</td>
-          <td>
-          	<input type='text' name='click' value='<?php echo $arcRow['click']; ?>' style='width:100px;' />
-          </td>
-        </tr>
-      </table>
-    </td>
-   </tr>
-    <tr>
-      <td height="24" class="bline"> <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;文档来源：</td>
-            <td width="250">
-              <input name="source" type="text" id="source" style="width:160" value="<?php echo $arcRow["source"]?>" size="16"><input name="selsource" type="button" id="selsource" value="选择">             </td>
-            <td width="90">作　者：</td>
-            <td>
-            <input name="writer" type="text" id="writer" style="width:120px" value="<?php echo $arcRow["writer"]?>"><input name="selwriter" type="button" id="selwriter" value="选择">             </td>
-          </tr>
-        </table>
-        <script language='javascript'>InitPage();</script> </td>
-    </tr>
-    <tr>
-    <td height="24" class="bline"> <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;文档排序：</td>
-            <td width="250"> <select name="sortup" id="sortup" style="width:150">
-                <?php
+        </td>
+      </tr>
+      <tr>
+        <td width="400%" height="24">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;附加选项：</td>
+              <td>
+                <input name="remote" type="checkbox" class="np" id="remote" value="1" checked>
+                下载远程图片和资源
+                <input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" checked>
+                提取第一个图片为缩略图 </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <!-- //高级参数 -->
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
+      style="border:1px solid #cfcfcf;background:#ffffff;display:none">
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="22" width="240">&nbsp;评论选项：</td>
+              <td width="250">
+                <input type='radio' name='notpost' class='np' value='0'
+                  <?php if($arcRow['notpost']==0) echo " checked='1' "; ?> />允许评论
+                &nbsp;
+                <input type='radio' name='notpost' class='np' value='1'
+                  <?php if($arcRow['notpost']==1) echo " checked='1' "; ?> />禁止评论
+              </td>
+              <td width="90">浏览次数：</td>
+              <td>
+                <input type='text' name='click' value='<?php echo $arcRow['click']; ?>' style='width:100px;' />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文档来源：</td>
+              <td width="250">
+                <input name="source" type="text" id="source" style="width:160" value="<?php echo $arcRow["source"]?>"
+                  size="16"><input name="selsource" type="button" id="selsource" value="选择"> </td>
+              <td width="90">作　者：</td>
+              <td>
+                <input name="writer" type="text" id="writer" style="width:120px"
+                  value="<?php echo $arcRow["writer"]?>"><input name="selwriter" type="button" id="selwriter"
+                  value="选择"> </td>
+            </tr>
+          </table>
+          <script language='javascript'>InitPage();</script>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文档排序：</td>
+              <td width="250"> <select name="sortup" id="sortup" style="width:150">
+                  <?php
                 $subday = SubDay($arcRow["sortrank"],$arcRow["pubdate"]);
                 echo "<option value='0'>正常排序</option>\r\n";
                 if($subday>0) echo "<option value='$subday' selected>置顶 $subday 天</option>\r\n";
                 ?>
-                <option value="7">置顶一周</option>
-                <option value="30">置顶一个月</option>
-                <option value="90">置顶三个月</option>
-                <option value="180">置顶半年</option>
-                <option value="360">置顶一年</option>
-              </select> </td>
-            <td width="90">标题颜色：</td>
-            <td><input name="color" type="text" id="color" style="width:120" value="<?php echo $arcRow["color"]?>"><input name="modcolor" type="button" id="modcolor" value="选取" onClick="ShowColor(event,this)"></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" class="bline"> <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;阅读权限：</td>
-            <td width="250"> <select name="arcrank" id="arcrank" style="width:150">
-                <option value='<?php echo $arcRow["arcrank"]?>'>
-                <?php echo $arcRow["rankname"]?>                </option>
-                <?php
+                  <option value="7">置顶一周</option>
+                  <option value="30">置顶一个月</option>
+                  <option value="90">置顶三个月</option>
+                  <option value="180">置顶半年</option>
+                  <option value="360">置顶一年</option>
+                </select> </td>
+              <td width="90">标题颜色：</td>
+              <td><input name="color" type="text" id="color" style="width:120"
+                  value="<?php echo $arcRow["color"]?>"><input name="modcolor" type="button" id="modcolor" value="选取"
+                  onClick="ShowColor(event,this)"></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;阅读权限：</td>
+              <td width="250"> <select name="arcrank" id="arcrank" style="width:150">
+                  <option value='<?php echo $arcRow["arcrank"]?>'>
+                    <?php echo $arcRow["rankname"]?> </option>
+                  <?php
               $urank = $cuserLogin->getUserRank();
 
               $dsql->SetQuery("Select * from #@__arcrank where adminrank<='$urank'");
@@ -280,77 +346,97 @@ if($cfg_need_typeid2=='Y') {
               	echo "     <option value='".$row->rank."'>".$row->membername."</option>\r\n";
               }
               ?>
-              </select> </td>
-            <td width="90">发布选项：</td>
-            <td> <input name="ishtml" type="radio" class="np" value="1"<?php if($arcRow["ismake"]!=-1) echo " checked";?>>
-              生成HTML
-              <input type="radio" name="ishtml" class="np" value="0"<?php if($arcRow["ismake"]==-1) echo " checked";?>>
-              仅动态浏览 </td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="75" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;更新时间：</td>
-          <td width="250"><?php
+                </select> </td>
+              <td width="90">发布选项：</td>
+              <td> <input name="ishtml" type="radio" class="np" value="1"
+                  <?php if($arcRow["ismake"]!=-1) echo " checked";?>>
+                生成HTML
+                <input type="radio" name="ishtml" class="np" value="0"
+                  <?php if($arcRow["ismake"]==-1) echo " checked";?>>
+                仅动态浏览 </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="75" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;更新时间：</td>
+              <td width="250"><?php
 			$nowtime = GetDateTimeMk(time());
 			echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200\">";
 			?>
-          </td>
-          <td width="92">消费金币：</td>
-          <td width="368"><input name="money" type="text" id="money" value="<?php echo $arcRow["money"]?>" size="10"></td>
-        </tr>
-      </table></td>
-    </tr>
+              </td>
+              <td width="92">消费金币：</td>
+              <td width="368"><input name="money" type="text" id="money" value="<?php echo $arcRow["money"]?>"
+                  size="10"></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
 
-    <tr>
-      <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90" height="51">&nbsp;关键字：</td>
-          <td><input type="text"  name="keywords"  id="keywords" style="width:60%" value="<?php echo $arcRow["keywords"]?>" /></td>
-          </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90" height="51">&nbsp;文档摘要：</td>
-          <td><textarea name="description" rows="3" id="description" style="width:60%"><?php echo $arcRow["description"]?></textarea></td>
-          </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;自定义文件名：</td>
-          <td width="449"><input type="text" name="filename" id="filename" value="<?php echo $arcRow["filename"]?>" />（不包括后缀名如.html等）</td>
-          <td width="261">&nbsp;</td>
-        </tr>
-      </table>
-      </td>
-  </tr>
-  </table>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="51">&nbsp;关键字：</td>
+              <td><input type="text" name="keywords" id="keywords" style="width:60%"
+                  value="<?php echo $arcRow["keywords"]?>" /></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="51">&nbsp;文档摘要：</td>
+              <td><textarea name="description" rows="3" id="description"
+                  style="width:60%"><?php echo $arcRow["description"]?></textarea></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;自定义文件名：</td>
+              <td width="449"><input type="text" name="filename" id="filename"
+                  value="<?php echo $arcRow["filename"]?>" />（不包括后缀名如.html等）</td>
+              <td width="261">&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
 
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none;">
-  <tr>
-    <td height="35">
-	<table width="100%" border="0" cellspacing="1" cellpadding="1">
-        <tr>
-          <td width="17%">&nbsp;</td>
-          <td width="83%"><table width="214" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np" border="0" style="cursor:pointer"></td>
-                <td width="99">
-                	<img src="images/button_reset.gif" width="60" height="22" border="0" onClick="location.reload();" style="cursor:pointer">
-                </td>
-              </tr>
-            </table></td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</form>
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
+      style="border:1px solid #cfcfcf;border-top:none;">
+      <tr>
+        <td height="35">
+          <table width="100%" border="0" cellspacing="1" cellpadding="1">
+            <tr>
+              <td width="17%">&nbsp;</td>
+              <td width="83%">
+                <table width="214" border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60"
+                        height="22" class="np" border="0" style="cursor:pointer"></td>
+                    <td width="99">
+                      <img src="images/button_reset.gif" width="60" height="22" border="0" onClick="location.reload();"
+                        style="cursor:pointer">
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </form>
 </body>
+
 </html>

src/dede/templets/archives_sg_add.htm

@@ -4,16 +4,20 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>发布文档</title>
 <style type="text/css">
-<!--
 body { background-image: url(images/allbg.gif); }
--->
 </style>
+<link rel="stylesheet" href="../static/css/bootstrap.min.css">
+<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 <link href="css/base.css" rel="stylesheet" type="text/css">
+<script language="javascript" src="../static/js/jquery.js"></script>
 <script language="javascript" src="../static/js/dedeajax2.js"></script>
 <script language='javascript' src="js/main.js"></script>
 <script type="text/javascript" src="js/calendar/calendar.js"></script>
+<script src="../static/js/bootstrap.bundle.js"></script>
+<link rel="stylesheet" href="../static/css/jquery.fileupload.css">
+<link href="../static/css/cropper.min.css" rel="stylesheet">
+<script src="../static/js/cropper.min.js"></script>
 <script language="javascript">
-<!--
 function checkSubmit()
 {
   if(document.form1.title.value==""){
@@ -25,8 +29,17 @@ function checkSubmit()
 	   return false;
   }
 }
--->
 </script>
+<style>
+  img {
+    vertical-align: baseline;
+  }
+
+  input,
+  select {
+    height: auto !important;
+  }
+</style>
 </head>
 <body topmargin="8">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
@@ -55,6 +68,7 @@ function checkSubmit()
   <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
   <input type="hidden" name="cid" value="<?php echo $cid?>" />
   <input type="hidden" name="dopost" value="save" />
+  <input type="hidden" id="litpic_b64" name="litpic_b64" value="">
   <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
     <tr>
       <td height="24" colspan="4" class="bline">
@@ -95,19 +109,25 @@ function checkSubmit()
             	<table width="100%" border="0" cellspacing="1" cellpadding="1">
                 <tr>
                   <td height="30">
-                  <input name="picname" type="text" id="picname" style="width:240px" />
-                  <input type="button"  value="本地上传" style="width:70px;cursor:pointer;" />
-                  <iframe name='uplitpicfra' id='uplitpicfra' src='' style='display:none'></iframe>
-                  <span class="litpic_span"><input name="litpic" type="file" id="litpic"  onChange="SeePicNew(this, 'divpicview', 'uplitpicfra', 165, 'archives_sg_add.php');" size="1" class='np coolbg'/></span>
-                  <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;" onClick="SelectImage('form1.picname','small');" class='np coolbg'/>
-                  <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg'/>
-                  <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote'/>远程
+                    <input name="picname" type="text" id="picname" style="width:240px" />
+                    <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;"
+                      onClick="SelectImage('form1.picname','small');" class='np coolbg' />
+                    <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote' />远程
+                    <span class="btn btn-success fileinput-button">
+                      <i class="glyphicon glyphicon-plus"></i>
+                      选择图片
+                      <input type="file" name="files[]" id="iptAddImages">
+                    </span>
+                    <button id="btnClearAll" type="button" class="btn btn-danger delete">
+                      <i class="fa fa-trash-o"></i>
+                      <span>清空</span>
+                    </button>
                   </td>
                 </tr>
               </table>
              </td>
             <td width="150" align="center">
-            <div id='divpicview' class='divpre'></div>
+              <img id="litPic" src="../static/defaultpic.gif" style="height: 80px">
             </td>
           </tr>
         </table></td>

src/dede/templets/archives_sg_edit.htm

@@ -4,16 +4,20 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>更改文档</title>
 <style type="text/css">
-<!--
 body { background-image: url(images/allbg.gif); }
--->
 </style>
+<link rel="stylesheet" href="../static/css/bootstrap.min.css">
+<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 <link href="css/base.css" rel="stylesheet" type="text/css">
+<script language="javascript" src="../static/js/jquery.js"></script>
 <script language="javascript" src="../static/js/dedeajax2.js"></script>
 <script language="javascript" src="js/main.js"></script>
 <script type="text/javascript" src="js/calendar/calendar.js"></script>
+<script src="../static/js/bootstrap.bundle.js"></script>
+<link rel="stylesheet" href="../static/css/jquery.fileupload.css">
+<link href="../static/css/cropper.min.css" rel="stylesheet">
+<script src="../static/js/cropper.min.js"></script>
 <script language="javascript">
-<!--
 function checkSubmit()
 {
    if(document.form1.title.value==""){
@@ -22,8 +26,17 @@ function checkSubmit()
 	 return false;
   }
 }
--->
 </script>
+<style>
+  img {
+    vertical-align: baseline;
+  }
+
+  input,
+  select {
+    height: auto !important;
+  }
+</style>
 </head>
 <body topmargin="8">
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
@@ -51,6 +64,7 @@ function checkSubmit()
 <input type="hidden" name="id" value="<?php echo $aid; ?>" />
 <input type="hidden" name="sortrank" value="<?php echo $addRow['senddate']; ?>" />
 <input type="hidden" name="dopost" value="save" />
+<input type="hidden" id="litpic_b64" name="litpic_b64" value="">
   <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
     <tr>
       <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
@@ -112,14 +126,26 @@ function checkSubmit()
             <td width="90" height="81">
             	&nbsp;缩 略 图：<br/>
             	&nbsp;           </td>
-            <td width="500">
-             <input name="picname" type="text" id="picname" style="width:280px" value="<?php echo $addRow["litpic"]; ?>"><input type="button" name="Submit" value="浏览..." style="width:60px" onClick="SelectImage('form1.picname','');" />
-             <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg'/>
-             <input type='checkbox' class='np' name='ddisremote' value='1' />
-             远程
+            <td width="560">
+              <input name="picname" type="text" id="picname" style="width:300px"
+              value="<?php echo $addRow["litpic"]?>"><input type="button" name="Submit" value="浏览..."
+              style="width:70px" onClick="SelectImage('form1.picname','');">
+            <input type='checkbox' class='np' name='ddisremote' value='1'>
+            远程
+            <span class="btn btn-success fileinput-button">
+              <i class="glyphicon glyphicon-plus"></i>
+              选择图片
+              <input type="file" name="files[]" id="iptAddImages">
+            </span>
+            <button id="btnClearAll" type="button" class="btn btn-danger delete">
+              <i class="fa fa-trash-o"></i>
+              <span>清空</span>
+            </button>
              </td>
             <td align="center">
-            <img src="<?php if( !empty($addRow["litpic"]) ) echo $addRow["litpic"]; else echo "images/pview.gif"; ?>" width="150" height="100" id="picview" name="picview" />
+              <img id="litPic"
+              src="<?php if($addRow["litpic"]!="") echo $addRow["litpic"]; else echo "../static/defaultpic.gif";?>"
+              style="height: 80px">
             </td>
           </tr>
         </table></td>

src/dede/templets/article_edit.htm

@@ -1,114 +1,117 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>更改文章</title>
-<style type="text/css">
-<!--
-body {
-	background-image: url(images/allbg.gif);
-}
--->
-</style>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<link href='css/tb-box.css' rel='stylesheet' type='text/css' />
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script language="javascript" src="js/main.js"></script>
-<script type="text/javascript"src="js/handlers.js"></script>
-<script language="javascript" src="../static/js/jquery/jquery.js"></script>
-<script language="javascript" src="../static/js/jquery/ui.core.js"></script>
-<script language="javascript" src="../static/js/jquery/ui.draggable.js"></script>
-<script language='javascript' src='js/tb-box.js'></script>
-<script language="javascript">
-<!--
-var swfu = null;
-var arctype = 'article';
-function checkSubmit()
-{
-	if(document.form1.title.value=='')
-	{
-		alert('文章标题不能为空！');
-		document.form1.title.focus();
-		return false;
-	}
-}
 
-function addVote()
-{
-    tb_show('添加投票', 'vote_add.php?isarc=1&TB_iframe=true&height=460&width=600', false);
-}
-
-function selectVote()
-{
-    tb_show('选取投票','vote_main.php?issel=1&TB_iframe=true&height=460&width=600',false);
-}
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>更改文章</title>
+  <style type="text/css">
+    body {
+      background-image: url(images/allbg.gif);
+    }
+  </style>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="../static/js/dedeajax2.js"></script>
+  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <script type="text/javascript" src="js/handlers.js"></script>
+  <script src="../static/js/bootstrap.bundle.js"></script>
+  <link rel="stylesheet" href="../static/css/jquery.fileupload.css">
+  <link href="../static/css/cropper.min.css" rel="stylesheet">
+  <script src="../static/js/cropper.min.js"></script>
+  <script language="javascript">
+    var swfu = null;
+    var arctype = 'article';
+    function checkSubmit() {
+      if (document.form1.title.value == '') {
+        alert('文章标题不能为空！');
+        document.form1.title.focus();
+        return false;
+      }
+    }
+  </script>
+  <style>
+    .albCt img {
+      cursor: pointer;
+    }
 
+    img {
+      vertical-align: baseline;
+    }
 
-function viewVote()
-{
-    if($("#voteid").val() != 0)
-    {
-        window.open('<?php echo $cfg_cmsurl;?>/plus/vote.php?dopost=view&aid=' + $("#voteid").val());
-    } else {
-        alert('请选择一个投票');
-        return false;
+    input,
+    select {
+      height: auto !important;
     }
-}
-window.onload = function ()
-{
-};
--->
-</script>
+  </style>
 </head>
+
 <body topmargin="8">
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="60%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文章列表</u></a> &gt;&gt; 更改文章</td>
-    <td width="30%" align='right'>&nbsp; <?php echo $backurl; ?><a href="catalog_main.php">[<u>栏目管理</u>]</a></td>
-    <td width="1%">&nbsp;</td>
-  </tr>
-</table>
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
-  <tr>
-    <td colspan="2"><table border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-          <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()"><u>高级参数</u></a></td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
-  <tr>
-    <td colspan="2"><table height="24" border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
-          <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-<form name="form1" action="article_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
-  <input type="hidden" name="dopost" value="save" />
-  <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-  <input type="hidden" name="id" value="<?php echo $aid?>" />
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
+  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
+    <tr>
+      <td width="60%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
+          href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文章列表</u></a>
+        &gt;&gt; 更改文章</td>
+      <td width="30%" align='right'>&nbsp; <?php echo $backurl; ?><a href="catalog_main.php">[<u>栏目管理</u>]</a></td>
+      <td width="1%">&nbsp;</td>
+    </tr>
+  </table>
+  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
     <tr>
-      <td height="24" colspan="2" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
+      <td colspan="2">
+        <table border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="90">&nbsp;文章标题：</td>
-            <td width='408'><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:388px"></td>
-            <td width="90">&nbsp;简略标题：</td>
-            <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px"  value="<?php echo $arcRow['shorttitle']; ?>"></td>
+            <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                onClick="ShowItem2()"><u>高级参数</u></a></td>
           </tr>
-        </table></td>
+        </table>
+      </td>
     </tr>
+  </table>
+  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
     <tr>
-      <td width="400%" height="24" colspan="2" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
+      <td colspan="2">
+        <table height="24" border="0" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="90">&nbsp;自定义属性：</td>
-            <td><?php
+            <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
+            <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+  <form name="form1" action="article_edit.php" enctype="multipart/form-data" method="post"
+    onSubmit="return checkSubmit();">
+    <input type="hidden" name="dopost" value="save" />
+    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
+    <input type="hidden" name="id" value="<?php echo $aid?>" />
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
+      style="border:1px solid #cfcfcf;background:#ffffff;">
+      <tr>
+        <td height="24" colspan="2" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文章标题：</td>
+              <td width='408'><input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>"
+                  style="width:388px"></td>
+              <td width="90">&nbsp;简略标题：</td>
+              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px"
+                  value="<?php echo $arcRow['shorttitle']; ?>"></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="400%" height="24" colspan="2" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;自定义属性：</td>
+              <td><?php
          $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
          $dsql->Execute();
          while($trow = $dsql->GetObject())
@@ -132,184 +135,210 @@ window.onload = function ()
          	}
          }
           ?></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="2" class="bline" id="redirecturltr" style="display:<?php echo (empty($addRow['redirecturl']) ? 'none' : 'block');?>"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;跳转网址：</td>
-            <td><input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="<?php echo $addRow["redirecturl"]?>" /></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" colspan="2" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;TAG标签：</td>
-            <td><input name="tags" type="text" id="tags" value="<?php echo $tags; ?>" style="width:300px" />
-              (','号分开，单个标签小于12字节)</td>
-            <td width="40">权重：</td>
-            <td width="141"><input name="weight" type="text" id="weight" style="width:50px" value="<?php echo $arcRow['weight'];?>" />
-              (越小越靠前)</td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr id="pictable">
-      <td height="24" colspan="2" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="81">&nbsp;缩 略 图：<br/></td>
-            <td><input name="picname" type="text" id="picname" style="width:300px" value="<?php echo $arcRow["litpic"]?>">
-              <input type="button" name="Submit" value="浏览..." style="width:70px" onClick="SelectImage('form1.picname','');">
-              <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg'/>
-              <input type='checkbox' class='np' name='ddisremote' value='1' />
-              远程 </td>
-            <td align="center"><img src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "images/pview.gif";?>" width="150" height="100" id="picview" name="picview"></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="2" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;文章来源：</td>
-            <td width="250"><input name="source" type="text" id="source" style="width:160px" value="<?php echo $arcRow["source"]?>" size="16">
-              <input name="selsource" type="button" id="selsource" value="选择" /></td>
-            <td width="90">作　者：</td>
-            <td><input name="writer" type="text" id="writer" style="width:120px" value="<?php echo $arcRow["writer"]?>">
-              <input name="selwriter" type="button" id="selwriter" value="选择" /></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="2" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;文章主栏目：</td>
-            <td><?php
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="2" class="bline" id="redirecturltr"
+          style="display:<?php echo (empty($addRow['redirecturl']) ? 'none' : 'block');?>">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;跳转网址：</td>
+              <td><input name="redirecturl" type="text" id="redirecturl" style="width:300px"
+                  value="<?php echo $addRow["redirecturl"]?>" /></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="400%" height="24" colspan="2" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;TAG标签：</td>
+              <td><input name="tags" type="text" id="tags" value="<?php echo $tags; ?>" style="width:300px" />
+                (','号分开，单个标签小于12字节)</td>
+              <td width="40">权重：</td>
+              <td width="141"><input name="weight" type="text" id="weight" style="width:50px"
+                  value="<?php echo $arcRow['weight'];?>" />
+                (越小越靠前)</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr id="pictable">
+        <td height="24" colspan="2" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="81">&nbsp;缩 略 图：<br /></td>
+              <td><input name="picname" type="text" id="picname" style="width:300px"
+                  value="<?php echo $arcRow["litpic"]?>">
+
+                <input type='checkbox' class='np' name='ddisremote' value='1' />
+                远程
+                <span class="btn btn-success fileinput-button">
+                  <i class="glyphicon glyphicon-plus"></i>
+                  选择图片
+                  <input type="file" name="files[]" id="iptAddImages">
+                </span>
+                <button id="btnClearAll" type="button" class="btn btn-danger delete">
+                  <i class="fa fa-trash-o"></i>
+                  <span>清空</span>
+                </button>
+              </td>
+              <td align="center">
+                <img id="litPic"
+                  src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "../static/defaultpic.gif";?>"
+                  style="height: 80px">
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="2" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文章来源：</td>
+              <td width="250"><input name="source" type="text" id="source" style="width:160px"
+                  value="<?php echo $arcRow["source"]?>" size="16">
+                <input name="selsource" type="button" id="selsource" value="选择" /></td>
+              <td width="90">作　者：</td>
+              <td><input name="writer" type="text" id="writer" style="width:120px"
+                  value="<?php echo $arcRow["writer"]?>">
+                <input name="selwriter" type="button" id="selwriter" value="选择" /></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="2" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文章主栏目：</td>
+              <td><?php
             $typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
             echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
             if($arcRow["typeid"]=="0") echo "<option value='0' selected>请选择栏目...</option>\r\n";
             echo $typeOptions;
             echo "</select>";
 			     ?>
-              <img src='images/menusearch.gif' style='cursor:pointer' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid', '<?php echo $arcRow['typeid']; ?>')" alt='快捷选择' title='快捷选择' />
-              <?php 
+                <img src='images/menusearch.gif' style='cursor:pointer'
+                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid', '<?php echo $arcRow['typeid']; ?>')"
+                  alt='快捷选择' title='快捷选择' />
+                <?php 
      			 if($cfg_remote_site=='Y')
      			 {
    				 ?>
-              <input name="isremote" type="checkbox" id="isremote" value="1" <?php if($cfg_title_site=='Y') echo "checked";?>>
-              是否同步远程发布
-              <?php GetFtp();?>
-              <?php
+                <input name="isremote" type="checkbox" id="isremote" value="1"
+                  <?php if($cfg_title_site=='Y') echo "checked";?>>
+                是否同步远程发布
+                <?php GetFtp();?>
+                <?php
      			 }
     		?></td>
-          </tr>
-        </table></td>
-    </tr>
-    <?php
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <?php
 if($cfg_need_typeid2=='Y') {
 ?>
-    <tr>
-      <td height="24" colspan="2" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;文章副栏目：</td>
-            <td><span id='typeid2ct'></span>
-              <input type='text' name='typeid2' id='typeid2' value='<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']); ?>' style='width:200px;' />
-              <img src='images/menusearch2.gif' style='cursor:pointer;' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2', '<?php echo $arcRow['typeid2']; ?>')" alt='选择副栏目' title='选择副栏目' /></td>
-          </tr>
-        </table></td>
-    </tr>
-    <?php } ?>
-    <tr>
-      <td colspan="2"><?php
+      <tr>
+        <td height="24" colspan="2" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;文章副栏目：</td>
+              <td><span id='typeid2ct'></span>
+                <input type='text' name='typeid2' id='typeid2'
+                  value='<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']); ?>' style='width:200px;' />
+                <img src='images/menusearch2.gif' style='cursor:pointer;'
+                  onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2', '<?php echo $arcRow['typeid2']; ?>')"
+                  alt='选择副栏目' title='选择副栏目' /></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <?php } ?>
+      <tr>
+        <td colspan="2"><?php
       PrintAutoFieldsEdit($cInfos['fieldset'],$addRow,'autofield');
       ?></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="2" bgcolor="#F9FCEF" class="bline2">&nbsp;文章内容：</td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" colspan="2" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;附加选项：</td>
-            <td><input name="remote" type="checkbox" class="np" id="remote" value="1" checked>
-              下载远程图片和资源
-              <input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" checked>
-              提取第一个图片为缩略图 </td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td width="100%"><?php GetEditor("body",stripcslashes($addRow['body']),450); ?></td>
-      <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
-    </tr>
-  </table>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="votehead" style="margin-top:10px;">
-    <tr>
-      <td><table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="84" height="24" align="center" background="images/itemnote1.gif"><a href='javascript:ShowHideT("voteset")'><u>插入投票</u></a></td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="voteset" style="border:1px solid #cfcfcf;background:#ffffff;">
-    <tr>
-      <td height="30"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="22">&nbsp;投票：</td>
-            <td><input type="text" name="voteid" id="voteid" value="<?php echo $arcRow['voteid']; ?>" />
-              <input name="selvote" type="button" id="selvote" value="选择投票" onClick="selectVote()" />
-              <input name="addvote" type="button" id="addvote" value="新增投票" onclick="addVote()" />
-              <input type="button" name="viewvote" id="viewvote" value="查看投票" onclick="viewVote()" /></td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
-  <!-- //高级参数 -->
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="adset" style="border:1px solid #cfcfcf;background:#ffffff;display:none">
-    <tr>
-      <td height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td  width="110" height="22">&nbsp;评论选项：</td>
-            <td width="250"><input type='radio' name='notpost' class='np' value='0'<?php if($arcRow['notpost']==0) echo " checked='1' "; ?>/>
-              允许评论
-              &nbsp;
-              <input type='radio' name='notpost' class='np' value='1'<?php if($arcRow['notpost']==1) echo " checked='1' "; ?>/>
-              禁止评论 </td>
-            <td width="90">浏览次数：</td>
-            <td><input type='text' name='click' value='<?php echo $arcRow['click']; ?>' style='width:100px;' /></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="110">&nbsp;文章排序：</td>
-            <td width="250"><select name="sortup" id="sortup" style="width:150">
-                <?php
+      </tr>
+      <tr>
+        <td height="24" colspan="2" bgcolor="#F9FCEF" class="bline2">&nbsp;文章内容：</td>
+      </tr>
+      <tr>
+        <td width="400%" height="24" colspan="2" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;附加选项：</td>
+              <td><input name="remote" type="checkbox" class="np" id="remote" value="1" checked>
+                下载远程图片和资源
+                <input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" checked>
+                提取第一个图片为缩略图 </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="100%"><?php GetEditor("body",stripcslashes($addRow['body']),450); ?></td>
+        <td width="255" align="center" valign="top" bgcolor="#FFFFCC" id="mPic" style="display:none"></td>
+      </tr>
+    </table>
+    <!-- //高级参数 -->
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
+      style="border:1px solid #cfcfcf;background:#ffffff;display:none">
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="110" height="22">&nbsp;评论选项：</td>
+              <td width="250"><input type='radio' name='notpost' class='np' value='0'
+                  <?php if($arcRow['notpost']==0) echo " checked='1' "; ?> />
+                允许评论
+                &nbsp;
+                <input type='radio' name='notpost' class='np' value='1'
+                  <?php if($arcRow['notpost']==1) echo " checked='1' "; ?> />
+                禁止评论 </td>
+              <td width="90">浏览次数：</td>
+              <td><input type='text' name='click' value='<?php echo $arcRow['click']; ?>' style='width:100px;' /></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="110">&nbsp;文章排序：</td>
+              <td width="250"><select name="sortup" id="sortup" style="width:150">
+                  <?php
                 $subday = SubDay($arcRow["sortrank"],$arcRow["pubdate"]);
                 echo "<option value='0'>正常排序</option>\r\n";
                 if($subday>0) echo "<option value='$subday' selected>置顶 $subday 天</option>\r\n";
                 ?>
-                <option value="7">置顶一周</option>
-                <option value="30">置顶一个月</option>
-                <option value="90">置顶三个月</option>
-                <option value="180">置顶半年</option>
-                <option value="360">置顶一年</option>
-              </select></td>
-            <td width="90">标题颜色：</td>
-            <td><input name="color" type="text" id="color" style="width:120" value="<?php echo $arcRow["color"]?>">
-              <input name="modcolor" type="button" id="modcolor" value="选取" onClick="ShowColor(event,this)"></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="110">&nbsp;阅读权限：</td>
-            <td width="250"><select name="arcrank" id="arcrank" style="width:150">
-                <option value='<?php echo $arcRow["arcrank"]?>'> <?php echo $arcRow["rankname"]?> </option>
-                <?php
+                  <option value="7">置顶一周</option>
+                  <option value="30">置顶一个月</option>
+                  <option value="90">置顶三个月</option>
+                  <option value="180">置顶半年</option>
+                  <option value="360">置顶一年</option>
+                </select></td>
+              <td width="90">标题颜色：</td>
+              <td><input name="color" type="text" id="color" style="width:120" value="<?php echo $arcRow["color"]?>">
+                <input name="modcolor" type="button" id="modcolor" value="选取" onClick="ShowColor(event,this)"></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="110">&nbsp;阅读权限：</td>
+              <td width="250"><select name="arcrank" id="arcrank" style="width:150">
+                  <option value='<?php echo $arcRow["arcrank"]?>'> <?php echo $arcRow["rankname"]?> </option>
+                  <?php
                 $urank = $cuserLogin->getUserRank();
 
                 $dsql->SetQuery("Select * from `#@__arcrank` where adminrank<='$urank'");
@@ -318,99 +347,122 @@ if($cfg_need_typeid2=='Y') {
                 	echo "     <option value='".$row->rank."'>".$row->membername."</option>\r\n";
                 }
               ?>
-              </select></td>
-            <td width="90">发布选项：</td>
-            <td><input name="ishtml" type="radio" class="np" value="1"<?php if($arcRow["ismake"]!=-1) echo " checked";?>>
-              生成HTML
-              <input type="radio" name="ishtml" class="np" value="0"<?php if($arcRow["ismake"]==-1) echo " checked";?>>
-              仅动态浏览 </td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="75" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="110">&nbsp;更新时间：</td>
-            <td width="250"><?php
+                </select></td>
+              <td width="90">发布选项：</td>
+              <td><input name="ishtml" type="radio" class="np" value="1"
+                  <?php if($arcRow["ismake"]!=-1) echo " checked";?>>
+                生成HTML
+                <input type="radio" name="ishtml" class="np" value="0"
+                  <?php if($arcRow["ismake"]==-1) echo " checked";?>>
+                仅动态浏览 </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="75" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="110">&nbsp;更新时间：</td>
+              <td width="250"><?php
           $nowtime = GetDateTimeMk(time());
           echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:120px;\">";
 			?>
-              <script language="javascript" type="text/javascript">
-					Calendar.setup({
-						inputField     :    "pubdate",
-						ifFormat       :    "%Y-%m-%d %H:%M:%S",
-						showsTime      :    true,
-						timeFormat     :    "24"
-					});
-				 </script></td>
-            <td width="92">消费金币：</td>
-            <td width="368"><input name="money" type="text" id="money" value="<?php echo $arcRow["money"]?>" size="10"></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="110" height="51">&nbsp;关键字：</td>
-            <td><input type="text"  name="keywords"  id="keywords" style="width:60%" value="<?php echo $arcRow["keywords"]?>" /></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="110" height="51">&nbsp;文章摘要：</td>
-            <td><textarea name="description" rows="5" id="description" style="width:80%"><?php echo $arcRow["description"]?></textarea></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="110">&nbsp;自定义文件名：</td>
-            <td><input type="text" name="filename" id="filename" value="<?php echo $arcRow["filename"]?>" />
-              （不包括后缀名如.html等）</td>
-            <td><?php
+                <script language="javascript" type="text/javascript">
+                  Calendar.setup({
+                    inputField: "pubdate",
+                    ifFormat: "%Y-%m-%d %H:%M:%S",
+                    showsTime: true,
+                    timeFormat: "24"
+                  });
+                </script>
+              </td>
+              <td width="92">消费金币：</td>
+              <td width="368"><input name="money" type="text" id="money" value="<?php echo $arcRow["money"]?>"
+                  size="10"></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="110" height="51">&nbsp;关键字：</td>
+              <td><input type="text" name="keywords" id="keywords" style="width:60%"
+                  value="<?php echo $arcRow["keywords"]?>" /></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="110" height="51">&nbsp;文章摘要：</td>
+              <td><textarea name="description" rows="5" id="description"
+                  style="width:80%"><?php echo $arcRow["description"]?></textarea></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="110">&nbsp;自定义文件名：</td>
+              <td><input type="text" name="filename" id="filename" value="<?php echo $arcRow["filename"]?>" />
+                （不包括后缀名如.html等）</td>
+              <td><?php
   if(isset($cfg_tamplate_rand) && $cfg_tamplate_rand==1)
   {
   ?>
-              模板选择：
-              <select name='templet' id='templet' style='width:200px' size='1'>
-                <?php
+                模板选择：
+                <select name='templet' id='templet' style='width:200px' size='1'>
+                  <?php
      foreach($cfg_tamplate_arr as $k=>$v)
      {
          $v = trim($v);
          echo ($v==$addRow['templet'] ? "<option value='$v' selected>$v</option>\r\n" : "<option value='$v'>$v</option>\r\n");
      }
  ?>
-              </select>
-              <?php
+                </select>
+                <?php
 	}
 	else{
 		echo "<input type='hidden' name='templet' value='{$addRow['templet']}' />";
 	}
   ?></td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none;">
-    <tr>
-      <td height="35"><table width="100%" border="0" cellspacing="1" cellpadding="1">
-          <tr>
-            <td width="17%">&nbsp;</td>
-            <td width="83%"><table width="214" border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                  <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np" border="0" style="cursor:pointer"></td>
-                  <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0" onClick="location.reload();" style="cursor:pointer"></td>
-                </tr>
-              </table></td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
-  <script language='javascript'>InitPage();</script>
-</form>
-<div id="__tmpbody" style="display:none"></div>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
+      style="border:1px solid #cfcfcf;border-top:none;">
+      <tr>
+        <td height="35">
+          <table width="100%" border="0" cellspacing="1" cellpadding="1">
+            <tr>
+              <td width="17%">&nbsp;</td>
+              <td width="83%">
+                <table width="214" border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60"
+                        height="22" class="np" border="0" style="cursor:pointer"></td>
+                    <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0"
+                        onClick="location.reload();" style="cursor:pointer"></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <script language='javascript'>InitPage();</script>
+  </form>
+  <div id="__tmpbody" style="display:none"></div>
 </body>
+
 </html>

src/dede/templets/catalog_add_quick.htm

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>栏目管理--快速创建栏目</title>
-<script type="text/javascript" src="../static/js/jquery/jquery.js"></script>
+<script type="text/javascript" src="../static/js/jquery.js"></script>
 <script type="text/javascript">
 var $ = jQuery;
 $(document).ready(function(){

src/dede/templets/co_edit.htm

@@ -4,17 +4,16 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>修改采集节点</title>
 <link href="css/base.css" rel="stylesheet" type="text/css" />
+<script language="javascript" src="../static/js/jquery.js"></script>
 <script language="javascript" src="js/main.js"></script>
 <script language="javascript" type="text/javascript" src="js/co.js"></script>
 <style type="text/css">
-<!--
 .STYLE2 {color: #666666}
 tr{display:compact}
 /*chrome调整*/
 @media screen and (-webkit-min-device-pixel-ratio:0) {
 	tr{display:table-row}
 } 
--->
 </style>
 </head>
 <body>

src/dede/templets/content_i_list.htm

@@ -1,149 +1,172 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>文档管理</title>
-<link rel="stylesheet" type="text/css" href="css/base.css">
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language="javascript" src="js/ieemu.js"></script>
-<script language="javascript" src="js/context_menu.js"></script>
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="js/list.js"></script>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+	<title>文档管理</title>
+	<link rel="stylesheet" type="text/css" href="css/base.css">
+	<script language="javascript" src="../static/js/jquery.js"></script>
+	<script language="javascript" src="../static/js/jquery.js"></script>
+	<script language="javascript" src="../static/js/dedeajax2.js"></script>
+	<script language="javascript" src="js/ieemu.js"></script>
+	<script language="javascript" src="js/context_menu.js"></script>
+	<script language="javascript" src="js/main.js"></script>
+	<script language="javascript" src="js/list.js"></script>
 </head>
+
 <body leftmargin="8" topmargin="8" background='images/allbg.gif' onLoad="ContextMenu.intializeContextMenu()">
 
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="1" bgcolor="#cfcfcf">
- <tr>
- <td align="center" height="28" background="images/newlinebg3.gif">
-	<input type='button' class="coolbg np" onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';" value='添加文档' />
-	{dede:if $adminid == $mid }
-	<input type='button' class="coolbg np" onClick="location='content_i_list.php?cid={dede:global.cid/}&mid=0';" value='全部文档' />
-	{else}
-	<input type='button' class="coolbg np" onClick="location='content_i_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';" value='我的文档' />
-	{/dede:if}
-	{dede:global.CheckUserSend/}
- <input type='button' class="coolbg np" onClick="location='catalog_main.php';" value='栏目管理' />
- <input type='button' class="coolbg np" name='bb1' onClick="location='makehtml_list.php?cid={dede:global.cid/}';" value='更新列表' />
- <input type='button' class="coolbg np" name='bb2' onClick="location='makehtml_archives.php?cid={dede:global.cid/}';" value='更新文档' />
- <input type='button' class="coolbg np" name='bb1' onClick="location='recycling.php?cid={dede:global.cid/}';" value='文章回收站' />
- </td>
- </tr>
-</table>
+	<table width="98%" border="0" align="center" cellpadding="0" cellspacing="1" bgcolor="#cfcfcf">
+		<tr>
+			<td align="center" height="28" background="images/newlinebg3.gif">
+				<input type='button' class="coolbg np"
+					onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';"
+					value='添加文档' />
+				{dede:if $adminid == $mid }
+				<input type='button' class="coolbg np"
+					onClick="location='content_i_list.php?cid={dede:global.cid/}&mid=0';" value='全部文档' />
+				{else}
+				<input type='button' class="coolbg np"
+					onClick="location='content_i_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';"
+					value='我的文档' />
+				{/dede:if}
+				{dede:global.CheckUserSend/}
+				<input type='button' class="coolbg np" onClick="location='catalog_main.php';" value='栏目管理' />
+				<input type='button' class="coolbg np" name='bb1'
+					onClick="location='makehtml_list.php?cid={dede:global.cid/}';" value='更新列表' />
+				<input type='button' class="coolbg np" name='bb2'
+					onClick="location='makehtml_archives.php?cid={dede:global.cid/}';" value='更新文档' />
+				<input type='button' class="coolbg np" name='bb1'
+					onClick="location='recycling.php?cid={dede:global.cid/}';" value='文章回收站' />
+			</td>
+		</tr>
+	</table>
 
-<table width='98%'border='0' cellpadding='2' cellspacing='1' bgcolor='#cfcfcf' align='center' style="margin-top:8px;">
-<tr bgcolor='#EEF4EA' height='26' >
-	<td background='images/wbg.gif' colspan='7' style="padding-left:10px;">
-		{dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键进行常用操作)
-	</td>
-</tr>
-<tr  bgcolor="#FBFCE2" height="25" align="center">
-	<td width="13%">文档图片</td>
-	<td width="35%">文档标题</td>
-	<td width="12%">类目</td>
-	<td width="11%">权限</td>
-	<td width="10%">发布人</td>
-	<td width="10%">HTML</td>
-	<td  width="9%">点击</td>
-</tr>
-</table>
+	<table width='98%' border='0' cellpadding='2' cellspacing='1' bgcolor='#cfcfcf' align='center'
+		style="margin-top:8px;">
+		<tr bgcolor='#EEF4EA' height='26'>
+			<td background='images/wbg.gif' colspan='7' style="padding-left:10px;">
+				{dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键进行常用操作)
+			</td>
+		</tr>
+		<tr bgcolor="#FBFCE2" height="25" align="center">
+			<td width="13%">文档图片</td>
+			<td width="35%">文档标题</td>
+			<td width="12%">类目</td>
+			<td width="11%">权限</td>
+			<td width="10%">发布人</td>
+			<td width="10%">HTML</td>
+			<td width="9%">点击</td>
+		</tr>
+	</table>
 
-<form name="form2">
-{dede:datalist}
-<table width="98%" border="0" cellpadding="1" cellspacing="1"
-	class='ilist'
-	bgcolor="{dede:label bind="GetColor('#FAFAF1','#FFFFFF')" /}"  align='center' style="margin-top:8px;">
-	<tr>
-	<td width="13%" align='center'>
-		<img src="{dede:field.litpic function='CheckPic(@me)' /}" width="80" height="60" alt="文档图片" border="0">
-	</td>
-	<td width="35%">
-		<input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np" />
-		<img src='images/trun.gif' title="编辑属性" alt="编辑属性" onClick="QuickEdit({dede:field.id/}, event, this);" style='cursor:pointer' border='0' width='16' height='16' />
-		<a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives"
-			oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="str_replace('\'', '', @me)" /}')">
-		<b>{dede:field.title/}{dede:field.flag function='IsCommendArchives(@me)'/}</b>
-		</a>
-		<br/>
-　　发布时间：{dede:field.senddate function='GetDateTimeMk(@me)' /}
-	</td>
-	<td width="12%" height="26" align="center">
-		{dede:field.typeid function='GetTypename(@me)'/}
-		<br />
-		ID: {dede:field.id/}
-	</td>
-	<td width="11%" align="center">{dede:field.arcrank function='GetRankName(@me)' /}</td>
-	<td width="10%" align="center">{dede:field.mid function=GetMemberName(@me)/}</td>
-	<td width="10%" align="center">{dede:field.ismake function='IsHtmlArchives(@me)' /}</td>
-	<td  width="9%" align="center">{dede:field.click/}</td>
-	</tr>
-</table>
-{/dede:datalist}
-</form>
+	<form name="form2">
+		{dede:datalist}
+		<table width="98%" border="0" cellpadding="1" cellspacing="1" class='ilist' bgcolor="{dede:label bind="
+			GetColor('#FAFAF1','#FFFFFF')" /}" align='center' style="margin-top:8px;">
+			<tr>
+				<td width="13%" align='center'>
+					<img src="{dede:field.litpic function='CheckPic(@me)' /}" width="80" height="60" alt="文档图片"
+						border="0">
+				</td>
+				<td width="35%">
+					<input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np" />
+					<img src='images/trun.gif' title="编辑属性" alt="编辑属性"
+						onClick="QuickEdit({dede:field.id/}, event, this);" style='cursor:pointer' border='0' width='16'
+						height='16' />
+					<a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives"
+						oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="
+						str_replace('\'', '' , @me)" /}')">
+						<b>{dede:field.title/}{dede:field.flag function='IsCommendArchives(@me)'/}</b>
+					</a>
+					<br />
+					　　发布时间：{dede:field.senddate function='GetDateTimeMk(@me)' /}
+				</td>
+				<td width="12%" height="26" align="center">
+					{dede:field.typeid function='GetTypename(@me)'/}
+					<br />
+					ID: {dede:field.id/}
+				</td>
+				<td width="11%" align="center">{dede:field.arcrank function='GetRankName(@me)' /}</td>
+				<td width="10%" align="center">{dede:field.mid function=GetMemberName(@me)/}</td>
+				<td width="10%" align="center">{dede:field.ismake function='IsHtmlArchives(@me)' /}</td>
+				<td width="9%" align="center">{dede:field.click/}</td>
+			</tr>
+		</table>
+		{/dede:datalist}
+	</form>
 
-<table width="98%" border="0" cellspacing="1" cellpadding="1" bgcolor='#cfcfcf' align='center' style="margin-top:8px;">
-	<tr bgcolor="#ffffff">
-	<td height="36" colspan="10">
-		&nbsp;
-		<a href="javascript:selAll()" class="coolbg">全选</a>
-		<a href="javascript:noSelAll()" class="coolbg">取消</a>
-		<a href="javascript:viewArc(0)" class="coolbg">&nbsp;查看&nbsp;</a>
-		<a href="javascript:editArc(0)" class="coolbg">&nbsp;更改&nbsp;</a>
-		<a href="javascript:updateArc(0)" class="coolbg">&nbsp;更新&nbsp;</a>
-		<a href="javascript:checkArc(0)" class="coolbg">&nbsp;审核&nbsp;</a>
-		<a href="javascript:adArc(0)" class="coolbg">&nbsp;推荐&nbsp;</a>
-		<a href="javascript:;" onClick="moveArc(event,this,<?php echo (empty($channelid) ? 0 : $channelid); ?>)" class="coolbg">&nbsp;移动&nbsp;</a>
-		<a href="javascript:delArc(0)" class="coolbg">&nbsp;删除&nbsp;</a>
-		<a href="javascript:;" onClick="cAtts('attsAdd',event,this)" class="coolbg">&nbsp;增加属性&nbsp;</a>
-		<a href="javascript:;" onClick="cAtts('attsDel',event,this)" class="coolbg">&nbsp;删除属性&nbsp;</a>
-	</td>
-	</tr>
-	<tr>
-	<td height="28" align="center" bgcolor="#F9FCEF">
-		{dede:pagelist listsize=5/}
-	</td>
-</tr>
-</table>
+	<table width="98%" border="0" cellspacing="1" cellpadding="1" bgcolor='#cfcfcf' align='center'
+		style="margin-top:8px;">
+		<tr bgcolor="#ffffff">
+			<td height="36" colspan="10">
+				&nbsp;
+				<a href="javascript:selAll()" class="coolbg">全选</a>
+				<a href="javascript:noSelAll()" class="coolbg">取消</a>
+				<a href="javascript:viewArc(0)" class="coolbg">&nbsp;查看&nbsp;</a>
+				<a href="javascript:editArc(0)" class="coolbg">&nbsp;更改&nbsp;</a>
+				<a href="javascript:updateArc(0)" class="coolbg">&nbsp;更新&nbsp;</a>
+				<a href="javascript:checkArc(0)" class="coolbg">&nbsp;审核&nbsp;</a>
+				<a href="javascript:adArc(0)" class="coolbg">&nbsp;推荐&nbsp;</a>
+				<a href="javascript:;" onClick="moveArc(event,this,<?php echo (empty($channelid) ? 0 : $channelid); ?>)"
+					class="coolbg">&nbsp;移动&nbsp;</a>
+				<a href="javascript:delArc(0)" class="coolbg">&nbsp;删除&nbsp;</a>
+				<a href="javascript:;" onClick="cAtts('attsAdd',event,this)" class="coolbg">&nbsp;增加属性&nbsp;</a>
+				<a href="javascript:;" onClick="cAtts('attsDel',event,this)" class="coolbg">&nbsp;删除属性&nbsp;</a>
+			</td>
+		</tr>
+		<tr>
+			<td height="28" align="center" bgcolor="#F9FCEF">
+				{dede:pagelist listsize=5/}
+			</td>
+		</tr>
+	</table>
 
-<form name='form3' action='content_i_list.php' method='get'>
-<input type='hidden' name='dopost' value='listArchives' />
-<table width='98%'  border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf' align="center" style="margin-top:8px">
- <tr>
-    <td background='images/wbg.gif' align='center'>
-	<table border='0' cellpadding='0' cellspacing='0' height="32">
-	   <tr >
-	      <td width='90' align='center'>请选择类目：</td>
-	      <td width='160'>
-	<select name='cid' style='width:150'>
- 	<option value='0'>选择分类...</option>
-		{dede:global.optionarr/}
-	</select>
-	</td>
-	<td width='70' background='images/wbg.gif'>
-	关键字：
-	</td>
-	<td width='160'>
-		<input type='text' name='keyword' value='{dede:global.keyword/}' style='width:150px;height:20px;' />
-	</td>
-	<td width='110'>
-    		<select name='orderby' style='width:80px'>
-            <option value='id'>排序...</option>
-            <option value='pubdate'>更新时间</option>
-            <option value='sortrank'>置顶权值</option>
-            <option value='click'>点击量</option>
-            <option value='scores'>评论积分</option>
-            <option value='lastpost'>最后评论</option>
-      	</select>
-   </td>
-	<td>
-		<input name="imageField" type="image" src="images/button_search.gif" width="60" height="22" border="0" class="np" />
- </td>
-</tr>
-</table>
-</td>
-</table>
-</form>
-</tr>
-</table>
+	<form name='form3' action='content_i_list.php' method='get'>
+		<input type='hidden' name='dopost' value='listArchives' />
+		<table width='98%' border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf' align="center"
+			style="margin-top:8px">
+			<tr>
+				<td background='images/wbg.gif' align='center'>
+					<table border='0' cellpadding='0' cellspacing='0' height="32">
+						<tr>
+							<td width='90' align='center'>请选择类目：</td>
+							<td width='160'>
+								<select name='cid' style='width:150'>
+									<option value='0'>选择分类...</option>
+									{dede:global.optionarr/}
+								</select>
+							</td>
+							<td width='70' background='images/wbg.gif'>
+								关键字：
+							</td>
+							<td width='160'>
+								<input type='text' name='keyword' value='{dede:global.keyword/}'
+									style='width:150px;height:20px;' />
+							</td>
+							<td width='110'>
+								<select name='orderby' style='width:80px'>
+									<option value='id'>排序...</option>
+									<option value='pubdate'>更新时间</option>
+									<option value='sortrank'>置顶权值</option>
+									<option value='click'>点击量</option>
+									<option value='scores'>评论积分</option>
+									<option value='lastpost'>最后评论</option>
+								</select>
+							</td>
+							<td>
+								<input name="imageField" type="image" src="images/button_search.gif" width="60"
+									height="22" border="0" class="np" />
+							</td>
+						</tr>
+					</table>
+				</td>
+		</table>
+	</form>
+	</tr>
+	</table>
 
 </body>
+
 </html>

src/dede/templets/content_list.htm

@@ -1,160 +1,186 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>文档管理</title>
-<link rel="stylesheet" type="text/css" href="css/base.css">
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language="javascript" src="js/ieemu.js"></script>
-<script language="javascript" src="js/context_menu.js"></script>
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="js/list.js"></script>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+	<title>文档管理</title>
+	<link rel="stylesheet" type="text/css" href="css/base.css">
+	<script language="javascript" src="../static/js/jquery.js"></script>
+	<script language="javascript" src="../static/js/dedeajax2.js"></script>
+	<script language="javascript" src="js/ieemu.js"></script>
+	<script language="javascript" src="js/context_menu.js"></script>
+	<script language="javascript" src="js/main.js"></script>
+	<script language="javascript" src="js/list.js"></script>
 </head>
+
 <body leftmargin="8" topmargin="8" background='images/allbg.gif' onLoad="ContextMenu.intializeContextMenu()">
 
-<!--  快速转换位置按钮  -->
-<table width="98%" border="0" cellpadding="0" cellspacing="1" bgcolor="#CFCFCF" align="center">
-<tr>
- <td height="26" background="images/newlinebg3.gif">
-  <table width="98%" border="0" cellspacing="0" cellpadding="0">
-  <tr>
-  <td align="center">
-  <input type='button' class="coolbg np" onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';" value='添加文档' />
-  {dede:if $adminid==$mid }
-	<input type='button' class="coolbg np" onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';" value='全部文档' />
-	{else}
-	<input type='button' class="coolbg np" onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';" value='我的文档' />
-	{/dede:if}
-	{dede:global.CheckUserSend/}
- <input type='button' class="coolbg np" onClick="location='catalog_main.php';" value='栏目管理' />
- <input type='button' class="coolbg np" name='bb1' onClick="location='makehtml_list.php?cid={dede:global.cid/}';" value='更新列表' />
- <input type='button' class="coolbg np" name='bb2' onClick="location='makehtml_archives.php?cid={dede:global.cid/}';" value='更新文档' />
- <input type='button' class="coolbg np" name='bb1' onClick="location='recycling.php?cid={dede:global.cid/}';" value='文章回收站' />
- </td>
- </tr>
-</table>
-</td>
-</tr>
-</table>
-  
-<!--  内容列表   -->
-<form name="form2">
-<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#CFCFCF" align="center" style="margin-top:8px">
-<tr bgcolor="#E7E7E7" >
-	<td height="28" colspan="10" background="images/tbg.gif" style="padding-left:10px;">
-	◆ {dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键弹出菜单)
-	</td>
-</tr>
-<tr align="center" bgcolor="#FBFCE2" height="25">
-	<td width="6%">ID</td>
-	<td width="4%">选择</td>
-	<td width="28%">文章标题</td>
-	<td width="10%">更新时间</td>
-	<td width="10%">类目</td>
-	<td width="8%">点击</td>
-	<td width="6%">HTML</td>
-	<td width="8%">权限</td>
-	<td width="8%">发布人</td>
-	<td width="10%">操作</td>
-</tr>
-{dede:datalist}
-<tr align='center' bgcolor="#FFFFFF" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
-	<td nowrap>
-		{dede:field.id/}
-	</td>
-	<td>
-		<input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np" />
-	</td>
-	<td align='left'>
-		<span id="arc{dede:field.id/}">
-			<a href='archives_do.php?aid={dede:field.id/}&dopost=editArchives'
-				 oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="str_replace('\'', '', @me)" /}')">
-				<u>{dede:field.title/}</u>
-			</a>
-		</span>
-		{dede:field.flag function='IsCommendArchives(@me)'/}
-	</td>
-	<td>{dede:field.senddate function='GetDateMk(@me)'/}</td>
-	<td><a href='content_list.php?cid={dede:field.typeid/}'>{dede:field.typeid function='GetTypename(@me)'/}</a></td>
-	<td>{dede:field.click/}</td>
-	<td>{dede:field.ismake function="IsHtmlArchives(@me)"/}</td>
-	<td>{dede:field.arcrank function="GetRankName(@me)"/}</td>
-	<td>{dede:field.mid function=GetMemberName(@me)/}</td>
-	<td>
-		<img src='images/trun.gif' title="编辑属性" alt="编辑属性" onClick="QuickEdit({dede:field.id/}, event, this);" style='cursor:pointer' border='0' width='16' height='16' />
-		<img src='images/gtk-edit.png' title="编辑" alt="编辑" onClick="editArc({dede:field.id/});" style='cursor:pointer' border='0' width='16' height='16' />
-		<img src='images/part-list.gif' title="预览" alt="预览" onClick="viewArc({dede:field.id/});" style='cursor:pointer' border='0' width='16' height='16' />
-	</td>
-</tr>
-{/dede:datalist}
-<tr bgcolor="#ffffff">
-<td height="36" colspan="10">
-	&nbsp;
-	<a href="javascript:selAll()" class="coolbg">全选</a>
-	<a href="javascript:noSelAll()" class="coolbg">取消</a>
-	<a href="javascript:updateArc(0)" class="coolbg">&nbsp;更新&nbsp;</a>
-	<a href="javascript:checkArc(0)" class="coolbg">&nbsp;审核&nbsp;</a>
-	<a href="javascript:adArc(0)" class="coolbg">&nbsp;推荐&nbsp;</a>
-	<a href="javascript:;" onClick="moveArc(event,this,<?php echo (empty($channelid) ? 0 : $channelid); ?>)" class="coolbg">&nbsp;移动&nbsp;</a>
-	<a href="javascript:delArc(0)" class="coolbg">&nbsp;删除&nbsp;</a>
-	<?php if($channelid==1) echo "	<a href=\"javascript:kwArc(0)\" class=\"coolbg\">&nbsp;自动关键字&nbsp;</a>\r\n"; ?>
-	<a href="javascript:;" onClick="cAtts('attsAdd',event,this)" class="coolbg">&nbsp;增加属性&nbsp;</a>
-	<a href="javascript:;" onClick="cAtts('attsDel',event,this)" class="coolbg">&nbsp;删除属性&nbsp;</a>
-</td>
-</tr>
-</form>
-<tr align="right" bgcolor="#F9FCEF">
-	<td height="36" colspan="10" align="center">
-		{dede:pagelist listsize=3/}
-	</td>
-</tr>
-</table>
+	<!--  快速转换位置按钮  -->
+	<table width="98%" border="0" cellpadding="0" cellspacing="1" bgcolor="#CFCFCF" align="center">
+		<tr>
+			<td height="26" background="images/newlinebg3.gif">
+				<table width="98%" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td align="center">
+							<input type='button' class="coolbg np"
+								onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';"
+								value='添加文档' />
+							{dede:if $adminid==$mid }
+							<input type='button' class="coolbg np"
+								onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';" value='全部文档' />
+							{else}
+							<input type='button' class="coolbg np"
+								onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';"
+								value='我的文档' />
+							{/dede:if}
+							{dede:global.CheckUserSend/}
+							<input type='button' class="coolbg np" onClick="location='catalog_main.php';"
+								value='栏目管理' />
+							<input type='button' class="coolbg np" name='bb1'
+								onClick="location='makehtml_list.php?cid={dede:global.cid/}';" value='更新列表' />
+							<input type='button' class="coolbg np" name='bb2'
+								onClick="location='makehtml_archives.php?cid={dede:global.cid/}';" value='更新文档' />
+							<input type='button' class="coolbg np" name='bb1'
+								onClick="location='recycling.php?cid={dede:global.cid/}';" value='文章回收站' />
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
 
-<!--  搜索表单  -->
-<form name='form3' action='content_list.php' method='get'>
-<input type='hidden' name='dopost' value='listArchives' />
-<table width='98%'  border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf' align="center" style="margin-top:8px">
-  <tr bgcolor='#EEF4EA'>
-    <td background='images/wbg.gif' align='center'>
-      <table border='0' cellpadding='0' cellspacing='0' height="32">
-        <tr>
-          <td width='160'>
-          <select name='cid' style='width:150px'>
-          <option value='0'>选择栏目...</option>
-          	{dede:global.optionarr /}
-          </select>
-        </td >
-        <td nowrap>
-          关键字：
-        </td>
-        <td width='130'>
-          	<input type='text' name='keyword' value='{dede:global.keyword/}' style='width:120px' />
-        </td>
-        <td width='90'>
-    		<select name='orderby' style='width:80px'>
-            <option value='id'>排序...</option>
-            <option value='pubdate'>更新时间</option>
-            <option value='sortrank'>置顶权值</option>
-            <option value='click'>点击量</option>
-            <option value='scores'>评论积分</option>
-            <option value='lastpost'>最后评论</option>
-      	</select>
-      </td>
-      <td width='90'>
-    		<select name='flag' style='width:80px'>
-            <option value=''>属性...</option>
-            {dede:global.flagsArr /}
-      	</select>
-      </td>
-       <td>
-          <input name="imageField" type="image" src="images/button_search.gif" width="60" height="22" border="0" class="np" />
-       </td>
-      </tr>
-     </table>
-   </td>
-  </tr>
-</table>
-</form>
+	<!--  内容列表   -->
+	<form name="form2">
+		<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#CFCFCF" align="center"
+			style="margin-top:8px">
+			<tr bgcolor="#E7E7E7">
+				<td height="28" colspan="10" background="images/tbg.gif" style="padding-left:10px;">
+					◆ {dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键弹出菜单)
+				</td>
+			</tr>
+			<tr align="center" bgcolor="#FBFCE2" height="25">
+				<td width="6%">ID</td>
+				<td width="4%">选择</td>
+				<td width="28%">文章标题</td>
+				<td width="10%">更新时间</td>
+				<td width="10%">类目</td>
+				<td width="8%">点击</td>
+				<td width="6%">HTML</td>
+				<td width="8%">权限</td>
+				<td width="8%">发布人</td>
+				<td width="10%">操作</td>
+			</tr>
+			{dede:datalist}
+			<tr align='center' bgcolor="#FFFFFF" height="26" align="center"
+				onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
+				<td nowrap>
+					{dede:field.id/}
+				</td>
+				<td>
+					<input name="arcID" type="checkbox" id="arcID" value="{dede:field.id/}" class="np" />
+				</td>
+				<td align='left'>
+					<span id="arc{dede:field.id/}">
+						<a href='archives_do.php?aid={dede:field.id/}&dopost=editArchives'
+							oncontextmenu="ShowMenu(event,this,{dede:field.id/},'{dede:field.title function="
+							str_replace('\'', '' , @me)" /}')">
+							<u>{dede:field.title/}</u>
+						</a>
+					</span>
+					{dede:field.flag function='IsCommendArchives(@me)'/}
+				</td>
+				<td>{dede:field.senddate function='GetDateMk(@me)'/}</td>
+				<td><a href='content_list.php?cid={dede:field.typeid/}'>{dede:field.typeid
+						function='GetTypename(@me)'/}</a></td>
+				<td>{dede:field.click/}</td>
+				<td>{dede:field.ismake function="IsHtmlArchives(@me)"/}</td>
+				<td>{dede:field.arcrank function="GetRankName(@me)"/}</td>
+				<td>{dede:field.mid function=GetMemberName(@me)/}</td>
+				<td>
+					<img src='images/trun.gif' title="编辑属性" alt="编辑属性"
+						onClick="QuickEdit({dede:field.id/}, event, this);" style='cursor:pointer' border='0' width='16'
+						height='16' />
+					<img src='images/gtk-edit.png' title="编辑" alt="编辑" onClick="editArc({dede:field.id/});"
+						style='cursor:pointer' border='0' width='16' height='16' />
+					<img src='images/part-list.gif' title="预览" alt="预览" onClick="viewArc({dede:field.id/});"
+						style='cursor:pointer' border='0' width='16' height='16' />
+				</td>
+			</tr>
+			{/dede:datalist}
+			<tr bgcolor="#ffffff">
+				<td height="36" colspan="10">
+					&nbsp;
+					<a href="javascript:selAll()" class="coolbg">全选</a>
+					<a href="javascript:noSelAll()" class="coolbg">取消</a>
+					<a href="javascript:updateArc(0)" class="coolbg">&nbsp;更新&nbsp;</a>
+					<a href="javascript:checkArc(0)" class="coolbg">&nbsp;审核&nbsp;</a>
+					<a href="javascript:adArc(0)" class="coolbg">&nbsp;推荐&nbsp;</a>
+					<a href="javascript:;"
+						onClick="moveArc(event,this,<?php echo (empty($channelid) ? 0 : $channelid); ?>)"
+						class="coolbg">&nbsp;移动&nbsp;</a>
+					<a href="javascript:delArc(0)" class="coolbg">&nbsp;删除&nbsp;</a>
+					<?php if($channelid==1) echo "	<a href=\"javascript:kwArc(0)\" class=\"coolbg\">&nbsp;自动关键字&nbsp;</a>\r\n"; ?>
+					<a href="javascript:;" onClick="cAtts('attsAdd',event,this)" class="coolbg">&nbsp;增加属性&nbsp;</a>
+					<a href="javascript:;" onClick="cAtts('attsDel',event,this)" class="coolbg">&nbsp;删除属性&nbsp;</a>
+				</td>
+			</tr>
+	</form>
+	<tr align="right" bgcolor="#F9FCEF">
+		<td height="36" colspan="10" align="center">
+			{dede:pagelist listsize=3/}
+		</td>
+	</tr>
+	</table>
+
+	<!--  搜索表单  -->
+	<form name='form3' action='content_list.php' method='get'>
+		<input type='hidden' name='dopost' value='listArchives' />
+		<table width='98%' border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf' align="center"
+			style="margin-top:8px">
+			<tr bgcolor='#EEF4EA'>
+				<td background='images/wbg.gif' align='center'>
+					<table border='0' cellpadding='0' cellspacing='0' height="32">
+						<tr>
+							<td width='160'>
+								<select name='cid' style='width:150px'>
+									<option value='0'>选择栏目...</option>
+									{dede:global.optionarr /}
+								</select>
+							</td>
+							<td nowrap>
+								关键字：
+							</td>
+							<td width='130'>
+								<input type='text' name='keyword' value='{dede:global.keyword/}' style='width:120px' />
+							</td>
+							<td width='90'>
+								<select name='orderby' style='width:80px'>
+									<option value='id'>排序...</option>
+									<option value='pubdate'>更新时间</option>
+									<option value='sortrank'>置顶权值</option>
+									<option value='click'>点击量</option>
+									<option value='scores'>评论积分</option>
+									<option value='lastpost'>最后评论</option>
+								</select>
+							</td>
+							<td width='90'>
+								<select name='flag' style='width:80px'>
+									<option value=''>属性...</option>
+									{dede:global.flagsArr /}
+								</select>
+							</td>
+							<td>
+								<input name="imageField" type="image" src="images/button_search.gif" width="60"
+									height="22" border="0" class="np" />
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</form>
 
 </body>
+
 </html>

src/dede/templets/content_sg_list.htm

@@ -1,272 +1,285 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>文档管理</title>
-<link rel="stylesheet" type="text/css" href="css/base.css">
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language="javascript" src="js/ieemu.js"></script>
-<script language="javascript" src="js/context_menu.js"></script>
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript">
-if(moz) {
-	extendEventObject();
-	extendElementModel();
-	emulateAttachEvent();
-}
-function viewArc(aid){
-	if(aid==0) aid = getOneItem();
-	window.open("archives_do.php?aid="+aid+"&dopost=viewArchives");
-}
-function editArc(aid){
-	if(aid==0) aid = getOneItem();
-	location="archives_do.php?aid="+aid+"&dopost=editArchives";
-}
-function checkArc(aid){
-	var qstr=getCheckboxItem();
-	if(aid==0) aid = getOneItem();
-	location="archives_do.php?aid="+aid+"&dopost=checkArchives&qstr="+qstr;
-}
-function updateArc(aid){
-	var qstr=getCheckboxItem();
-	if(aid==0) aid = getOneItem();
-	location="archives_do.php?aid="+aid+"&dopost=makeArchives&qstr="+qstr;
-}
-function moveArc(aid){
-	var qstr=getCheckboxItem();
-	if(aid==0) aid = getOneItem();
-	location="archives_do.php?aid="+aid+"&dopost=moveArchives&qstr="+qstr;
-}
-function delArc(aid){
-	var qstr=getCheckboxItem();
-	if(aid==0) aid = getOneItem();
-	location="archives_do.php?qstr="+qstr+"&aid="+aid+"&dopost=delArchives";
-}
-function adArc(aid){
-	var qstr=getCheckboxItem();
-	if(aid==0) aid = getOneItem();
-	location="archives_do.php?aid="+aid+"&dopost=commendArchives&qstr="+qstr;
-}
-function moveArc(e, obj, cid){
-	var qstr=getCheckboxItem();
-	if(qstr=='')
-	{
-		alert('必须选择一个或多个文档！');
-		return;
-	}
-	LoadQuickDiv(e, 'archives_do.php?dopost=moveArchives&qstr='+qstr+'&channelid='+cid+'&rnd='+Math.random(), 'moveArchives', '450px', '180px');
-	ChangeFullDiv('show');
-}
-//上下文菜单
-function ShowMenu(evt,obj,aid,atitle)
-{
-  var popupoptions
-  popupoptions = [
-    new ContextItem("浏览文档",function(){ viewArc(aid); }),
-    new ContextItem("编辑文档",function(){ editArc(aid); }),
-    new ContextSeperator(),
-    new ContextItem("更新HTML",function(){ updateArc(aid); }),
-    new ContextItem("审核文档",function(){ checkArc(aid); }),
-    new ContextItem("推荐文档",function(){ adArc(aid); }),
-    new ContextItem("删除文档",function(){ delArc(aid); }),
-    new ContextSeperator(),
-    new ContextItem("复制(<u>C</u>)",function(){ copyToClipboard(atitle); }),
-    new ContextItem("重载页面",function(){ location.reload(); }),
-    new ContextSeperator(),
-    new ContextItem("全部选择",function(){ selAll(); }),
-    new ContextItem("取消选择",function(){ noSelAll(); }),
-    new ContextSeperator(),
-    new ContextItem("关闭菜单",function(){})
-  ]
-  ContextMenu.display(evt,popupoptions);
-  //location="catalog_main.php";
-}
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+	<title>文档管理</title>
+	<link rel="stylesheet" type="text/css" href="css/base.css">
+	<script language="javascript" src="../static/js/jquery.js"></script>
+	<script language="javascript" src="../static/js/dedeajax2.js"></script>
+	<script language="javascript" src="js/ieemu.js"></script>
+	<script language="javascript" src="js/context_menu.js"></script>
+	<script language="javascript" src="js/main.js"></script>
+	<script language="javascript">
+		if (moz) {
+			extendEventObject();
+			extendElementModel();
+			emulateAttachEvent();
+		}
+		function viewArc(aid) {
+			if (aid == 0) aid = getOneItem();
+			window.open("archives_do.php?aid=" + aid + "&dopost=viewArchives");
+		}
+		function editArc(aid) {
+			if (aid == 0) aid = getOneItem();
+			location = "archives_do.php?aid=" + aid + "&dopost=editArchives";
+		}
+		function checkArc(aid) {
+			var qstr = getCheckboxItem();
+			if (aid == 0) aid = getOneItem();
+			location = "archives_do.php?aid=" + aid + "&dopost=checkArchives&qstr=" + qstr;
+		}
+		function updateArc(aid) {
+			var qstr = getCheckboxItem();
+			if (aid == 0) aid = getOneItem();
+			location = "archives_do.php?aid=" + aid + "&dopost=makeArchives&qstr=" + qstr;
+		}
+		function moveArc(aid) {
+			var qstr = getCheckboxItem();
+			if (aid == 0) aid = getOneItem();
+			location = "archives_do.php?aid=" + aid + "&dopost=moveArchives&qstr=" + qstr;
+		}
+		function delArc(aid) {
+			var qstr = getCheckboxItem();
+			if (aid == 0) aid = getOneItem();
+			location = "archives_do.php?qstr=" + qstr + "&aid=" + aid + "&dopost=delArchives";
+		}
+		function adArc(aid) {
+			var qstr = getCheckboxItem();
+			if (aid == 0) aid = getOneItem();
+			location = "archives_do.php?aid=" + aid + "&dopost=commendArchives&qstr=" + qstr;
+		}
+		function moveArc(e, obj, cid) {
+			var qstr = getCheckboxItem();
+			if (qstr == '') {
+				alert('必须选择一个或多个文档！');
+				return;
+			}
+			LoadQuickDiv(e, 'archives_do.php?dopost=moveArchives&qstr=' + qstr + '&channelid=' + cid + '&rnd=' + Math.random(), 'moveArchives', '450px', '180px');
+			ChangeFullDiv('show');
+		}
+		//上下文菜单
+		function ShowMenu(evt, obj, aid, atitle) {
+			var popupoptions
+			popupoptions = [
+				new ContextItem("浏览文档", function () { viewArc(aid); }),
+				new ContextItem("编辑文档", function () { editArc(aid); }),
+				new ContextSeperator(),
+				new ContextItem("更新HTML", function () { updateArc(aid); }),
+				new ContextItem("审核文档", function () { checkArc(aid); }),
+				new ContextItem("推荐文档", function () { adArc(aid); }),
+				new ContextItem("删除文档", function () { delArc(aid); }),
+				new ContextSeperator(),
+				new ContextItem("复制(<u>C</u>)", function () { copyToClipboard(atitle); }),
+				new ContextItem("重载页面", function () { location.reload(); }),
+				new ContextSeperator(),
+				new ContextItem("全部选择", function () { selAll(); }),
+				new ContextItem("取消选择", function () { noSelAll(); }),
+				new ContextSeperator(),
+				new ContextItem("关闭菜单", function () { })
+			]
+			ContextMenu.display(evt, popupoptions);
+			//location="catalog_main.php";
+		}
 
-//获得选中文件的文件名
-function getCheckboxItem()
-{
-	var allSel="";
-	if(document.form2.arcID.value) return document.form2.arcID.value;
-	for(i=0;i<document.form2.arcID.length;i++)
-	{
-		if(document.form2.arcID[i].checked)
-		{
-			if(allSel=="")
-				allSel=document.form2.arcID[i].value;
-			else
-				allSel=allSel+"`"+document.form2.arcID[i].value;
+		//获得选中文件的文件名
+		function getCheckboxItem() {
+			var allSel = "";
+			if (document.form2.arcID.value) return document.form2.arcID.value;
+			for (i = 0; i < document.form2.arcID.length; i++) {
+				if (document.form2.arcID[i].checked) {
+					if (allSel == "")
+						allSel = document.form2.arcID[i].value;
+					else
+						allSel = allSel + "`" + document.form2.arcID[i].value;
+				}
+			}
+			return allSel;
 		}
-	}
-	return allSel;
-}
 
-//获得选中其中一个的id
-function getOneItem()
-{
-	var allSel="";
-	if(document.form2.arcID.value) return document.form2.arcID.value;
-	for(i=0;i<document.form2.arcID.length;i++)
-	{
-		if(document.form2.arcID[i].checked)
-		{
-				allSel = document.form2.arcID[i].value;
-				break;
+		//获得选中其中一个的id
+		function getOneItem() {
+			var allSel = "";
+			if (document.form2.arcID.value) return document.form2.arcID.value;
+			for (i = 0; i < document.form2.arcID.length; i++) {
+				if (document.form2.arcID[i].checked) {
+					allSel = document.form2.arcID[i].value;
+					break;
+				}
+			}
+			return allSel;
 		}
-	}
-	return allSel;
-}
 
-function selAll()
-{
-	for(i=0;i<document.form2.arcID.length;i++)
-	{
-		if(!document.form2.arcID[i].checked)
-		{
-			document.form2.arcID[i].checked=true;
+		function selAll() {
+			for (i = 0; i < document.form2.arcID.length; i++) {
+				if (!document.form2.arcID[i].checked) {
+					document.form2.arcID[i].checked = true;
+				}
+			}
 		}
-	}
-}
-function noSelAll()
-{
-	for(i=0;i<document.form2.arcID.length;i++)
-	{
-		if(document.form2.arcID[i].checked)
-		{
-			document.form2.arcID[i].checked=false;
+		function noSelAll() {
+			for (i = 0; i < document.form2.arcID.length; i++) {
+				if (document.form2.arcID[i].checked) {
+					document.form2.arcID[i].checked = false;
+				}
+			}
 		}
-	}
-}
-</script>
+	</script>
 </head>
+
 <body leftmargin="8" topmargin="8" background='images/allbg.gif' onLoad="ContextMenu.intializeContextMenu()">
-<table width='98%' border='0' align='center' cellpadding='0' cellspacing='0' align="center">
-<tr>
-<td align='center' valign='top'>
-	<table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#D6D6D6">
+	<table width='98%' border='0' align='center' cellpadding='0' cellspacing='0' align="center">
 		<tr>
-    <td height="26" background="images/newlinebg3.gif">
-    <table width="98%" border="0" cellspacing="0" cellpadding="0">
-     <tr>
-     <td align="center">
-  <input type='button' class="coolbg np" onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';" value='添加文档' />
-  {dede:if $adminid==$mid }
-	<input type='button' class="coolbg np" onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';" value='全部文档' />
-	{else}
-	<input type='button' class="coolbg np" onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';" value='我的文档' />
-	{/dede:if}
- <input type='button' class="coolbg np" onClick="location='catalog_main.php';" value='栏目管理' />
- <input type='button' class="coolbg np" name='bb1' onClick="location='makehtml_list.php?cid={dede:global.cid/}';" value='更新列表' />
-	<input type='button' class="coolbg np" name='bb2' onClick="location='makehtml_archives.php?cid={dede:global.cid/}';" value='更新文档' />
-	<?php echo $CheckUserSend; ?>
-       </td>
-     </tr>
-    </table>
-    </td>
-    </tr>
-  </table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr bgcolor="#FFFFFF"><td height="4"></td></tr>
-</table>
-<table width="100%" border="0" cellpadding="2" cellspacing="1" bgcolor="#cfcfcf">
-<tr bgcolor="#E7E7E7">
-<td height="24" colspan="9" background="images/tbg.gif" style="padding-left:10px;">{dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键进行常用操作)
-</td>
-</tr>
-<form name="form2">
-<tr align="center" bgcolor="#FBFCE2" height="25">
-<td width="6%">ID</td>
-<td width="6%">选择</td>
-<td width="26%">文章标题</td>
-<td width="11%">更新时间</td>
-<td width="11%">类目</td>
-<td width="10%">权限</td>
-<td width="8%">点击</td>
-<td width="10%">发布人</td>
-<td width="10%">操作</td>
-</tr>
-{dede:datalist}
-<tr align='center' bgcolor="#FFFFFF"  onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';" height="22">
-<td>{dede:field.id/}</td>
-<td><input name="arcID" type="checkbox" id="arcID" value="{dede:field.aid/}" class="np"></td>
-<td align='left'>
-<a href='archives_do.php?aid={dede:field.aid/}&dopost=editArchives'
-	oncontextmenu="ShowMenu(event,this,{dede:field.aid/},'{dede:field.title function="str_replace('\'', '', @me)" /}')">
-	<u>{dede:field.title/}{dede:field.flag function='IsCommendArchives(@me)'/}</u>
-</a>
-</td>
-<td>{dede:field.senddate function='GetDateMk(@me)'/}</td>
-<td>{dede:field.typename/}</td>
-<td>{dede:field.arcrank function="GetRankName(@me)"/}</td>
-<td>{dede:field.click/}</td>
-<td>{dede:field.mid function=GetMemberName(@me)/}</td>
-<td>
-<a href="javascript:editArc({dede:field.aid/})">编辑</a> |
-<a href="javascript:viewArc({dede:field.aid/})">预览</a>
-</td>
-</tr>
-{/dede:datalist}
-<tr bgcolor="#ffffff">
-<td height="24" colspan="9">
-&nbsp;
-<a href="javascript:selAll()" class="coolbg">全选</a>
-<a href="javascript:noSelAll()" class="coolbg">取消</a>
-<a href="javascript:updateArc(0)" class="coolbg">&nbsp;更新&nbsp;</a>
-<a href="javascript:checkArc(0)" class="coolbg">&nbsp;审核&nbsp;</a>
-<a href="javascript:adArc(0)" class="coolbg">&nbsp;推荐&nbsp;</a>
-<a href="javascript:;" onClick="moveArc(event,this,<?php echo (empty($channelid) ? 0 : $channelid); ?>)" class="coolbg">&nbsp;移动&nbsp;</a>
-<a href="javascript:delArc(0)" class="coolbg">&nbsp;删除&nbsp;</a>
-</td>
-</tr>
-</form>
-<tr align="right" bgcolor="#F9FCEF">
-<td height="20" colspan="9" align="center">
-	{dede:pagelist listsize=3/}
-</td>
-</tr>
-</table>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-<tr>
-<td height="4"></td>
-</tr>
-<tr bgcolor="#FFFFFF">
-<td height="26">
-<table width='100%'  border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf'>
-   <tr bgcolor='#EEF4EA'>
-          <form name='form3' action='content_sg_list.php' method='get'>
-          <input type='hidden' name='dopost' value='listArchives'>
-          <td background='images/wbg.gif'>
-          	<table width='600' border='0' cellpadding='0' cellspacing='0'>
-          	<tr>
-          	<td width='90' align='center'>请选择类目：</td>
-          	<td width='160'>
-          <select name='cid' style='width:150'>
-          <option value='0'>选择分类...</option>
-          	{dede:global.optionarr/}
-          </select>
-        </td>
-        <td width='70'>
-          关键字：
-        </td>
-          <td width='160'>
-          	<input type='text' name='keyword' value='{dede:global.keyword/}' style='width:150'>
-          </td>
-          <td>
-          <input name="imageField" type="image" src="images/button_search.gif" width="60" height="22" border="0" class="np">
-         </td>
-        </tr>
-        </table>
-          </td>
-        </form>
-        </tr>
-   </table>
-</td>
-</tr>
-<tr>
-<td colspan="2" height="4"></td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
+			<td align='center' valign='top'>
+				<table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#D6D6D6">
+					<tr>
+						<td height="26" background="images/newlinebg3.gif">
+							<table width="98%" border="0" cellspacing="0" cellpadding="0">
+								<tr>
+									<td align="center">
+										<input type='button' class="coolbg np"
+											onClick="location='catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives';"
+											value='添加文档' />
+										{dede:if $adminid==$mid }
+										<input type='button' class="coolbg np"
+											onClick="location='content_list.php?cid={dede:global.cid/}&mid=0';"
+											value='全部文档' />
+										{else}
+										<input type='button' class="coolbg np"
+											onClick="location='content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID(); ?>';"
+											value='我的文档' />
+										{/dede:if}
+										<input type='button' class="coolbg np" onClick="location='catalog_main.php';"
+											value='栏目管理' />
+										<input type='button' class="coolbg np" name='bb1'
+											onClick="location='makehtml_list.php?cid={dede:global.cid/}';"
+											value='更新列表' />
+										<input type='button' class="coolbg np" name='bb2'
+											onClick="location='makehtml_archives.php?cid={dede:global.cid/}';"
+											value='更新文档' />
+										<?php echo $CheckUserSend; ?>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<table width="100%" border="0" cellpadding="0" cellspacing="0">
+					<tr bgcolor="#FFFFFF">
+						<td height="4"></td>
+					</tr>
+				</table>
+				<table width="100%" border="0" cellpadding="2" cellspacing="1" bgcolor="#cfcfcf">
+					<tr bgcolor="#E7E7E7">
+						<td height="24" colspan="9" background="images/tbg.gif" style="padding-left:10px;">
+							{dede:global.positionname/}文档列表 &nbsp;(使用鼠标右键进行常用操作)
+						</td>
+					</tr>
+					<form name="form2">
+						<tr align="center" bgcolor="#FBFCE2" height="25">
+							<td width="6%">ID</td>
+							<td width="6%">选择</td>
+							<td width="26%">文章标题</td>
+							<td width="11%">更新时间</td>
+							<td width="11%">类目</td>
+							<td width="10%">权限</td>
+							<td width="8%">点击</td>
+							<td width="10%">发布人</td>
+							<td width="10%">操作</td>
+						</tr>
+						{dede:datalist}
+						<tr align='center' bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';"
+							onMouseOut="javascript:this.bgColor='#FFFFFF';" height="22">
+							<td>{dede:field.id/}</td>
+							<td><input name="arcID" type="checkbox" id="arcID" value="{dede:field.aid/}" class="np">
+							</td>
+							<td align='left'>
+								<a href='archives_do.php?aid={dede:field.aid/}&dopost=editArchives'
+									oncontextmenu="ShowMenu(event,this,{dede:field.aid/},'{dede:field.title function="
+									str_replace('\'', '' , @me)" /}')">
+									<u>{dede:field.title/}{dede:field.flag function='IsCommendArchives(@me)'/}</u>
+								</a>
+							</td>
+							<td>{dede:field.senddate function='GetDateMk(@me)'/}</td>
+							<td>{dede:field.typename/}</td>
+							<td>{dede:field.arcrank function="GetRankName(@me)"/}</td>
+							<td>{dede:field.click/}</td>
+							<td>{dede:field.mid function=GetMemberName(@me)/}</td>
+							<td>
+								<a href="javascript:editArc({dede:field.aid/})">编辑</a> |
+								<a href="javascript:viewArc({dede:field.aid/})">预览</a>
+							</td>
+						</tr>
+						{/dede:datalist}
+						<tr bgcolor="#ffffff">
+							<td height="24" colspan="9">
+								&nbsp;
+								<a href="javascript:selAll()" class="coolbg">全选</a>
+								<a href="javascript:noSelAll()" class="coolbg">取消</a>
+								<a href="javascript:updateArc(0)" class="coolbg">&nbsp;更新&nbsp;</a>
+								<a href="javascript:checkArc(0)" class="coolbg">&nbsp;审核&nbsp;</a>
+								<a href="javascript:adArc(0)" class="coolbg">&nbsp;推荐&nbsp;</a>
+								<a href="javascript:;"
+									onClick="moveArc(event,this,<?php echo (empty($channelid) ? 0 : $channelid); ?>)"
+									class="coolbg">&nbsp;移动&nbsp;</a>
+								<a href="javascript:delArc(0)" class="coolbg">&nbsp;删除&nbsp;</a>
+							</td>
+						</tr>
+					</form>
+					<tr align="right" bgcolor="#F9FCEF">
+						<td height="20" colspan="9" align="center">
+							{dede:pagelist listsize=3/}
+						</td>
+					</tr>
+				</table>
+				<table width="100%" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td height="4"></td>
+					</tr>
+					<tr bgcolor="#FFFFFF">
+						<td height="26">
+							<table width='100%' border='0' cellpadding='1' cellspacing='1' bgcolor='#cfcfcf'>
+								<tr bgcolor='#EEF4EA'>
+									<form name='form3' action='content_sg_list.php' method='get'>
+										<input type='hidden' name='dopost' value='listArchives'>
+										<td background='images/wbg.gif'>
+											<table width='600' border='0' cellpadding='0' cellspacing='0'>
+												<tr>
+													<td width='90' align='center'>请选择类目：</td>
+													<td width='160'>
+														<select name='cid' style='width:150'>
+															<option value='0'>选择分类...</option>
+															{dede:global.optionarr/}
+														</select>
+													</td>
+													<td width='70'>
+														关键字：
+													</td>
+													<td width='160'>
+														<input type='text' name='keyword' value='{dede:global.keyword/}'
+															style='width:150'>
+													</td>
+													<td>
+														<input name="imageField" type="image"
+															src="images/button_search.gif" width="60" height="22"
+															border="0" class="np">
+													</td>
+												</tr>
+											</table>
+										</td>
+									</form>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					<tr>
+						<td colspan="2" height="4"></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
 </body>
+
 </html>

src/dede/templets/diy_add.htm

@@ -1,107 +1,129 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>新增频道</title>
-<link href="css/base.css" rel="stylesheet" type="text/css" />
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="js/diy.js"></script>
-<script language="javascript">
-<!--
-function checkSubmit(){
-    if(document.form1.name.value=='')
-	{
-		alert("自定义表单名称不能为空！");
-		return false;
-	}
-	return true;
-}
--->
-</script>
-<style type="text/css">
-<!--
-.STYLE1 {color: #FF0000}
-td{ padding:2px; padding-left:6px; line-height:150%; }
-.STYLE2 {color: #666666; display:none; }
--->
-</style>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>新增频道</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css" />
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <script language="javascript" src="js/diy.js"></script>
+  <script language="javascript">
+    function checkSubmit() {
+      if (document.form1.name.value == '') {
+        alert("自定义表单名称不能为空！");
+        return false;
+      }
+      return true;
+    }
+  </script>
+  <style type="text/css">
+    .STYLE1 {
+      color: #FF0000
+    }
+
+    td {
+      padding: 2px;
+      padding-left: 6px;
+      line-height: 150%;
+    }
+
+    .STYLE2 {
+      color: #666666;
+      display: none;
+    }
+  </style>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
-  <form name="form1" action="diy_add.php?action=add" method="post" onSubmit="return checkSubmit();">
-    <tr bgcolor="#CFCFCF"> 
-      <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif'>
-      	<b>&nbsp;<a href="diy_main.php"><u>自定义表单管理</u></a> &gt; 新增自定义表单：</b>
-      </td>
-    </tr>
-    <tr> 
-      <td width="160" height="28" align="left" bgcolor="#FFFFFF">
-      	diyid：<br />
-        <span class="STYLE2" id='help1'>　　数字，创建后不可更改，并具有唯一性。推荐使用默认值</span>
-      </td>
-      <td bgcolor="#FFFFFF">
-      	<input name="diyid" type="text" id="diyid" size="10" value="<?php echo $newdiyid?>" class='pubinputs' style='width:60px' />
-      * <img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onClick="showHide2('help1')" />
-      </td>
-    </tr>
-    <tr> 
-      <td height="28" align="left" bgcolor="#FFFFFF">
-      	自定义表单名称：<br />
-        <span class="STYLE2" id="help3">　　自定义表单的中文名称，在后台管理，前台发布等均使用此名字。</span>
-       </td>
-      <td bgcolor="#FFFFFF">
-	    <input name="name" type="text" id="name" style="width:180px" value="自定义表单<?php echo $newdiyid;?>" class='pubinputs' />
-      *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onClick="showHide2('help3')" />
-     </td>
-    </tr>
-    <tr> 
-      <td height="28" align="left" bgcolor="#FFFFFF">数据表：<br />
-        <span class="STYLE2" id="help5">　　必须由英文、数字、下划线组成，用于保存自定义表单数据，不能和已有表名重复，创建后不可修改表名。</span></td>
-      <td bgcolor="#FFFFFF">
-	    <input name="table" type="text" id="table"  style="width:180px" value="<?php echo $cfg_dbprefix; ?>diyform<?php echo $newdiyid; ?>" class='pubinputs'/>
-        *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onClick="showHide2('help5')" />
-      </td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">字段配置：</td>
-      <td bgcolor="#FFFFFF"><span class="STYLE1">建立自定义表单后在“更改”自定义表单的地方添加字段即可。</span></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">列表模板：</td>
-      <td bgcolor="#FFFFFF"><input name="listtemplate" type="text" id="listtemplate" style="width:180px" value="list_diyform<?php echo $newdiyid;?>.htm" class='pubinputs' /></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">内容模板：</td>
-      <td bgcolor="#FFFFFF"><input name="viewtemplate" type="text" id="viewtemplate" style="width:180px" value="view_diyform<?php echo $newdiyid;?>.htm" class='pubinputs' /></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">发布模板：</td>
-      <td bgcolor="#FFFFFF"><input name="posttemplate" type="text" id="posttemplate" style="width:180px" value="post_diyform<?php echo $newdiyid;?>.htm" class='pubinputs' /></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">前台列表和内容页公开？：</td>
-      <td bgcolor="#FFFFFF">
-      <label><input name="public" type="radio" value="2" class='np' />完全公开</label>
-      <label><input name="public" type="radio" value="1" class='np' checked='1' />公开审核过的</label>
-      <label><input name="public" type="radio" value="0" class='np' />不公开</label>
-      </td>
-    </tr>
-    <tr bgcolor="#F9FCEF"> 
-      <td height="28" colspan="2">
-      	<table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <tr> 
-            <td width="26%" height="45">&nbsp;</td>
-            <td width="15%">
-            	<input type="submit" name="button" id="button" value="确定"  class="np coolbg"/>
-            </td>
-            <td width="59%">
-            	<input name="按钮" type="button" class="np coolbg"  id="button2" onClick="location='mychannel_main.php';" value="返回"/>
-            </td>
-          </tr>
-        </table>
-       </td>
-    </tr>
-  </form>
-</table>
+  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+    style="background:#CFCFCF;">
+    <form name="form1" action="diy_add.php?action=add" method="post" onSubmit="return checkSubmit();">
+      <tr bgcolor="#CFCFCF">
+        <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif'>
+          <b>&nbsp;<a href="diy_main.php"><u>自定义表单管理</u></a> &gt; 新增自定义表单：</b>
+        </td>
+      </tr>
+      <tr>
+        <td width="160" height="28" align="left" bgcolor="#FFFFFF">
+          diyid：<br />
+          <span class="STYLE2" id='help1'>　　数字，创建后不可更改，并具有唯一性。推荐使用默认值</span>
+        </td>
+        <td bgcolor="#FFFFFF">
+          <input name="diyid" type="text" id="diyid" size="10" value="<?php echo $newdiyid?>" class='pubinputs'
+            style='width:60px' />
+          * <img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onClick="showHide2('help1')" />
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">
+          自定义表单名称：<br />
+          <span class="STYLE2" id="help3">　　自定义表单的中文名称，在后台管理，前台发布等均使用此名字。</span>
+        </td>
+        <td bgcolor="#FFFFFF">
+          <input name="name" type="text" id="name" style="width:180px" value="自定义表单<?php echo $newdiyid;?>"
+            class='pubinputs' />
+          *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onClick="showHide2('help3')" />
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">数据表：<br />
+          <span class="STYLE2" id="help5">　　必须由英文、数字、下划线组成，用于保存自定义表单数据，不能和已有表名重复，创建后不可修改表名。</span></td>
+        <td bgcolor="#FFFFFF">
+          <input name="table" type="text" id="table" style="width:180px"
+            value="<?php echo $cfg_dbprefix; ?>diyform<?php echo $newdiyid; ?>" class='pubinputs' />
+          *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onClick="showHide2('help5')" />
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">字段配置：</td>
+        <td bgcolor="#FFFFFF"><span class="STYLE1">建立自定义表单后在“更改”自定义表单的地方添加字段即可。</span></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">列表模板：</td>
+        <td bgcolor="#FFFFFF"><input name="listtemplate" type="text" id="listtemplate" style="width:180px"
+            value="list_diyform<?php echo $newdiyid;?>.htm" class='pubinputs' /></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">内容模板：</td>
+        <td bgcolor="#FFFFFF"><input name="viewtemplate" type="text" id="viewtemplate" style="width:180px"
+            value="view_diyform<?php echo $newdiyid;?>.htm" class='pubinputs' /></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">发布模板：</td>
+        <td bgcolor="#FFFFFF"><input name="posttemplate" type="text" id="posttemplate" style="width:180px"
+            value="post_diyform<?php echo $newdiyid;?>.htm" class='pubinputs' /></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">前台列表和内容页公开？：</td>
+        <td bgcolor="#FFFFFF">
+          <label><input name="public" type="radio" value="2" class='np' />完全公开</label>
+          <label><input name="public" type="radio" value="1" class='np' checked='1' />公开审核过的</label>
+          <label><input name="public" type="radio" value="0" class='np' />不公开</label>
+        </td>
+      </tr>
+      <tr bgcolor="#F9FCEF">
+        <td height="28" colspan="2">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="26%" height="45">&nbsp;</td>
+              <td width="15%">
+                <input type="submit" name="button" id="button" value="确定" class="np coolbg" />
+              </td>
+              <td width="59%">
+                <input name="按钮" type="button" class="np coolbg" id="button2" onClick="location='mychannel_main.php';"
+                  value="返回" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </form>
+  </table>
 </body>
+
 </html>

src/dede/templets/diy_edit.htm

@@ -1,93 +1,111 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>修改自定义表单</title>
-<link href="css/base.css" rel="stylesheet" type="text/css" />
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="js/diy.js"></script>
-<script language="javascript">
-<!--
-function checkSubmit(){
-	if(document.form1.typename.value=='')
-	{
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>修改自定义表单</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css" />
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <script language="javascript" src="js/diy.js"></script>
+  <script language="javascript">
+    function checkSubmit() {
+      if (document.form1.typename.value == '') {
         alert("自定义表单名称不能为空！");
-		return false;
-	}
-	return true;
-}
-//删除
-function DelNote(gourl){
-	if(!window.confirm("你确认要删除这条记录么！")){ return false; }
-	location.href=gourl;
-}
--->
-</script>
-<style type="text/css">
-<!--
-.STYLE1 {color: #FF0000}
-td{ padding:2px; padding-left:6px; line-height:150%; }
-.STYLE2 {color: #666666; display:none; }
--->
-</style>
+        return false;
+      }
+      return true;
+    }
+    //删除
+    function DelNote(gourl) {
+      if (!window.confirm("你确认要删除这条记录么！")) { return false; }
+      location.href = gourl;
+    }
+  </script>
+  <style type="text/css">
+    .STYLE1 {
+      color: #FF0000
+    }
+
+    td {
+      padding: 2px;
+      padding-left: 6px;
+      line-height: 150%;
+    }
+
+    .STYLE2 {
+      color: #666666;
+      display: none;
+    }
+  </style>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<div class="bodytitle">
-	<div class="bodytitleleft"></div>
-	<div class="bodytitletxt" style="padding-left:10px;">自定义表单管理</div>
-</div>
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
-  <form name="form1" action="diy_edit.php" method="post" onSubmit="return checkSubmit();">
-    <input type='hidden' name='diyid' value='<?php echo $diyid;?>'>
-    <input type='hidden' name='dopost' value='save'>
-    <tr bgcolor="#CFCFCF"> 
-      <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif' style="padding-left:10px;">
-      	<b><a href="diy_main.php"><u>自定义表单管理</u></a> &gt; 修改自定义表单：</b>
-      	(修改表名不会创建新表，如果您不懂手工处理这些表，请不要更改)
-      </td>
-    </tr>
-    <tr> 
-      <td width="170" height="28" align="left" bgcolor="#FFFFFF">自定义表单 diyid：<br />
-        <span class="STYLE2" id='help1'>　　数字，创建后不可更改，并具有唯一性。</span> </td>
-      <td bgcolor="#FFFFFF">
-       <?php echo $diyid;?>
-      * <img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onclick="showHide2('help1')" /></td>
-    </tr>
-    <tr> 
-      <td height="28" align="left" bgcolor="#F9FCEF">自定义表单名称：<br />
-      <span class="STYLE2" id="help3">　　自定义表单的中文名称，在后台管理，前台发布等均使用此名字。</span></td>
-      <td bgcolor="#F9FCEF">
-	    <input name="name" type="text" id="name" value="<?php echo $row['name']?>" style="width:180px" class='alltxt' />
-      *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onclick="showHide2('help3')" />
-     </td>
-    </tr>
-    <tr> 
-      <td height="28" align="left" bgcolor="#FFFFFF">数据表：<br />
-        <span class="STYLE2" id="help5">　　自定义表单数据表创建后不可修改表名</span></td>
-      <td bgcolor="#FFFFFF">
-	    <input name="table" type="text" id="table"  style="width:180px" value="<?php echo $row['table']; ?>" class='alltxt' disabled='1' />
-        *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onclick="showHide2('help5')" />
-      </td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#F9FCEF">模型字段配置：<br />
-      信息索引类字段系统已经加入，<br />
-      您只需要增加其它个性化字段即可。</td>
-      <td bgcolor="#F9FCEF">
-      	<input name="fset" type="button" id="fset" value="添加新字段" onClick="location.href='diy_field_add.php?diyid=<?php echo $diyid; ?>'" class="np coolbg" style="margin-top:5px"/>
-      </td>
-    </tr>
-     <tr>
-      <td colspan='2'  bgcolor="#FFFFFF" style="padding:6px">
-<table width="100%" border="0" cellpadding="1" cellspacing="1" align="center"  style="background:#cfcfcf;">
-   <tr align="center" bgcolor="#FBFCE2" height="26">
-      <td width="28%">表单提示文字</td>
-      <td width="18%">数据字段名</td>
-      <td width="20%">数据类型</td>
-      <td width="18%">表单类型</td>
-      <td>维护</td>
-  </tr>
-<?php 
+  <div class="bodytitle">
+    <div class="bodytitleleft"></div>
+    <div class="bodytitletxt" style="padding-left:10px;">自定义表单管理</div>
+  </div>
+  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+    style="background:#CFCFCF;">
+    <form name="form1" action="diy_edit.php" method="post" onSubmit="return checkSubmit();">
+      <input type='hidden' name='diyid' value='<?php echo $diyid;?>'>
+      <input type='hidden' name='dopost' value='save'>
+      <tr bgcolor="#CFCFCF">
+        <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif' style="padding-left:10px;">
+          <b><a href="diy_main.php"><u>自定义表单管理</u></a> &gt; 修改自定义表单：</b>
+          (修改表名不会创建新表，如果您不懂手工处理这些表，请不要更改)
+        </td>
+      </tr>
+      <tr>
+        <td width="170" height="28" align="left" bgcolor="#FFFFFF">自定义表单 diyid：<br />
+          <span class="STYLE2" id='help1'>　　数字，创建后不可更改，并具有唯一性。</span> </td>
+        <td bgcolor="#FFFFFF">
+          <?php echo $diyid;?>
+          * <img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onclick="showHide2('help1')" /></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#F9FCEF">自定义表单名称：<br />
+          <span class="STYLE2" id="help3">　　自定义表单的中文名称，在后台管理，前台发布等均使用此名字。</span></td>
+        <td bgcolor="#F9FCEF">
+          <input name="name" type="text" id="name" value="<?php echo $row['name']?>" style="width:180px"
+            class='alltxt' />
+          *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onclick="showHide2('help3')" />
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">数据表：<br />
+          <span class="STYLE2" id="help5">　　自定义表单数据表创建后不可修改表名</span></td>
+        <td bgcolor="#FFFFFF">
+          <input name="table" type="text" id="table" style="width:180px" value="<?php echo $row['table']; ?>"
+            class='alltxt' disabled='1' />
+          *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onclick="showHide2('help5')" />
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#F9FCEF">模型字段配置：<br />
+          信息索引类字段系统已经加入，<br />
+          您只需要增加其它个性化字段即可。</td>
+        <td bgcolor="#F9FCEF">
+          <input name="fset" type="button" id="fset" value="添加新字段"
+            onClick="location.href='diy_field_add.php?diyid=<?php echo $diyid; ?>'" class="np coolbg"
+            style="margin-top:5px" />
+        </td>
+      </tr>
+      <tr>
+        <td colspan='2' bgcolor="#FFFFFF" style="padding:6px">
+          <table width="100%" border="0" cellpadding="1" cellspacing="1" align="center" style="background:#cfcfcf;">
+            <tr align="center" bgcolor="#FBFCE2" height="26">
+              <td width="28%">表单提示文字</td>
+              <td width="18%">数据字段名</td>
+              <td width="20%">数据类型</td>
+              <td width="18%">表单类型</td>
+              <td>维护</td>
+            </tr>
+            <?php 
 
 $ds = file(DedeInclude('/inc/fieldtype.txt'));
 foreach($ds as $d){
@@ -101,85 +119,94 @@ $dtp->LoadSource($fieldset);
 if(is_array($dtp->CTags)){
 foreach($dtp->CTags as $ctag)
 {
-?>  <tr align="center" bgcolor="#FFFFFF" height="24">
-      <td>
-      <?php 
+?> <tr align="center" bgcolor="#FFFFFF" height="24">
+              <td>
+                <?php 
 			$itname = $ctag->GetAtt('itemname');
 			if($itname=='') echo "没指定";
 			else echo $itname;
 			?>
-			</td>
-      <td>
-      	<?php echo $ctag->GetTagName()?>
-      </td>
-      <td>
-      <?php 
+              </td>
+              <td>
+                <?php echo $ctag->GetTagName()?>
+              </td>
+              <td>
+                <?php 
 			$ft = $ctag->GetAtt('type');
 			if(isset($fieldtypes[$ft])) echo $fieldtypes[$ft];
 			else  echo "系统专用类型";
 			?>
-			</td>
-		  <td>
-		 <?php 
+              </td>
+              <td>
+                <?php 
 			$ft = $ctag->GetAtt('autofield');
 			if($ft==''||$ft==0) echo "固化表单";
 			else  echo "自动表单";
 		 ?>
-		  </td>
-      <td>
-      	<a href="diy_field_edit.php?diyid=<?php echo $diyid;?>&fname=<?php echo $ctag->GetTagName()?>">[修改]</a>
-      	<a href="diy_field_edit.php?diyid=<?php echo $diyid;?>&action=delete&fname=<?php echo $ctag->GetTagName()?>">[删除]</a>
-      </td>
-  </tr>
-<?php 
+              </td>
+              <td>
+                <a href="diy_field_edit.php?diyid=<?php echo $diyid;?>&fname=<?php echo $ctag->GetTagName()?>">[修改]</a>
+                <a
+                  href="diy_field_edit.php?diyid=<?php echo $diyid;?>&action=delete&fname=<?php echo $ctag->GetTagName()?>">[删除]</a>
+              </td>
+            </tr>
+            <?php 
  }}
  
 ?>
-</table>
-      </td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">列表模板：</td>
-      <td bgcolor="#FFFFFF">
-      	<input name="listtemplate" type="text" id="listtemplate" style="width:180px" value="<?php echo $row['listtemplate'];?>" class='alltxt' />
-      </td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">内容模板：</td>
-      <td bgcolor="#FFFFFF">
-      	<input name="viewtemplate" type="text" id="viewtemplate" style="width:180px" value="<?php echo $row['viewtemplate'];?>" class='alltxt' />
-      </td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">发布模板：</td>
-      <td bgcolor="#FFFFFF">
-      	<input name="posttemplate" type="text" id="posttemplate" style="width:180px" value="<?php echo $row['posttemplate'];?>" class='alltxt' />
-      </td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">前台列表和内容页公开？：</td>
-      <td bgcolor="#FFFFFF">
-      <label><input name="public" type="radio" value="2" <?php echo $row['public'] == 2 ? 'checked' : '';?> class='np' />完全公开</label>
-      <label><input name="public" type="radio" value="1" <?php echo $row['public'] == 1 ? 'checked' : '';?> class='np' />公开审核过的</label>
-      <label><input name="public" type="radio" value="0" <?php echo $row['public'] == 0 ? 'checked' : '';?> class='np' />不公开</label>
-      </td>
-    </tr>
-    <tr bgcolor="#F9FCEF"> 
-      <td height="28" colspan="2">
-      	<table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <tr> 
-            <td width="26%" height="45">&nbsp;</td>
-            <td width="15%">
-            	<input type="submit" name="button" id="button" value="确定"  class='np coolbg'/>
-            </td>
-            <td width="59%">
-            	<input name="按钮" type="button" class='np coolbg'  id="button2" onclick="location='diy_main.php';" value="返回"/>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </form>
-</table>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">列表模板：</td>
+        <td bgcolor="#FFFFFF">
+          <input name="listtemplate" type="text" id="listtemplate" style="width:180px"
+            value="<?php echo $row['listtemplate'];?>" class='alltxt' />
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">内容模板：</td>
+        <td bgcolor="#FFFFFF">
+          <input name="viewtemplate" type="text" id="viewtemplate" style="width:180px"
+            value="<?php echo $row['viewtemplate'];?>" class='alltxt' />
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">发布模板：</td>
+        <td bgcolor="#FFFFFF">
+          <input name="posttemplate" type="text" id="posttemplate" style="width:180px"
+            value="<?php echo $row['posttemplate'];?>" class='alltxt' />
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">前台列表和内容页公开？：</td>
+        <td bgcolor="#FFFFFF">
+          <label><input name="public" type="radio" value="2" <?php echo $row['public'] == 2 ? 'checked' : '';?>
+              class='np' />完全公开</label>
+          <label><input name="public" type="radio" value="1" <?php echo $row['public'] == 1 ? 'checked' : '';?>
+              class='np' />公开审核过的</label>
+          <label><input name="public" type="radio" value="0" <?php echo $row['public'] == 0 ? 'checked' : '';?>
+              class='np' />不公开</label>
+        </td>
+      </tr>
+      <tr bgcolor="#F9FCEF">
+        <td height="28" colspan="2">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="26%" height="45">&nbsp;</td>
+              <td width="15%">
+                <input type="submit" name="button" id="button" value="确定" class='np coolbg' />
+              </td>
+              <td width="59%">
+                <input name="按钮" type="button" class='np coolbg' id="button2" onclick="location='diy_main.php';"
+                  value="返回" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </form>
+  </table>
 </body>
+
 </html>

src/dede/templets/freelist_add.htm

@@ -1,169 +1,192 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>新增自由列表</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script src="js/main.js" language="javascript"></script>
-<script language="JavaScript">
-function ChangeListStyle(){
-   var itxt = document.getElementById("myinnertext");
-   var myems = document.getElementsByName("liststyle");
-   if(myems[0].checked) itxt.value = document.getElementById("list1").innerHTML;
-   else if(myems[1].checked) itxt.value = document.getElementById("list2").innerHTML;
-   else if(myems[2].checked) itxt.value = document.getElementById("list3").innerHTML;
-   else if(myems[3].checked) itxt.value = document.getElementById("list4").innerHTML;
-   itxt.value = itxt.value.replace("<BR>","<BR/>");
-   itxt.value = itxt.value.toLowerCase();
-}
-function ShowHide(objname){
-  var obj = document.getElementById(objname);
-  if(obj.style.display == "block" || obj.style.display == "")
-	   obj.style.display = "none";
-  else
-	   obj.style.display = "block";
-}
-function SelectTemplets(fname)
-{
-   if(document.all){
-     var posLeft = window.event.clientY-200;
-     var posTop = window.event.clientX-300;
-   }
-   else{
-     var posLeft = 100;
-     var posTop = 100;
-   }
-   window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir)?>&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
-}
-function CheckSubmit(){
-   if(document.form1.title.value==""){
-       alert("自由列表标题标题不能为空！");
-	   document.form1.title.focus();
-	   return false;
-   }
-   return true;
-}
-</script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>新增自由列表</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script src="js/main.js" language="javascript"></script>
+  <script language="JavaScript">
+    function ChangeListStyle() {
+      var itxt = document.getElementById("myinnertext");
+      var myems = document.getElementsByName("liststyle");
+      if (myems[0].checked) itxt.value = document.getElementById("list1").innerHTML;
+      else if (myems[1].checked) itxt.value = document.getElementById("list2").innerHTML;
+      else if (myems[2].checked) itxt.value = document.getElementById("list3").innerHTML;
+      else if (myems[3].checked) itxt.value = document.getElementById("list4").innerHTML;
+      itxt.value = itxt.value.replace("<BR>", "<BR/>");
+      itxt.value = itxt.value.toLowerCase();
+    }
+    function ShowHide(objname) {
+      var obj = document.getElementById(objname);
+      if (obj.style.display == "block" || obj.style.display == "")
+        obj.style.display = "none";
+      else
+        obj.style.display = "block";
+    }
+    function SelectTemplets(fname) {
+      if (document.all) {
+        var posLeft = window.event.clientY - 200;
+        var posTop = window.event.clientX - 300;
+      }
+      else {
+        var posLeft = 100;
+        var posTop = 100;
+      }
+      window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir)?>&f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left=" + posLeft + ", top=" + posTop);
+    }
+    function CheckSubmit() {
+      if (document.form1.title.value == "") {
+        alert("自由列表标题标题不能为空！");
+        document.form1.title.focus();
+        return false;
+      }
+      return true;
+    }
+  </script>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<div class="bodytitle">
-	<div class="bodytitleleft"></div>
-	<div class="bodytitletxt" style="padding-left:10px;">频道管理</div>
-</div>
-<center>
-<div style="display:none" id="list1">
-<li>[field:textlink/]</li>
-</div>
+  <div class="bodytitle">
+    <div class="bodytitleleft"></div>
+    <div class="bodytitletxt" style="padding-left:10px;">频道管理</div>
+  </div>
+  <center>
+    <div style="display:none" id="list1">
+      <li>[field:textlink/]</li>
+    </div>
 
-<div style="display:none" id="list2">
-<li>[[field:typelink/]][field:textlink/]</li>
-</div>
+    <div style="display:none" id="list2">
+      <li>[[field:typelink/]][field:textlink/]</li>
+    </div>
 
-<div style="display:none" id="list3">
-<table width='98%' border='0' cellspacing='2' cellpadding='0'>
-   <tr><td align='center'>[field:imglink/]</td></tr>
-   <tr><td align='center'>[field:textlink/]</td></tr>
-</table>
-</div>
+    <div style="display:none" id="list3">
+      <table width='98%' border='0' cellspacing='2' cellpadding='0'>
+        <tr>
+          <td align='center'>[field:imglink/]</td>
+        </tr>
+        <tr>
+          <td align='center'>[field:textlink/]</td>
+        </tr>
+      </table>
+    </div>
 
-<div style="display:none" id="list4">
-<li>
-   [field:imglink/]
-    [field:textlink/]
-    <span class="info">
-        <small>日期：</small>[field:pubdate function="GetDateMK(@me)"/]
-        <small>点击：</small>[field:click/]
-        <small>好评：</small>[field:scores/]
-    </span>
-    <p class="intro"> [field:description/]...</p>
-    </li>
-</div>
-  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="border:1px solid #CFCFCF;border-bottom:none;">
-    <tr>
-      <td align="left" bgcolor="#EDF9D5" background="images/tbg.gif" style="padding-left:10px;">
-      	<a href="freelist_main.php"><strong><u>自自由列表管理</u></strong></a> 
-      	<strong> &gt;&gt; 增加一个列表：</strong>
-      </td>
-      <td align="right" bgcolor="#EDF9D5" background="images/tbg.gif"></td>
-    </tr>
-  </table>
-  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
-    <form action="freelist_add.php" method="post"  name="form1" onSubmit="return CheckSubmit();">
-      <input type="hidden" name="dopost" value="save">
+    <div style="display:none" id="list4">
+      <li>
+        [field:imglink/]
+        [field:textlink/]
+        <span class="info">
+          <small>日期：</small>[field:pubdate function="GetDateMK(@me)"/]
+          <small>点击：</small>[field:click/]
+          <small>好评：</small>[field:scores/]
+        </span>
+        <p class="intro"> [field:description/]...</p>
+      </li>
+    </div>
+    <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+      style="border:1px solid #CFCFCF;border-bottom:none;">
       <tr>
-        <td height="265" valign="top" bgcolor="#FFFFFF"><table width="99%" border="0" align="center" cellpadding="0" cellspacing="1">
-            <tr>
-              <td height="56"> <table width="100%" border="0" cellspacing="1" cellpadding="0">
-                  <tr>
-                    <td height="28" colspan="2" align="left"><img src="images/help.gif" width="16" height="16">自由列表标记的说明：自由列表标记(freelist)的功能基本等同于arclist标记，区别是freelist标记支持分页，这让生成Google
-                      Map、生成按自定义排序规则的文章列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，这样不会影响系统生成HTML或访问速度。</td>
-                  </tr>
-                  <tr>
-                    <td width="16%" height="28" align="left">自由列表标题：</td>
-                    <td width="84%" align="left"><input name="title" type="text" id="title" style="width:35%"></td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">列表HTML存放目录：</td>
-                    <td align="left"><input name="listdir" type="text" id="listdir" style="width:35%" value="{cmspath}/freelist/">
-                      {listdir}变量的值</td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">目录默认页名称：</td>
-                    <td align="left"> <input name="defaultpage" type="text" id="defaultpage" style="width:35%" value="index.html">
-                      <input name="nodefault" type="checkbox"  id="nodefault" value="1">
-                      不使用目录默认主页 </td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">命名规则：</td>
-                    <td align="left"><input name="namerule" type="text" id="namerule" style="width:35%" value="{listdir}/index_{listid}_{page}.html"></td>
-                  </tr>
-                  <tr>
-                    <td height="30" align="left">列表模板：</td>
-                    <td align="left"><input name="templet" type="text" id="templet" style="width:300px" value="{style}/list_free.htm">
-                      <input type="button" name="set4" value="浏览..." style="width:60px" onClick="SelectTemplets('form1.templet');" class="inputbut"/></td>
-                  </tr>
-                  <tr>
-                    <td height="30" align="left">最大列出页数：</td>
-                    <td align="left">
-                    	<input name="maxpage" type="text" id="maxpage" style="width:100px" value="100">
-                    </td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">&nbsp;</td>
-                    <td align="left">以下选项用于模板里的 &lt;meta name=&quot;keywords|description&quot;
-                      content=&quot;&quot;&gt; 描述</td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">关键字：</td>
-                    <td align="left"><input name="keywords" type="text" id="keywords" style="width:60%"></td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">列表描述：</td>
-                    <td align="left"><textarea name="description" id="description" style="width:60%;height:50px"></textarea></td>
-                  </tr>
-                </table></td>
-            </tr>
-            <tr>
-              <td height="26" align="left" style="background:#FBFCE2;"><img src="images/file_tt.gif" width="7" height="8" style="margin-left:6px;margin-right:6px;">列表样式：（这里是定义自由列表模板里的{dede:freelist
-                /}标记的样式和属性）</td>
-            </tr>
-            <tr>
-              <td height="72" align="left"><table width="99%" border="0" cellspacing="0" cellpadding="0">
-                  <tr>
-                    <td width="25%" height="126"><img src="images/g_t2.gif" width="130" height="100">
-                      <input name="liststyle"  type="radio" onClick="ChangeListStyle()" value="1">
-                    </td>
-                    <td width="25%"><img src="images/g_t1.gif" width="130" height="110">
-                      <input type="radio"  onClick="ChangeListStyle()" name="liststyle" value="2"></td>
-                    <td width="25%"><img src="images/g_t3.gif" width="130" height="110">
-                      <input type="radio"  onClick="ChangeListStyle()" name="liststyle" value="3"></td>
-                    <td><img src="images/g_t4.gif" width="130" height="110"> <input name="liststyle" type="radio"  onClick="ChangeListStyle()" value="4" checked></td>
-                  </tr>
-                </table></td>
-            </tr>
-            <tr>
-              <td height="28" align="left"> 限定栏目：
-               <?php
+        <td align="left" bgcolor="#EDF9D5" background="images/tbg.gif" style="padding-left:10px;">
+          <a href="freelist_main.php"><strong><u>自自由列表管理</u></strong></a>
+          <strong> &gt;&gt; 增加一个列表：</strong>
+        </td>
+        <td align="right" bgcolor="#EDF9D5" background="images/tbg.gif"></td>
+      </tr>
+    </table>
+    <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+      style="background:#CFCFCF;">
+      <form action="freelist_add.php" method="post" name="form1" onSubmit="return CheckSubmit();">
+        <input type="hidden" name="dopost" value="save">
+        <tr>
+          <td height="265" valign="top" bgcolor="#FFFFFF">
+            <table width="99%" border="0" align="center" cellpadding="0" cellspacing="1">
+              <tr>
+                <td height="56">
+                  <table width="100%" border="0" cellspacing="1" cellpadding="0">
+                    <tr>
+                      <td height="28" colspan="2" align="left"><img src="images/help.gif" width="16"
+                          height="16">自由列表标记的说明：自由列表标记(freelist)的功能基本等同于arclist标记，区别是freelist标记支持分页，这让生成Google
+                        Map、生成按自定义排序规则的文章列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，这样不会影响系统生成HTML或访问速度。</td>
+                    </tr>
+                    <tr>
+                      <td width="16%" height="28" align="left">自由列表标题：</td>
+                      <td width="84%" align="left"><input name="title" type="text" id="title" style="width:35%"></td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">列表HTML存放目录：</td>
+                      <td align="left"><input name="listdir" type="text" id="listdir" style="width:35%"
+                          value="{cmspath}/freelist/">
+                        {listdir}变量的值</td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">目录默认页名称：</td>
+                      <td align="left"> <input name="defaultpage" type="text" id="defaultpage" style="width:35%"
+                          value="index.html">
+                        <input name="nodefault" type="checkbox" id="nodefault" value="1">
+                        不使用目录默认主页 </td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">命名规则：</td>
+                      <td align="left"><input name="namerule" type="text" id="namerule" style="width:35%"
+                          value="{listdir}/index_{listid}_{page}.html"></td>
+                    </tr>
+                    <tr>
+                      <td height="30" align="left">列表模板：</td>
+                      <td align="left"><input name="templet" type="text" id="templet" style="width:300px"
+                          value="{style}/list_free.htm">
+                        <input type="button" name="set4" value="浏览..." style="width:60px"
+                          onClick="SelectTemplets('form1.templet');" class="inputbut" /></td>
+                    </tr>
+                    <tr>
+                      <td height="30" align="left">最大列出页数：</td>
+                      <td align="left">
+                        <input name="maxpage" type="text" id="maxpage" style="width:100px" value="100">
+                      </td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">&nbsp;</td>
+                      <td align="left">以下选项用于模板里的 &lt;meta name=&quot;keywords|description&quot;
+                        content=&quot;&quot;&gt; 描述</td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">关键字：</td>
+                      <td align="left"><input name="keywords" type="text" id="keywords" style="width:60%"></td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">列表描述：</td>
+                      <td align="left"><textarea name="description" id="description"
+                          style="width:60%;height:50px"></textarea></td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <td height="26" align="left" style="background:#FBFCE2;"><img src="images/file_tt.gif" width="7"
+                    height="8" style="margin-left:6px;margin-right:6px;">列表样式：（这里是定义自由列表模板里的{dede:freelist
+                  /}标记的样式和属性）</td>
+              </tr>
+              <tr>
+                <td height="72" align="left">
+                  <table width="99%" border="0" cellspacing="0" cellpadding="0">
+                    <tr>
+                      <td width="25%" height="126"><img src="images/g_t2.gif" width="130" height="100">
+                        <input name="liststyle" type="radio" onClick="ChangeListStyle()" value="1">
+                      </td>
+                      <td width="25%"><img src="images/g_t1.gif" width="130" height="110">
+                        <input type="radio" onClick="ChangeListStyle()" name="liststyle" value="2"></td>
+                      <td width="25%"><img src="images/g_t3.gif" width="130" height="110">
+                        <input type="radio" onClick="ChangeListStyle()" name="liststyle" value="3"></td>
+                      <td><img src="images/g_t4.gif" width="130" height="110"> <input name="liststyle" type="radio"
+                          onClick="ChangeListStyle()" value="4" checked></td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <td height="28" align="left"> 限定栏目：
+                  <?php
                  echo "<select name='typeid' style='width:100'>\r\n";
                  echo "<option value='0'>不限栏目...</option>\r\n";
                 $dsql->SetQuery("Select ID,typename, channeltype From #@__arctype");
@@ -177,11 +200,11 @@ function CheckSubmit(){
 		 echo "<option value='{$lrow->ID}' $disable>{$lrow->typename}</option>\r\n";
                 }
 		echo "</select>";
-		?>            </td>
-            </tr>
-            <tr>
-              <td height="28" align="left"> 限定频道：
-                <?php
+		?> </td>
+              </tr>
+              <tr>
+                <td height="28" align="left"> 限定频道：
+                  <?php
        echo "<select name='channel' style='width:100'>\r\n";
        echo "<option value='0' selected>不限...</option>\r\n";
        $dsql->SetQuery("Select ID,typename From #@__channeltype where ID>0");
@@ -192,11 +215,11 @@ function CheckSubmit(){
 	   }
        echo "</select>";
 		?>
-                　(如果限定了频道内容模型，则允许使用附加表指定的列表字段作为底层变量)</td>
-            </tr>
-            <tr>
-              <td height="28" align="left">附加属性：
-                <?php
+                  　(如果限定了频道内容模型，则允许使用附加表指定的列表字段作为底层变量)</td>
+              </tr>
+              <tr>
+                <td height="28" align="left">附加属性：
+                  <?php
        echo "<select name='att' style='width:100'>\r\n";
        echo "<option value='0' selected>不限...</option>\r\n";
        $dsql->SetQuery("Select * From #@__arcatt");
@@ -207,73 +230,81 @@ function CheckSubmit(){
 	   }
        echo "</select>";
 		?>
-                文档发布时间：
-                <input name="subday" type="text" id="subday2" value="0" size="6">
-                天以内 （0 表示不限） </td>
-            </tr>
-            <tr>
-              <td height="28" align="left">每页记录数：
-                <input name="pagesize" type="text" id="pagesize" value="30" size="4">
-                　显示列数：
-                <input name="col" type="text" id="col3" value="1" size="4">
-                标题长度：
-                <input name="titlelen" type="text" id="titlelen" value="60" size="4">
-                （1 字节 = 0.5个中文字）</td>
-            </tr>
-            <tr>
-              <td height="28" align="left"> 高级筛选：
-                <input name="types[]" type="checkbox" id="type1" value="image" >
-                带缩略图
-                <input name="types[]" type="checkbox" id="type2" value="commend" >
-                推荐
-                <input name="types[]" type="checkbox" id="type3" value="spec" >
-                专题　关键字：
-                <input name="keywordarc" type="text" id="keywordarc">
-                （&quot;,&quot;逗号分开）</td>
-            </tr>
-            <tr>
-              <td height="28" align="left">排列顺序：
-                <select name="orderby" id="orderby" style="width:120">
-                  <option value="sortrank">置顶权限值</option>
-                  <option value="pubdate" selected>发布时间</option>
-                  <option value="senddate">录入时间</option>
-                  <option value="click">点击量</option>
-                  <option value="id">文档ＩＤ</option>
-                  <option value="lastpost">最后评论时间</option>
-                  <option value="postnum">评论总数</option>
-                </select>
-                　
-                <input name="order" type="radio"   value="desc" checked>
-                由高到低
-                <input type="radio" name="order" value="asc">
-                由低到高</td>
-            </tr>
-            <tr>
-              <td height="28" align="left">循环内的单行记录样式(InnerText)：[<a href='javascript:ShowHide("innervar");'><img src="images/help.gif" width="16" height="16" border="0">底层变量field参考</a>]</td>
-            </tr>
-            <tr>
-              <td height="99" align="left"> <textarea name="innertext" cols="80" rows="6" id="myinnertext" style="width:80%;height:120px"></textarea>
-                <script language="javascript">document.form1.innertext.value=document.getElementById("list4").innerHTML.toLowerCase();</script>
-              </td>
-            </tr>
-            <tr>
-              <td height="80" align="left" id='innervar' style="display:none"><font color="#CC6600"><img src="images/help.gif" width="16" height="16">支持字段(底层变量[field:varname/])：id,title,color,typeid,ismake,description,pubdate,senddate,arcrank,click,litpic,typedir,typename,arcurl,typeurl,<br>
-                stime(pubdate 的&quot;0000-00-00&quot;格式),textlink,typelink,imglink,image
-                普通字段直接用[field:字段名/]表示。<br>
-                ·Pubdate发布时间的调用参数 [field:pubdate function=MyDate('Y-m-d H:i:s',@me)/]</font>
-              </td>
-            </tr>
-            <tr>
-              <td height="50" align="left"> &nbsp; <input name="Submit2" type="submit" id="Submit2" value="保存一个列表" class="coolbg" />
-              </td>
-            </tr>
-          </table></td>
+                  文档发布时间：
+                  <input name="subday" type="text" id="subday2" value="0" size="6">
+                  天以内 （0 表示不限） </td>
+              </tr>
+              <tr>
+                <td height="28" align="left">每页记录数：
+                  <input name="pagesize" type="text" id="pagesize" value="30" size="4">
+                  　显示列数：
+                  <input name="col" type="text" id="col3" value="1" size="4">
+                  标题长度：
+                  <input name="titlelen" type="text" id="titlelen" value="60" size="4">
+                  （1 字节 = 0.5个中文字）</td>
+              </tr>
+              <tr>
+                <td height="28" align="left"> 高级筛选：
+                  <input name="types[]" type="checkbox" id="type1" value="image">
+                  带缩略图
+                  <input name="types[]" type="checkbox" id="type2" value="commend">
+                  推荐
+                  <input name="types[]" type="checkbox" id="type3" value="spec">
+                  专题　关键字：
+                  <input name="keywordarc" type="text" id="keywordarc">
+                  （&quot;,&quot;逗号分开）</td>
+              </tr>
+              <tr>
+                <td height="28" align="left">排列顺序：
+                  <select name="orderby" id="orderby" style="width:120">
+                    <option value="sortrank">置顶权限值</option>
+                    <option value="pubdate" selected>发布时间</option>
+                    <option value="senddate">录入时间</option>
+                    <option value="click">点击量</option>
+                    <option value="id">文档ＩＤ</option>
+                    <option value="lastpost">最后评论时间</option>
+                    <option value="postnum">评论总数</option>
+                  </select>
+                  　
+                  <input name="order" type="radio" value="desc" checked>
+                  由高到低
+                  <input type="radio" name="order" value="asc">
+                  由低到高</td>
+              </tr>
+              <tr>
+                <td height="28" align="left">循环内的单行记录样式(InnerText)：[<a href='javascript:ShowHide("innervar");'><img
+                      src="images/help.gif" width="16" height="16" border="0">底层变量field参考</a>]</td>
+              </tr>
+              <tr>
+                <td height="99" align="left"> <textarea name="innertext" cols="80" rows="6" id="myinnertext"
+                    style="width:80%;height:120px"></textarea>
+                  <script
+                    language="javascript">document.form1.innertext.value = document.getElementById("list4").innerHTML.toLowerCase();</script>
+                </td>
+              </tr>
+              <tr>
+                <td height="80" align="left" id='innervar' style="display:none">
+                  <font color="#CC6600"><img src="images/help.gif" width="16"
+                      height="16">支持字段(底层变量[field:varname/])：id,title,color,typeid,ismake,description,pubdate,senddate,arcrank,click,litpic,typedir,typename,arcurl,typeurl,<br>
+                    stime(pubdate 的&quot;0000-00-00&quot;格式),textlink,typelink,imglink,image
+                    普通字段直接用[field:字段名/]表示。<br>
+                    ·Pubdate发布时间的调用参数 [field:pubdate function=MyDate('Y-m-d H:i:s',@me)/]</font>
+                </td>
+              </tr>
+              <tr>
+                <td height="50" align="left"> &nbsp; <input name="Submit2" type="submit" id="Submit2" value="保存一个列表"
+                    class="coolbg" />
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </form>
+      <tr>
+        <td valign="top" bgcolor="#F9FCEF">&nbsp;</td>
       </tr>
-    </form>
-    <tr>
-      <td valign="top" bgcolor="#F9FCEF">&nbsp;</td>
-    </tr>
-  </table>
-</center>
+    </table>
+  </center>
 </body>
+
 </html>

src/dede/templets/freelist_edit.htm

@@ -1,139 +1,160 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>更改自由列表</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script src="js/main.js" language="javascript"></script>
-<script language="JavaScript">
-function ChangeListStyle(){
-	var itxt = document.getElementById("myinnertext");
-	var myems = document.getElementsByName("liststyle");
-	if(myems[0].checked) itxt.value = document.getElementById("list1").innerHTML;
-	else if(myems[1].checked) itxt.value = document.getElementById("list2").innerHTML;
-	else if(myems[2].checked) itxt.value = document.getElementById("list3").innerHTML;
-	else if(myems[3].checked) itxt.value = document.getElementById("list4").innerHTML;
-	itxt.value = itxt.value.replace("<BR>","<BR/>");
-	itxt.value = itxt.value.toLowerCase();
-}
-function ShowHide(objname){
-	var obj = document.getElementById(objname);
-	if(obj.style.display == "block" || obj.style.display == "")
-	obj.style.display = "none";
-	else
-	obj.style.display = "block";
-}
-function SelectTemplets(fname)
-{
-   if(document.all){
-     var posLeft = window.event.clientY-200;
-     var posTop = window.event.clientX-300;
-   }
-   else{
-     var posLeft = 100;
-     var posTop = 100;
-   }
-	window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir)?>&f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
-}
-function CheckSubmit(){
-	if(document.form1.title.value==""){
-		alert("自由列表标题标题不能为空！");
-		document.form1.title.focus();
-		return false;
-	}
-	return true;
-}
-</script>
-<link rel="stylesheet" type="text/css" href="css/codemirror.css">
-<script type="text/javascript" src="js/codemirror.js"></script>
-<script type="text/javascript" src="js/mode/xml/xml.js"></script>
-<script type="text/javascript" src="js/mode/javascript/javascript.js"></script>
-<script type="text/javascript" src="js/mode/css/css.js"></script>
-<script type="text/javascript" src="js/mode/htmlmixed/htmlmixed.js"></script>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>更改自由列表</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script src="js/main.js" language="javascript"></script>
+  <script language="JavaScript">
+    function ChangeListStyle() {
+      var itxt = document.getElementById("myinnertext");
+      var myems = document.getElementsByName("liststyle");
+      if (myems[0].checked) itxt.value = document.getElementById("list1").innerHTML;
+      else if (myems[1].checked) itxt.value = document.getElementById("list2").innerHTML;
+      else if (myems[2].checked) itxt.value = document.getElementById("list3").innerHTML;
+      else if (myems[3].checked) itxt.value = document.getElementById("list4").innerHTML;
+      itxt.value = itxt.value.replace("<BR>", "<BR/>");
+      itxt.value = itxt.value.toLowerCase();
+    }
+    function ShowHide(objname) {
+      var obj = document.getElementById(objname);
+      if (obj.style.display == "block" || obj.style.display == "")
+        obj.style.display = "none";
+      else
+        obj.style.display = "block";
+    }
+    function SelectTemplets(fname) {
+      if (document.all) {
+        var posLeft = window.event.clientY - 200;
+        var posTop = window.event.clientX - 300;
+      }
+      else {
+        var posLeft = 100;
+        var posTop = 100;
+      }
+      window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir)?>&f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left=" + posLeft + ", top=" + posTop);
+    }
+    function CheckSubmit() {
+      if (document.form1.title.value == "") {
+        alert("自由列表标题标题不能为空！");
+        document.form1.title.focus();
+        return false;
+      }
+      return true;
+    }
+  </script>
+  <link rel="stylesheet" type="text/css" href="css/codemirror.css">
+  <script type="text/javascript" src="js/codemirror.js"></script>
+  <script type="text/javascript" src="js/mode/xml/xml.js"></script>
+  <script type="text/javascript" src="js/mode/javascript/javascript.js"></script>
+  <script type="text/javascript" src="js/mode/css/css.js"></script>
+  <script type="text/javascript" src="js/mode/htmlmixed/htmlmixed.js"></script>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<div class="bodytitle">
-	<div class="bodytitleleft"></div>
-	<div class="bodytitletxt" style="padding-left:10px;">频道管理</div>
-</div>
-<center>
-  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
-    <form action="freelist_edit.php" method="post"  name="form1" onSubmit="return CheckSubmit();">
-      <input type="hidden" name="dopost" value="save">
-      <input type="hidden" name="aid" value="<?php echo $row['aid']?>">
-      <tr>
-        <td height="28" bgcolor="#EDF9D5" background="images/tbg.gif"> <table width="98%" border="0" cellpadding="0" cellspacing="0">
-            <tr>
-              <td width="35%" height="18" align="left" style="padding-left:10px;">
-              	<a href="freelist_main.php"><strong>＞<u>自自由列表管理</u></strong></a>
-                <strong> &gt;&gt; 更改自由列表：</strong>
-              </td>
-              <td width="65%" align="right"></td>
-            </tr>
-          </table></td>
-      </tr>
-      <tr>
-        <td height="265" valign="top" bgcolor="#FFFFFF"><table width="99%" border="0" align="right" cellpadding="0" cellspacing="1">
-            <tr>
-              <td height="56"> <table width="100%" border="0" cellspacing="1" cellpadding="0">
-                  <tr>
-                    <td height="28" colspan="2" align="left"><img src="images/help.gif" width="16" height="16">自由列表标记的说明：自由列表标记(freelist)的功能基本等同于arclist标记，区别是freelist标记支持分页，这让生成Google
-                      Map、生成按自定义排序规则的文章列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，这样不会影响系统生成HTML或访问速度。</td>
-                  </tr>
-                  <tr>
-                    <td width="16%" height="28" align="left">自由列表标题：</td>
-                    <td width="84%" align="left"><input name="title" type="text" id="title" style="width:35%" value="<?php echo $row['title']?>"></td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">列表HTML存放目录：</td>
-                    <td align="left"><input name="listdir" type="text" id="listdir" style="width:35%" value="<?php echo $row['listdir']?>">
-                      {listdir}变量的值</td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">目录默认页名称：</td>
-                    <td align="left"><input name="defaultpage" type="text" id="defaultpage" style="width:35%" value="<?php echo $row['defaultpage']?>">
-                      <input name="nodefault" type="checkbox"  id="nodefault" value="1"<?php  if($row['nodefault']==1) echo " checked"; ?>>
-                      不使用目录默认主页
-                    </td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">命名规则：</td>
-                    <td align="left"><input name="namerule" type="text" id="namerule" style="width:35%" value="<?php echo $row['namerule']?>"></td>
-                  </tr>
-                  <tr>
-                    <td height="35" align="left">列表模板：</td>
-                    <td align="left"><input name="templet" type="text" id="templet" style="width:300px" value="<?php echo $row['templet']?>">
-                      <input type="button" name="set4" value="浏览..." style="width:60px" onClick="SelectTemplets('form1.templet');" class="inputbut"/></td>
-                  </tr>
-                  <tr>
-                    <td height="30" align="left">最大列出页数：</td>
-                    <td align="left">
-                    	<input name="maxpage" type="text" id="maxpage" style="width:100px" value="<?php echo $row['maxpage']; ?>">
-                    </td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">&nbsp;</td>
-                    <td align="left">以下选项用于模板里的 &lt;meta name=&quot;keywords|description&quot;
-                      content=&quot;&quot;&gt; 描述</td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">关键字：</td>
-                    <td align="left"><input name="keywords" type="text" id="keywords" style="width:60%" value="<?php echo $row['keywords']; ?>" /></td>
-                  </tr>
-                  <tr>
-                    <td height="28" align="left">列表描述：</td>
-                    <td align="left"><textarea name="description" id="description" style="width:60%;height:50px"><?php echo $row['description']?></textarea></td>
-                  </tr>
-                </table></td>
-            </tr>
-            <tr>
-              <td height="26" align="left" style="background:#FBFCE2;" ><img src="images/file_tt.gif" width="7" height="8" style="margin-left:6px;margin-right:6px;">
-              	列表样式：（这里是定义自由列表模板里的{dede:freelist/}标记的样式和属性）</td>
-            </tr>
-            <tr>
-              <td height="28" align="left">
-              	限定栏目：
-               <?php
+  <div class="bodytitle">
+    <div class="bodytitleleft"></div>
+    <div class="bodytitletxt" style="padding-left:10px;">频道管理</div>
+  </div>
+  <center>
+    <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+      style="background:#CFCFCF;">
+      <form action="freelist_edit.php" method="post" name="form1" onSubmit="return CheckSubmit();">
+        <input type="hidden" name="dopost" value="save">
+        <input type="hidden" name="aid" value="<?php echo $row['aid']?>">
+        <tr>
+          <td height="28" bgcolor="#EDF9D5" background="images/tbg.gif">
+            <table width="98%" border="0" cellpadding="0" cellspacing="0">
+              <tr>
+                <td width="35%" height="18" align="left" style="padding-left:10px;">
+                  <a href="freelist_main.php"><strong>＞<u>自自由列表管理</u></strong></a>
+                  <strong> &gt;&gt; 更改自由列表：</strong>
+                </td>
+                <td width="65%" align="right"></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td height="265" valign="top" bgcolor="#FFFFFF">
+            <table width="99%" border="0" align="right" cellpadding="0" cellspacing="1">
+              <tr>
+                <td height="56">
+                  <table width="100%" border="0" cellspacing="1" cellpadding="0">
+                    <tr>
+                      <td height="28" colspan="2" align="left"><img src="images/help.gif" width="16"
+                          height="16">自由列表标记的说明：自由列表标记(freelist)的功能基本等同于arclist标记，区别是freelist标记支持分页，这让生成Google
+                        Map、生成按自定义排序规则的文章列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，这样不会影响系统生成HTML或访问速度。</td>
+                    </tr>
+                    <tr>
+                      <td width="16%" height="28" align="left">自由列表标题：</td>
+                      <td width="84%" align="left"><input name="title" type="text" id="title" style="width:35%"
+                          value="<?php echo $row['title']?>"></td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">列表HTML存放目录：</td>
+                      <td align="left"><input name="listdir" type="text" id="listdir" style="width:35%"
+                          value="<?php echo $row['listdir']?>">
+                        {listdir}变量的值</td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">目录默认页名称：</td>
+                      <td align="left"><input name="defaultpage" type="text" id="defaultpage" style="width:35%"
+                          value="<?php echo $row['defaultpage']?>">
+                        <input name="nodefault" type="checkbox" id="nodefault" value="1"
+                          <?php  if($row['nodefault']==1) echo " checked"; ?>>
+                        不使用目录默认主页
+                      </td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">命名规则：</td>
+                      <td align="left"><input name="namerule" type="text" id="namerule" style="width:35%"
+                          value="<?php echo $row['namerule']?>"></td>
+                    </tr>
+                    <tr>
+                      <td height="35" align="left">列表模板：</td>
+                      <td align="left"><input name="templet" type="text" id="templet" style="width:300px"
+                          value="<?php echo $row['templet']?>">
+                        <input type="button" name="set4" value="浏览..." style="width:60px"
+                          onClick="SelectTemplets('form1.templet');" class="inputbut" /></td>
+                    </tr>
+                    <tr>
+                      <td height="30" align="left">最大列出页数：</td>
+                      <td align="left">
+                        <input name="maxpage" type="text" id="maxpage" style="width:100px"
+                          value="<?php echo $row['maxpage']; ?>">
+                      </td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">&nbsp;</td>
+                      <td align="left">以下选项用于模板里的 &lt;meta name=&quot;keywords|description&quot;
+                        content=&quot;&quot;&gt; 描述</td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">关键字：</td>
+                      <td align="left"><input name="keywords" type="text" id="keywords" style="width:60%"
+                          value="<?php echo $row['keywords']; ?>" /></td>
+                    </tr>
+                    <tr>
+                      <td height="28" align="left">列表描述：</td>
+                      <td align="left"><textarea name="description" id="description"
+                          style="width:60%;height:50px"><?php echo $row['description']?></textarea></td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <td height="26" align="left" style="background:#FBFCE2;"><img src="images/file_tt.gif" width="7"
+                    height="8" style="margin-left:6px;margin-right:6px;">
+                  列表样式：（这里是定义自由列表模板里的{dede:freelist/}标记的样式和属性）</td>
+              </tr>
+              <tr>
+                <td height="28" align="left">
+                  限定栏目：
+                  <?php
                $typeid = $ctag->GetAtt('typeid');
                echo "<select name='typeid' style='width:100'>\r\n";
                echo "<option value='0'>不限栏目...</option>\r\n";
@@ -150,10 +171,10 @@ function CheckSubmit(){
                }
                echo "</select>";
 		?></td>
-            </tr>
-            <tr>
-              <td height="28" align="left"> 限定频道：
-                <?php
+              </tr>
+              <tr>
+                <td height="28" align="left"> 限定频道：
+                  <?php
                 $channel  = $ctag->GetAtt('channel');
                 echo "<select name='channel' style='width:100'><option value='0'>不限</option>\r\n";
                 $dsql->SetQuery("Select id,typename From #@__channeltype where id>0");
@@ -165,11 +186,11 @@ function CheckSubmit(){
                 }
                 echo "</select>";
 		?>
-                　(如果限定了频道内容模型，则允许使用附加表指定的列表字段作为底层变量)</td>
-            </tr>
-            <tr>
-              <td height="28" align="left">附加属性：
-                <?php
+                  　(如果限定了频道内容模型，则允许使用附加表指定的列表字段作为底层变量)</td>
+              </tr>
+              <tr>
+                <td height="28" align="left">附加属性：
+                  <?php
                 $att  = $ctag->GetAtt('att');
                 echo "<select name='att' style='width:100'>\r\n";
                 echo "<option value='0'>不限...</option>\r\n";
@@ -188,39 +209,46 @@ function CheckSubmit(){
                 }
                 echo "</select>";
 		?>
-                文档发布时间：
-                <input name="subday" type="text" id="subday" size="6" value="<?php echo $ctag->GetAtt('subday')?>">
-                天以内 （0 表示不限） </td>
-            </tr>
-            <tr>
-              <td height="28" align="left">每页记录数：
-                <input name="pagesize" type="text" id="pagesize"  value="<?php echo $ctag->GetAtt('pagesize')?>" size="4">
-                　显示列数：
-                <input name="col" type="text" id="col" value="<?php  $col = $ctag->GetAtt('col'); $v = ( empty($col) ? '1' :  $col ); echo $v; ?>" size="4">
-                标题长度：
-                <input name="titlelen" type="text" id="titlelen" value="<?php echo $ctag->GetAtt('titlelen')?>" size="4">
-                （1 字节 = 0.5个中文字）</td>
-            </tr>
-            <tr>
-              <td height="28" align="left">
-              	<?php
+                  文档发布时间：
+                  <input name="subday" type="text" id="subday" size="6" value="<?php echo $ctag->GetAtt('subday')?>">
+                  天以内 （0 表示不限） </td>
+              </tr>
+              <tr>
+                <td height="28" align="left">每页记录数：
+                  <input name="pagesize" type="text" id="pagesize" value="<?php echo $ctag->GetAtt('pagesize')?>"
+                    size="4">
+                  　显示列数：
+                  <input name="col" type="text" id="col"
+                    value="<?php  $col = $ctag->GetAtt('col'); $v = ( empty($col) ? '1' :  $col ); echo $v; ?>"
+                    size="4">
+                  标题长度：
+                  <input name="titlelen" type="text" id="titlelen" value="<?php echo $ctag->GetAtt('titlelen')?>"
+                    size="4">
+                  （1 字节 = 0.5个中文字）</td>
+              </tr>
+              <tr>
+                <td height="28" align="left">
+                  <?php
               	$setype = $ctag->GetAtt('type');
               	if($setype=='') $setype = 'X';
               	?>
-              	高级筛选：
-                <input name="types[]" type="checkbox" id="type1" value="image" <?php if(preg_match("#image#i",$setype)) echo ' checked';?>>
-                带缩略图
-                <input name="types[]" type="checkbox" id="type2" value="commend" <?php if(preg_match("#commend#i", $setype)) echo ' checked';?>>
-                推荐
-                <input name="types[]" type="checkbox" id="type3" value="spec" class="inputbut"<?php if(preg_match("#spec#i", $setype)) echo ' checked';?>>
-                专题　关键字：
-                <input name="keywordarc" type="text" id="keywordarc" value="<?php echo $ctag->GetAtt('keyword')?>">
-                （&quot;,&quot;逗号分开）
+                  高级筛选：
+                  <input name="types[]" type="checkbox" id="type1" value="image"
+                    <?php if(preg_match("#image#i",$setype)) echo ' checked';?>>
+                  带缩略图
+                  <input name="types[]" type="checkbox" id="type2" value="commend"
+                    <?php if(preg_match("#commend#i", $setype)) echo ' checked';?>>
+                  推荐
+                  <input name="types[]" type="checkbox" id="type3" value="spec" class="inputbut"
+                    <?php if(preg_match("#spec#i", $setype)) echo ' checked';?>>
+                  专题　关键字：
+                  <input name="keywordarc" type="text" id="keywordarc" value="<?php echo $ctag->GetAtt('keyword')?>">
+                  （&quot;,&quot;逗号分开）
                 </td>
-            </tr>
-            <tr>
-              <td height="28" align="left">排列顺序：
-                <?php
+              </tr>
+              <tr>
+                <td height="28" align="left">排列顺序：
+                  <?php
                 $orderby = $ctag->GetAtt('orderby');
                 $sorta = "sortrank,置顶权限值;pubdate,发布时间;senddate,录入时间;click,点击量;id,文档ＩＤ,lastpost,最后评论时间;postnum,评论总数;rand,随机获取";
                 $sortas = explode(';',$sorta);
@@ -231,58 +259,66 @@ function CheckSubmit(){
                 	$sortarrs[$vs[0]] = $vs[1];
                 }
                 ?>
-              <select name="orderby" id="orderby" style="width:120">
-                	<?php
+                  <select name="orderby" id="orderby" style="width:120">
+                    <?php
                 	echo "<option value=\"$orderby\" selected>{$sortarrs[$orderby]}</option>\r\n";
                 	?>
-                  <option value="sortrank">置顶权限值</option>
-                  <option value="pubdate">发布时间</option>
-                  <option value="senddate">录入时间</option>
-                  <option value="click">点击量</option>
-                  <option value="id">文档ＩＤ</option>
-                  <option value="lastpost">最后评论时间</option>
-                  <option value="postnum">评论总数</option>
-                </select>
-                　
-                <input name="order" type="radio"   value="desc"<?php if($ctag->GetAtt('orderway')=='desc') echo " checked";?>>
-                由高到低
-                <input type="radio" name="order"  value="asc"<?php if($ctag->GetAtt('orderway')=='asc') echo " checked";?>>
-                由低到高</td>
-            </tr>
-            <tr>
-              <td height="28" align="left">循环内的单行记录样式(InnerText)：[<img src="images/help.gif" width="16" height="16"><a href='javascript:ShowHide("innervar");'>底层变量field参考</a>]</td>
-            </tr>
-            <tr>
-              <td height="80" align="left">
-			  <textarea name="innertext" cols="80" rows="6" id="myinnertext" style="width:80%;height:120px"><?php echo $ctag->GetInnerText()?></textarea>
-              </td>
-            </tr>
-            <tr>
-              <td height="80" align="left" id='innervar' style="display:none"><font color="#CC6600"><img src="images/help.gif" width="16" height="16">支持字段(底层变量[field:varname/])：id,title,color,typeid,ismake,description,pubdate,senddate,arcrank,click,litpic,typedir,typename,arcurl,typeurl,<br>
-                stime(pubdate 的&quot;0000-00-00&quot;格式),textlink,typelink,imglink,image
-                普通字段直接用[field:字段名/]表示。<br>
-                ·Pubdate发布时间的调用参数 [field:pubdate function=MyDate('Y--%d H:i:s',@me)/]</font>
-              </td>
-            </tr>
-            <tr>
-              <td height="50" align="left"> &nbsp;
-                <input name="Submit2" type="submit" id="Submit2" value="保存一个列表" class="coolbg" />
-              </td>
-            </tr>
-          </table></td>
+                    <option value="sortrank">置顶权限值</option>
+                    <option value="pubdate">发布时间</option>
+                    <option value="senddate">录入时间</option>
+                    <option value="click">点击量</option>
+                    <option value="id">文档ＩＤ</option>
+                    <option value="lastpost">最后评论时间</option>
+                    <option value="postnum">评论总数</option>
+                  </select>
+                  　
+                  <input name="order" type="radio" value="desc"
+                    <?php if($ctag->GetAtt('orderway')=='desc') echo " checked";?>>
+                  由高到低
+                  <input type="radio" name="order" value="asc"
+                    <?php if($ctag->GetAtt('orderway')=='asc') echo " checked";?>>
+                  由低到高</td>
+              </tr>
+              <tr>
+                <td height="28" align="left">循环内的单行记录样式(InnerText)：[<img src="images/help.gif" width="16" height="16"><a
+                    href='javascript:ShowHide("innervar");'>底层变量field参考</a>]</td>
+              </tr>
+              <tr>
+                <td height="80" align="left">
+                  <textarea name="innertext" cols="80" rows="6" id="myinnertext"
+                    style="width:80%;height:120px"><?php echo $ctag->GetInnerText()?></textarea>
+                </td>
+              </tr>
+              <tr>
+                <td height="80" align="left" id='innervar' style="display:none">
+                  <font color="#CC6600"><img src="images/help.gif" width="16"
+                      height="16">支持字段(底层变量[field:varname/])：id,title,color,typeid,ismake,description,pubdate,senddate,arcrank,click,litpic,typedir,typename,arcurl,typeurl,<br>
+                    stime(pubdate 的&quot;0000-00-00&quot;格式),textlink,typelink,imglink,image
+                    普通字段直接用[field:字段名/]表示。<br>
+                    ·Pubdate发布时间的调用参数 [field:pubdate function=MyDate('Y--%d H:i:s',@me)/]</font>
+                </td>
+              </tr>
+              <tr>
+                <td height="50" align="left"> &nbsp;
+                  <input name="Submit2" type="submit" id="Submit2" value="保存一个列表" class="coolbg" />
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </form>
+      <tr>
+        <td valign="top" bgcolor="#F9FCEF">&nbsp;</td>
       </tr>
-    </form>
-    <tr>
-      <td valign="top" bgcolor="#F9FCEF">&nbsp;</td>
-    </tr>
-  </table>
-</center>
-<script type="text/javascript">
+    </table>
+  </center>
+  <script type="text/javascript">
     var editor = CodeMirror.fromTextArea(document.getElementById('myinnertext'), {
-        lineNumbers: true,
-        lineWrapping: true,
-        mode: 'text/html'
+      lineNumbers: true,
+      lineWrapping: true,
+      mode: 'text/html'
     });
-</script>
+  </script>
 </body>
+
 </html>

src/dede/templets/freelist_main.htm

@@ -1,140 +1,153 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>自由列表管理</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language="javascript" src="js/main.js"></script>
-<script language="JavaScript">
-var pageno = 1;
-var totalrow = <?php echo $totalRow?>;
-var pagesize = <?php echo $pagesize?>;
-var orderby = '<?php echo $orderby?>';
-var addget = "<?php echo $addget?>";
-//加载列表
-function ReloadPage(ordertype){
-	orderby = ordertype;
-	var listArea = $Obj('rslist');
-	var errMsg = "网络通信出错！<br>[<a href=\"javascript:ReloadPage('"+ordertype+"')\"><u>点击此重新加载列表</u></a>]";
-	var myajax = new DedeAjax(listArea,true,true,"",errMsg,"正在加载...");
-	myajax.SendGet("freelist_main.php?dopost=getlist&pageno="+pageno+"&orderby="+ordertype+addget);
-}
-//载入指定页的列表
-function LoadPage(npage){
-	pageno = npage;
-	ReloadPage(orderby);
-	ReloadPageNum(pageno);
-}
-//更改
-function EditNote(nid){
-	location.href = 'freelist_edit.php?aid='+nid;
-}
-//更新HTML
-function CreateNote(nid){
-	location.href = 'makehtml_freelist.php?aid='+nid;
-}
-//删除
-function DelNote(nid){
-	if(!window.confirm("你确认要删除这条记录么！")){ return false; }
-	var listArea = $Obj('rslist');
-	totalrow = totalrow - 1;
-	var pagenum = Math.ceil(totalrow/pagesize);
-	if(pagenum<=pageno) pageno = pagenum;
-	var errMsg = "网络通信出错！<br>[<a href=\"javascript:LoadPage('"+pageno+"')\"><u>点击此重新加载列表</u></a>]";
-	var myajax = new DedeAjax(listArea,true,true,"",errMsg,"正在处理...");
-	myajax.SendGet("freelist_main.php?dopost=del&aid="+nid+"&pageno="+pageno);
-	ReloadPageNum(pageno);
-}
-//重新加载分页列表
-function ReloadPageNum(startnum){
-	var ListArea = $Obj('pagelist');
-	var pagenum = Math.ceil(totalrow/pagesize);
-	var listsize = 3;
-	var ahtml = "";
-	var startloop = 1;
-	var endnum = 0;
-	ahtml += "共："+totalrow+" 条记录/"+pagenum+"页";
-	if(pageno>1 && pageno!=1) ahtml += " <a href='#' onclick='LoadPage(1)'>首页</a> ";
-	if(pageno>1) ahtml += "<a href='#' onclick='LoadPage("+(pageno-1)+")'>↑上页</a> ";
-	if(startnum >= pagenum-listsize){
-		startloop = pagenum-(listsize*2);
-		if(startloop<1) startloop = 1;
-		for(i=startloop;i<=pagenum;i++){
-			if(i==pageno) ahtml += i+" ";
-			else ahtml += "<a href='#' onclick='LoadPage("+i+")'>["+i+"]</a> ";
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+	<title>自由列表管理</title>
+	<link href="css/base.css" rel="stylesheet" type="text/css">
+	<script language="javascript" src="../static/js/jquery.js"></script>
+	<script language="javascript" src="../static/js/dedeajax2.js"></script>
+	<script language="javascript" src="js/main.js"></script>
+	<script language="JavaScript">
+		var pageno = 1;
+		var totalrow = <? php echo $totalRow?>;
+		var pagesize = <? php echo $pagesize?>;
+		var orderby = '<?php echo $orderby?>';
+		var addget = "<?php echo $addget?>";
+		//加载列表
+		function ReloadPage(ordertype) {
+			orderby = ordertype;
+			var listArea = $Obj('rslist');
+			var errMsg = "网络通信出错！<br>[<a href=\"javascript:ReloadPage('" + ordertype + "')\"><u>点击此重新加载列表</u></a>]";
+			var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在加载...");
+			myajax.SendGet("freelist_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype + addget);
+		}
+		//载入指定页的列表
+		function LoadPage(npage) {
+			pageno = npage;
+			ReloadPage(orderby);
+			ReloadPageNum(pageno);
+		}
+		//更改
+		function EditNote(nid) {
+			location.href = 'freelist_edit.php?aid=' + nid;
+		}
+		//更新HTML
+		function CreateNote(nid) {
+			location.href = 'makehtml_freelist.php?aid=' + nid;
 		}
-	}
-	else if(pagenum < listsize){
-		for(i=1;i<=pagenum;i++){
-			if(i==pageno) ahtml += i+" ";
-			else ahtml += "<a href='#' onclick='LoadPage("+i+")'>["+i+"]</a> ";
+		//删除
+		function DelNote(nid) {
+			if (!window.confirm("你确认要删除这条记录么！")) { return false; }
+			var listArea = $Obj('rslist');
+			totalrow = totalrow - 1;
+			var pagenum = Math.ceil(totalrow / pagesize);
+			if (pagenum <= pageno) pageno = pagenum;
+			var errMsg = "网络通信出错！<br>[<a href=\"javascript:LoadPage('" + pageno + "')\"><u>点击此重新加载列表</u></a>]";
+			var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在处理...");
+			myajax.SendGet("freelist_main.php?dopost=del&aid=" + nid + "&pageno=" + pageno);
+			ReloadPageNum(pageno);
 		}
-	}
-	else{
-		startloop = startnum-listsize;
-		if(startloop<1){ startloop=1; endnum = startloop + (listsize*2); }
-		else{ endnum = startnum+listsize; }
-		if(endnum >= pagenum) endnum = pagenum;
-		for(i=startloop;i<=endnum;i++){
-			if(i==pageno) ahtml += i+" ";
-			else ahtml += "<a href='#' onclick='LoadPage("+i+")'>["+i+"]</a> ";
+		//重新加载分页列表
+		function ReloadPageNum(startnum) {
+			var ListArea = $Obj('pagelist');
+			var pagenum = Math.ceil(totalrow / pagesize);
+			var listsize = 3;
+			var ahtml = "";
+			var startloop = 1;
+			var endnum = 0;
+			ahtml += "共：" + totalrow + " 条记录/" + pagenum + "页";
+			if (pageno > 1 && pageno != 1) ahtml += " <a href='#' onclick='LoadPage(1)'>首页</a> ";
+			if (pageno > 1) ahtml += "<a href='#' onclick='LoadPage(" + (pageno - 1) + ")'>↑上页</a> ";
+			if (startnum >= pagenum - listsize) {
+				startloop = pagenum - (listsize * 2);
+				if (startloop < 1) startloop = 1;
+				for (i = startloop; i <= pagenum; i++) {
+					if (i == pageno) ahtml += i + " ";
+					else ahtml += "<a href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
+				}
+			}
+			else if (pagenum < listsize) {
+				for (i = 1; i <= pagenum; i++) {
+					if (i == pageno) ahtml += i + " ";
+					else ahtml += "<a href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
+				}
+			}
+			else {
+				startloop = startnum - listsize;
+				if (startloop < 1) { startloop = 1; endnum = startloop + (listsize * 2); }
+				else { endnum = startnum + listsize; }
+				if (endnum >= pagenum) endnum = pagenum;
+				for (i = startloop; i <= endnum; i++) {
+					if (i == pageno) ahtml += i + " ";
+					else ahtml += "<a href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
+				}
+			}
+			if (pageno < pagenum) ahtml += "<a href='#' onclick='LoadPage(" + (pageno + 1) + ")'>下页↓</a> ";
+			if (pageno != pagenum && pagenum > 1) ahtml += " <a href='#' onclick='LoadPage(" + pagenum + ")'>末页</a>";
+			ListArea.innerHTML = ahtml;
 		}
-	}
-	if(pageno<pagenum) ahtml += "<a href='#' onclick='LoadPage("+(pageno+1)+")'>下页↓</a> ";
-	if(pageno!=pagenum && pagenum>1) ahtml += " <a href='#' onclick='LoadPage("+pagenum+")'>末页</a>";
-	ListArea.innerHTML = ahtml;
-}
-</script>
+	</script>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<div class="bodytitle">
-	<div class="bodytitleleft"></div>
-	<div class="bodytitletxt" style="padding-left:10px;">频道管理</div>
-</div>
+	<div class="bodytitle">
+		<div class="bodytitleleft"></div>
+		<div class="bodytitletxt" style="padding-left:10px;">频道管理</div>
+	</div>
 
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="border:1px solid #CFCFCF;border-bottom:none;">
-<tr>
-<td bgcolor="#CFCFCF" class="tbtitletxt" background="images/tbg.gif">
-	<table width='100%' border="0" cellpadding='0' cellspacing='0'>
-    <tr>
-     <td width='36%' class="tbtitletxt" style="padding-left:10px;"><strong>自由列表管理</strong>&nbsp;[<a href="freelist_add.php"><u>增加列表</u></a>]</td>
-     <td width="29%">&nbsp;</td>
-     <td width="35%" align='right'>&nbsp;</td>
-    </tr>
-  </table>
-  </td>
-  </tr>
-</table>
+	<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+		style="border:1px solid #CFCFCF;border-bottom:none;">
+		<tr>
+			<td bgcolor="#CFCFCF" class="tbtitletxt" background="images/tbg.gif">
+				<table width='100%' border="0" cellpadding='0' cellspacing='0'>
+					<tr>
+						<td width='36%' class="tbtitletxt" style="padding-left:10px;"><strong>自由列表管理</strong>&nbsp;[<a
+								href="freelist_add.php"><u>增加列表</u></a>]</td>
+						<td width="29%">&nbsp;</td>
+						<td width="35%" align='right'>&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
 	<span id='rslist'>
-	<?php
+		<?php
 	GetTagList($dsql,$pageno,$pagesize,$orderby);
 	?>
 	</span>
-	<table width="98%" border="0" cellpadding="5" cellspacing="1" align="center" style=" border:1px solid #CFCFCF;line-height:31px;margin:auto;">
+	<table width="98%" border="0" cellpadding="5" cellspacing="1" align="center"
+		style=" border:1px solid #CFCFCF;line-height:31px;margin:auto;">
 		<tr>
-		  <td height="35" align="center" style="background:#F9FCEF;padding:7px 6px 3px 6px;" >
-      <table width="100%" border="0" cellpadding="0" cellspacing="0">
-        <form action="freelist_main.php" name="form1" id="form1">
-          <tr>
-            <td width="200" align="center">
-            	<input type="text" name="keyword" id="keyword" class='alltxt' style="width:170px" value="<?php echo $keyword?>" />
-            </td>
-            <td width="80" align="left">
-            	<input type="submit" name="Submit2" value="搜索"  class="coolbg np" />
-            </td>
-            <td align="left">
-            	<input type="button" name="bt1" value="增加列表" style="width:70px" onclick="location='freelist_add.php';" class="coolbg np" />
-              &nbsp;
-              <input type="button" name="bt2" value="更新所有列表HTML" style="width:180px" onclick="location='makehtml_freelist.php';" class="coolbg np" />
-            </td>
-            <td width="200">
-            	<span id='pagelist'><script language='javascript'>ReloadPageNum(1);</script></span>
-            </td>
-          </tr>
-        </form>
-      </table></td>
-  </tr>
-</table>
+			<td height="35" align="center" style="background:#F9FCEF;padding:7px 6px 3px 6px;">
+				<table width="100%" border="0" cellpadding="0" cellspacing="0">
+					<form action="freelist_main.php" name="form1" id="form1">
+						<tr>
+							<td width="200" align="center">
+								<input type="text" name="keyword" id="keyword" class='alltxt' style="width:170px"
+									value="<?php echo $keyword?>" />
+							</td>
+							<td width="80" align="left">
+								<input type="submit" name="Submit2" value="搜索" class="coolbg np" />
+							</td>
+							<td align="left">
+								<input type="button" name="bt1" value="增加列表" style="width:70px"
+									onclick="location='freelist_add.php';" class="coolbg np" />
+								&nbsp;
+								<input type="button" name="bt2" value="更新所有列表HTML" style="width:180px"
+									onclick="location='makehtml_freelist.php';" class="coolbg np" />
+							</td>
+							<td width="200">
+								<span id='pagelist'>
+									<script language='javascript'>ReloadPageNum(1);</script></span>
+							</td>
+						</tr>
+					</form>
+				</table>
+			</td>
+		</tr>
+	</table>
 </body>
+
 </html>

src/dede/templets/index2.htm

@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title><?php echo $cfg_webname; ?>-<?php echo $cfg_softname." ".$cfg_version; ?></title>
 <link href="css/frame.css" rel="stylesheet" type="text/css" />
-<script src="../static/js/jquery/jquery.js" language="javascript" type="text/javascript"></script>
+<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
 <script src="js/frame.js" language="javascript" type="text/javascript"></script>
 <link href="images/style<?php echo $cfg_admin_skin;?>/style.css" rel="stylesheet" type="text/css" />
 <style type="text/css">

src/dede/templets/index_body.htm

@@ -1,95 +1,93 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>DedeCMS Home</title>
-<base target="_self">
-<link rel="stylesheet" type="text/css" href="css/base.css" />
-<link rel="stylesheet" type="text/css" href="css/indexbody.css" />
-<link href="images/style<?php echo $cfg_admin_skin;?>/style.css" rel="stylesheet" type="text/css" />
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script type="text/javascript" src="../static/js/jquery/jquery.js" ></script>
-<script language="javascript" src="../static/js/jquery/ui.core.js"></script>
-<script language="javascript" src="../static/js/jquery/ui.draggable.js"></script>
-<script language="javascript" src="../static/js/jquery/ui.sortable.js"></script>
-<script language="javascript" src="js/jquery.json-2.2.min.js"></script>
-<script language="javascript" src="js/indexbody.js"></script>
-<script language="javascript" src="js/drag.js"></script>
-<script type="text/javascript">
-function showMore()
-{
-	$("#allInfo").toggle();
-	$("#allInfoTD").toggle();
-}
+    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+    <title>DedeCMS Home</title>
+    <base target="_self">
+    <link rel="stylesheet" type="text/css" href="css/base.css" />
+    <link rel="stylesheet" type="text/css" href="css/indexbody.css" />
+    <link href="images/style<?php echo $cfg_admin_skin;?>/style.css" rel="stylesheet" type="text/css" />
+    <script language="javascript" src="../static/js/jquery.js"></script>
+    <script language="javascript" src="../static/js/dedeajax2.js"></script>
+    <script language="javascript" src="js/jquery.json-2.2.min.js"></script>
+    <script language="javascript" src="js/indexbody.js"></script>
+    <script type="text/javascript">
+        function showMore() {
+            $("#allInfo").toggle();
+            $("#allInfoTD").toggle();
+        }
 
-$(function()
-{
-   $.get("index_testenv.php",function(data)
-  {
-	if(data !== '')
-	{
-		$("#__testEvn").html(data);
-	}
-  });
-   $.get("index_body.php?dopost=get_seo",function(data)
-  {
-	if(data !== '')
-	{
-		$("#SEOInfo").html(data);
-	}
-  });
-});
-</script>
+        $(function () {
+            $.get("index_testenv.php", function (data) {
+                if (data !== '') {
+                    $("#__testEvn").html(data);
+                }
+            });
+            $.get("index_body.php?dopost=get_seo", function (data) {
+                if (data !== '') {
+                    $("#SEOInfo").html(data);
+                }
+            });
+        });
+    </script>
 </head>
+
 <body leftmargin="8" topmargin='8' bgcolor="#FFFFFF">
-<div style="min-width:780px">
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
-  <tr>
-    <td>
-     <div style='float:left'>
-       欢迎使用专业的PHP网站管理系统，轻松建站的首选利器 -- <?php echo $cfg_softname; ?>
-     </div>
-     <div id='' style='float:right;padding-right:8px;'>
-         <!--  //保留位置（顶右）  -->
-     </div>
-   </td>
-  </tr>
-  <tr>
-    <td height="1" background="images/sp_bg.gif" style='padding:0px'></td>
-  </tr>
-</table>
-<div id="__testEvn"></div>
-<div id='mainmsg'>
-  <div class="column" id="column1"><!--左侧开始-->    
-        <dl class="dbox" id="item1">
-            <dt class='lside'><span class='l'><?php echo $cfg_soft_enname; ?> 更新消息</span></dt>
-            <dd>
-                <div id='updatetest'>
-                    <div id='updateinfos'>
-                        <?php
+    <div style="min-width:780px">
+        <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
+            <tr>
+                <td>
+                    <div style='float:left'>
+                        欢迎使用专业的PHP网站管理系统，轻松建站的首选利器 -- <?php echo $cfg_softname; ?>
+                    </div>
+                    <div id='' style='float:right;padding-right:8px;'>
+                        <!--  //保留位置（顶右）  -->
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td height="1" background="images/sp_bg.gif" style='padding:0px'></td>
+            </tr>
+        </table>
+        <div id="__testEvn"></div>
+        <div id='mainmsg'>
+            <div class="column" id="column1">
+                <!--左侧开始-->
+                <dl class="dbox" id="item1">
+                    <dt class='lside'><span class='l'><?php echo $cfg_soft_enname; ?> 更新消息</span></dt>
+                    <dd>
+                        <div id='updatetest'>
+                            <div id='updateinfos'>
+                                <?php
                             echo "<div class='updatedvt'><b>您系统版本最后更新时间为：{$oktime} </b><br/>";
                             echo " <a href='javascript:LoadUpdateInfos();' class='np coolbg'>进行在线更新</a> &nbsp; \r\n";
                             echo " <a href='sys_repair.php' class='np coolbg'>系统错误修复</a></div>\r\n";
                             echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' width='98%' height='50'></iframe>";
                         ?>
-                    </div>
-                 </div>
-            </dd>
-        </dl><!--更新消息结束-->        
-        <dl class='dbox' id="item2">
-            <dt class='lside'><span class='l'>商业授权查询</span></dt>
-            <dd>               
-                <iframe name="showauth" src="index_body.php?dopost=showauth" width="100%" frameborder="0" scrolling="no" marginwidth="10" marginheight="10" id="showauth"></iframe>                
-            </dd>
-        </dl><!--更新消息结束-->
-        <dl class='dbox' id="item3">
-            <dt class='lside'>
-                <div class='l'>快捷操作</div>
-                <div class='r'><a href='#' onClick="AddNew()"><b>【新增】</b></a><a href='#' onClick="ListAll()"><b>【管理】</b></a></div>
-            </dt>
-            <dd>
-                <div id='quickmenu'>
-                    <?php
+                            </div>
+                        </div>
+                    </dd>
+                </dl>
+                <!--更新消息结束-->
+                <dl class='dbox' id="item2">
+                    <dt class='lside'><span class='l'>商业授权查询</span></dt>
+                    <dd>
+                        <iframe name="showauth" src="index_body.php?dopost=showauth" width="100%" frameborder="0"
+                            scrolling="no" marginwidth="10" marginheight="10" id="showauth"></iframe>
+                    </dd>
+                </dl>
+                <!--更新消息结束-->
+                <dl class='dbox' id="item3">
+                    <dt class='lside'>
+                        <div class='l'>快捷操作</div>
+                        <div class='r'><a href='#' onClick="AddNew()"><b>【新增】</b></a><a href='#'
+                                onClick="ListAll()"><b>【管理】</b></a></div>
+                    </dt>
+                    <dd>
+                        <div id='quickmenu'>
+                            <?php
                         $dtp = new DedeTagparse();
                         $dtp->SetNameSpace('menu','<','>');
                         $dtp->LoadTemplet($myIcoFile);
@@ -102,18 +100,21 @@ $(function()
                             }
                         }
                     ?>
-                </div>
-            </dd>
+                        </div>
+                    </dd>
 
-        </dl><!--快捷操作结束-->   
-        <dl class="dbox" id="item4">
-            <dt class='lside'><div class='l'>系统基本信息</div></dt>
-            <dd class='intable'>
-                <table width="98%" class="dboxtable">
-                    <tr>
-                        <td width="25%" class='nline' style="text-align:right">您的级别：</td>
-                        <td class='nline'>
-                            <?php
+                </dl>
+                <!--快捷操作结束-->
+                <dl class="dbox" id="item4">
+                    <dt class='lside'>
+                        <div class='l'>系统基本信息</div>
+                    </dt>
+                    <dd class='intable'>
+                        <table width="98%" class="dboxtable">
+                            <tr>
+                                <td width="25%" class='nline' style="text-align:right">您的级别：</td>
+                                <td class='nline'>
+                                    <?php
                                 if($cuserLogin->getUserType()==10) {
                                     echo "总管理员";
                             } else if($cuserLogin->getUserType()==5) {
@@ -122,41 +123,51 @@ $(function()
                                 echo "信息采集员或其它管理员";
                             }
                         ?>
-                        [<a href="javascript:showMore()">查看更多</a>]</td>
-                    </tr>
-                    <tr>
-                     <td colspan="2" class='nline' id="allInfoTD" style="display:none"><table width="100%" border="0" cellspacing="0" cellpadding="0" id="allInfo" style="display:none">
-                    <tr>
-                        <td rowspan="5" class='nline' style="text-align:right">PHP环境摘要：</td>
-                        <td class='nline' style="text-align:left"> PHP版本：<?php echo @phpversion(); ?>&nbsp;GD版本：<?php echo @gdversion(); ?></td>
-                    </tr>
-                    <tr>
-                        <td class='nline' style="text-align:left">是否安全模式：<font color='red'><?php echo ($isSafeMode ? 'On' : 'Off')?></font>
-                            <?php
+                                    [<a href="javascript:showMore()">查看更多</a>]</td>
+                            </tr>
+                            <tr>
+                                <td colspan="2" class='nline' id="allInfoTD" style="display:none">
+                                    <table width="100%" border="0" cellspacing="0" cellpadding="0" id="allInfo"
+                                        style="display:none">
+                                        <tr>
+                                            <td rowspan="5" class='nline' style="text-align:right">PHP环境摘要：</td>
+                                            <td class='nline' style="text-align:left">
+                                                PHP版本：<?php echo @phpversion(); ?>&nbsp;GD版本：<?php echo @gdversion(); ?>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class='nline' style="text-align:left">是否安全模式：<font color='red'>
+                                                    <?php echo ($isSafeMode ? 'On' : 'Off')?></font>
+                                                <?php
                                 if($isSafeMode) {
                                     echo "<br>　　<font color='blue'>由于您的系统以安全模式运行，为了确保程序兼容性，第一次进入本系统时请更改“<a href='sys_info.php'><u>更改系统参数</u></a>”里的FTP选项，并选择用FTP形式创建目录，完成后：<a href='testenv.php' style='color:red'><u>点击此进行一次DedeCMS目录权限检测&gt;&gt;</u></a></font>";
                                 } else {
                                     echo "　<a href='testenv.php' style='color:blue'><u>DedeCMS目录权限检测&gt;&gt;</u></a></font>";
                                 }
                             ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class='nline' style="text-align:left">
-                            Register_Globals：<font color='red'><?php echo ini_get("register_globals") ? 'On' : 'Off'?></font> &nbsp;
-                            Magic_Quotes_Gpc：<font color='red'><?php echo ini_get("magic_quotes_gpc") ? 'On' : 'Off'?></font>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class='nline' style="text-align:left">支持上传的最大文件：<?php echo ini_get("post_max_size")?></td>
-                    </tr>
-                    <tr>
-                        <td class='nline' style="text-align:left">是否允许打开远程连接：<?php echo ini_get("allow_url_fopen") ? '支持' : '不支持'; ?></td>
-                    </tr>
-                    <tr>
-                        <td class='nline' style="text-align:right"> 其它必须函数检测：</td>
-                        <td class='nline' style="text-align:left">
-                            <?php
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class='nline' style="text-align:left">
+                                                Register_Globals：<font color='red'>
+                                                    <?php echo ini_get("register_globals") ? 'On' : 'Off'?></font>
+                                                &nbsp;
+                                                Magic_Quotes_Gpc：<font color='red'>
+                                                    <?php echo ini_get("magic_quotes_gpc") ? 'On' : 'Off'?></font>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class='nline' style="text-align:left">
+                                                支持上传的最大文件：<?php echo ini_get("post_max_size")?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class='nline' style="text-align:left">
+                                                是否允许打开远程连接：<?php echo ini_get("allow_url_fopen") ? '支持' : '不支持'; ?></td>
+                                        </tr>
+                                        <tr>
+                                            <td class='nline' style="text-align:right"> 其它必须函数检测：</td>
+                                            <td class='nline' style="text-align:left">
+                                                <?php
                                 $needfunc = array('dir','phpinfo');
                                 $n = 0;
                                 foreach($needfunc as $k) {
@@ -171,56 +182,80 @@ $(function()
                                 echo "被禁用的函数可能导致部份功能无法使用！";
                                 }
                             ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class='nline' style="text-align:right"> 软件版本信息： </td>
-                        <td class='nline' style="text-align:left"> 版本名称：<?php echo $cfg_soft_enname; ?>&nbsp;版本号：<?php echo $cfg_version; ?></td>
-                    </tr>
-                     </table></td>
-                    </tr>
-                </table>
-            </dd>
-        </dl><!--系统基本信息结束-->
-        <dl class='dbox' id="item5">
-            <dt class='lside'><div class='l'>程序团队</div></dt>
-            <dd class='intable'>
-                <table width="98%" class="dboxtable">
-                    <tr>
-                        <td width='25%' height='36' class='nline' style="text-align:right"> 主程序研发： </td>
-                        <td class='nline' style="text-align:left"><a href="https://github.com/dedetech" target="_blank" style="color:blue">织梦团队</a></td>
-                    </tr>
-                    <tr>
-                        <td height='36' class='nline' style="text-align:right">鸣谢：</td>
-                        <td class='nline' style="text-align:left"><a href="https://github.com/dedetech/DedeCMSv5/graphs/contributors" target="_blank" style="color:blue">热心用户</a>、<a href="http://www.dedecms.com/thanks.html" target="_blank" style="color:blue">赞助商</a></td>
-                    </tr>
-                </table>
-            </dd>
-        </dl><!--开发团队结束-->
-    </div><!--左侧结束-->
-    <div class="column" id="column2" ><!-- //右边的快捷消息开始 -->
-        <dl class='dbox' id="item8">
-            <dt class='lside'><div class='l'>赞助商链接(<a href="http://ad.dedecms.com/ad/" target="_blank">说明</a>)</div></dt>
-            <dd>
-                <iframe name="showad" src="index_body.php?dopost=showad" frameborder="0" width="100%" id="showad" frameborder="0" scrolling="no"  marginheight="5"></iframe>
-            </dd>
-        </dl><!--赞助商链接结束-->
-        <dl class='dbox' id="item6">
-            <dt class='lside'><div class='l'>信息统计</div></dt>
-            <dd id='listCount'>
-                正在载入中...
-            </dd>
-        </dl><!--信息统计结束-->
-<dl class='dbox' id="item7">
-            <dt class='lside'><div class='l'>SEO信息</div></dt>
-            <dd id='SEOInfo'>
-			正在载入中……
-            </dd>
-        </dl>
-        <dl class='dbox' id="item7">
-            <dt class='lside'><div class='l'>最新文档</div></dt>
-            <dd id='listNews'>
-<?php
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class='nline' style="text-align:right"> 软件版本信息： </td>
+                                            <td class='nline' style="text-align:left">
+                                                版本名称：<?php echo $cfg_soft_enname; ?>&nbsp;版本号：<?php echo $cfg_version; ?>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </dd>
+                </dl>
+                <!--系统基本信息结束-->
+                <dl class='dbox' id="item5">
+                    <dt class='lside'>
+                        <div class='l'>程序团队</div>
+                    </dt>
+                    <dd class='intable'>
+                        <table width="98%" class="dboxtable">
+                            <tr>
+                                <td width='25%' height='36' class='nline' style="text-align:right"> 主程序研发： </td>
+                                <td class='nline' style="text-align:left"><a href="https://github.com/dedetech"
+                                        target="_blank" style="color:blue">织梦团队</a></td>
+                            </tr>
+                            <tr>
+                                <td height='36' class='nline' style="text-align:right">鸣谢：</td>
+                                <td class='nline' style="text-align:left"><a
+                                        href="https://github.com/dedetech/DedeCMSv5/graphs/contributors" target="_blank"
+                                        style="color:blue">热心用户</a>、<a href="http://www.dedecms.com/thanks.html"
+                                        target="_blank" style="color:blue">赞助商</a></td>
+                            </tr>
+                        </table>
+                    </dd>
+                </dl>
+                <!--开发团队结束-->
+            </div>
+            <!--左侧结束-->
+            <div class="column" id="column2">
+                <!-- //右边的快捷消息开始 -->
+                <dl class='dbox' id="item8">
+                    <dt class='lside'>
+                        <div class='l'>赞助商链接(<a href="http://ad.dedecms.com/ad/" target="_blank">说明</a>)</div>
+                    </dt>
+                    <dd>
+                        <iframe name="showad" src="index_body.php?dopost=showad" frameborder="0" width="100%"
+                            id="showad" frameborder="0" scrolling="no" marginheight="5"></iframe>
+                    </dd>
+                </dl>
+                <!--赞助商链接结束-->
+                <dl class='dbox' id="item6">
+                    <dt class='lside'>
+                        <div class='l'>信息统计</div>
+                    </dt>
+                    <dd id='listCount'>
+                        正在载入中...
+                    </dd>
+                </dl>
+                <!--信息统计结束-->
+                <dl class='dbox' id="item7">
+                    <dt class='lside'>
+                        <div class='l'>SEO信息</div>
+                    </dt>
+                    <dd id='SEOInfo'>
+                        正在载入中……
+                    </dd>
+                </dl>
+                <dl class='dbox' id="item7">
+                    <dt class='lside'>
+                        <div class='l'>最新文档</div>
+                    </dt>
+                    <dd id='listNews'>
+                        <?php
     $query = "SELECT arc.id, arc.arcrank, arc.title, arc.channel, ch.editcon  FROM `#@__archives` arc
             LEFT JOIN `#@__channeltype` ch ON ch.id = arc.channel
              WHERE arc.arcrank<>-2 ORDER BY arc.id DESC LIMIT 0, 6 ";
@@ -231,8 +266,8 @@ $(function()
         $arcArr[] = $row;
     }
 ?>
-    <table width="100%" class="dboxtable">
-    <?php
+                        <table width="100%" class="dboxtable">
+                            <?php
     if(count($arcArr) > 1)
     {
         foreach($arcArr as $row)
@@ -243,82 +278,88 @@ $(function()
             $linkstr = "·<a href='{$row['editcon']}?aid={$row['id']}&channelid={$row['channel']}'>{$row['title']}</a>";
             if($row['arcrank']==-1) $linkstr .= "<font color='red'>(未审核)</font>";
         ?>
-        <tr>
-            <td class='nline'  style="text-align:left">
-                <?php echo $linkstr; ?>
-            </td>
-        </tr>
-        <?php
+                            <tr>
+                                <td class='nline' style="text-align:left">
+                                    <?php echo $linkstr; ?>
+                                </td>
+                            </tr>
+                            <?php
         }
     } else {
     ?>
-        <tr>
-            <td class='nline'  style="text-align:left">
-                暂无新增内容
-            </td>
-        </tr>
-    <?php
+                            <tr>
+                                <td class='nline' style="text-align:left">
+                                    暂无新增内容
+                                </td>
+                            </tr>
+                            <?php
     }
     ?>
-    </table>
-            </dd>
-        </dl><!--最新文档结束-->
-        
-    </div>
-</div>
-<br style='clear:both'/>
-<!-- //底部 -->
-<div align="center" class="footer">
-Copyright &copy; 2004-2020 <a href='http://www.dedecms.com' target='_blank'><u>DedeCMS</u></a>. 织梦科技 版权所有
-</div>
+                        </table>
+                    </dd>
+                </dl>
+                <!--最新文档结束-->
+
+            </div>
+        </div>
+        <br style='clear:both' />
+        <!-- //底部 -->
+        <div align="center" class="footer">
+            Copyright &copy; 2004-2020 <a href='http://www.dedecms.com' target='_blank'><u>DedeCMS</u></a>. 织梦科技 版权所有
+        </div>
 
-<!--  下面是隐藏的项目  -->
-<div id='loaddiv' style='display:none'>
-    <p align='center' style='padding-top:200px'><img src='images/loadinglit.gif' /> 请稍后，正在下载更新文件列表...</p>
-</div>
-<div id="editTab">
-<span id='editTabBody'>请稍候，正在载入...</span>
-</div>
-<div id="addTab">
-<form name='addform' action='index_body.php'>
-<input type='hidden' name='dopost' value='addnew' />
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-   <tr>
-     <td height='28' colspan='3' background="images/tbg.gif">
-         <div style='float:left'><b>增加快捷操作项</b></div>
-      <div style='float:right;padding:3px 10px 0 0;'>
-        <a href="javascript:CloseTab('addTab')"><img src="images/close.gif" width="12" height="12" border="0" /></a>
-      </div>
-     </td>
-   </tr>
-      <tr><td style="height:6px;font-size:1px;border-top:1px solid #8DA659" colspan="2">&nbsp;</td></tr>
-   <tr>
-     <td width="20%" height="28" align="right">链接标题：</td>
-     <td width="70%">
-         <input name="title" type="text" id="title" class='pubinputs' style="width:255px;"/>
-     </td>
-   </tr>
-   <tr>
-     <td height="28" width="20%" align="right">ICO图片：</td>
-     <td width="70%">
-         <input name="ico" type="text" id="ico" class='pubinputs' style="width:255px;"/>
-     </td>
-   </tr>
-   <tr>
-     <td height="28" width="20%" align="right">链接网址：</td>
-     <td width="70%">
-         <input name="link" type="text" id="link" class='pubinputs' style="width:255px;"/>
-     </td>
-   </tr>
-   <tr>
-     <td height="45">&nbsp;</td>
-     <td>
-         <input type="submit" name="Submit" value="保存项目" class="np coolbg" style="width:80px;cursor:pointer" />
-     </td>
-   </tr>
-  </table>
-</form>
-</div>
-</div>
+        <!--  下面是隐藏的项目  -->
+        <div id='loaddiv' style='display:none'>
+            <p align='center' style='padding-top:200px'><img src='images/loadinglit.gif' /> 请稍后，正在下载更新文件列表...</p>
+        </div>
+        <div id="editTab">
+            <span id='editTabBody'>请稍候，正在载入...</span>
+        </div>
+        <div id="addTab">
+            <form name='addform' action='index_body.php'>
+                <input type='hidden' name='dopost' value='addnew' />
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <tr>
+                        <td height='28' colspan='3' background="images/tbg.gif">
+                            <div style='float:left'><b>增加快捷操作项</b></div>
+                            <div style='float:right;padding:3px 10px 0 0;'>
+                                <a href="javascript:CloseTab('addTab')"><img src="images/close.gif" width="12"
+                                        height="12" border="0" /></a>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="height:6px;font-size:1px;border-top:1px solid #8DA659" colspan="2">&nbsp;</td>
+                    </tr>
+                    <tr>
+                        <td width="20%" height="28" align="right">链接标题：</td>
+                        <td width="70%">
+                            <input name="title" type="text" id="title" class='pubinputs' style="width:255px;" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td height="28" width="20%" align="right">ICO图片：</td>
+                        <td width="70%">
+                            <input name="ico" type="text" id="ico" class='pubinputs' style="width:255px;" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td height="28" width="20%" align="right">链接网址：</td>
+                        <td width="70%">
+                            <input name="link" type="text" id="link" class='pubinputs' style="width:255px;" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td height="45">&nbsp;</td>
+                        <td>
+                            <input type="submit" name="Submit" value="保存项目" class="np coolbg"
+                                style="width:80px;cursor:pointer" />
+                        </td>
+                    </tr>
+                </table>
+            </form>
+        </div>
+    </div>
 </body>
+
 </html>

src/dede/templets/index_body_move.htm

@@ -7,13 +7,8 @@
 <link rel="stylesheet" type="text/css" href="css/base.css" />
 <link rel="stylesheet" type="text/css" href="css/indexbody.css" />
 <script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script type="text/javascript" src="../static/js/jquery/jquery.js" ></script>
-<script language="javascript" src="../static/js/jquery/ui.core.js"></script>
-<script language="javascript" src="../static/js/jquery/ui.draggable.js"></script>
-<script language="javascript" src="../static/js/jquery/ui.sortable.js"></script>
 <script language="javascript" src="js/jquery.json-2.2.min.js"></script>
 <script language="javascript" src="js/indexbody.js"></script>
-<script language="javascript" src="js/drag.js"></script>
 </head>
 <body leftmargin="8" topmargin='8' bgcolor="#FFFFFF">
 <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">

src/dede/templets/index_menu2.htm

@@ -4,7 +4,7 @@
 <title>DedeCMS menu</title>
 <link rel="stylesheet" href="css/base.css" type="text/css" />
 <script language="javascript" type="text/javascript" src="../static/js/dedeajax2.js"></script>
-<script src="../static/js/jquery/jquery.js" language="javascript" type="text/javascript"></script>
+<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
 <?php
 echo "<script language='javascript'>var curopenItem = '$openitem';</script>\r\n";
 ?>

src/dede/templets/login.htm

@@ -5,7 +5,7 @@
 <title><?php echo $cfg_softname." ".$cfg_version; ?></title>
 <link href="css/base.css" rel="stylesheet" type="text/css" />
 <link href="css/login.css" rel="stylesheet" type="text/css" />
-<script src="../static/js/jquery/jquery.js" language="javascript" type="text/javascript"></script>
+<script src="../static/js/jquery.js" language="javascript" type="text/javascript"></script>
 <script type="text/javascript">
 $ = jQuery;
 function changeAuthCode() {

src/dede/templets/member_guestbook.htm

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>会员空间留言管理</title>
 <link href="css/base.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../static/js/jquery/jquery.js" ></script>
+<script type="text/javascript" src="../static/js/jquery.js" ></script>
 <script language="javascript">
 //获得选中文件的文件名
 function getCheckboxItem(){

src/dede/templets/member_model_add.htm

@@ -1,92 +1,104 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>新增会员模型</title>
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="js/diy.js"></script>
-<script language="javascript">
-<!--
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>新增会员模型</title>
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <script language="javascript" src="js/diy.js"></script>
+  <script language="javascript">
+    function CheckSubmit() {
+      if (document.form1.name.value == '') {
+        alert("自定义表单名称不能为空！");
+        return false;
+      }
+      return true;
+    }
+  </script>
+  <link href="css/base.css" rel="stylesheet" type="text/css" />
+  <style type="text/css">
+    .STYLE1 {
+      color: #FF0000
+    }
+
+    td {
+      padding: 2px;
+      padding-left: 6px;
+      line-height: 150%;
+    }
 
-function CheckSubmit()
-{
-	if(document.form1.name.value=='')
-	{
-		alert("自定义表单名称不能为空！");
-		return false;
-	}
-	return true;
-}
--->
-</script>
-<link href="css/base.css" rel="stylesheet" type="text/css" />
-<style type="text/css">
-<!--
-.STYLE1 {
-	color: #FF0000
-}
-td {
-	padding:2px;
-	padding-left:6px;
-	line-height:150%;
-}
-.STYLE2 {
-	color: #666666;
-	display:none;
-}
--->
-</style>
+    .STYLE2 {
+      color: #666666;
+      display: none;
+    }
+  </style>
 </head>
+
 <body background="images/allbg.gif" leftmargin="8" topmargin="8">
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
-  <form name="form1" action="member_model_add.php?action=add" method="post" onSubmit="return CheckSubmit();">
-    <tr bgcolor="#CFCFCF">
-      <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif'><b>&nbsp;<a href="member_model_main.php"><u>会员模型管理</u></a> &gt; 新增会员模型：</b></td>
-    </tr>
-    <tr>
-      <td width="35%" height="28" align="left" bgcolor="#FFFFFF"> 模型ID：<br />
-        <span class="STYLE2" id='help1'>　　数字，创建后不可更改，并具有唯一性。推荐使用默认值</span></td>
-      <td width="65%" bgcolor="#FFFFFF"><input name="id" type="text" id="id" size="10" value="<?php echo $newid?>" class='pubinputs' style='width:60px' />
-        * <img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onClick="showHide2('help1')" /></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF"> 会员模型名称：<br />
-        <span class="STYLE2" id="help3">　　自定义表单的中文名称，在后台管理，前台发布等均使用此名字。</span></td>
-      <td bgcolor="#FFFFFF"><input name="name" type="text" id="name" style="width:180px" value="会员模型<?php echo $newid;?>" class='pubinputs' />
-        *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onClick="showHide2('help3')" /></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">数据表：<br />
-        <span class="STYLE2" id="help5">　　必须由英文、数字、下划线组成，用于保存自定义表单数据，不能和已有表名重复，创建后不可修改表名。</span></td>
-      <td bgcolor="#FFFFFF"><input name="table" type="text" id="table"  style="width:180px" value="<?php echo $cfg_dbprefix; ?>member_<?php echo $newid; ?>" class='pubinputs'/>
-        *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onClick="showHide2('help5')" /></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">模型描述：</td>
-      <td bgcolor="#FFFFFF"><textarea name="description" cols="50" rows="5" class="tbtitle" id="description" onClick="this.value=''">模型描述</textarea></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">字段配置：</td>
-      <td bgcolor="#FFFFFF"><span class="STYLE1">建立自定义表单后在“更改”自定义表单的地方添加字段即可。</span></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">启用状态：</td>
-      <td bgcolor="#FFFFFF"><label>
-          <input name="state" type="radio" class='np'  value="1" checked/>
-        启用 &nbsp;
-        <input name="state" type="radio"  value="0" class='np'/>
-      禁用</label></td>
-    </tr>
-    <tr bgcolor="#F9FCEF">
-      <td height="28" colspan="2"><table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="26%" height="45">&nbsp;</td>
-            <td width="15%"><input type="submit" name="button" id="button" value="确定"  class="np coolbg"/></td>
-            <td width="59%"><input name="按钮" type="button" class="np coolbg"  id="button2" onClick="location='mychannel_main.php';" value="返回"/></td>
-          </tr>
-        </table></td>
-    </tr>
-  </form>
-</table>
+  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+    style="background:#CFCFCF;">
+    <form name="form1" action="member_model_add.php?action=add" method="post" onSubmit="return CheckSubmit();">
+      <tr bgcolor="#CFCFCF">
+        <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif'><b>&nbsp;<a
+              href="member_model_main.php"><u>会员模型管理</u></a> &gt; 新增会员模型：</b></td>
+      </tr>
+      <tr>
+        <td width="35%" height="28" align="left" bgcolor="#FFFFFF"> 模型ID：<br />
+          <span class="STYLE2" id='help1'>　　数字，创建后不可更改，并具有唯一性。推荐使用默认值</span></td>
+        <td width="65%" bgcolor="#FFFFFF"><input name="id" type="text" id="id" size="10" value="<?php echo $newid?>"
+            class='pubinputs' style='width:60px' />
+          * <img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onClick="showHide2('help1')" /></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF"> 会员模型名称：<br />
+          <span class="STYLE2" id="help3">　　自定义表单的中文名称，在后台管理，前台发布等均使用此名字。</span></td>
+        <td bgcolor="#FFFFFF"><input name="name" type="text" id="name" style="width:180px"
+            value="会员模型<?php echo $newid;?>" class='pubinputs' />
+          *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onClick="showHide2('help3')" /></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">数据表：<br />
+          <span class="STYLE2" id="help5">　　必须由英文、数字、下划线组成，用于保存自定义表单数据，不能和已有表名重复，创建后不可修改表名。</span></td>
+        <td bgcolor="#FFFFFF"><input name="table" type="text" id="table" style="width:180px"
+            value="<?php echo $cfg_dbprefix; ?>member_<?php echo $newid; ?>" class='pubinputs' />
+          *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onClick="showHide2('help5')" /></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">模型描述：</td>
+        <td bgcolor="#FFFFFF"><textarea name="description" cols="50" rows="5" class="tbtitle" id="description"
+            onClick="this.value=''">模型描述</textarea></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">字段配置：</td>
+        <td bgcolor="#FFFFFF"><span class="STYLE1">建立自定义表单后在“更改”自定义表单的地方添加字段即可。</span></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">启用状态：</td>
+        <td bgcolor="#FFFFFF"><label>
+            <input name="state" type="radio" class='np' value="1" checked />
+            启用 &nbsp;
+            <input name="state" type="radio" value="0" class='np' />
+            禁用</label></td>
+      </tr>
+      <tr bgcolor="#F9FCEF">
+        <td height="28" colspan="2">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="26%" height="45">&nbsp;</td>
+              <td width="15%"><input type="submit" name="button" id="button" value="确定" class="np coolbg" /></td>
+              <td width="59%"><input name="按钮" type="button" class="np coolbg" id="button2"
+                  onClick="location='mychannel_main.php';" value="返回" /></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </form>
+  </table>
 </body>
+
 </html>

src/dede/templets/member_model_edit.htm

@@ -1,95 +1,107 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>修改会员模型管理</title>
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="js/diy.js"></script>
-<script language="javascript">
-<!--
-function CheckSubmit()
-{
-	if(document.form1.typename.value=='')
-	{
-		alert("自定义表单名称不能为空！");
-		return false;
-	}
-	return true;
-}
-//删除
-function DelNote(gourl){
-	if(!window.confirm("你确认要删除这条记录么！")){ return false; }
-	location.href=gourl;
-}
--->
-</script>
-<link href="css/base.css" rel="stylesheet" type="text/css" />
-<style type="text/css">
-<!--
-.STYLE1 {
-	color: #FF0000
-}
-td {
-	padding:2px;
-	padding-left:6px;
-	line-height:150%;
-}
-.STYLE2 {
-	color: #666666;
-	display:none;
-}
--->
-</style>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>修改会员模型管理</title>
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <script language="javascript" src="js/diy.js"></script>
+  <script language="javascript">
+    function CheckSubmit() {
+      if (document.form1.typename.value == '') {
+        alert("自定义表单名称不能为空！");
+        return false;
+      }
+      return true;
+    }
+    //删除
+    function DelNote(gourl) {
+      if (!window.confirm("你确认要删除这条记录么！")) { return false; }
+      location.href = gourl;
+    }
+  </script>
+  <link href="css/base.css" rel="stylesheet" type="text/css" />
+  <style type="text/css">
+    .STYLE1 {
+      color: #FF0000
+    }
+
+    td {
+      padding: 2px;
+      padding-left: 6px;
+      line-height: 150%;
+    }
+
+    .STYLE2 {
+      color: #666666;
+      display: none;
+    }
+  </style>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<div class="bodytitle">
-  <div class="bodytitleleft"></div>
-  <div class="bodytitletxt" style="padding-left:10px;">会员模型管理</div>
-</div>
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
-  <form name="form1" action="member_model_edit.php" method="post" onSubmit="return CheckSubmit();">
-    <input type='hidden' name='id' value='<?php echo $id;?>'>
-     <input type='hidden' name='name' value='<?php echo $row['name'];?>'>
-    <input type='hidden' name='dopost' value='save'>
-    <tr bgcolor="#CFCFCF">
-      <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif' style="padding-left:10px;"><b><a href="member_model_main.php"><u>会员模型管理</u></a> &gt; 修改<?php echo $row['name']?>会员模型：</b> (修改表名不会创建新表，如果您不懂手工处理这些表，请不要更改) </td>
-    </tr>
-    <tr>
-      <td width="35%" height="28" align="left" bgcolor="#FFFFFF">会员模型ID：<br />
-        <span class="STYLE2" id='help1'>　　数字，创建后不可更改，并具有唯一性。</span></td>
-      <td width="65%" bgcolor="#FFFFFF"><?php echo $id;?> * <img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onclick="ShowHide2('help1')" /> <?php if($row['issystem']) echo "<font color='red'>系统模型,我们不建议您去修改基本配置信息!</font>";?></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#F9FCEF">模型名称：<br />
-        <span class="STYLE2" id="help3">　　会员模型类型统一使用中文,前台后台都保持一致。</span></td>
-      <td bgcolor="#F8FCEF"><input name="name" type="text" id="name" value="<?php echo $row['name']?>" style="width:180px" class='alltxt' <?php if($row['issystem']) echo "disabled='1'";?>/>
-        *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onclick="ShowHide2('help3')" /></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">数据表：<br />
-        <span class="STYLE2" id="help5">　　模型表一旦创建不可修改</span></td>
-      <td bgcolor="#FFFFFF"><input name="table" type="text" id="table"  style="width:180px" value="<?php echo $row['table']; ?>" class='alltxt' disabled='1' />
-        *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand" onclick="ShowHide2('help5')" /></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#F9FCEF">模型字段配置：<br />
-        信息索引类字段系统已经加入，<br />
-        您只需要增加其它个性化字段即可。</td>
-      <td bgcolor="#F8FCEF"><input name="fset" type="button" id="fset" value="添加新字段" onClick="location.href='member_model_field_add.php?id=<?php echo $id; ?>'" class="np coolbg" style="margin-top:5px"/></td>
-    </tr>
-    <tr>
-      <td colspan='2'  bgcolor="#FFFFFF" style="padding:6px"><table width="100%" border="0" cellpadding="1" cellspacing="1" align="center"  style="background:#cfcfcf;">
-          <tr align="center" bgcolor="#FBFCE2" height="24">
-            <td width="12%">提示文字</td>
-            <td width="12%">数据字段名</td>
-            <td width="12%">数据类型</td>
-            <td width="12%">前台显示</td>
-            <td width="12%">条件搜索</td>
-            <td width="12%">状态</td>
-            <td width="12%">表单类型</td>
-            <td width="16%">维护</td>
-          </tr>
-          <?php 
+  <div class="bodytitle">
+    <div class="bodytitleleft"></div>
+    <div class="bodytitletxt" style="padding-left:10px;">会员模型管理</div>
+  </div>
+  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+    style="background:#CFCFCF;">
+    <form name="form1" action="member_model_edit.php" method="post" onSubmit="return CheckSubmit();">
+      <input type='hidden' name='id' value='<?php echo $id;?>'>
+      <input type='hidden' name='name' value='<?php echo $row['name'];?>'>
+      <input type='hidden' name='dopost' value='save'>
+      <tr bgcolor="#CFCFCF">
+        <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif' style="padding-left:10px;"><b><a
+              href="member_model_main.php"><u>会员模型管理</u></a> &gt; 修改<?php echo $row['name']?>会员模型：</b>
+          (修改表名不会创建新表，如果您不懂手工处理这些表，请不要更改) </td>
+      </tr>
+      <tr>
+        <td width="35%" height="28" align="left" bgcolor="#FFFFFF">会员模型ID：<br />
+          <span class="STYLE2" id='help1'>　　数字，创建后不可更改，并具有唯一性。</span></td>
+        <td width="65%" bgcolor="#FFFFFF"><?php echo $id;?> * <img src="images/help.gif" alt="帮助" width="16" height="16"
+            border="0" style="cursor:hand" onclick="ShowHide2('help1')" />
+          <?php if($row['issystem']) echo "<font color='red'>系统模型,我们不建议您去修改基本配置信息!</font>";?></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#F9FCEF">模型名称：<br />
+          <span class="STYLE2" id="help3">　　会员模型类型统一使用中文,前台后台都保持一致。</span></td>
+        <td bgcolor="#F8FCEF"><input name="name" type="text" id="name" value="<?php echo $row['name']?>"
+            style="width:180px" class='alltxt' <?php if($row['issystem']) echo "disabled='1'";?> />
+          *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onclick="ShowHide2('help3')" /></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">数据表：<br />
+          <span class="STYLE2" id="help5">　　模型表一旦创建不可修改</span></td>
+        <td bgcolor="#FFFFFF"><input name="table" type="text" id="table" style="width:180px"
+            value="<?php echo $row['table']; ?>" class='alltxt' disabled='1' />
+          *<img src="images/help.gif" alt="帮助" width="16" height="16" border="0" style="cursor:hand"
+            onclick="ShowHide2('help5')" /></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#F9FCEF">模型字段配置：<br />
+          信息索引类字段系统已经加入，<br />
+          您只需要增加其它个性化字段即可。</td>
+        <td bgcolor="#F8FCEF"><input name="fset" type="button" id="fset" value="添加新字段"
+            onClick="location.href='member_model_field_add.php?id=<?php echo $id; ?>'" class="np coolbg"
+            style="margin-top:5px" /></td>
+      </tr>
+      <tr>
+        <td colspan='2' bgcolor="#FFFFFF" style="padding:6px">
+          <table width="100%" border="0" cellpadding="1" cellspacing="1" align="center" style="background:#cfcfcf;">
+            <tr align="center" bgcolor="#FBFCE2" height="24">
+              <td width="12%">提示文字</td>
+              <td width="12%">数据字段名</td>
+              <td width="12%">数据类型</td>
+              <td width="12%">前台显示</td>
+              <td width="12%">条件搜索</td>
+              <td width="12%">状态</td>
+              <td width="12%">表单类型</td>
+              <td width="16%">维护</td>
+            </tr>
+            <?php 
 
 $ds = file(DedeInclude('/inc/fieldtype.txt'));
 foreach($ds as $d){
@@ -104,68 +116,80 @@ if(is_array($dtp->CTags)){
 foreach($dtp->CTags as $ctag)
 {
 ?>
-          <tr align="center" bgcolor="#FFFFFF" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';"
-
-onMouseOut="javascript:this.bgColor='#FFFFFF';">
-            <td><?php 
+            <tr align="center" bgcolor="#FFFFFF" height="26" align="center"
+              onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
+              <td><?php 
 			$itname = $ctag->GetAtt('itemname');
 			if($itname=='') echo "没指定";
 			else echo $itname;
 			?></td>
-            <td><?php echo $ctag->GetTagName()?></td>
-            <td><?php 
+              <td><?php echo $ctag->GetTagName()?></td>
+              <td><?php 
 			$ft = $ctag->GetAtt('type');
 			if(isset($fieldtypes[$ft])) echo $fieldtypes[$ft];
 			else  echo "系统专用类型";
 			?></td>
-            <td><?php 
+              <td><?php 
 			$issearch = $ctag->GetAtt('issearch');
 			echo ($issearch == '1')? "<font color=green>√</font>" : "<font color=red>×</font>";
 			?></td>
-            <td><?php 
+              <td><?php 
 			$isshow = $ctag->GetAtt('isshow');
 			echo ($isshow == '1')? "<font color=green>√</font>" : "<font color=red>×</font>";
 			?></td>
-            <td><?php 
+              <td><?php 
 			$state = $ctag->GetAtt('state');
 			echo ($state == 1)? "<font color=green>√</font>" : "<font color=red>×</font>";
 			?></td>
-            <td><?php 
+              <td><?php 
 			$ft = $ctag->GetAtt('autofield');
 			if($ft==''||$ft==0) echo "固化表单";
 			else  echo "自动表单";
 		 ?></td>
-            <td><a href="member_model_field_edit.php?id=<?php echo $id;?>&fname=<?php echo $ctag->GetTagName()?>">[修改]</a> <a href="member_model_field_edit.php?id=<?php echo $id;?>&action=disabled&fname=<?php echo $ctag->GetTagName()?>">[<?php echo ($ctag->GetAtt('state')==1)? "禁用" : "启用" ?>]</a> <a href="member_model_field_edit.php?id=<?php echo $id;?>&action=delete&fname=<?php echo $ctag->GetTagName()?>">[删除]</a></td>
-          </tr>
-          <?php 
+              <td><a
+                  href="member_model_field_edit.php?id=<?php echo $id;?>&fname=<?php echo $ctag->GetTagName()?>">[修改]</a>
+                <a
+                  href="member_model_field_edit.php?id=<?php echo $id;?>&action=disabled&fname=<?php echo $ctag->GetTagName()?>">[<?php echo ($ctag->GetAtt('state')==1)? "禁用" : "启用" ?>]</a>
+                <a
+                  href="member_model_field_edit.php?id=<?php echo $id;?>&action=delete&fname=<?php echo $ctag->GetTagName()?>">[删除]</a>
+              </td>
+            </tr>
+            <?php 
  }}
  
 ?>
-        </table></td>
-    </tr>
-<tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">模型描述：</td>
-      <td bgcolor="#FFFFFF"><label>
-        <textarea name="description" cols="50" rows="5" class="tbtitle" id="description"><?php echo $row['description']; ?></textarea>
-      </label></td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#FFFFFF">会员模型状态：</td>
-      <td bgcolor="#FFFFFF"><input name="state" type="radio" class='np'  value="1" <?php if($row['state']=='1') echo " checked='1' "; ?>/>
-        启用 &nbsp;
-        <input name="state" type="radio"  value="0" class='np' <?php if($row['state']=='0') echo " checked='1' "; ?>/>
-      禁用</td>
-    </tr>
-    <tr bgcolor="#F9FCEF">
-      <td height="28" colspan="2"><table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="26%" height="45">&nbsp;</td>
-            <td width="15%"><input type="submit" name="button" id="button" value="确定"  class='np coolbg'/></td>
-            <td width="59%"><input name="按钮" type="button" class='np coolbg'  id="button2" onclick="location='diy_main.php';" value="返回"/></td>
-          </tr>
-        </table></td>
-    </tr>
-  </form>
-</table>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">模型描述：</td>
+        <td bgcolor="#FFFFFF"><label>
+            <textarea name="description" cols="50" rows="5" class="tbtitle"
+              id="description"><?php echo $row['description']; ?></textarea>
+          </label></td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#FFFFFF">会员模型状态：</td>
+        <td bgcolor="#FFFFFF"><input name="state" type="radio" class='np' value="1"
+            <?php if($row['state']=='1') echo " checked='1' "; ?> />
+          启用 &nbsp;
+          <input name="state" type="radio" value="0" class='np' <?php if($row['state']=='0') echo " checked='1' "; ?> />
+          禁用</td>
+      </tr>
+      <tr bgcolor="#F9FCEF">
+        <td height="28" colspan="2">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="26%" height="45">&nbsp;</td>
+              <td width="15%"><input type="submit" name="button" id="button" value="确定" class='np coolbg' /></td>
+              <td width="59%"><input name="按钮" type="button" class='np coolbg' id="button2"
+                  onclick="location='diy_main.php';" value="返回" /></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </form>
+  </table>
 </body>
+
 </html>

src/dede/templets/member_scores.htm

@@ -1,94 +1,113 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>会员管理--积分头衔设置</title>
-<script language="javascript" src="js/main.js"></script>
-<script type="text/javascript">
-function CheckAll(form, prefix, checkall) {
-	var checkall = checkall ? checkall : 'chkall';
-	for(var i = 0; i < form.elements.length; i++) {
-		var e = form.elements[i];
-		if(e.name && e.name != checkall && (!prefix || (prefix && e.name.match(prefix)))) {
-			e.checked = form.elements[checkall].checked;
-		}
-	}
-}
-</script>
-<link href="css/base.css" rel="stylesheet" type="text/css" />
-<style type="text/css">
-.rb{ border-right:1px solid #98CAEF }
-.tb{ border-top:1px solid #98CAEF }
-td{ padding-left:10px}
-</style>
-<body background="images/allbg.gif" >
-<div class="bodytitle">
-	<div class="bodytitleleft"></div>
-	<div class="bodytitletxt"  style="padding-left:10px;">积分头衔设置</div>
-</div>
-<form action="member_scores.php" method="post" >
-<input name="action" type="hidden" value="save" />
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="border:1px solid #CFCFCF;border-bottom:none;">
-  <tr bgcolor="#EDF9D5">
-    <td width="100%" height="24" background='images/tbg.gif' style="padding-left:10px;">
-    	<b><a href="member_main.php"><U>会员管理</U></a> &gt; 积分头衔设置：</b>
-    </td>
-  </tr>
-  </table>  
-  <table width="98%" border="0" cellpadding="1" cellspacing="1" bgcolor="#CFCFCF" align="center">
-        <tr>
-          <td width="6%" height="30" align="center" valign="middle" bgcolor="#FBFCE2">
-          	<input type="checkbox" name="chkall" id="chkall" onClick="CheckAll(this.form)" class='np' />
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>会员管理--积分头衔设置</title>
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <script type="text/javascript">
+    function CheckAll(form, prefix, checkall) {
+      var checkall = checkall ? checkall : 'chkall';
+      for (var i = 0; i < form.elements.length; i++) {
+        var e = form.elements[i];
+        if (e.name && e.name != checkall && (!prefix || (prefix && e.name.match(prefix)))) {
+          e.checked = form.elements[checkall].checked;
+        }
+      }
+    }
+  </script>
+  <link href="css/base.css" rel="stylesheet" type="text/css" />
+  <style type="text/css">
+    .rb {
+      border-right: 1px solid #98CAEF
+    }
+
+    .tb {
+      border-top: 1px solid #98CAEF
+    }
+
+    td {
+      padding-left: 10px
+    }
+  </style>
+
+<body background="images/allbg.gif">
+  <div class="bodytitle">
+    <div class="bodytitleleft"></div>
+    <div class="bodytitletxt" style="padding-left:10px;">积分头衔设置</div>
+  </div>
+  <form action="member_scores.php" method="post">
+    <input name="action" type="hidden" value="save" />
+    <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+      style="border:1px solid #CFCFCF;border-bottom:none;">
+      <tr bgcolor="#EDF9D5">
+        <td width="100%" height="24" background='images/tbg.gif' style="padding-left:10px;">
+          <b><a href="member_main.php"><U>会员管理</U></a> &gt; 积分头衔设置：</b>
+        </td>
+      </tr>
+    </table>
+    <table width="98%" border="0" cellpadding="1" cellspacing="1" bgcolor="#CFCFCF" align="center">
+      <tr>
+        <td width="6%" height="30" align="center" valign="middle" bgcolor="#FBFCE2">
+          <input type="checkbox" name="chkall" id="chkall" onClick="CheckAll(this.form)" class='np' />
           删?</td>
-          <td width="23%" height="30" align="center" bgcolor="#FEFCEF">积分大于</td>
-          <td width="24%" height="30" align="center" bgcolor="#FEFCEF">星星数</td>
-          <td width="23%" height="30" align="center" bgcolor="#FEFCEF">级别头衔</td>
-          <td width="24%" height="30" align="center" bgcolor="#FEFCEF">是否默认</td>
-        </tr>
-        <?php
+        <td width="23%" height="30" align="center" bgcolor="#FEFCEF">积分大于</td>
+        <td width="24%" height="30" align="center" bgcolor="#FEFCEF">星星数</td>
+        <td width="23%" height="30" align="center" bgcolor="#FEFCEF">级别头衔</td>
+        <td width="24%" height="30" align="center" bgcolor="#FEFCEF">是否默认</td>
+      </tr>
+      <?php
 		foreach($Scores as $v){	
 		?>
-        <tr height="28" bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
-          <td height="28" align="center" >
-          	<input name="Ids-<?php echo $v['id']?>" type="checkbox" id="Ids-<?php echo $v['id']?>" value="1" class='np' />
-          </td>
-          <td height="28" align="left" style="padding:5px;">
-          <input name="integral-<?php echo $v['id']?>" type="text" id="integral-<?php echo $v['id']?>" value="<?php echo $v['integral']?>" size="10" /></td>
-          <td height="28" align="left" style="padding:5px;">
-          <input name="icon-<?php echo $v['id']?>" type="text" id="icon-<?php echo $v['id']?>" value="<?php echo $v['icon']?>" size="3" /></td>
-          <td height="28" align="left" style="padding:5px;">
-          <input name="titles-<?php echo $v['id']?>" type="text" id="titles-<?php echo $v['id']?>" value="<?php echo $v['titles']?>" size="20" /></td>
-          <td height="28" align="left" style="padding:5px;">
-            <select name="isdefault-<?php echo $v['id']?>" id="isdefault-<?php echo $v['id']?>">
-              <option value="1" <?php if($v['isdefault']) echo " selected='selected'";?>>是</option>
-              <option value="0" <?php if(!$v['isdefault']) echo " selected='selected'";?>>否</option>            
-            </select>
-            </td>
-        </tr>
-        <?php
+      <tr height="28" bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';"
+        onMouseOut="javascript:this.bgColor='#FFFFFF';">
+        <td height="28" align="center">
+          <input name="Ids-<?php echo $v['id']?>" type="checkbox" id="Ids-<?php echo $v['id']?>" value="1" class='np' />
+        </td>
+        <td height="28" align="left" style="padding:5px;">
+          <input name="integral-<?php echo $v['id']?>" type="text" id="integral-<?php echo $v['id']?>"
+            value="<?php echo $v['integral']?>" size="10" /></td>
+        <td height="28" align="left" style="padding:5px;">
+          <input name="icon-<?php echo $v['id']?>" type="text" id="icon-<?php echo $v['id']?>"
+            value="<?php echo $v['icon']?>" size="3" /></td>
+        <td height="28" align="left" style="padding:5px;">
+          <input name="titles-<?php echo $v['id']?>" type="text" id="titles-<?php echo $v['id']?>"
+            value="<?php echo $v['titles']?>" size="20" /></td>
+        <td height="28" align="left" style="padding:5px;">
+          <select name="isdefault-<?php echo $v['id']?>" id="isdefault-<?php echo $v['id']?>">
+            <option value="1" <?php if($v['isdefault']) echo " selected='selected'";?>>是</option>
+            <option value="0" <?php if(!$v['isdefault']) echo " selected='selected'";?>>否</option>
+          </select>
+        </td>
+      </tr>
+      <?php
 		}
 		?>
-        <tr bgcolor="#F9FCEF">
-          <td height="28">&nbsp;&nbsp;新增：</td>
-          <td height="28" style="padding:5px;"><input name="add_integral" type="text" id="add_integral" size="10" /></td>
-          <td height="28" style="padding:5px;"><input name="add_icon" type="text" id="add_icon" size="3" /></td>
-          <td height="28" style="padding:5px;"><input name="add_titles" type="text" id="add_titles" size="20" /></td>
-          <td height="28" style="padding:5px;">
+      <tr bgcolor="#F9FCEF">
+        <td height="28">&nbsp;&nbsp;新增：</td>
+        <td height="28" style="padding:5px;"><input name="add_integral" type="text" id="add_integral" size="10" /></td>
+        <td height="28" style="padding:5px;"><input name="add_icon" type="text" id="add_icon" size="3" /></td>
+        <td height="28" style="padding:5px;"><input name="add_titles" type="text" id="add_titles" size="20" /></td>
+        <td height="28" style="padding:5px;">
           <select name="add_isdefault" id="add_isdefault">
-              <option value="1" >是</option>
-              <option value="0" >否</option>            
+            <option value="1">是</option>
+            <option value="0">否</option>
           </select></td>
-        </tr>
-</table>
-<br />
-<table width="96%" border="0" align="center" cellpadding="0" cellspacing="0">
-  <tr>
-    <td height="40" align="center">
-    	<input name="imageField" type="submit" class="np coolbg" value="提交" id="imageField"/>
-    </td>
-  </tr>
-</table>
-</form>
+      </tr>
+    </table>
+    <br />
+    <table width="96%" border="0" align="center" cellpadding="0" cellspacing="0">
+      <tr>
+        <td height="40" align="center">
+          <input name="imageField" type="submit" class="np coolbg" value="提交" id="imageField" />
+        </td>
+      </tr>
+    </table>
+  </form>
 
 </body>
-</html>
+
+</html>

src/dede/templets/mychannel_modifysearch.htm

@@ -1,119 +1,133 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>修改频道</title>
-<script language="javascript" src="js/main.js"></script>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<style type="text/css">
-<!--
-.STYLE1 {color: #FF0000}
-td{ padding:2px; padding-left:6px; line-height:150%; }
-.STYLE2 {color: #666666; }
--->
-</style>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>修改频道</title>
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    .STYLE1 {
+      color: #FF0000
+    }
+
+    td {
+      padding: 2px;
+      padding-left: 6px;
+      line-height: 150%;
+    }
+
+    .STYLE2 {
+      color: #666666;
+    }
+  </style>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<div class="bodytitle">
-	<div class="bodytitleleft"></div>
-	<div class="bodytitletxt" style="padding-left:10px;">自定义搜索管理</div>
-</div>
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
-  <form name="form1" action="mychannel_edit.php" method="post" target="stafrm">
-    <input type='hidden' name='mid' value='<?php echo $mid?>'>
-    <input type='hidden' name='maintable' value='<?php echo $channel['maintable']?>'>
-    <input type='hidden' name='addontable' value='<?php echo $channel['addtable'];?>'>
-    <input type='hidden' name='step' value='<?php echo $step?>'>
-    <input type='hidden' name='dopost' value='modifysearch'>
-    <tr bgcolor="#CFCFCF">
-      <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif' style="padding-left:10px;">
-      	<div style="width:100px; float:right"><a href="mychannel_edit.php?dopost=del&mid=<?php echo $mid;?>">删除自定义搜索</a></div>
-      	<b><a href="mychannel_main.php"><u>内容模型管理</u></a> &gt; 自定义搜索管理：</b>
-      	(自定义搜索再方便搜索的同时在一定程度上降低了效率，请根据需求定义搜索)
-      </td>
-    </tr>
-    <tr>
-      <td width="35%" height="28" align="left" bgcolor="#FFFFFF">频道ID：<br /></td>
-      <td width="65%" bgcolor="#FFFFFF">
-      	<?php echo $mid;?>
-</td>
-    </tr>
-    <tr>
-      <td height="28" align="left" bgcolor="#ffffff">频道名称：<br /></td>
-      <td bgcolor="#ffffff">
-	    <?php echo $channel['typename']?>
-      </td>
-    </tr>
-    <?php
+  <div class="bodytitle">
+    <div class="bodytitleleft"></div>
+    <div class="bodytitletxt" style="padding-left:10px;">自定义搜索管理</div>
+  </div>
+  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+    style="background:#CFCFCF;">
+    <form name="form1" action="mychannel_edit.php" method="post" target="stafrm">
+      <input type='hidden' name='mid' value='<?php echo $mid?>'>
+      <input type='hidden' name='maintable' value='<?php echo $channel['maintable']?>'>
+      <input type='hidden' name='addontable' value='<?php echo $channel['addtable'];?>'>
+      <input type='hidden' name='step' value='<?php echo $step?>'>
+      <input type='hidden' name='dopost' value='modifysearch'>
+      <tr bgcolor="#CFCFCF">
+        <td height="28" colspan="2" bgcolor="#EDF9D5" background='images/tbg.gif' style="padding-left:10px;">
+          <div style="width:100px; float:right"><a
+              href="mychannel_edit.php?dopost=del&mid=<?php echo $mid;?>">删除自定义搜索</a></div>
+          <b><a href="mychannel_main.php"><u>内容模型管理</u></a> &gt; 自定义搜索管理：</b>
+          (自定义搜索再方便搜索的同时在一定程度上降低了效率，请根据需求定义搜索)
+        </td>
+      </tr>
+      <tr>
+        <td width="35%" height="28" align="left" bgcolor="#FFFFFF">频道ID：<br /></td>
+        <td width="65%" bgcolor="#FFFFFF">
+          <?php echo $mid;?>
+        </td>
+      </tr>
+      <tr>
+        <td height="28" align="left" bgcolor="#ffffff">频道名称：<br /></td>
+        <td bgcolor="#ffffff">
+          <?php echo $channel['typename']?>
+        </td>
+      </tr>
+      <?php
     if($channel['issystem'] >= 0) {
     ?>
-    <tr>
-      <td align="left" bgcolor="#FFFFFF">主表可供自定义搜索的字段<br />
-        <span class="STYLE2" id="help2">标题、关键字、摘要为默认选项，不用选择 </span></td>
-      <td bgcolor="#FFFFFF">
-      	<?php echo $mainfields; ?>
-      </td>
-    </tr>
-    <?php 
+      <tr>
+        <td align="left" bgcolor="#FFFFFF">主表可供自定义搜索的字段<br />
+          <span class="STYLE2" id="help2">标题、关键字、摘要为默认选项，不用选择 </span></td>
+        <td bgcolor="#FFFFFF">
+          <?php echo $mainfields; ?>
+        </td>
+      </tr>
+      <?php 
     }    
     ?>
-    <tr>
-      <td height="28" align="left" bgcolor="#ffffff">附件表可供自定义搜索的字段：<br />
-      <span class="STYLE2" id="help4">这里的字段是程序依据字段类型自动选择生成的。</span></td>
-      <td bgcolor="#ffffff">
-	    <?php echo $addonfields;?>
-     </td>
-    </tr>
-    <tr>
-      <td align="left" bgcolor="#FFFFFF">自定义搜索结果页模板<br />
-        <span class="STYLE2" id="help5" style="display: none;">只填写文件名，且文件必须在templets/default目录中 </span></td>
-      <td bgcolor="#FFFFFF">
-		    <input type="text" name="template" value="<?php echo $template;?>" style="width:200px" />
-      </td>
-    </tr>
-    <tr bgcolor="#ffffff">
-      <td height="28" colspan="2">
-      	<table width="100%" border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <td height="28" align="left" bgcolor="#ffffff">附件表可供自定义搜索的字段：<br />
+          <span class="STYLE2" id="help4">这里的字段是程序依据字段类型自动选择生成的。</span></td>
+        <td bgcolor="#ffffff">
+          <?php echo $addonfields;?>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" bgcolor="#FFFFFF">自定义搜索结果页模板<br />
+          <span class="STYLE2" id="help5" style="display: none;">只填写文件名，且文件必须在templets/default目录中 </span></td>
+        <td bgcolor="#FFFFFF">
+          <input type="text" name="template" value="<?php echo $template;?>" style="width:200px" />
+        </td>
+      </tr>
+      <tr bgcolor="#ffffff">
+        <td height="28" colspan="2">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="26%" height="45">&nbsp;</td>
+              <td width="15%">
+                <input type="submit" name="button" id="button" value="确定" class='np coolbg' />
+              </td>
+              <td width="59%">
+                <input name="bt" type="button" id="button2" onclick="location='mychannel_main.php';" value="返回"
+                  class='np coolbg' />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </form>
+    <tr bgcolor="bgcolor=" #F9FCEF">
+      <td height="20" colspan="2" bgcolor="#F9FCEF">
+        <table width="100%">
           <tr>
-            <td width="26%" height="45">&nbsp;</td>
-            <td width="15%">
-            	<input type="submit" name="button" id="button" value="确定"   class='np coolbg'/>
-            </td>
-            <td width="59%">
-            	<input name="bt" type="button"  id="button2" onclick="location='mychannel_main.php';" value="返回" class='np coolbg'/>
+            <td width="74%"><strong>&nbsp;&nbsp;</strong>进行状态： </td>
+            <td width="26%" align="right">
+              <script language='javascript'>
+                function ResizeDiv(obj, ty) {
+                  if (ty == "+") document.all[obj].style.pixelHeight += 50;
+                  else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
+                }
+              </script>
+              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
             </td>
           </tr>
         </table>
       </td>
     </tr>
-  </form>
-  <tr bgcolor="bgcolor="#F9FCEF">
-    <td height="20" colspan="2" bgcolor="#F9FCEF"> <table width="100%">
-        <tr>
-          <td width="74%"><strong>&nbsp;&nbsp;</strong>进行状态： </td>
-          <td width="26%" align="right">
-          	<script language='javascript'>
-          	function ResizeDiv(obj,ty)
-          	{
-          		if(ty=="+") document.all[obj].style.pixelHeight += 50;
-          		else if(document.all[obj].style.pixelHeight>80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
-          	}
-            	</script>
-            [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr bgcolor="#FFFFFF">
-    <td colspan="2" id="mtd">
-    	<div id='mdv' style='width:100%;height:250px;'>
-        <iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe>
-      </div>
-	  </td>
-  </tr>
-</table>
-
-
-
+    <tr bgcolor="#FFFFFF">
+      <td colspan="2" id="mtd">
+        <div id='mdv' style='width:100%;height:250px;'>
+          <iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe>
+        </div>
+      </td>
+    </tr>
+  </table>
 </body>
-</html>
+
+</html>

src/dede/templets/search_keywords_main.htm

@@ -1,148 +1,156 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>搜索关键字管理</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script language="javascript" src="js/key.js"></script>
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language='javascript' src='js/main.js'></script>
-<script language="JavaScript">
-var pageno = 1;
-var totalrow = <?php echo $totalRow?>;
-var pagesize = <?php echo $pagesize?>;
-var orderby = '<?php echo $orderby?>';
-//加载列表
-function ReloadPage(ordertype){
-	orderby = ordertype;
-	var listArea = $Obj('rslist');
-	var errMsg = "网络通信出错！<br>[<a href=\"javascript:ReloadPage('"+ordertype+"')\"><u>点击此重新加载列表</u></a>]";
-  var myajax = new DedeAjax(listArea,true,true,"",errMsg,"正在加载...");
-  myajax.SendGet("search_keywords_main.php?dopost=getlist&pageno="+pageno+"&orderby="+ordertype);
-}
-//载入指定页的列表
-function LoadPage(npage){
-	pageno = npage;
-	ReloadPage(orderby);
-	ReloadPageNum(pageno);
-}
-//更新一个关键词
-function UpdateNote(nid){
-	var listArea = $Obj('rslist');
-	var kw = $Obj('keyword'+nid).value;
-	var kws = $Obj('spwords'+nid).value;
-	var ct = $Obj('count'+nid).value;
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>搜索关键字管理</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="js/key.js"></script>
+  <script language="javascript" src="../static/js/dedeajax2.js"></script>
+  <script language='javascript' src='js/main.js'></script>
+  <script language="JavaScript">
+    var pageno = 1;
+    var totalrow = <?php echo $totalRow?>;
+    var pagesize = <?php echo $pagesize?>;
+    var orderby = '<?php echo $orderby?>';
+    //加载列表
+    function ReloadPage(ordertype) {
+      orderby = ordertype;
+      var listArea = $Obj('rslist');
+      var errMsg = "网络通信出错！<br>[<a href=\"javascript:ReloadPage('" + ordertype + "')\"><u>点击此重新加载列表</u></a>]";
+      var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在加载...");
+      myajax.SendGet("search_keywords_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype);
+    }
+    //载入指定页的列表
+    function LoadPage(npage) {
+      pageno = npage;
+      ReloadPage(orderby);
+      ReloadPageNum(pageno);
+    }
+    //更新一个关键词
+    function UpdateNote(nid) {
+      var listArea = $Obj('rslist');
+      var kw = $Obj('keyword' + nid).value;
+      var kws = $Obj('spwords' + nid).value;
+      var ct = $Obj('count' + nid).value;
 
-	var errMsg = "网络通信出错！<br>[<a href=\"javascript:LoadPage('"+pageno+"')\"><u>点击此重新加载列表</u></a>]";
-	var myajax = new DedeAjax(listArea,true,true,"",errMsg,"正在处理...");
+      var errMsg = "网络通信出错！<br>[<a href=\"javascript:LoadPage('" + pageno + "')\"><u>点击此重新加载列表</u></a>]";
+      var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在处理...");
      <?php
-   if(strtolower(substr($cfg_soft_lang, 0, 3)) == 'utf') {
+   if (strtolower(substr($cfg_soft_lang, 0, 3)) == 'utf') {
    ?>
-   myajax.AddKeyUtf8('dopost','update');
-   myajax.AddKeyUtf8('aid',nid);
-   myajax.AddKeyUtf8('keyword',kw);
-   myajax.AddKeyUtf8('spwords',kws);
-   myajax.AddKeyUtf8('count',ct);
-   myajax.AddKeyUtf8('pageno',pageno);
-   myajax.AddKeyUtf8('orderby',orderby);
-   myajax.SendPost2('search_keywords_main.php');
+          myajax.AddKeyUtf8('dopost', 'update');
+        myajax.AddKeyUtf8('aid', nid);
+        myajax.AddKeyUtf8('keyword', kw);
+        myajax.AddKeyUtf8('spwords', kws);
+        myajax.AddKeyUtf8('count', ct);
+        myajax.AddKeyUtf8('pageno', pageno);
+        myajax.AddKeyUtf8('orderby', orderby);
+        myajax.SendPost2('search_keywords_main.php');
    <?php
    }
-   elseif (strtolower(substr($cfg_soft_lang, 0, 2)) == 'gb') {
-   	 echo 'myajax.SendGet2("search_keywords_main.php?dopost=update&aid="+nid+"&keyword="+kw+"&spwords="+kws+"&count="+ct+"&pageno="+pageno+"&orderby="+orderby);';
-   }
+      elseif(strtolower(substr($cfg_soft_lang, 0, 2)) == 'gb') {
+        echo 'myajax.SendGet2("search_keywords_main.php?dopost=update&aid="+nid+"&keyword="+kw+"&spwords="+kws+"&count="+ct+"&pageno="+pageno+"&orderby="+orderby);';
+      }
    ?>
    //myajax.SendGet("search_keywords_main.php?dopost=update&aid="+nid+"&keyword="+kw+"&spwords="+kws+"&count="+ct+"&pageno="+pageno);
 }
-//删除关键词
-function DelNote(nid){
-	var listArea = $Obj('rslist');
-	totalrow = totalrow - 1;
-  var pagenum = Math.ceil(totalrow/pagesize);
-  if(pagenum<=pageno) pageno = pagenum;
-  var errMsg = "网络通信出错！<br>[<a href=\"javascript:LoadPage('"+pageno+"')\"><u>点击此重新加载列表</u></a>]";
-	var myajax = new DedeAjax(listArea,true,true,"",errMsg,"正在处理...");
-  myajax.SendGet("search_keywords_main.php?dopost=del&aid="+nid+"&pageno="+pageno+"&orderby="+orderby);
-  ReloadPageNum(pageno);
-}
-//重新加载分页列表
-function ReloadPageNum(startnum){
-  var ListArea = $Obj('pagelist');
-  var pagenum = Math.ceil(totalrow/pagesize);
-  var listsize = 3;
-  var ahtml = "";
-  var startloop = 1;
-  var endnum = 0;
-  ahtml += "共："+totalrow+" 条记录/"+pagenum+"页 ";
-  if(pageno>1) ahtml += "<a href='#' onclick='LoadPage("+(pageno-1)+")'>↑上页</a> ";
-  if(startnum >= pagenum-listsize){
-  	startloop = pagenum-(listsize*2);
-  	if(startloop<1) startloop = 1;
-  	for(i=startloop;i<=pagenum;i++){
-  		if(i==pageno) ahtml += i+" ";
-  		else ahtml += "<a href='#' onclick='LoadPage("+i+")'>["+i+"]</a> ";
-  	}
-  }
-  else if(pagenum < listsize){
-  	for(i=1;i<=pagenum;i++){
-  		if(i==pageno) ahtml += i+" ";
-  		else ahtml += "<a href='#' onclick='LoadPage("+i+")'>["+i+"]</a> ";
-  	}
-  }
-  else{
-  	startloop = startnum-listsize;
-  	if(startloop<1){ startloop=1; endnum = startloop + (listsize*2); }
-  	else{ endnum = startnum+listsize; }
-  	if(endnum >= pagenum) endnum = pagenum;
-  	for(i=startloop;i<=endnum;i++){
-  		if(i==pageno) ahtml += i+" ";
-  		else ahtml += "<a href='#' onclick='LoadPage("+i+")'>["+i+"]</a> ";
-  	}
-  }
-  if(pageno<pagenum) ahtml += "<a href='#' onclick='LoadPage("+(pageno+1)+")'>下页↓</a> ";
-  ListArea.innerHTML = ahtml;
-}
-</script>
-<style>
-	.nnpp{
-	border-bottom:1px solid #666666;
-	border-top:1px solid #FFFFFF;
-	border-left:1px solid #FFFFFF;
-	border-right:1px solid #FFFFFF;
-	filter:alpha(opacity=50);
- }
-</style>
+    //删除关键词
+    function DelNote(nid) {
+      var listArea = $Obj('rslist');
+      totalrow = totalrow - 1;
+      var pagenum = Math.ceil(totalrow / pagesize);
+      if (pagenum <= pageno) pageno = pagenum;
+      var errMsg = "网络通信出错！<br>[<a href=\"javascript:LoadPage('" + pageno + "')\"><u>点击此重新加载列表</u></a>]";
+      var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在处理...");
+      myajax.SendGet("search_keywords_main.php?dopost=del&aid=" + nid + "&pageno=" + pageno + "&orderby=" + orderby);
+      ReloadPageNum(pageno);
+    }
+    //重新加载分页列表
+    function ReloadPageNum(startnum) {
+      var ListArea = $Obj('pagelist');
+      var pagenum = Math.ceil(totalrow / pagesize);
+      var listsize = 3;
+      var ahtml = "";
+      var startloop = 1;
+      var endnum = 0;
+      ahtml += "共：" + totalrow + " 条记录/" + pagenum + "页 ";
+      if (pageno > 1) ahtml += "<a href='#' onclick='LoadPage(" + (pageno - 1) + ")'>↑上页</a> ";
+      if (startnum >= pagenum - listsize) {
+        startloop = pagenum - (listsize * 2);
+        if (startloop < 1) startloop = 1;
+        for (i = startloop; i <= pagenum; i++) {
+          if (i == pageno) ahtml += i + " ";
+          else ahtml += "<a href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
+        }
+      }
+      else if (pagenum < listsize) {
+        for (i = 1; i <= pagenum; i++) {
+          if (i == pageno) ahtml += i + " ";
+          else ahtml += "<a href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
+        }
+      }
+      else {
+        startloop = startnum - listsize;
+        if (startloop < 1) { startloop = 1; endnum = startloop + (listsize * 2); }
+        else { endnum = startnum + listsize; }
+        if (endnum >= pagenum) endnum = pagenum;
+        for (i = startloop; i <= endnum; i++) {
+          if (i == pageno) ahtml += i + " ";
+          else ahtml += "<a href='#' onclick='LoadPage(" + i + ")'>[" + i + "]</a> ";
+        }
+      }
+      if (pageno < pagenum) ahtml += "<a href='#' onclick='LoadPage(" + (pageno + 1) + ")'>下页↓</a> ";
+      ListArea.innerHTML = ahtml;
+    }
+  </script>
+  <style>
+    .nnpp {
+      border-bottom: 1px solid #666666;
+      border-top: 1px solid #FFFFFF;
+      border-left: 1px solid #FFFFFF;
+      border-right: 1px solid #FFFFFF;
+      filter: alpha(opacity=50);
+    }
+  </style>
 </head>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<div class="main" align='center'>
-  <table width="98%" border="0" cellpadding="1" cellspacing="1" bgcolor="#D6D6D6" style="margin-bottom:3px">
-    <tr>
-      <td height="26" colspan="8" background="images/tbg.gif"><table width="100%" border="0">
-          <tr>
-            <td width="31%" align="left" style="padding-left:10px;"><strong>搜索关键词维护</strong></td>
-            <td align="right">
-            	&nbsp;
-            	<input class="np coolbg" name="n1" type="button" id="n1" value="文档关键字维护" onClick="location='article_keywords_main.php';" style="width:135">
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-	</table>
-	<span id='rslist'>
-	<?php
+  <div class="main" align='center'>
+    <table width="98%" border="0" cellpadding="1" cellspacing="1" bgcolor="#D6D6D6" style="margin-bottom:3px">
+      <tr>
+        <td height="26" colspan="8" background="images/tbg.gif">
+          <table width="100%" border="0">
+            <tr>
+              <td width="31%" align="left" style="padding-left:10px;"><strong>搜索关键词维护</strong></td>
+              <td align="right">
+                &nbsp;
+                <input class="np coolbg" name="n1" type="button" id="n1" value="文档关键字维护"
+                  onClick="location='article_keywords_main.php';" style="width:135">
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <span id='rslist'>
+      <?php
 		GetKeywordList($dsql,$pageno,$pagesize,$orderby);
 	?>
-	</span>
+    </span>
 
-  <table width="98%" border="0" cellpadding="1" cellspacing="1"  bgcolor="#cfcfcf" style="margin-bottom:3px">
-    <tr align="center">
-      <td height="35" colspan="8"  bgcolor="#F9FCEF">
-      <span id='pagelist'></span>
-      <script language='javascript'>ReloadPageNum(1);</script>
-      </td>
-    </tr>
-  </table>
+    <table width="98%" border="0" cellpadding="1" cellspacing="1" bgcolor="#cfcfcf" style="margin-bottom:3px">
+      <tr align="center">
+        <td height="35" colspan="8" bgcolor="#F9FCEF">
+          <span id='pagelist'></span>
+          <script language='javascript'>ReloadPageNum(1);</script>
+        </td>
+      </tr>
+    </table>
 
-</div>
+  </div>
 </body>
+
 </html>

src/dede/templets/spec_add.htm

@@ -4,19 +4,16 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>专题发布向导</title>
 <style type="text/css">
-<!--
 body {
 	background-image: url(images/allbg.gif);
 }
--->
 </style>
 <link href="css/base.css" rel="stylesheet" type="text/css">
+<script language="javascript" src="../static/js/jquery.js"></script>
 <script language="javascript" src="../static/js/dedeajax2.js"></script>
 <script type="text/javascript" src="js/calendar/calendar.js"></script>
 <script language='javascript' src='js/main.js'></script>
 <script language="javascript">
-<!--
-
 function checkSubmit(){
 	if(document.form1.title.value==""){
 		alert("专题名称不能为空！");
@@ -61,7 +58,6 @@ function CheckVal(id){
        }
    }
 }
--->
 </script>
 </head>
 <body topmargin="8">

src/dede/templets/spec_edit.htm

@@ -1,129 +1,140 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>更改专题</title>
-<style type="text/css">
-<!--
-body { background-image: url(images/allbg.gif); }
--->
-</style>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script language='javascript' src='js/main.js'></script>
-<script language="javascript">
-<!--
-function SelectTemplets(fname)
-{
-   if(document.all){
-     var posLeft = window.event.clientY-100;
-     var posTop = window.event.clientX-400;
-   }
-   else{
-     var posLeft = 100;
-     var posTop = 100;
-   }
-     window.open("./dialog/select_templets.php?f="+fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left="+posLeft+", top="+posTop);
-}
-function SelectArcList(fname)
-{
-   if(document.all){
-     var posLeft = window.event.clientY-100;
-     var posTop = window.event.clientX-400;
-   }
-   else{
-     var posLeft = 100;
-     var posTop = 100;
-   }
-   window.open("content_select_list.php?f="+fname, "selArcList", "scrollbars=yes,resizable=yes,statebar=no,width=700,height=500,left="+posLeft+", top="+posTop);
-}
-function checkSubmit()
-{
-   if(document.form1.title.value==""){
-	   alert("专题名称不能为空！");
-	   return false;
-  }
-  for(i=1;i<=6;i++){
-      $val = CheckVal(i);
-      if($val == false)
-      {
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>更改专题</title>
+  <style type="text/css">
+    body {
+      background-image: url(images/allbg.gif);
+    }
+  </style>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="../static/js/dedeajax2.js"></script>
+  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <script language='javascript' src='js/main.js'></script>
+  <script language="javascript">
+    function SelectTemplets(fname) {
+      if (document.all) {
+        var posLeft = window.event.clientY - 100;
+        var posTop = window.event.clientX - 400;
+      }
+      else {
+        var posLeft = 100;
+        var posTop = 100;
+      }
+      window.open("./dialog/select_templets.php?f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left=" + posLeft + ", top=" + posTop);
+    }
+    function SelectArcList(fname) {
+      if (document.all) {
+        var posLeft = window.event.clientY - 100;
+        var posTop = window.event.clientX - 400;
+      }
+      else {
+        var posLeft = 100;
+        var posTop = 100;
+      }
+      window.open("content_select_list.php?f=" + fname, "selArcList", "scrollbars=yes,resizable=yes,statebar=no,width=700,height=500,left=" + posLeft + ", top=" + posTop);
+    }
+    function checkSubmit() {
+      if (document.form1.title.value == "") {
+        alert("专题名称不能为空！");
+        return false;
+      }
+      for (i = 1; i <= 6; i++) {
+        $val = CheckVal(i);
+        if ($val == false) {
           return false;
+        }
       }
-  }
-}
+    }
 
-function CheckVal(id){
-   var notename = $DE('notename'+id);
-   var arcid = $DE('arcid'+id);
-   if(arcid.value != "")
-   {
-       if(notename.value == "")
-       {
-           $DE('notename'+id).focus();
-           alert('你的节点'+id+'名称不能为空');
-           return false; 
-       }
-   }
-}
--->
-</script>
+    function CheckVal(id) {
+      var notename = $DE('notename' + id);
+      var arcid = $DE('arcid' + id);
+      if (arcid.value != "") {
+        if (notename.value == "") {
+          $DE('notename' + id).focus();
+          alert('你的节点' + id + '名称不能为空');
+          return false;
+        }
+      }
+    }
+  </script>
 </head>
+
 <body topmargin="8">
-<form name="form1" action="spec_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
-<input type="hidden" name="id" value="<?php echo $arcRow['id']?>" />
-<input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-<input type="hidden" name="arcrank" value="<?php echo $arcRow['arcrank']?>" />
-<input type="hidden" name="source" value="本站" />
-<input type="hidden" name="dopost" value="save" />
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
-    <tr>
-      <td width="85%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a href="content_s_list.php"><u>专题列表</u></a><a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"></a> &gt;&gt; 修改专题</td>
-      <td width="10%" align="right"><a href="makehtml_spec.php">[<u>更新HTML</u>]</a>&nbsp; </td>
-    </tr>
-  </table>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
-    <tr>
-      <td colspan="2"> <table width="168" border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规参数&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()"><u>专题文档</u></a>&nbsp;</td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
-    <tr>
-      <td colspan="2"> <table width="168" height="24" border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()"><u>常规参数</u></a>&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote1.gif">专题文档</td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
-    <tr>
-      <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;专题名称：</td>
-          <td width='408'>
-          	<input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>" style="width:388px" />
-          </td>
-          <td width="90">&nbsp;简略标题：</td>
-          <td>
-          	<input name="shorttitle" type="text" id="shorttitle" style="width:150px" value="<?php echo $arcRow['shorttitle']; ?>" />
-          </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;自定义属性：</td>
-          <td>
-         <?php
+  <form name="form1" action="spec_edit.php" enctype="multipart/form-data" method="post"
+    onSubmit="return checkSubmit();">
+    <input type="hidden" name="id" value="<?php echo $arcRow['id']?>" />
+    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
+    <input type="hidden" name="arcrank" value="<?php echo $arcRow['arcrank']?>" />
+    <input type="hidden" name="source" value="本站" />
+    <input type="hidden" name="dopost" value="save" />
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="85%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
+            href="content_s_list.php"><u>专题列表</u></a><a
+            href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"></a>
+          &gt;&gt; 修改专题</td>
+        <td width="10%" align="right"><a href="makehtml_spec.php">[<u>更新HTML</u>]</a>&nbsp; </td>
+      </tr>
+    </table>
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
+      <tr>
+        <td colspan="2">
+          <table width="168" border="0" cellpadding="0" cellspacing="0">
+            <tr>
+              <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规参数&nbsp;</td>
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                  onClick="ShowItem2()"><u>专题文档</u></a>&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
+      <tr>
+        <td colspan="2">
+          <table width="168" height="24" border="0" cellpadding="0" cellspacing="0">
+            <tr>
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                  onClick="ShowItem1()"><u>常规参数</u></a>&nbsp;</td>
+              <td width="84" align="center" background="images/itemnote1.gif">专题文档</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
+      style="border:1px solid #cfcfcf;background:#ffffff;">
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;专题名称：</td>
+              <td width='408'>
+                <input name="title" type="text" id="title" value="<?php echo $arcRow['title']; ?>"
+                  style="width:388px" />
+              </td>
+              <td width="90">&nbsp;简略标题：</td>
+              <td>
+                <input name="shorttitle" type="text" id="shorttitle" style="width:150px"
+                  value="<?php echo $arcRow['shorttitle']; ?>" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="400%" height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;自定义属性：</td>
+              <td>
+                <?php
 				$dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
         $dsql->Execute();
         while($trow = $dsql->GetObject())
@@ -135,221 +146,243 @@ function CheckVal(id){
             		  echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' />{$trow->attname}[{$trow->att}]";
          }
           ?>
-           </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr id="pictable">
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="90">
-            	&nbsp;缩 略 图：
-            </td>
-            <td width="500">
-             <input name="picname" type="text" id="picname" style="width:250px" value="<?php echo $arcRow["litpic"]?>" />
-             <input type="button" name="Submit" value="浏览..." style="width:70px" onClick="SelectImage('form1.picname','');" />
-             <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg' />
-             <input type='checkbox' class='np' name='ddisremote' value='1' />远程
-            </td>
-            <td align="center">
-            <img src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "images/pview.gif";?>" width="150" height="100" id="picview" name="picview" />
-            </td>
-          </tr>
-        </table>
-       </td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;专题模板：</td>
-            <td>
-            	<input name="templet" type="text" id="templet" style="width:250px" value="<?php echo $addRow["templet"]?>" />
-              <input type="button" name="set3" value="浏览..." style="width:60px" onClick="SelectTemplets('form1.templet');" />
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;责任编辑：</td>
-            <td width="224">
-            	<input name="writer" type="text" id="writer" value="<?php echo $arcRow["writer"]?>" />
-            </td>
-            <td width="75">发布选项：</td>
-            <td width="421"> <input name="ishtml" type="radio" class="np" value="1"<?php if($arcRow["ismake"]!=-1) echo " checked='1'";?> />
-              生成HTML
-              <input type="radio" name="ishtml" class="np" value="0"<?php if($arcRow["ismake"]==-1) echo " checked='1'";?> />
-            仅动态浏览 </td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;内容排序：</td>
-            <td width="224">
-            	<select name="sortup" id="sortup" style="width:150">
-                <?php
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr id="pictable">
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="90">
+                &nbsp;缩 略 图：
+              </td>
+              <td width="500">
+                <input name="picname" type="text" id="picname" style="width:250px"
+                  value="<?php echo $arcRow["litpic"]?>" />
+                <input type="button" name="Submit" value="浏览..." style="width:70px"
+                  onClick="SelectImage('form1.picname','');" />
+                <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');"
+                  class='np coolbg' />
+                <input type='checkbox' class='np' name='ddisremote' value='1' />远程
+              </td>
+              <td align="center">
+                <img src="<?php if($arcRow["litpic"]!="") echo $arcRow["litpic"]; else echo "images/pview.gif";?>"
+                  width="150" height="100" id="picview" name="picview" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;专题模板：</td>
+              <td>
+                <input name="templet" type="text" id="templet" style="width:250px"
+                  value="<?php echo $addRow["templet"]?>" />
+                <input type="button" name="set3" value="浏览..." style="width:60px"
+                  onClick="SelectTemplets('form1.templet');" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;责任编辑：</td>
+              <td width="224">
+                <input name="writer" type="text" id="writer" value="<?php echo $arcRow["writer"]?>" />
+              </td>
+              <td width="75">发布选项：</td>
+              <td width="421"> <input name="ishtml" type="radio" class="np" value="1"
+                  <?php if($arcRow["ismake"]!=-1) echo " checked='1'";?> />
+                生成HTML
+                <input type="radio" name="ishtml" class="np" value="0"
+                  <?php if($arcRow["ismake"]==-1) echo " checked='1'";?> />
+                仅动态浏览 </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;内容排序：</td>
+              <td width="224">
+                <select name="sortup" id="sortup" style="width:150">
+                  <?php
                 $subday = SubDay($arcRow["sortrank"],$arcRow["senddate"]);
                 echo "<option value='0'>正常排序</option>\r\n";
                 if($subday>0) echo "<option value='$subday' selected>置顶 $subday 天</option>\r\n";
                 ?>
-                <option value="7">置顶一周</option>
-                <option value="30">置顶一个月</option>
-                <option value="90">置顶三个月</option>
-                <option value="180">置顶半年</option>
-                <option value="360">置顶一年</option>
-            </select> </td>
-            <td width="72">标题颜色：</td>
-            <td width="130">
-            	<input name="color" type="text" id="color" style="width:120px" value="<?php echo $arcRow["color"]?>" />
-            </td>
-            <td width="293">
-            	<input name="modcolor" type="button" id="modcolor" value="选取" onClick="ShowColor(event,this)" />
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;主 分 类：</td>
-            <td width="620">
-            <?php
+                  <option value="7">置顶一周</option>
+                  <option value="30">置顶一个月</option>
+                  <option value="90">置顶三个月</option>
+                  <option value="180">置顶半年</option>
+                  <option value="360">置顶一年</option>
+                </select> </td>
+              <td width="72">标题颜色：</td>
+              <td width="130">
+                <input name="color" type="text" id="color" style="width:120px" value="<?php echo $arcRow["color"]?>" />
+              </td>
+              <td width="293">
+                <input name="modcolor" type="button" id="modcolor" value="选取" onClick="ShowColor(event,this)" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;主 分 类：</td>
+              <td width="620">
+                <?php
            	$typeOptions = GetOptionList($arcRow["typeid"],$cuserLogin->getUserChannel(),0);
            	echo "<select name='typeid' style='width:240px'>\r\n";
             if($arcRow["typeid"]=="0") echo "<option value='0' selected='1'>请选择主分类...</option>\r\n";
             echo $typeOptions;
             echo "</select>";
-			      ?> 
-			      <img src='images/menusearch.gif' style='cursor:pointer;' onClick="ShowCatMap(event, this, 0, 'typeid')" alt='快捷选择' title='快捷选择' />
-			      <?php 
+			      ?>
+                <img src='images/menusearch.gif' style='cursor:pointer;' onClick="ShowCatMap(event, this, 0, 'typeid')"
+                  alt='快捷选择' title='快捷选择' />
+                <?php 
      			 if($cfg_remote_site=='Y')
      			 {
-   				 ?> 　 
-     				 <input name="isremote" type="checkbox" id="isremote" value="1" <?php if($cfg_title_site=='Y') echo "checked";?>>是否同步远程发布  <?php GetFtp();?>     <?php
+   				 ?> 　
+                <input name="isremote" type="checkbox" id="isremote" value="1"
+                  <?php if($cfg_title_site=='Y') echo "checked";?>>是否同步远程发布 <?php GetFtp();?> <?php
      			 }
-    		?>  </td>
-            <td width="100" align="center">&nbsp; </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="51">&nbsp;关键字：</td>
-            <td> <input type="text" name="keywords" rows="3" id="keywords" style="width:350px" value="<?php echo $arcRow["keywords"]?>" />
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="78">&nbsp;专题说明：</td>
-            <td> <textarea name="description" rows="4" id="textarea" style="width:350px"><?php echo $arcRow["description"]?></textarea>
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-   <td height="24" colspan="4" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90" height="22" width="240">&nbsp;评论选项：</td>
-          <td width="250">
-          <input type='radio' name='notpost' class='np' value='0'<?php if($arcRow['notpost']==0) echo " checked='1' "; ?>/>允许评论
-          &nbsp;
-          <input type='radio' name='notpost' class='np' value='1'<?php if($arcRow['notpost']==1) echo " checked='1' "; ?>/>禁止评论
-          </td>
-          <td width="90">浏览次数：</td>
-          <td>
-          	<input type='text' name='click' value='<?php echo $arcRow['click']; ?>' style='width:100px;' />
-          </td>
-        </tr>
-      </table>
-    </td>
-   </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;发布时间：</td>
-            <td>
-              <?php
+    		?> </td>
+              <td width="100" align="center">&nbsp; </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="51">&nbsp;关键字：</td>
+              <td> <input type="text" name="keywords" rows="3" id="keywords" style="width:350px"
+                  value="<?php echo $arcRow["keywords"]?>" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="78">&nbsp;专题说明：</td>
+              <td> <textarea name="description" rows="4" id="textarea"
+                  style="width:350px"><?php echo $arcRow["description"]?></textarea>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="22" width="240">&nbsp;评论选项：</td>
+              <td width="250">
+                <input type='radio' name='notpost' class='np' value='0'
+                  <?php if($arcRow['notpost']==0) echo " checked='1' "; ?> />允许评论
+                &nbsp;
+                <input type='radio' name='notpost' class='np' value='1'
+                  <?php if($arcRow['notpost']==1) echo " checked='1' "; ?> />禁止评论
+              </td>
+              <td width="90">浏览次数：</td>
+              <td>
+                <input type='text' name='click' value='<?php echo $arcRow['click']; ?>' style='width:100px;' />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;发布时间：</td>
+              <td>
+                <?php
 			         $addtime = GetDateTimeMk($arcRow["senddate"]);
 			         echo "$addtime (标准排序和生成HTML名称的依据时间) <input type='hidden' name='senddate' value='".$arcRow["senddate"]."' />";
 			        ?>
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;更新时间：</td>
-            <td>
-			
-              <?php
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;更新时间：</td>
+              <td>
+
+                <?php
 			         $nowtime = GetDateTimeMk($arcRow["pubdate"]);
 			         echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200px\" />";
 		          ?>
-				  <script language="javascript" type="text/javascript">
-					Calendar.setup({
-						inputField     :    "pubdate",
-						ifFormat       :    "%Y-%m-%d %H:%M:%S",
-						showsTime      :    true,
-						timeFormat     :    "24"
-					});
-				 </script>
-            </td>
-            <td width="234">&nbsp;</td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="104">&nbsp;自定义文件名：</td>
-            <td width="597">
-            	<input type="text" name="filename" id="filename" value="<?php echo $arcRow["filename"]?>" />（不包括后缀名如.html等）
-            </td>
-            <td width="99" align="center">&nbsp; </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <tr>
-     <td>
-      <?php
+                <script language="javascript" type="text/javascript">
+                  Calendar.setup({
+                    inputField: "pubdate",
+                    ifFormat: "%Y-%m-%d %H:%M:%S",
+                    showsTime: true,
+                    timeFormat: "24"
+                  });
+                </script>
+              </td>
+              <td width="234">&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="104">&nbsp;自定义文件名：</td>
+              <td width="597">
+                <input type="text" name="filename" id="filename"
+                  value="<?php echo $arcRow["filename"]?>" />（不包括后缀名如.html等）
+              </td>
+              <td width="99" align="center">&nbsp; </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <?php
         PrintAutoFieldsEdit($cInfos['fieldset'],$addRow,'autofield');
       ?>
-     </td>
-   </tr>
-  </table>
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" style="border:1px solid #cfcfcf;background:#ffffff;display:none;" id="adset">
-    <tr>
-      <td height="24" class="bline2"> <strong>专题节点列表：</strong>
-        (文章列表用ID1,ID2,ID3这样形式分开，系统会自动排除不同节点的相同文章) <br/>
-        关于单条记录模板里的[field:fieldname /]标记的使用，请参考关于系统帮助关于 arclist 标记的说明。</td>
-    </tr>
-    <tr>
-      <td height="24" valign="top">
-        <table width="800" border="0" cellspacing="2" cellpadding="2">
-          <?php
+        </td>
+      </tr>
+    </table>
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2"
+      style="border:1px solid #cfcfcf;background:#ffffff;display:none;" id="adset">
+      <tr>
+        <td height="24" class="bline2"> <strong>专题节点列表：</strong>
+          (文章列表用ID1,ID2,ID3这样形式分开，系统会自动排除不同节点的相同文章) <br />
+          关于单条记录模板里的[field:fieldname /]标记的使用，请参考关于系统帮助关于 arclist 标记的说明。</td>
+      </tr>
+      <tr>
+        <td height="24" valign="top">
+          <table width="800" border="0" cellspacing="2" cellpadding="2">
+            <?php
 		  $speclisttmp = GetSysTemplets("spec_arclist.htm");
 		  $i = 1;
 		  $dtp = new DedeTagParse();
@@ -376,134 +409,169 @@ function CheckVal(id){
       	$rownum = $ctag->GetAtt('rownum');
       	if(empty($rownum)) $rownum = 40;
       ?>
-          <tr bgcolor="#FBFCE2">
-            <td width="113">节点
-              <?php echo $i?>
-              名称：</td>
-            <td colspan="2"> <table width="600" border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                  <td width="310"><input name="notename<?php echo $i?>" type="text" id="notename<?php echo $i?>" style="width:300" value="<?php echo $notename?>">
-                  </td>
-                  <td width="90" align="center">节点标识：</td>
-                  <td width="200"><input name="noteid<?php echo $i?>" type="text" id="noteid<?php echo $i?>" style="width:100" value="<?php echo $noteid?>"></td>
-                </tr>
-              </table></td>
-          </tr>
-          <tr>
-            <td>节点文章列表：</td>
-            <td><textarea name="arcid<?php echo $i?>" rows="3" onblur='CheckVal(<?php echo $i ?>)' id="arcid<?php echo $i?>"  style="width:90%"><?php echo $idlist?></textarea></td>
-            <td align="center"><input name="selarc<?php echo $i?>" type="button" id="selarc<?php echo $i?>2" value="选择节点文章" style="width:100" onClick="SelectArcList('form1.arcid<?php echo $i?>');"></td>
-          </tr>
-          <tr>
-            <td>文档来源：</td>
-            <td colspan="2">
-            	<input name="isauto<?php echo $i?>" type="radio" id="isauto<?php echo $i?>" value="0" class="np"<?php if($isauto==0) echo " checked";?>>
-            	按文章列表
-            	<input name="isauto<?php echo $i?>" type="radio" id="isauto<?php echo $i?>" value="1" class="np"<?php if($isauto==1) echo " checked";?>>
-            	自动获取文档
-            	&nbsp;
-            	关键字：
-            	<input name="keywords<?php echo $i?>" type="text" value="<?php echo $keywords?>" id="keywords<?php echo $i?>" value="" size="16">(逗号分开)
-            	栏目ID：
-            	<input name="typeid<?php echo $i?>" type="text" value="<?php echo $typeid?>" id="typeid<?php echo $i?>" value="0" size="4">
-            </td>
-          </tr>
-          <tr>
-            <td height="51" rowspan="2" valign="top">节点布局：<br/> </td>
-            <td colspan="2">列数： <input name="col<?php echo $i?>" type="text" id="col<?php echo $i?>" value="<?php echo $col?>" size="3">
-              图片宽： <input name="imgwidth<?php echo $i?>" type="text" id="imgwidth<?php echo $i?>" value="<?php echo $imgwidth?>" size="3">
-              图片高： <input name="imgheight<?php echo $i?>" type="text" id="imgheight<?php echo $i?>" value="<?php echo $imgheight?>" size="3">
-              标题长：
-              <input name="titlelen<?php echo $i?>" type="text" id="titlelen<?php echo $i?>" value="<?php echo $titlelen?>" size="3">
-              简介长：
-              <input name="infolen<?php echo $i?>" type="text" id="infolen<?php echo $i?>" value="<?php echo $infolen?>" size="3">
-              文档数：
-              <input name="rownum<?php echo $i?>" type="text" id="rownum<?php echo $i?>" value="<?php echo $rownum?>" size="3">
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">单条记录的模板：<br/>
-            <textarea name="listtmp<?php echo $i?>" rows="3" id="listtmp<?php echo $i?>" style="width:60%"><?php echo $temp?></textarea></td>
-          </tr>
-      <?php
+            <tr bgcolor="#FBFCE2">
+              <td width="113">节点
+                <?php echo $i?>
+                名称：</td>
+              <td colspan="2">
+                <table width="600" border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td width="310"><input name="notename<?php echo $i?>" type="text" id="notename<?php echo $i?>"
+                        style="width:300" value="<?php echo $notename?>">
+                    </td>
+                    <td width="90" align="center">节点标识：</td>
+                    <td width="200"><input name="noteid<?php echo $i?>" type="text" id="noteid<?php echo $i?>"
+                        style="width:100" value="<?php echo $noteid?>"></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td>节点文章列表：</td>
+              <td><textarea name="arcid<?php echo $i?>" rows="3" onblur='CheckVal(<?php echo $i ?>)'
+                  id="arcid<?php echo $i?>" style="width:90%"><?php echo $idlist?></textarea></td>
+              <td align="center"><input name="selarc<?php echo $i?>" type="button" id="selarc<?php echo $i?>2"
+                  value="选择节点文章" style="width:100" onClick="SelectArcList('form1.arcid<?php echo $i?>');"></td>
+            </tr>
+            <tr>
+              <td>文档来源：</td>
+              <td colspan="2">
+                <input name="isauto<?php echo $i?>" type="radio" id="isauto<?php echo $i?>" value="0" class="np"
+                  <?php if($isauto==0) echo " checked";?>>
+                按文章列表
+                <input name="isauto<?php echo $i?>" type="radio" id="isauto<?php echo $i?>" value="1" class="np"
+                  <?php if($isauto==1) echo " checked";?>>
+                自动获取文档
+                &nbsp;
+                关键字：
+                <input name="keywords<?php echo $i?>" type="text" value="<?php echo $keywords?>"
+                  id="keywords<?php echo $i?>" value="" size="16">(逗号分开)
+                栏目ID：
+                <input name="typeid<?php echo $i?>" type="text" value="<?php echo $typeid?>" id="typeid<?php echo $i?>"
+                  value="0" size="4">
+              </td>
+            </tr>
+            <tr>
+              <td height="51" rowspan="2" valign="top">节点布局：<br /> </td>
+              <td colspan="2">列数： <input name="col<?php echo $i?>" type="text" id="col<?php echo $i?>"
+                  value="<?php echo $col?>" size="3">
+                图片宽： <input name="imgwidth<?php echo $i?>" type="text" id="imgwidth<?php echo $i?>"
+                  value="<?php echo $imgwidth?>" size="3">
+                图片高： <input name="imgheight<?php echo $i?>" type="text" id="imgheight<?php echo $i?>"
+                  value="<?php echo $imgheight?>" size="3">
+                标题长：
+                <input name="titlelen<?php echo $i?>" type="text" id="titlelen<?php echo $i?>"
+                  value="<?php echo $titlelen?>" size="3">
+                简介长：
+                <input name="infolen<?php echo $i?>" type="text" id="infolen<?php echo $i?>"
+                  value="<?php echo $infolen?>" size="3">
+                文档数：
+                <input name="rownum<?php echo $i?>" type="text" id="rownum<?php echo $i?>" value="<?php echo $rownum?>"
+                  size="3">
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2">单条记录的模板：<br />
+                <textarea name="listtmp<?php echo $i?>" rows="3" id="listtmp<?php echo $i?>"
+                  style="width:60%"><?php echo $temp?></textarea></td>
+            </tr>
+            <?php
       	$i++;
       }}
       $dtp->Clear();
 		  for($i;$i<=$cfg_specnote;$i++)
 		  {
 		  ?>
-          <tr bgcolor="#FBFCE2">
-            <td width="113">节点
-              <?php echo $i?>
-              名称：</td>
-            <td colspan="2"> <table width="600" border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                  <td width="310"><input name="notename<?php echo $i?>" type="text" id="notename<?php echo $i?>" style="width:300">
-                  </td>
-                  <td width="90" align="center">节点标识：</td>
-                  <td width="200"><input name="noteid<?php echo $i?>" type="text" id="noteid<?php echo $i?>" style="width:100"></td>
-                </tr>
-              </table></td>
-          </tr>
-          <tr>
-            <td>节点文章列表：</td>
-            <td><textarea name="arcid<?php echo $i?>" rows="3" onblur='CheckVal(<?php echo $i ?>)' id="arcid<?php echo $i?>" style="width:90%"></textarea></td>
-            <td align="center"><input name="selarc<?php echo $i?>" type="button" id="selarc<?php echo $i?>2" value="选择节点文章" style="width:100" onClick="SelectArcList('form1.arcid<?php echo $i?>');"></td>
-          </tr>
-          <tr>
-            <td>文档来源：</td>
-            <td colspan="2">
-            	<input name="isauto<?php echo $i?>" type="radio" id="isauto<?php echo $i?>" value="0" class="np" checked>
-            	按文章列表
-            	<input name="isauto<?php echo $i?>" type="radio" id="isauto<?php echo $i?>" value="1" class="np">
-            	自动获取文档
-            	&nbsp;
-            	关键字：
-            	<input name="keywords<?php echo $i?>" type="text" id="keywords<?php echo $i?>" value="" size="16">(空格分开)
-            	栏目ID：
-            	<input name="typeid<?php echo $i?>" type="text" id="typeid<?php echo $i?>" value="0" size="4">
-            </td>
-          </tr>
-          <tr>
-            <td height="51" rowspan="2" valign="top">节点布局：<br/> </td>
-            <td colspan="2">列数： <input name="col<?php echo $i?>" type="text" id="col<?php echo $i?>" value="1" size="3">
-              图片高： <input name="imgheight<?php echo $i?>" type="text" id="imgheight<?php echo $i?>" value="90" size="3">
-              图片宽： <input name="imgwidth<?php echo $i?>" type="text" id="imgwidth<?php echo $i?>" value="120" size="3">
-              标题长：
-              <input name="titlelen<?php echo $i?>" type="text" id="titlelen<?php echo $i?>" value="60" size="3">
-              简介长：
-              <input name="infolen<?php echo $i?>" type="text" id="infolen<?php echo $i?>" value="160" size="3">
-              文档数：
-              <input name="rownum<?php echo $i?>" type="text" id="rownum<?php echo $i?>" value="40" size="3">
-            </td>
-          </tr>
-          <tr>
-            <td colspan="2">单条记录的模板：<br/> <textarea name="listtmp<?php echo $i?>" rows="3" id="listtmp<?php echo $i?>" style="width:60%"><?php echo $speclisttmp?></textarea></td>
-          </tr>
-          <?php
+            <tr bgcolor="#FBFCE2">
+              <td width="113">节点
+                <?php echo $i?>
+                名称：</td>
+              <td colspan="2">
+                <table width="600" border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td width="310"><input name="notename<?php echo $i?>" type="text" id="notename<?php echo $i?>"
+                        style="width:300">
+                    </td>
+                    <td width="90" align="center">节点标识：</td>
+                    <td width="200"><input name="noteid<?php echo $i?>" type="text" id="noteid<?php echo $i?>"
+                        style="width:100"></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td>节点文章列表：</td>
+              <td><textarea name="arcid<?php echo $i?>" rows="3" onblur='CheckVal(<?php echo $i ?>)'
+                  id="arcid<?php echo $i?>" style="width:90%"></textarea></td>
+              <td align="center"><input name="selarc<?php echo $i?>" type="button" id="selarc<?php echo $i?>2"
+                  value="选择节点文章" style="width:100" onClick="SelectArcList('form1.arcid<?php echo $i?>');"></td>
+            </tr>
+            <tr>
+              <td>文档来源：</td>
+              <td colspan="2">
+                <input name="isauto<?php echo $i?>" type="radio" id="isauto<?php echo $i?>" value="0" class="np"
+                  checked>
+                按文章列表
+                <input name="isauto<?php echo $i?>" type="radio" id="isauto<?php echo $i?>" value="1" class="np">
+                自动获取文档
+                &nbsp;
+                关键字：
+                <input name="keywords<?php echo $i?>" type="text" id="keywords<?php echo $i?>" value="" size="16">(空格分开)
+                栏目ID：
+                <input name="typeid<?php echo $i?>" type="text" id="typeid<?php echo $i?>" value="0" size="4">
+              </td>
+            </tr>
+            <tr>
+              <td height="51" rowspan="2" valign="top">节点布局：<br /> </td>
+              <td colspan="2">列数： <input name="col<?php echo $i?>" type="text" id="col<?php echo $i?>" value="1"
+                  size="3">
+                图片高： <input name="imgheight<?php echo $i?>" type="text" id="imgheight<?php echo $i?>" value="90"
+                  size="3">
+                图片宽： <input name="imgwidth<?php echo $i?>" type="text" id="imgwidth<?php echo $i?>" value="120"
+                  size="3">
+                标题长：
+                <input name="titlelen<?php echo $i?>" type="text" id="titlelen<?php echo $i?>" value="60" size="3">
+                简介长：
+                <input name="infolen<?php echo $i?>" type="text" id="infolen<?php echo $i?>" value="160" size="3">
+                文档数：
+                <input name="rownum<?php echo $i?>" type="text" id="rownum<?php echo $i?>" value="40" size="3">
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2">单条记录的模板：<br /> <textarea name="listtmp<?php echo $i?>" rows="3"
+                  id="listtmp<?php echo $i?>" style="width:60%"><?php echo $speclisttmp?></textarea></td>
+            </tr>
+            <?php
 		  }
 		  ?>
-        </table>
-      </td>
-    </tr>
-  </table>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none;">
-  <tr>
-    <td height="35">
-	<table width="100%" border="0" cellspacing="1" cellpadding="1">
-        <tr>
-          <td width="17%">&nbsp;</td>
-          <td width="83%"><table width="214" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td width="115"><input name="imageField" type="image" class='np' src="images/button_ok.gif" width="60" height="22" border="0"></td>
-                <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0" onClick="location.reload();" style="cursor:pointer"></td>
-              </tr>
-            </table></td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-<script language='javascript'>InitPage();</script>
-</form>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
+      style="border:1px solid #cfcfcf;border-top:none;">
+      <tr>
+        <td height="35">
+          <table width="100%" border="0" cellspacing="1" cellpadding="1">
+            <tr>
+              <td width="17%">&nbsp;</td>
+              <td width="83%">
+                <table width="214" border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td width="115"><input name="imageField" type="image" class='np' src="images/button_ok.gif"
+                        width="60" height="22" border="0"></td>
+                    <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0"
+                        onClick="location.reload();" style="cursor:pointer"></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+    <script language='javascript'>InitPage();</script>
+  </form>
 </body>
+
 </html>

src/dede/templets/sys_data_replace.htm

@@ -3,6 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>数据批量替换</title>
+<script language="javascript" src="../static/js/jquery.js"></script>
 <script language='javascript' src='js/main.js'></script>
 <script language='javascript' src='../static/js/dedeajax2.js'></script>
 <script language='javascript'>

src/dede/templets/sys_info.htm

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>系统配置参数</title>
 <script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language="javascript" src="../static/js/jquery/jquery.js"></script>
+<script language="javascript" src="../static/js/jquery.js"></script>
 <script language="javascript">
 var searchconfig = false;
 function Nav()

src/dede/templets/sys_safe.htm

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>系统配置参数 - 验证安全设置</title>
 <link href="css/base.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../static/js/jquery/jquery.js" ></script>
+<script type="text/javascript" src="../static/js/jquery.js" ></script>
 <script type="text/javascript">
 var $ = jQuery;
 $(document).ready(function(){

src/dede/templets/sys_safetest.htm

@@ -1,84 +1,92 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>木马自检程序</title>
-<link href="css/base.css" rel="stylesheet" type="text/css" />
-<link rel="stylesheet" type="text/css" href="css/indexbody.css" />
-<style type="text/css">
-td{padding-left:8px;}
-</style>
-<script language='javascript' src='js/main.js'></script>
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language='javascript'>
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>木马自检程序</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css" />
+  <link rel="stylesheet" type="text/css" href="css/indexbody.css" />
+  <style type="text/css">
+    td {
+      padding-left: 8px;
+    }
+  </style>
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language='javascript' src='js/main.js'></script>
+  <script language="javascript" src="../static/js/dedeajax2.js"></script>
+  <script language='javascript'>
 
-function LoadCtTest()
-{
-	var filetype = $Obj('filetype').value;
-	var info = $Obj('info').value;
-	$Obj('loaddiv').style.display='block';
-	var myajax = new DedeAjax($DE('messagetd'));
-	myajax.SendGet2('sys_safetest.php?action=test&filetype=' + filetype + "&info=" + info);
-	$Obj('loaddiv').style.display='none';
-}
+    function LoadCtTest() {
+      var filetype = $Obj('filetype').value;
+      var info = $Obj('info').value;
+      $Obj('loaddiv').style.display = 'block';
+      var myajax = new DedeAjax($DE('messagetd'));
+      myajax.SendGet2('sys_safetest.php?action=test&filetype=' + filetype + "&info=" + info);
+      $Obj('loaddiv').style.display = 'none';
+    }
 
-function LoadCtClear()
-{
-	$Obj('loaddiv').style.display='block';
-	var myajax = new DedeAjax($DE('messagetd'));
-	myajax.SendGet2('sys_safetest.php?action=clear');
-	$Obj('loaddiv').style.display='none';
-}
+    function LoadCtClear() {
+      $Obj('loaddiv').style.display = 'block';
+      var myajax = new DedeAjax($DE('messagetd'));
+      myajax.SendGet2('sys_safetest.php?action=clear');
+      $Obj('loaddiv').style.display = 'none';
+    }
 
-</script>
+  </script>
 </head>
+
 <body leftmargin="8" topmargin="8" background='images/allbg.gif'>
 
-<div id='loaddiv' style='display:none'>
-	<p align='center' style='padding-top:200px'><img src='images/loadinglit.gif' /> 请稍后，正在操作中...</p>
-</div>
+  <div id='loaddiv' style='display:none'>
+    <p align='center' style='padding-top:200px'><img src='images/loadinglit.gif' /> 请稍后，正在操作中...</p>
+  </div>
 
-<div class="bodytitle">
-	<div class="bodytitleleft"></div>
-	<div class="bodytitletxt" style="padding-left:10px;">用户安全中心</div>
-</div>
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
-  <tr>
-    <td width="100%" height="24" colspan="2" bgcolor="#EDF9D5" background="images/tbg.gif" style="padding-left:10px;">
-      <b>木马自检程序</b>
-    </td>
-  </tr>
-  <tr>
-    <td height="73" colspan="2" bgcolor="#FFFFFF">
-     <strong>安全建议：</strong>
-    	<br />
-      1、有条件的用户把中 data、templets、uploads、html、special、images、install目录设置为不允许执行脚本，其它目录禁止写入，系统将更安全；<br />
-      2、本检测程以开发模式为标准，如果您的网站目录包含其它系统，此检测程序可能会产生错误判断；<br />
-      3、检测程序会跳过对模板缓存目录的检测，为了安全起见，检测完成后建议清空模板缓存。
-    </td>
-  </tr>
-  <tr>
-    <td height="50" colspan="2" bgcolor="#FFFFFF"><p>文件类型：
-        <input name="filetype" type="text" id="filetype" value="php|inc" style="width:420px"/> 
-    &nbsp;要检查的文件类型</p>
-    <p>代码特征：
-      <input name="info" type="text" id="info" value="eval|cmd|system|exec|_GET|_POST" style="width:420px"/>
-    &nbsp;特征代码</p></td>
-  </tr>
-  <tr>
-    <td height="50" colspan="2" bgcolor="#FFFFFF">
-    <input type="button" name="bt1" value="开始检测" class="coolbg np" onclick="LoadCtTest();" />
-    &nbsp;
-    <input type="button" name="bt2" value="清空模板缓存" class="coolbg np" onclick="LoadCtClear();" />
-	</td>
-  </tr>
-  <tr>
-    <td height="30" colspan="2" bgcolor="#F9FCEF">检测结果：(结果仅供参考，请务必查看源码后才删除非法文件)</td>
-  </tr>
-  <tr>
-    <td height="300" colspan="2" id="messagetd" valign="top" bgcolor="#FFFFFF">
-    </td>
-  </tr>
-</table>
+  <div class="bodytitle">
+    <div class="bodytitleleft"></div>
+    <div class="bodytitletxt" style="padding-left:10px;">用户安全中心</div>
+  </div>
+  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle"
+    style="background:#CFCFCF;">
+    <tr>
+      <td width="100%" height="24" colspan="2" bgcolor="#EDF9D5" background="images/tbg.gif" style="padding-left:10px;">
+        <b>木马自检程序</b>
+      </td>
+    </tr>
+    <tr>
+      <td height="73" colspan="2" bgcolor="#FFFFFF">
+        <strong>安全建议：</strong>
+        <br />
+        1、有条件的用户把中 data、templets、uploads、html、special、images、install目录设置为不允许执行脚本，其它目录禁止写入，系统将更安全；<br />
+        2、本检测程以开发模式为标准，如果您的网站目录包含其它系统，此检测程序可能会产生错误判断；<br />
+        3、检测程序会跳过对模板缓存目录的检测，为了安全起见，检测完成后建议清空模板缓存。
+      </td>
+    </tr>
+    <tr>
+      <td height="50" colspan="2" bgcolor="#FFFFFF">
+        <p>文件类型：
+          <input name="filetype" type="text" id="filetype" value="php|inc" style="width:420px" />
+          &nbsp;要检查的文件类型</p>
+        <p>代码特征：
+          <input name="info" type="text" id="info" value="eval|cmd|system|exec|_GET|_POST" style="width:420px" />
+          &nbsp;特征代码</p>
+      </td>
+    </tr>
+    <tr>
+      <td height="50" colspan="2" bgcolor="#FFFFFF">
+        <input type="button" name="bt1" value="开始检测" class="coolbg np" onclick="LoadCtTest();" />
+        &nbsp;
+        <input type="button" name="bt2" value="清空模板缓存" class="coolbg np" onclick="LoadCtClear();" />
+      </td>
+    </tr>
+    <tr>
+      <td height="30" colspan="2" bgcolor="#F9FCEF">检测结果：(结果仅供参考，请务必查看源码后才删除非法文件)</td>
+    </tr>
+    <tr>
+      <td height="300" colspan="2" id="messagetd" valign="top" bgcolor="#FFFFFF">
+      </td>
+    </tr>
+  </table>
 </body>
+
 </html>

src/dede/templets/video_add.htm

@@ -1,94 +1,105 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>增加视频</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="inc/spark/js/swfobject.js"></script>
-<script language="javascript">
-<!--
-function checkSubmit()
-{
-	if(document.form1.title.value==""){
-		alert("视频名称不能为空！");
-		document.form1.title.focus();
-		return false;
-	}
-	if(document.form1.typeid.value==0){
-		alert("请选择档案的主类别！");
-		return false;
-	}
-    if(document.form1.videourl.value==""){
-		alert("视频地址不能为空");
-		return false;
-	}
-}
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>增加视频</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="../static/js/dedeajax2.js"></script>
+  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <script language="javascript" src="inc/spark/js/swfobject.js"></script>
+  <script language="javascript">
+    function checkSubmit() {
+      if (document.form1.title.value == "") {
+        alert("视频名称不能为空！");
+        document.form1.title.focus();
+        return false;
+      }
+      if (document.form1.typeid.value == 0) {
+        alert("请选择档案的主类别！");
+        return false;
+      }
+      if (document.form1.videourl.value == "") {
+        alert("视频地址不能为空");
+        return false;
+      }
+    }
 
+    if ($Nav() != "IE") ShowObj('adset');
 
-if($Nav()!="IE") ShowObj('adset');
-  
-</script>
+  </script>
 </head>
+
 <body topmargin="8">
-<form name="form1" action="video_add.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
-<input type="hidden" name="dopost" value="save" />
-<input type="hidden" name="channelid" value="<?php echo $channelid?>" />
-<input type="hidden" name="cid" value="<?php echo $cid; ?>" />
+  <form name="form1" action="video_add.php" enctype="multipart/form-data" method="post"
+    onSubmit="return checkSubmit();">
+    <input type="hidden" name="dopost" value="save" />
+    <input type="hidden" name="channelid" value="<?php echo $channelid?>" />
+    <input type="hidden" name="cid" value="<?php echo $cid; ?>" />
     <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
-    <tr>
-      <td width="64%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>视频列表</u></a>&gt;&gt;发布新视频</td>
-      <td align="right">&nbsp; <a href="catalog_main.php">[<u>栏目管理</u>]</a>
-      </td>
-    </tr>
-  </table>
-  
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
-    <tr>
-      <td colspan="2">
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem2()"><u>高级参数</u></a></td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
+      <tr>
+        <td width="64%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
+            href="catalog_do.php?cid=<?php echo $cid?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>视频列表</u></a>&gt;&gt;发布新视频
+        </td>
+        <td align="right">&nbsp; <a href="catalog_main.php">[<u>栏目管理</u>]</a>
+        </td>
+      </tr>
+    </table>
+
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
+      <tr>
+        <td colspan="2">
+          <table border="0" cellpadding="0" cellspacing="0">
+            <tr>
+              <td width="84" height="24" align="center" background="images/itemnote1.gif">&nbsp;常规信息&nbsp;</td>
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                  onClick="ShowItem2()"><u>高级参数</u></a></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
+      <tr>
+        <td colspan="2">
+          <table height="24" border="0" cellpadding="0" cellspacing="0">
+            <tr>
+              <td width="84" align="center" background="images/itemnote2.gif"><a href="#"
+                  onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
+              <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+
 
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head2" style="display:none">
-    <tr>
-      <td colspan="2"> <table height="24" border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="84" align="center" background="images/itemnote2.gif"><a href="#" onClick="ShowItem1()"><u>常规信息</u></a>&nbsp;</td>
-            <td width="84" align="center" background="images/itemnote1.gif">高级参数</td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
- 
-  
 
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="needset" style="border:1px solid #cfcfcf;background:#ffffff;">
-    <tr>
-      <td height="24"  class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;视频名称：</td>
-          <td width='408'><input name="title" type="text" id="title" style="width:388px">          </td>
-          <td width="90">&nbsp;简略标题：</td>
-          <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px">          </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;自定义属性：</td>
-          <td>
-         <?php
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="needset"
+      style="border:1px solid #cfcfcf;background:#ffffff;">
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;视频名称：</td>
+              <td width='408'><input name="title" type="text" id="title" style="width:388px"> </td>
+              <td width="90">&nbsp;简略标题：</td>
+              <td><input name="shorttitle" type="text" id="shorttitle" style="width:150px"> </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="400%" height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;自定义属性：</td>
+              <td>
+                <?php
          $dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
          $dsql->Execute();
          while($trow = $dsql->GetObject())
@@ -112,184 +123,206 @@ if($Nav()!="IE") ShowObj('adset');
          	}
          }
           ?>
-           </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td height="24"  class="bline" id="redirecturltr" style="display:none">
-	   <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;跳转网址：</td>
-            <td>
-            	<input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="" />            </td>
-          </tr>
-       </table>       </td>
-    </tr>
-    <tr>
-      <td width="400%" height="24" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;TAG标签：</td>
-          <td><input name="tags" type="text" id="tags" value="" style="width:300px" onChange="$Obj('keywords').value=this.value;" />(','号分开，单个标签小于12字节)</td>
-        </tr>
-      </table>
-      </td>
-    </tr>
-   <tr id="pictable">
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90"> &nbsp;缩 略 图：</td>
-            <td width="560">
-            	<table width="100%" border="0" cellspacing="1" cellpadding="1">
-                <tr>
-                  <td height="30">
-                  <input name="picname" type="text" id="picname" style="width:240px" />
-                  <input type="button"  value="本地上传" style="width:70px;cursor:pointer;" />
-                  <iframe name='uplitpicfra' id='uplitpicfra' src='' width='200' height='200' style='display:none'></iframe>
-                  <span class="litpic_span"><input name="litpic" type="file" id="litpic"  onChange="SeePicNew(this, 'divpicview', 'uplitpicfra', 165, 'video_add.php');" size="1" class='np coolbg'/></span>
-                  <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;" onClick="SelectImage('form1.picname','small');" class='np coolbg'/>
-                  <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;" onClick="imageCut('picname');" class='np coolbg'/>
-                  <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote'/>远程
-                  </td>
-                </tr>
-              </table>
-             </td>
-            <td width="150" align="center">
-            <div id='divpicview' class='divpre'></div>
-            </td>
-          </tr>
-        </table></td>
-    </tr>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline" id="redirecturltr" style="display:none">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;跳转网址：</td>
+              <td>
+                <input name="redirecturl" type="text" id="redirecturl" style="width:300px" value="" /> </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="400%" height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;TAG标签：</td>
+              <td><input name="tags" type="text" id="tags" value="" style="width:300px"
+                  onChange="$Obj('keywords').value=this.value;" />(','号分开，单个标签小于12字节)</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr id="pictable">
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90"> &nbsp;缩 略 图：</td>
+              <td width="560">
+                <table width="100%" border="0" cellspacing="1" cellpadding="1">
+                  <tr>
+                    <td height="30">
+                      <input name="picname" type="text" id="picname" style="width:240px" />
+                      <input type="button" value="本地上传" style="width:70px;cursor:pointer;" />
+                      <iframe name='uplitpicfra' id='uplitpicfra' src='' width='200' height='200'
+                        style='display:none'></iframe>
+                      <span class="litpic_span"><input name="litpic" type="file" id="litpic"
+                          onChange="SeePicNew(this, 'divpicview', 'uplitpicfra', 165, 'video_add.php');" size="1"
+                          class='np coolbg' /></span>
+                      <input type="button" name="Submit2" value="站内选择" style="margin-left:8px;"
+                        onClick="SelectImage('form1.picname','small');" class='np coolbg' />
+                      <input type="button" name="Submit2" value="裁剪" style="margin-left:8px;"
+                        onClick="imageCut('picname');" class='np coolbg' />
+                      <input type='checkbox' class='np' name='ddisremote' value='1' id='ddisremote' />远程
+                    </td>
+                  </tr>
+                </table>
+              </td>
+              <td width="150" align="center">
+                <div id='divpicview' class='divpre'></div>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
 
-    <tr>
-      <td height="24"  class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;视频来源：</td>
-            <td width="240">
-              <input name="source" type="text" id="source" style="width:200px">            </td>
-            <td width="90">视频作者：</td>
-            <td width="159"><input name="writer" type="text" id="writer" style="width:120px"></td>
-			<td>&nbsp;</td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24"  class="bline"> <table width="800" border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;视频来源：</td>
+              <td width="240">
+                <input name="source" type="text" id="source" style="width:200px"> </td>
+              <td width="90">视频作者：</td>
+              <td width="159"><input name="writer" type="text" id="writer" style="width:120px"></td>
+              <td>&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
 
 
 
-		  <tr>
-          <td width="90">&nbsp;视频主栏目：</td>
-          <td>
-       <span id='typeidct'>
-       <?php
+            <tr>
+              <td width="90">&nbsp;视频主栏目：</td>
+              <td>
+                <span id='typeidct'>
+                  <?php
           $typeOptions = GetOptionList($cid,$cuserLogin->getUserChannel(),$channelid);
           echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
           echo "<option value='0'>请选择栏目...</option>\r\n";
           echo $typeOptions;
           echo "</select>";
 			?></span>
-			<img src='images/menusearch.gif' style='cursor:pointer;' onclick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择' />
-			&nbsp;
-			<?php
+                <img src='images/menusearch.gif' style='cursor:pointer;'
+                  onclick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid')" alt='快捷选择' title='快捷选择' />
+                &nbsp;
+                <?php
 			if($cfg_need_typeid2=='Y')
 			{
 				echo "<a href='javascript:AddTypeid2();'>【<u>选择副栏目</u>】</a>";
 			}
 			?>
-			  </td>
-        </tr>
-        </table>       </td>
-    </tr>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+
+      <tr id='typeid2tr' style='display:none'>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;视频副栏目：</td>
+              <td>
+                <span id='typeid2ct'></span><input type='text' name='typeid2' id='typeid2' value=''
+                  style='width:200px;' />
+                <img src='images/menusearch2.gif' style='cursor:pointer;'
+                  onclick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt='选择副栏目' title='选择副栏目' />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
 
-	<tr id='typeid2tr' style='display:none'>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;视频副栏目：</td>
-          <td>
-          <span id='typeid2ct'></span><input type='text' name='typeid2' id='typeid2' value='' style='width:200px;' />
-          <img src='images/menusearch2.gif' style='cursor:pointer;' onclick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2')" alt='选择副栏目' title='选择副栏目' />
-			    </td>
-        </tr>
-        </table>
-      </td>
-    </tr>
-    
-    <tr>
-      <td height="24"  bgcolor="#F1F5F2" class="bline2"><strong>视频地址：</strong></td>
-    </tr>
-    <tr>
-      <td height="24"  class="bline">
-        <table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;视频地址：</td>
-            <td>
+      <tr>
+        <td height="24" bgcolor="#F1F5F2" class="bline2"><strong>视频地址：</strong></td>
+      </tr>
+      <tr>
+        <td height="24" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;视频地址：</td>
+              <td>
                 <input name="videourl" type="text" id="videourl" style="width:300px;float:left;margin-right:5px;">
                 <div style='float:left;'>
-                    <!-- cc视频插件代码 -->
-                    <object width='72' height='24'>
+                  <!-- cc视频插件代码 -->
+                  <object width='72' height='24'>
                     <param name='wmode' value='transparent' />
                     <param name='allowScriptAccess' value='always' />
-                    <param name='movie' value='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=<?php echo $userid?>&type=其他' />
-                    <embed src='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=<?php echo $userid?>&type=其他' type='application/x-shockwave-flash' width='72' height='24' allowScriptAccess='always' wmode='transparent'></embed>
-                    </object>
-                    <!-- cc视频插件代码 -->
+                    <param name='movie'
+                      value='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=<?php echo $userid?>&type=其他' />
+                    <embed src='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=<?php echo $userid?>&type=其他'
+                      type='application/x-shockwave-flash' width='72' height='24' allowScriptAccess='always'
+                      wmode='transparent'></embed>
+                  </object>
+                  <!-- cc视频插件代码 -->
                 </div>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    
-    <tr>
-      <td height="24"  bgcolor="#F1F5F2" class="bline2"><strong>剧情介绍：</strong></td>
-    </tr>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+
+      <tr>
+        <td height="24" bgcolor="#F1F5F2" class="bline2"><strong>剧情介绍：</strong></td>
+      </tr>
       <tr>
-      <td height="24" colspan="4" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;内容摘要：</td>
-          <td width="500"><textarea name="description" rows="3" id="description" style="width:80%;height:200px;"></textarea></td>
-          <td>&nbsp;</td>
-        </tr>
-      </table>
-      </td>
-  </tr>
-  </table>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;内容摘要：</td>
+              <td width="500"><textarea name="description" rows="3" id="description"
+                  style="width:80%;height:200px;"></textarea></td>
+              <td>&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
 
- <!-- //高级参数 -->
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="adset" style="display:none;border:1px solid #cfcfcf;background:#ffffff;">
-  <tr>
-  <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90" height="22">&nbsp;文章排序：</td>
-            <td width="240"> <select name="sortup" id="sortup" style="width:150">
-                <option value="0" selected>默认排序</option>
-                <option value="7">置顶一周</option>
-                <option value="30">置顶一个月</option>
-                <option value="90">置顶三个月</option>
-                <option value="180">置顶半年</option>
-                <option value="360">置顶一年</option>
-              </select> </td>
-            <td width="90">标题颜色：</td>
-            <td>
-            	<input name="color" type="text" id="color" style="width:120px">
+    <!-- //高级参数 -->
+    <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
+      style="display:none;border:1px solid #cfcfcf;background:#ffffff;">
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90" height="22">&nbsp;文章排序：</td>
+              <td width="240"> <select name="sortup" id="sortup" style="width:150">
+                  <option value="0" selected>默认排序</option>
+                  <option value="7">置顶一周</option>
+                  <option value="30">置顶一个月</option>
+                  <option value="90">置顶三个月</option>
+                  <option value="180">置顶半年</option>
+                  <option value="360">置顶一年</option>
+                </select> </td>
+              <td width="90">标题颜色：</td>
+              <td>
+                <input name="color" type="text" id="color" style="width:120px">
                 <input type="button" onclick="ShowColor(event,this)" value="选取" id="modcolor" name="modcolor">
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td width="90">&nbsp;阅读权限：</td>
-            <td width="240"> <select name="arcrank" id="arcrank" style="width:150px">
-                <?php
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;阅读权限：</td>
+              <td width="240"> <select name="arcrank" id="arcrank" style="width:150px">
+                  <?php
                 $urank = $cuserLogin->getUserRank();
                 $dsql->SetQuery("Select * from `#@__arcrank` where adminrank<='$urank'");
                 $dsql->Execute();
@@ -298,73 +331,88 @@ if($Nav()!="IE") ShowObj('adset');
                 	echo "     <option value='".$row->rank."'>".$row->membername."</option>\r\n";
                 }
               ?>
-              </select> </td>
-            <td width="90">发布选项：</td>
-            <td>
-            	<input name="ishtml" type="radio" class="np" value="1" checked>
-              生成HTML
-              <input type="radio" name="ishtml" class="np" value="0">
-              仅动态浏览              </td>
-          </tr>
-        </table></td>
-    </tr>
+                </select> </td>
+              <td width="90">发布选项：</td>
+              <td>
+                <input name="ishtml" type="radio" class="np" value="1" checked>
+                生成HTML
+                <input type="radio" name="ishtml" class="np" value="0">
+                仅动态浏览 </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
 
-    <tr>
-      <td height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;发布时间：</td>
-          <td width="241"><?php
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;发布时间：</td>
+              <td width="241"><?php
           $nowtime = GetDateTimeMk(time());
           echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200\">";
-			?>          </td>
-          <td width="90">消费点数：</td>
-          <td width="379"><input name="money" type="text" id="money" value="0" size="10">          </td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr>
-      <td height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;关键字：</td>
-          <td colspan="2"><input type='text' name="keywords" id="keywords" style="width:290px;" value="" /><input name="autokey" type="checkbox" onClick="ShowHide('keywords');"; class="np" id="autokey" value="1"<?php if($cfg_arc_autokeyword=='Y') echo ' checked'; ?>>
-<input type="button" name="Submit" value="浏览..." style="width:56;height:20" onClick="SelectKeywords('form1.keywords');">&nbsp;&nbsp;自动获取，手动填写用","分开</td>
-        </tr>
-      </table></td>
-    </tr>
+			?> </td>
+              <td width="90">消费点数：</td>
+              <td width="379"><input name="money" type="text" id="money" value="0" size="10"> </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;关键字：</td>
+              <td colspan="2"><input type='text' name="keywords" id="keywords" style="width:290px;" value="" /><input
+                  name="autokey" type="checkbox" onClick="ShowHide('keywords');" ; class="np" id="autokey" value="1"
+                  <?php if($cfg_arc_autokeyword=='Y') echo ' checked'; ?>>
+                <input type="button" name="Submit" value="浏览..." style="width:56;height:20"
+                  onClick="SelectKeywords('form1.keywords');">&nbsp;&nbsp;自动获取，手动填写用","分开</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
 
-    <tr>
-      <td height="24" colspan="4" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;自定义文件名：</td>
-          <td width="449"><input type="text" name="filename" id="filename"/>不包括后缀名如.html等</td>
-          <td width="261">&nbsp;</td>
-        </tr>
-      </table>
-      </td>
-  </tr>
-  <tr>
-      <td height="24" colspan="4">&nbsp;</td>
-  </tr>
-  </table>
+      <tr>
+        <td height="24" colspan="4" class="bline">
+          <table width="800" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td width="90">&nbsp;自定义文件名：</td>
+              <td width="449"><input type="text" name="filename" id="filename" />不包括后缀名如.html等</td>
+              <td width="261">&nbsp;</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td height="24" colspan="4">&nbsp;</td>
+      </tr>
+    </table>
 
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none;">
-  <tr>
-    <td height="35">
-	<table width="100%" border="0" cellspacing="1" cellpadding="1">
-        <tr>
-          <td width="17%">&nbsp;</td>
-          <td width="83%"><table width="214" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np" border="0"></td>
-                <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0" onClick="location.reload();" style="cursor:pointer;"></td>
-              </tr>
-            </table></td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</form>
-<script language='javascript'>InitPage();</script>
+    <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
+      style="border:1px solid #cfcfcf;border-top:none;">
+      <tr>
+        <td height="35">
+          <table width="100%" border="0" cellspacing="1" cellpadding="1">
+            <tr>
+              <td width="17%">&nbsp;</td>
+              <td width="83%">
+                <table width="214" border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60"
+                        height="22" class="np" border="0"></td>
+                    <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0"
+                        onClick="location.reload();" style="cursor:pointer;"></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </form>
+  <script language='javascript'>InitPage();</script>
 </body>
+
 </html>

src/dede/templets/video_edit.htm

@@ -1,35 +1,35 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>编辑视频</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script type="text/javascript" src="js/calendar/calendar.js"></script>
-<script language="javascript" src="js/main.js"></script>
-<script language="javascript" src="inc/spark/js/swfobject.js"></script>
-<script language="javascript">
-<!--
-function checkSubmit()
-{
-	if(document.form1.title.value==""){
-		alert("视频名称不能为空！");
-		document.form1.title.focus();
-		return false;
-	}
-	if(document.form1.typeid.value==0){
-		alert("请选择档案的主类别！");
-		return false;
-	}
-    if(document.form1.videourl.value==""){
-		alert("视频地址不能为空");
-		return false;
-	}
-}
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>编辑视频</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
+  <script language="javascript" src="../static/js/jquery.js"></script>
+  <script language="javascript" src="../static/js/dedeajax2.js"></script>
+  <script type="text/javascript" src="js/calendar/calendar.js"></script>
+  <script language="javascript" src="js/main.js"></script>
+  <script language="javascript" src="inc/spark/js/swfobject.js"></script>
+  <script language="javascript">
+      function checkSubmit() {
+        if (document.form1.title.value == "") {
+          alert("视频名称不能为空！");
+          document.form1.title.focus();
+          return false;
+        }
+        if (document.form1.typeid.value == 0) {
+          alert("请选择档案的主类别！");
+          return false;
+        }
+        if (document.form1.videourl.value == "") {
+          alert("视频地址不能为空");
+          return false;
+        }
+      }
 
-if($Nav()!="IE") ShowObj('adset');
-  
-</script>
+    if ($Nav() != "IE") ShowObj('adset');
+  </script>
 </head>
 <body topmargin="8">
 <form name="form1" action="video_edit.php" enctype="multipart/form-data" method="post" onSubmit="return checkSubmit();">
@@ -218,41 +218,45 @@ if($Nav()!="IE") ShowObj('adset');
                 <input name="videourl" type="text" id="videourl" style="width:300px;float:left;margin-right:5px;" value="<?php echo $addRow["videourl"]?>">
                 <div style='float:left;'>
                       <!-- cc视频插件代码 -->
-                    <object width='72' height='24'>
-                    <param name='wmode' value='transparent' />
-                    <param name='allowScriptAccess' value='always' />
-                    <param name='movie' value='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=198119&type=其他' />
-                    <embed src='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=198119&type=其他' type='application/x-shockwave-flash' width='72' height='24' allowScriptAccess='always' wmode='transparent'></embed>
-                    </object>
-                    <!-- cc视频插件代码 -->
-                </div>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    
-    <tr>
-      <td height="24"  bgcolor="#F1F5F2" class="bline2"><strong>剧情介绍：</strong></td>
-    </tr>
-      <tr>
-      <td height="24" colspan="4" class="bline">
+  <object width='72' height='24'>
+    <param name='wmode' value='transparent' />
+    <param name='allowScriptAccess' value='always' />
+    <param name='movie' value='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=198119&type=其他' />
+    <embed src='http://union.bokecc.com/flash/plugin/plugin_13.swf?userID=198119&type=其他'
+      type='application/x-shockwave-flash' width='72' height='24' allowScriptAccess='always'
+      wmode='transparent'></embed>
+  </object>
+  <!-- cc视频插件代码 -->
+  </div>
+  </td>
+  </tr>
+  </table>
+  </td>
+  </tr>
+
+  <tr>
+    <td height="24" bgcolor="#F1F5F2" class="bline2"><strong>剧情介绍：</strong></td>
+  </tr>
+  <tr>
+    <td height="24" colspan="4" class="bline">
       <table width="800" border="0" cellspacing="0" cellpadding="0">
         <tr>
           <td width="90">&nbsp;内容摘要：</td>
-          <td width="500"><textarea name="description" rows="3" id="description" style="width:80%;height:200px;"><?php echo $arcRow["description"]?></textarea></td>
+          <td width="500"><textarea name="description" rows="3" id="description"
+              style="width:80%;height:200px;"><?php echo $arcRow["description"]?></textarea></td>
           <td>&nbsp;</td>
         </tr>
       </table>
-      </td>
+    </td>
   </tr>
   </table>
 
- <!-- //高级参数 -->
-  <table width="98%"  border="0" align="center" cellpadding="2" cellspacing="2" id="adset" style="display:none;border:1px solid #cfcfcf;background:#ffffff;">
-  <tr>
-  <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
+  <!-- //高级参数 -->
+  <table width="98%" border="0" align="center" cellpadding="2" cellspacing="2" id="adset"
+    style="display:none;border:1px solid #cfcfcf;background:#ffffff;">
+    <tr>
+      <td height="24" colspan="4" class="bline">
+        <table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
             <td width="90" height="22">&nbsp;文章排序：</td>
             <td width="240"> <select name="sortup" id="sortup" style="width:150">
@@ -269,106 +273,120 @@ if($Nav()!="IE") ShowObj('adset');
               </select> </td>
             <td width="90">标题颜色：</td>
             <td>
-            	<input name="color" type="text" id="color" style="width:120px">
-                <input type="button" onclick="ShowColor(event,this)" value="选取" id="modcolor" name="modcolor">
+              <input name="color" type="text" id="color" style="width:120px">
+              <input type="button" onclick="ShowColor(event,this)" value="选取" id="modcolor" name="modcolor">
             </td>
           </tr>
-        </table></td>
+        </table>
+      </td>
     </tr>
     <tr>
       <td height="24" colspan="4" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
+        <table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
             <td width="90">&nbsp;阅读权限：</td>
             <td width="250">
-            	<select name="arcrank" id="arcrank" style="width:150px">
-                <option value='<?php echo $arcRow["arcrank"]; ?>'><?php echo ($arcRow["arcrank"]==0 ? '已审核状态' : $arcRow["rankname"]); ?></option>
+              <select name="arcrank" id="arcrank" style="width:150px">
+                <option value='<?php echo $arcRow["arcrank"]; ?>'>
+                  <?php echo ($arcRow["arcrank"]==0 ? '已审核状态' : $arcRow["rankname"]); ?></option>
                 <option value='0'>已审核状态</option>
                 <option value='-1'>未审核状态</option>
               </select>
             </td>
             <td width="90">发布选项：</td>
-            <td> <input name="ishtml" type="radio" class="np" value="1"<?php if($arcRow["ismake"]!=-1) echo " checked";?>>
+            <td> <input name="ishtml" type="radio" class="np" value="1"
+                <?php if($arcRow["ismake"]!=-1) echo " checked";?>>
               生成HTML
-              <input type="radio" name="ishtml" class="np" value="0"<?php if($arcRow["ismake"]==-1) echo " checked";?>>
+              <input type="radio" name="ishtml" class="np" value="0" <?php if($arcRow["ismake"]==-1) echo " checked";?>>
               仅动态浏览 </td>
           </tr>
-        </table></td>
+        </table>
+      </td>
     </tr>
 
     <tr>
       <td height="75" class="bline">
-      	<table width="800" border="0" cellspacing="0" cellpadding="0">
-         <tr>
-        <td width="90">&nbsp;更新时间：</td>
-          <td width="241">
-		  <?php
+        <table width="800" border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <td width="90">&nbsp;更新时间：</td>
+            <td width="241">
+              <?php
           $nowtime = GetDateTimeMk($arcRow["pubdate"]);
           echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" style=\"width:200;\" >";
-			?>   
-            
-             <script language="javascript" type="text/javascript">
-					Calendar.setup({
-						inputField     :    "pubdate",
-						ifFormat       :    "%Y-%m-%d %H:%M:%S",
-						showsTime      :    true,
-						timeFormat     :    "24"
-					});
-				 </script>        </td>
-          <td width="92">消费金币：</td>
-          <td width="368">
-          	<input name="money" type="hidden" id="money" value="<?php echo $arcRow["money"]?>" />(此项已经独立分离)
-          </td>
-        </tr>
+			?>
+
+              <script language="javascript" type="text/javascript">
+                Calendar.setup({
+                  inputField: "pubdate",
+                  ifFormat: "%Y-%m-%d %H:%M:%S",
+                  showsTime: true,
+                  timeFormat: "24"
+                });
+              </script>
+            </td>
+            <td width="92">消费金币：</td>
+            <td width="368">
+              <input name="money" type="hidden" id="money" value="<?php echo $arcRow["money"]?>" />(此项已经独立分离)
+            </td>
+          </tr>
         </table>
-       </td>
-     </tr>
+      </td>
+    </tr>
     <tr>
       <td height="24" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90" height="51">&nbsp;关键字：</td>
-          <td>
-          	<input type="text"  name="keywords"  id="keywords" style="width:60%" value="<?php echo $arcRow["keywords"]?>" />
-          </td>
+        <table width="800" border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <td width="90" height="51">&nbsp;关键字：</td>
+            <td>
+              <input type="text" name="keywords" id="keywords" style="width:60%"
+                value="<?php echo $arcRow["keywords"]?>" />
+            </td>
           </tr>
-      </table>
-     </td>
+        </table>
+      </td>
     </tr>
 
     <tr>
-     <td height="24" colspan="4" class="bline">
-      <table width="800" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td width="90">&nbsp;自定义文件名：</td>
-          <td width="449"><input type="text" name="filename" id="filename" value="<?php echo $arcRow["filename"]?>" />（不包括后缀名如.html等）</td>
-          <td width="261">&nbsp;</td>
-        </tr>
-      </table>
-     </td>
-  </tr>
-  <tr>
+      <td height="24" colspan="4" class="bline">
+        <table width="800" border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <td width="90">&nbsp;自定义文件名：</td>
+            <td width="449"><input type="text" name="filename" id="filename"
+                value="<?php echo $arcRow["filename"]?>" />（不包括后缀名如.html等）</td>
+            <td width="261">&nbsp;</td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr>
       <td height="24" colspan="4">&nbsp;</td>
-  </tr>
+    </tr>
   </table>
 
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF" style="border:1px solid #cfcfcf;border-top:none;">
-  <tr>
-    <td height="35">
-	<table width="100%" border="0" cellspacing="1" cellpadding="1">
-        <tr>
-          <td width="17%">&nbsp;</td>
-          <td width="83%"><table width="214" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60" height="22" class="np" border="0"></td>
-                <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0" onClick="location.reload();" style="cursor:pointer;"></td>
-              </tr>
-            </table></td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</form>
-<script language='javascript'>InitPage();</script>
-</body>
+  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#F9FCEF"
+    style="border:1px solid #cfcfcf;border-top:none;">
+    <tr>
+      <td height="35">
+        <table width="100%" border="0" cellspacing="1" cellpadding="1">
+          <tr>
+            <td width="17%">&nbsp;</td>
+            <td width="83%">
+              <table width="214" border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                  <td width="115"><input name="imageField" type="image" src="images/button_ok.gif" width="60"
+                      height="22" class="np" border="0"></td>
+                  <td width="99"><img src="images/button_reset.gif" width="60" height="22" border="0"
+                      onClick="location.reload();" style="cursor:pointer;"></td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+  </form>
+  <script language='javascript'>InitPage();</script>
+  </body>
+
 </html>

src/dede/templets/vote_add.htm

@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
 <title>增加投票</title>
 <link href="css/base.css" rel="stylesheet" type="text/css">
-<script language="javascript" src="../static/js/jquery/jquery.js"></script>
+<script language="javascript" src="../static/js/jquery.js"></script>
 <script src="../static/js/webcalendar.js" type="text/javascript"></script>
 <script language="javascript">
 var i=1;

src/dede/templets/vote_select.htm

@@ -1,53 +1,56 @@
 {dede:config.pagesize value='20'/}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>投票管理</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>投票管理</title>
+  <link href="css/base.css" rel="stylesheet" type="text/css">
 </head>
+<script language="javascript" src="../static/js/jquery.js"></script>
 <script language='javascript' src="js/main.js"></script>
-<script language="javascript" src="../static/js/jquery/jquery.js"></script>
-<script language="javascript" src="../static/js/jquery/ui.core.js"></script>
-<script language="javascript" src="../static/js/jquery/ui.draggable.js"></script>
 <script language='javascript' src='js/tb-box.js'></script>
 
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<form id="form1" name="form1" method="post" action="">
-<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
-  <tr>
-   <td height="28" background="images/tbg.gif" colspan="5">
-     <b>投票选择</b></td>
-</tr>
-  <tr align="center" bgcolor="#F9FCEF" height="24"> 
+  <form id="form1" name="form1" method="post" action="">
+    <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
+      <tr>
+        <td height="28" background="images/tbg.gif" colspan="5">
+          <b>投票选择</b></td>
+      </tr>
+      <tr align="center" bgcolor="#F9FCEF" height="24">
 
-      <td width="8%">投票ID</td>
-      <td width="18%">投票名称</td>
-	  <td width="20%">开始时间</td>
-	  <td width="20%">结束时间</td>
+        <td width="8%">投票ID</td>
+        <td width="18%">投票名称</td>
+        <td width="20%">开始时间</td>
+        <td width="20%">结束时间</td>
 
-	  <td width="10%">投票ID</td>
-  </tr>
-        {dede:datalist}
-         <tr align="center" bgcolor="#FFFFFF" height="24" 
-         	onMouseMove="javascript:this.bgColor='#f4fbf4';" onMouseOut="javascript:this.bgColor='#FFFFFF';"> 
-          <td <?php if($fields['aid'] == $aid) echo "style='color:red'";?>>{dede:field.aid /}</td>
-          <td <?php if($fields['aid'] == $aid) echo "style='color:red'";?>>
-          	{dede:field.votename /}
-          </td>
-          <td <?php if($fields['aid'] == $aid) echo "style='color:red'";?>>{dede:field name='starttime' function="MyDate('Y-m-d',@me)"/}</td>
-          <td <?php if($fields['aid'] == $aid) echo "style='color:red'";?>>{dede:field name='endtime' function="MyDate('Y-m-d',@me)"/}</td>
+        <td width="10%">投票ID</td>
+      </tr>
+      {dede:datalist}
+      <tr align="center" bgcolor="#FFFFFF" height="24" onMouseMove="javascript:this.bgColor='#f4fbf4';"
+        onMouseOut="javascript:this.bgColor='#FFFFFF';">
+        <td <?php if($fields['aid'] == $aid) echo "style='color:red'";?>>{dede:field.aid /}</td>
+        <td <?php if($fields['aid'] == $aid) echo "style='color:red'";?>>
+          {dede:field.votename /}
+        </td>
+        <td <?php if($fields['aid'] == $aid) echo "style='color:red'";?>>{dede:field name='starttime'
+          function="MyDate('Y-m-d',@me)"/}</td>
+        <td <?php if($fields['aid'] == $aid) echo "style='color:red'";?>>{dede:field name='endtime'
+          function="MyDate('Y-m-d',@me)"/}</td>
 
-		  <td><a href="javascript:PutVote({dede:field.aid/});" id="TB_closeWindowButton">选取</a></td>
-        </tr>
-		{/dede:datalist}
-     <tr align="center" bgcolor="#F9FCEF" height="24"> 
-      <td colspan="5">{dede:pagelist listsize='6'/}</td>
-     </tr>
-   </table>
-   </td>
-</tr>
-</table>
-</form>
+        <td><a href="javascript:PutVote({dede:field.aid/});" id="TB_closeWindowButton">选取</a></td>
+      </tr>
+      {/dede:datalist}
+      <tr align="center" bgcolor="#F9FCEF" height="24">
+        <td colspan="5">{dede:pagelist listsize='6'/}</td>
+      </tr>
+    </table>
+    </td>
+    </tr>
+    </table>
+  </form>
 </body>
+
 </html>

src/dede/testenv.php

@@ -20,7 +20,7 @@ $action = isset($action)? $action : '';
 <title>系统运行目录权限检测</title>
 <link rel="stylesheet" type="text/css" href="css/base.css" />
 <link rel="stylesheet" type="text/css" href="css/indexbody.css" />
-<script type="text/javascript" src="../static/js/jquery/jquery.js" ></script>
+<script type="text/javascript" src="../static/js/jquery.js" ></script>
 </head>
 <body leftmargin="8" topmargin='8' bgcolor="#FFFFFF" style="min-width:840px">
 <?php

src/install/templates/step-1.html

@@ -15,6 +15,7 @@
 		<ul>
 			<li><a href="http://www.DedeCMS.com" target="_blank">官方网站</a></li>
 			<li><a href="http://bbs.DedeCMS.com" target="_blank">技术论坛</a></li>
+			<li><a href="https://www.zhelixie.com/DesDev" target="_blank">代码</a></li>
 			<li><a href="http://help.DedeCMS.com" target="_blank">帮助</a></li>
 		</ul>
 	</div>

src/install/templates/step-2.html

@@ -16,6 +16,7 @@
 		<ul>
 			<li><a href="http://www.dedecms.com" target="_blank">官方网站</a></li>
 			<li><a href="http://bbs.dedecms.com" target="_blank">技术论坛</a></li>
+			<li><a href="https://www.zhelixie.com/DesDev" target="_blank">代码</a></li>
 			<li><a href="http://help.dedecms.com" target="_blank">帮助</a></li>
 		</ul>
 	</div>

src/install/templates/step-3.html

@@ -58,6 +58,7 @@
         <ul>
             <li><a href="http://www.dedecms.com" target="_blank">官方网站</a></li>
             <li><a href="http://bbs.dedecms.com" target="_blank">技术论坛</a></li>
+            <li><a href="https://www.zhelixie.com/DesDev" target="_blank">代码</a></li>
             <li><a href="http://help.dedecms.com" target="_blank">帮助</a></li>
         </ul>
     </div>

src/install/templates/step-4.html

@@ -15,6 +15,7 @@
 		<ul>
 			<li><a href="http://www.dedecms.com" target="_blank">官方网站</a></li>
 			<li><a href="http://bbs.dedecms.com" target="_blank">技术论坛</a></li>
+			<li><a href="https://www.zhelixie.com/DesDev" target="_blank">代码</a></li>
 			<li><a href="http://help.dedecms.com" target="_blank">帮助</a></li>
 		</ul>
 	</div>

src/install/templates/step-5.html

@@ -15,6 +15,7 @@
 		<ul>
 			<li><a href="http://www.dedecms.com" target="_blank">官方网站</a></li>
 			<li><a href="http://bbs.dedecms.com" target="_blank">技术论坛</a></li>
+			<li><a href="https://www.zhelixie.com/DesDev" target="_blank">代码</a></li>
 			<li><a href="http://help.dedecms.com" target="_blank">帮助</a></li>
 		</ul>
 	</div>

src/static/css/bootstrap-reboot.css

@@ -0,0 +1,325 @@
+/*!
+ * Bootstrap Reboot v4.5.0 (https://getbootstrap.com/)
+ * Copyright 2011-2020 The Bootstrap Authors
+ * Copyright 2011-2020 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+}
+
+html {
+  font-family: sans-serif;
+  line-height: 1.15;
+  -webkit-text-size-adjust: 100%;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
+  display: block;
+}
+
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #212529;
+  text-align: left;
+  background-color: #fff;
+}
+
+[tabindex="-1"]:focus:not(:focus-visible) {
+  outline: 0 !important;
+}
+
+hr {
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  margin-top: 0;
+  margin-bottom: 0.5rem;
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  text-decoration: underline;
+  -webkit-text-decoration: underline dotted;
+  text-decoration: underline dotted;
+  cursor: help;
+  border-bottom: 0;
+  -webkit-text-decoration-skip-ink: none;
+  text-decoration-skip-ink: none;
+}
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit;
+}
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0;
+}
+
+dt {
+  font-weight: 700;
+}
+
+dd {
+  margin-bottom: .5rem;
+  margin-left: 0;
+}
+
+blockquote {
+  margin: 0 0 1rem;
+}
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+small {
+  font-size: 80%;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -.25em;
+}
+
+sup {
+  top: -.5em;
+}
+
+a {
+  color: #007bff;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+a:hover {
+  color: #0056b3;
+  text-decoration: underline;
+}
+
+a:not([href]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+a:not([href]):hover {
+  color: inherit;
+  text-decoration: none;
+}
+
+pre,
+code,
+kbd,
+samp {
+  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  font-size: 1em;
+}
+
+pre {
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+  -ms-overflow-style: scrollbar;
+}
+
+figure {
+  margin: 0 0 1rem;
+}
+
+img {
+  vertical-align: middle;
+  border-style: none;
+}
+
+svg {
+  overflow: hidden;
+  vertical-align: middle;
+}
+
+table {
+  border-collapse: collapse;
+}
+
+caption {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+  color: #6c757d;
+  text-align: left;
+  caption-side: bottom;
+}
+
+th {
+  text-align: inherit;
+}
+
+label {
+  display: inline-block;
+  margin-bottom: 0.5rem;
+}
+
+button {
+  border-radius: 0;
+}
+
+button:focus {
+  outline: 1px dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+}
+
+input,
+button,
+select,
+optgroup,
+textarea {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+button,
+input {
+  overflow: visible;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+[role="button"] {
+  cursor: pointer;
+}
+
+select {
+  word-wrap: normal;
+}
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+button:not(:disabled),
+[type="button"]:not(:disabled),
+[type="reset"]:not(:disabled),
+[type="submit"]:not(:disabled) {
+  cursor: pointer;
+}
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  padding: 0;
+  border-style: none;
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  box-sizing: border-box;
+  padding: 0;
+}
+
+textarea {
+  overflow: auto;
+  resize: vertical;
+}
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  max-width: 100%;
+  padding: 0;
+  margin-bottom: .5rem;
+  font-size: 1.5rem;
+  line-height: inherit;
+  color: inherit;
+  white-space: normal;
+}
+
+progress {
+  vertical-align: baseline;
+}
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+[type="search"] {
+  outline-offset: -2px;
+  -webkit-appearance: none;
+}
+
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+::-webkit-file-upload-button {
+  font: inherit;
+  -webkit-appearance: button;
+}
+
+output {
+  display: inline-block;
+}
+
+summary {
+  display: list-item;
+  cursor: pointer;
+}
+
+template {
+  display: none;
+}
+
+[hidden] {
+  display: none !important;
+}
+/*# sourceMappingURL=bootstrap-reboot.css.map */

src/static/css/bootstrap-reboot.min.css

@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap Reboot v4.5.0 (https://getbootstrap.com/)
+ * Copyright 2011-2020 The Bootstrap Authors
+ * Copyright 2011-2020 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]){color:inherit;text-decoration:none}a:not([href]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
+/*# sourceMappingURL=bootstrap-reboot.min.css.map */

src/static/css/cropper.css

@@ -0,0 +1,305 @@
+/*!
+ * Cropper v4.0.0
+ * https://github.com/fengyuanchen/cropper
+ *
+ * Copyright (c) 2014-2018 Chen Fengyuan
+ * Released under the MIT license
+ *
+ * Date: 2018-04-01T06:26:32.417Z
+ */
+
+.cropper-container {
+  direction: ltr;
+  font-size: 0;
+  line-height: 0;
+  position: relative;
+  -ms-touch-action: none;
+  touch-action: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.cropper-container img {/*Avoid margin top issue (Occur only when margin-top <= -height)
+ */
+  display: block;
+  height: 100%;
+  image-orientation: 0deg;
+  max-height: none !important;
+  max-width: none !important;
+  min-height: 0 !important;
+  min-width: 0 !important;
+  width: 100%;
+}
+
+.cropper-wrap-box,
+.cropper-canvas,
+.cropper-drag-box,
+.cropper-crop-box,
+.cropper-modal {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+
+.cropper-wrap-box,
+.cropper-canvas {
+  overflow: hidden;
+}
+
+.cropper-drag-box {
+  background-color: #fff;
+  opacity: 0;
+}
+
+.cropper-modal {
+  background-color: #000;
+  opacity: .5;
+}
+
+.cropper-view-box {
+  display: block;
+  height: 100%;
+  outline-color: rgba(51, 153, 255, 0.75);
+  outline: 1px solid #39f;
+  overflow: hidden;
+  width: 100%;
+}
+
+.cropper-dashed {
+  border: 0 dashed #eee;
+  display: block;
+  opacity: .5;
+  position: absolute;
+}
+
+.cropper-dashed.dashed-h {
+  border-bottom-width: 1px;
+  border-top-width: 1px;
+  height: 33.33333%;
+  left: 0;
+  top: 33.33333%;
+  width: 100%;
+}
+
+.cropper-dashed.dashed-v {
+  border-left-width: 1px;
+  border-right-width: 1px;
+  height: 100%;
+  left: 33.33333%;
+  top: 0;
+  width: 33.33333%;
+}
+
+.cropper-center {
+  display: block;
+  height: 0;
+  left: 50%;
+  opacity: .75;
+  position: absolute;
+  top: 50%;
+  width: 0;
+}
+
+.cropper-center:before,
+.cropper-center:after {
+  background-color: #eee;
+  content: ' ';
+  display: block;
+  position: absolute;
+}
+
+.cropper-center:before {
+  height: 1px;
+  left: -3px;
+  top: 0;
+  width: 7px;
+}
+
+.cropper-center:after {
+  height: 7px;
+  left: 0;
+  top: -3px;
+  width: 1px;
+}
+
+.cropper-face,
+.cropper-line,
+.cropper-point {
+  display: block;
+  height: 100%;
+  opacity: .1;
+  position: absolute;
+  width: 100%;
+}
+
+.cropper-face {
+  background-color: #fff;
+  left: 0;
+  top: 0;
+}
+
+.cropper-line {
+  background-color: #39f;
+}
+
+.cropper-line.line-e {
+  cursor: ew-resize;
+  right: -3px;
+  top: 0;
+  width: 5px;
+}
+
+.cropper-line.line-n {
+  cursor: ns-resize;
+  height: 5px;
+  left: 0;
+  top: -3px;
+}
+
+.cropper-line.line-w {
+  cursor: ew-resize;
+  left: -3px;
+  top: 0;
+  width: 5px;
+}
+
+.cropper-line.line-s {
+  bottom: -3px;
+  cursor: ns-resize;
+  height: 5px;
+  left: 0;
+}
+
+.cropper-point {
+  background-color: #39f;
+  height: 5px;
+  opacity: .75;
+  width: 5px;
+}
+
+.cropper-point.point-e {
+  cursor: ew-resize;
+  margin-top: -3px;
+  right: -3px;
+  top: 50%;
+}
+
+.cropper-point.point-n {
+  cursor: ns-resize;
+  left: 50%;
+  margin-left: -3px;
+  top: -3px;
+}
+
+.cropper-point.point-w {
+  cursor: ew-resize;
+  left: -3px;
+  margin-top: -3px;
+  top: 50%;
+}
+
+.cropper-point.point-s {
+  bottom: -3px;
+  cursor: s-resize;
+  left: 50%;
+  margin-left: -3px;
+}
+
+.cropper-point.point-ne {
+  cursor: nesw-resize;
+  right: -3px;
+  top: -3px;
+}
+
+.cropper-point.point-nw {
+  cursor: nwse-resize;
+  left: -3px;
+  top: -3px;
+}
+
+.cropper-point.point-sw {
+  bottom: -3px;
+  cursor: nesw-resize;
+  left: -3px;
+}
+
+.cropper-point.point-se {
+  bottom: -3px;
+  cursor: nwse-resize;
+  height: 20px;
+  opacity: 1;
+  right: -3px;
+  width: 20px;
+}
+
+@media (min-width: 768px) {
+  .cropper-point.point-se {
+    height: 15px;
+    width: 15px;
+  }
+}
+
+@media (min-width: 992px) {
+  .cropper-point.point-se {
+    height: 10px;
+    width: 10px;
+  }
+}
+
+@media (min-width: 1200px) {
+  .cropper-point.point-se {
+    height: 5px;
+    opacity: .75;
+    width: 5px;
+  }
+}
+
+.cropper-point.point-se:before {
+  background-color: #39f;
+  bottom: -50%;
+  content: ' ';
+  display: block;
+  height: 200%;
+  opacity: 0;
+  position: absolute;
+  right: -50%;
+  width: 200%;
+}
+
+.cropper-invisible {
+  opacity: 0;
+}
+
+.cropper-bg {
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC');
+}
+
+.cropper-hide {
+  display: block;
+  height: 0;
+  position: absolute;
+  width: 0;
+}
+
+.cropper-hidden {
+  display: none !important;
+}
+
+.cropper-move {
+  cursor: move;
+}
+
+.cropper-crop {
+  cursor: crosshair;
+}
+
+.cropper-disabled .cropper-drag-box,
+.cropper-disabled .cropper-face,
+.cropper-disabled .cropper-line,
+.cropper-disabled .cropper-point {
+  cursor: not-allowed;
+}

src/static/css/cropper.min.css

@@ -0,0 +1,9 @@
+/*!
+ * Cropper v4.0.0
+ * https://github.com/fengyuanchen/cropper
+ *
+ * Copyright (c) 2014-2018 Chen Fengyuan
+ * Released under the MIT license
+ *
+ * Date: 2018-04-01T06:26:32.417Z
+ */.cropper-container{direction:ltr;font-size:0;line-height:0;position:relative;-ms-touch-action:none;touch-action:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.cropper-container img{display:block;height:100%;image-orientation:0deg;max-height:none!important;max-width:none!important;min-height:0!important;min-width:0!important;width:100%}.cropper-canvas,.cropper-crop-box,.cropper-drag-box,.cropper-modal,.cropper-wrap-box{bottom:0;left:0;position:absolute;right:0;top:0}.cropper-canvas,.cropper-wrap-box{overflow:hidden}.cropper-drag-box{background-color:#fff;opacity:0}.cropper-modal{background-color:#000;opacity:.5}.cropper-view-box{display:block;height:100%;outline-color:rgba(51,153,255,.75);outline:1px solid #39f;overflow:hidden;width:100%}.cropper-dashed{border:0 dashed #eee;display:block;opacity:.5;position:absolute}.cropper-dashed.dashed-h{border-bottom-width:1px;border-top-width:1px;height:33.33333%;left:0;top:33.33333%;width:100%}.cropper-dashed.dashed-v{border-left-width:1px;border-right-width:1px;height:100%;left:33.33333%;top:0;width:33.33333%}.cropper-center{display:block;height:0;left:50%;opacity:.75;position:absolute;top:50%;width:0}.cropper-center:after,.cropper-center:before{background-color:#eee;content:" ";display:block;position:absolute}.cropper-center:before{height:1px;left:-3px;top:0;width:7px}.cropper-center:after{height:7px;left:0;top:-3px;width:1px}.cropper-face,.cropper-line,.cropper-point{display:block;height:100%;opacity:.1;position:absolute;width:100%}.cropper-face{background-color:#fff;left:0;top:0}.cropper-line{background-color:#39f}.cropper-line.line-e{cursor:ew-resize;right:-3px;top:0;width:5px}.cropper-line.line-n{cursor:ns-resize;height:5px;left:0;top:-3px}.cropper-line.line-w{cursor:ew-resize;left:-3px;top:0;width:5px}.cropper-line.line-s{bottom:-3px;cursor:ns-resize;height:5px;left:0}.cropper-point{background-color:#39f;height:5px;opacity:.75;width:5px}.cropper-point.point-e{cursor:ew-resize;margin-top:-3px;right:-3px;top:50%}.cropper-point.point-n{cursor:ns-resize;left:50%;margin-left:-3px;top:-3px}.cropper-point.point-w{cursor:ew-resize;left:-3px;margin-top:-3px;top:50%}.cropper-point.point-s{bottom:-3px;cursor:s-resize;left:50%;margin-left:-3px}.cropper-point.point-ne{cursor:nesw-resize;right:-3px;top:-3px}.cropper-point.point-nw{cursor:nwse-resize;left:-3px;top:-3px}.cropper-point.point-sw{bottom:-3px;cursor:nesw-resize;left:-3px}.cropper-point.point-se{bottom:-3px;cursor:nwse-resize;height:20px;opacity:1;right:-3px;width:20px}@media (min-width:768px){.cropper-point.point-se{height:15px;width:15px}}@media (min-width:992px){.cropper-point.point-se{height:10px;width:10px}}@media (min-width:1200px){.cropper-point.point-se{height:5px;opacity:.75;width:5px}}.cropper-point.point-se:before{background-color:#39f;bottom:-50%;content:" ";display:block;height:200%;opacity:0;position:absolute;right:-50%;width:200%}.cropper-invisible{opacity:0}.cropper-bg{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC")}.cropper-hide{display:block;height:0;position:absolute;width:0}.cropper-hidden{display:none!important}.cropper-move{cursor:move}.cropper-crop{cursor:crosshair}.cropper-disabled .cropper-drag-box,.cropper-disabled .cropper-face,.cropper-disabled .cropper-line,.cropper-disabled .cropper-point{cursor:not-allowed}

src/static/css/jquery.fileupload.css

@@ -0,0 +1,37 @@
+@charset "UTF-8";
+/*
+ * jQuery File Upload Plugin CSS
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+.fileinput-button {
+  position: relative;
+  overflow: hidden;
+  display: inline-block;
+}
+.fileinput-button input {
+  position: absolute;
+  top: 0;
+  right: 0;
+  margin: 0;
+  opacity: 0;
+  -ms-filter: 'alpha(opacity=0)';
+  font-size: 200px !important;
+  direction: ltr;
+  cursor: pointer;
+}
+
+/* Fixes for IE < 8 */
+@media screen\9 {
+  .fileinput-button input {
+    filter: alpha(opacity=0);
+    font-size: 100%;
+    height: 100%;
+  }
+}

src/static/font-awesome/less/animated.less

@@ -0,0 +1,34 @@
+// Animated Icons
+// --------------------------
+
+.@{fa-css-prefix}-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+          animation: fa-spin 2s infinite linear;
+}
+
+.@{fa-css-prefix}-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8);
+}
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}

src/static/font-awesome/less/bordered-pulled.less

@@ -0,0 +1,25 @@
+// Bordered & Pulled
+// -------------------------
+
+.@{fa-css-prefix}-border {
+  padding: .2em .25em .15em;
+  border: solid .08em @fa-border-color;
+  border-radius: .1em;
+}
+
+.@{fa-css-prefix}-pull-left { float: left; }
+.@{fa-css-prefix}-pull-right { float: right; }
+
+.@{fa-css-prefix} {
+  &.@{fa-css-prefix}-pull-left { margin-right: .3em; }
+  &.@{fa-css-prefix}-pull-right { margin-left: .3em; }
+}
+
+/* Deprecated as of 4.4.0 */
+.pull-right { float: right; }
+.pull-left { float: left; }
+
+.@{fa-css-prefix} {
+  &.pull-left { margin-right: .3em; }
+  &.pull-right { margin-left: .3em; }
+}

src/static/font-awesome/less/core.less

@@ -0,0 +1,12 @@
+// Base Class Definition
+// -------------------------
+
+.@{fa-css-prefix} {
+  display: inline-block;
+  font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}

src/static/font-awesome/less/fixed-width.less

@@ -0,0 +1,6 @@
+// Fixed Width Icons
+// -------------------------
+.@{fa-css-prefix}-fw {
+  width: (18em / 14);
+  text-align: center;
+}

src/static/font-awesome/less/font-awesome.less

@@ -0,0 +1,18 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+@import "variables.less";
+@import "mixins.less";
+@import "path.less";
+@import "core.less";
+@import "larger.less";
+@import "fixed-width.less";
+@import "list.less";
+@import "bordered-pulled.less";
+@import "animated.less";
+@import "rotated-flipped.less";
+@import "stacked.less";
+@import "icons.less";
+@import "screen-reader.less";

src/static/font-awesome/less/icons.less

@@ -0,0 +1,789 @@
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+   readers do not read off random characters that represent icons */
+
+.@{fa-css-prefix}-glass:before { content: @fa-var-glass; }
+.@{fa-css-prefix}-music:before { content: @fa-var-music; }
+.@{fa-css-prefix}-search:before { content: @fa-var-search; }
+.@{fa-css-prefix}-envelope-o:before { content: @fa-var-envelope-o; }
+.@{fa-css-prefix}-heart:before { content: @fa-var-heart; }
+.@{fa-css-prefix}-star:before { content: @fa-var-star; }
+.@{fa-css-prefix}-star-o:before { content: @fa-var-star-o; }
+.@{fa-css-prefix}-user:before { content: @fa-var-user; }
+.@{fa-css-prefix}-film:before { content: @fa-var-film; }
+.@{fa-css-prefix}-th-large:before { content: @fa-var-th-large; }
+.@{fa-css-prefix}-th:before { content: @fa-var-th; }
+.@{fa-css-prefix}-th-list:before { content: @fa-var-th-list; }
+.@{fa-css-prefix}-check:before { content: @fa-var-check; }
+.@{fa-css-prefix}-remove:before,
+.@{fa-css-prefix}-close:before,
+.@{fa-css-prefix}-times:before { content: @fa-var-times; }
+.@{fa-css-prefix}-search-plus:before { content: @fa-var-search-plus; }
+.@{fa-css-prefix}-search-minus:before { content: @fa-var-search-minus; }
+.@{fa-css-prefix}-power-off:before { content: @fa-var-power-off; }
+.@{fa-css-prefix}-signal:before { content: @fa-var-signal; }
+.@{fa-css-prefix}-gear:before,
+.@{fa-css-prefix}-cog:before { content: @fa-var-cog; }
+.@{fa-css-prefix}-trash-o:before { content: @fa-var-trash-o; }
+.@{fa-css-prefix}-home:before { content: @fa-var-home; }
+.@{fa-css-prefix}-file-o:before { content: @fa-var-file-o; }
+.@{fa-css-prefix}-clock-o:before { content: @fa-var-clock-o; }
+.@{fa-css-prefix}-road:before { content: @fa-var-road; }
+.@{fa-css-prefix}-download:before { content: @fa-var-download; }
+.@{fa-css-prefix}-arrow-circle-o-down:before { content: @fa-var-arrow-circle-o-down; }
+.@{fa-css-prefix}-arrow-circle-o-up:before { content: @fa-var-arrow-circle-o-up; }
+.@{fa-css-prefix}-inbox:before { content: @fa-var-inbox; }
+.@{fa-css-prefix}-play-circle-o:before { content: @fa-var-play-circle-o; }
+.@{fa-css-prefix}-rotate-right:before,
+.@{fa-css-prefix}-repeat:before { content: @fa-var-repeat; }
+.@{fa-css-prefix}-refresh:before { content: @fa-var-refresh; }
+.@{fa-css-prefix}-list-alt:before { content: @fa-var-list-alt; }
+.@{fa-css-prefix}-lock:before { content: @fa-var-lock; }
+.@{fa-css-prefix}-flag:before { content: @fa-var-flag; }
+.@{fa-css-prefix}-headphones:before { content: @fa-var-headphones; }
+.@{fa-css-prefix}-volume-off:before { content: @fa-var-volume-off; }
+.@{fa-css-prefix}-volume-down:before { content: @fa-var-volume-down; }
+.@{fa-css-prefix}-volume-up:before { content: @fa-var-volume-up; }
+.@{fa-css-prefix}-qrcode:before { content: @fa-var-qrcode; }
+.@{fa-css-prefix}-barcode:before { content: @fa-var-barcode; }
+.@{fa-css-prefix}-tag:before { content: @fa-var-tag; }
+.@{fa-css-prefix}-tags:before { content: @fa-var-tags; }
+.@{fa-css-prefix}-book:before { content: @fa-var-book; }
+.@{fa-css-prefix}-bookmark:before { content: @fa-var-bookmark; }
+.@{fa-css-prefix}-print:before { content: @fa-var-print; }
+.@{fa-css-prefix}-camera:before { content: @fa-var-camera; }
+.@{fa-css-prefix}-font:before { content: @fa-var-font; }
+.@{fa-css-prefix}-bold:before { content: @fa-var-bold; }
+.@{fa-css-prefix}-italic:before { content: @fa-var-italic; }
+.@{fa-css-prefix}-text-height:before { content: @fa-var-text-height; }
+.@{fa-css-prefix}-text-width:before { content: @fa-var-text-width; }
+.@{fa-css-prefix}-align-left:before { content: @fa-var-align-left; }
+.@{fa-css-prefix}-align-center:before { content: @fa-var-align-center; }
+.@{fa-css-prefix}-align-right:before { content: @fa-var-align-right; }
+.@{fa-css-prefix}-align-justify:before { content: @fa-var-align-justify; }
+.@{fa-css-prefix}-list:before { content: @fa-var-list; }
+.@{fa-css-prefix}-dedent:before,
+.@{fa-css-prefix}-outdent:before { content: @fa-var-outdent; }
+.@{fa-css-prefix}-indent:before { content: @fa-var-indent; }
+.@{fa-css-prefix}-video-camera:before { content: @fa-var-video-camera; }
+.@{fa-css-prefix}-photo:before,
+.@{fa-css-prefix}-image:before,
+.@{fa-css-prefix}-picture-o:before { content: @fa-var-picture-o; }
+.@{fa-css-prefix}-pencil:before { content: @fa-var-pencil; }
+.@{fa-css-prefix}-map-marker:before { content: @fa-var-map-marker; }
+.@{fa-css-prefix}-adjust:before { content: @fa-var-adjust; }
+.@{fa-css-prefix}-tint:before { content: @fa-var-tint; }
+.@{fa-css-prefix}-edit:before,
+.@{fa-css-prefix}-pencil-square-o:before { content: @fa-var-pencil-square-o; }
+.@{fa-css-prefix}-share-square-o:before { content: @fa-var-share-square-o; }
+.@{fa-css-prefix}-check-square-o:before { content: @fa-var-check-square-o; }
+.@{fa-css-prefix}-arrows:before { content: @fa-var-arrows; }
+.@{fa-css-prefix}-step-backward:before { content: @fa-var-step-backward; }
+.@{fa-css-prefix}-fast-backward:before { content: @fa-var-fast-backward; }
+.@{fa-css-prefix}-backward:before { content: @fa-var-backward; }
+.@{fa-css-prefix}-play:before { content: @fa-var-play; }
+.@{fa-css-prefix}-pause:before { content: @fa-var-pause; }
+.@{fa-css-prefix}-stop:before { content: @fa-var-stop; }
+.@{fa-css-prefix}-forward:before { content: @fa-var-forward; }
+.@{fa-css-prefix}-fast-forward:before { content: @fa-var-fast-forward; }
+.@{fa-css-prefix}-step-forward:before { content: @fa-var-step-forward; }
+.@{fa-css-prefix}-eject:before { content: @fa-var-eject; }
+.@{fa-css-prefix}-chevron-left:before { content: @fa-var-chevron-left; }
+.@{fa-css-prefix}-chevron-right:before { content: @fa-var-chevron-right; }
+.@{fa-css-prefix}-plus-circle:before { content: @fa-var-plus-circle; }
+.@{fa-css-prefix}-minus-circle:before { content: @fa-var-minus-circle; }
+.@{fa-css-prefix}-times-circle:before { content: @fa-var-times-circle; }
+.@{fa-css-prefix}-check-circle:before { content: @fa-var-check-circle; }
+.@{fa-css-prefix}-question-circle:before { content: @fa-var-question-circle; }
+.@{fa-css-prefix}-info-circle:before { content: @fa-var-info-circle; }
+.@{fa-css-prefix}-crosshairs:before { content: @fa-var-crosshairs; }
+.@{fa-css-prefix}-times-circle-o:before { content: @fa-var-times-circle-o; }
+.@{fa-css-prefix}-check-circle-o:before { content: @fa-var-check-circle-o; }
+.@{fa-css-prefix}-ban:before { content: @fa-var-ban; }
+.@{fa-css-prefix}-arrow-left:before { content: @fa-var-arrow-left; }
+.@{fa-css-prefix}-arrow-right:before { content: @fa-var-arrow-right; }
+.@{fa-css-prefix}-arrow-up:before { content: @fa-var-arrow-up; }
+.@{fa-css-prefix}-arrow-down:before { content: @fa-var-arrow-down; }
+.@{fa-css-prefix}-mail-forward:before,
+.@{fa-css-prefix}-share:before { content: @fa-var-share; }
+.@{fa-css-prefix}-expand:before { content: @fa-var-expand; }
+.@{fa-css-prefix}-compress:before { content: @fa-var-compress; }
+.@{fa-css-prefix}-plus:before { content: @fa-var-plus; }
+.@{fa-css-prefix}-minus:before { content: @fa-var-minus; }
+.@{fa-css-prefix}-asterisk:before { content: @fa-var-asterisk; }
+.@{fa-css-prefix}-exclamation-circle:before { content: @fa-var-exclamation-circle; }
+.@{fa-css-prefix}-gift:before { content: @fa-var-gift; }
+.@{fa-css-prefix}-leaf:before { content: @fa-var-leaf; }
+.@{fa-css-prefix}-fire:before { content: @fa-var-fire; }
+.@{fa-css-prefix}-eye:before { content: @fa-var-eye; }
+.@{fa-css-prefix}-eye-slash:before { content: @fa-var-eye-slash; }
+.@{fa-css-prefix}-warning:before,
+.@{fa-css-prefix}-exclamation-triangle:before { content: @fa-var-exclamation-triangle; }
+.@{fa-css-prefix}-plane:before { content: @fa-var-plane; }
+.@{fa-css-prefix}-calendar:before { content: @fa-var-calendar; }
+.@{fa-css-prefix}-random:before { content: @fa-var-random; }
+.@{fa-css-prefix}-comment:before { content: @fa-var-comment; }
+.@{fa-css-prefix}-magnet:before { content: @fa-var-magnet; }
+.@{fa-css-prefix}-chevron-up:before { content: @fa-var-chevron-up; }
+.@{fa-css-prefix}-chevron-down:before { content: @fa-var-chevron-down; }
+.@{fa-css-prefix}-retweet:before { content: @fa-var-retweet; }
+.@{fa-css-prefix}-shopping-cart:before { content: @fa-var-shopping-cart; }
+.@{fa-css-prefix}-folder:before { content: @fa-var-folder; }
+.@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; }
+.@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; }
+.@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; }
+.@{fa-css-prefix}-bar-chart-o:before,
+.@{fa-css-prefix}-bar-chart:before { content: @fa-var-bar-chart; }
+.@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; }
+.@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; }
+.@{fa-css-prefix}-camera-retro:before { content: @fa-var-camera-retro; }
+.@{fa-css-prefix}-key:before { content: @fa-var-key; }
+.@{fa-css-prefix}-gears:before,
+.@{fa-css-prefix}-cogs:before { content: @fa-var-cogs; }
+.@{fa-css-prefix}-comments:before { content: @fa-var-comments; }
+.@{fa-css-prefix}-thumbs-o-up:before { content: @fa-var-thumbs-o-up; }
+.@{fa-css-prefix}-thumbs-o-down:before { content: @fa-var-thumbs-o-down; }
+.@{fa-css-prefix}-star-half:before { content: @fa-var-star-half; }
+.@{fa-css-prefix}-heart-o:before { content: @fa-var-heart-o; }
+.@{fa-css-prefix}-sign-out:before { content: @fa-var-sign-out; }
+.@{fa-css-prefix}-linkedin-square:before { content: @fa-var-linkedin-square; }
+.@{fa-css-prefix}-thumb-tack:before { content: @fa-var-thumb-tack; }
+.@{fa-css-prefix}-external-link:before { content: @fa-var-external-link; }
+.@{fa-css-prefix}-sign-in:before { content: @fa-var-sign-in; }
+.@{fa-css-prefix}-trophy:before { content: @fa-var-trophy; }
+.@{fa-css-prefix}-github-square:before { content: @fa-var-github-square; }
+.@{fa-css-prefix}-upload:before { content: @fa-var-upload; }
+.@{fa-css-prefix}-lemon-o:before { content: @fa-var-lemon-o; }
+.@{fa-css-prefix}-phone:before { content: @fa-var-phone; }
+.@{fa-css-prefix}-square-o:before { content: @fa-var-square-o; }
+.@{fa-css-prefix}-bookmark-o:before { content: @fa-var-bookmark-o; }
+.@{fa-css-prefix}-phone-square:before { content: @fa-var-phone-square; }
+.@{fa-css-prefix}-twitter:before { content: @fa-var-twitter; }
+.@{fa-css-prefix}-facebook-f:before,
+.@{fa-css-prefix}-facebook:before { content: @fa-var-facebook; }
+.@{fa-css-prefix}-github:before { content: @fa-var-github; }
+.@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; }
+.@{fa-css-prefix}-credit-card:before { content: @fa-var-credit-card; }
+.@{fa-css-prefix}-feed:before,
+.@{fa-css-prefix}-rss:before { content: @fa-var-rss; }
+.@{fa-css-prefix}-hdd-o:before { content: @fa-var-hdd-o; }
+.@{fa-css-prefix}-bullhorn:before { content: @fa-var-bullhorn; }
+.@{fa-css-prefix}-bell:before { content: @fa-var-bell; }
+.@{fa-css-prefix}-certificate:before { content: @fa-var-certificate; }
+.@{fa-css-prefix}-hand-o-right:before { content: @fa-var-hand-o-right; }
+.@{fa-css-prefix}-hand-o-left:before { content: @fa-var-hand-o-left; }
+.@{fa-css-prefix}-hand-o-up:before { content: @fa-var-hand-o-up; }
+.@{fa-css-prefix}-hand-o-down:before { content: @fa-var-hand-o-down; }
+.@{fa-css-prefix}-arrow-circle-left:before { content: @fa-var-arrow-circle-left; }
+.@{fa-css-prefix}-arrow-circle-right:before { content: @fa-var-arrow-circle-right; }
+.@{fa-css-prefix}-arrow-circle-up:before { content: @fa-var-arrow-circle-up; }
+.@{fa-css-prefix}-arrow-circle-down:before { content: @fa-var-arrow-circle-down; }
+.@{fa-css-prefix}-globe:before { content: @fa-var-globe; }
+.@{fa-css-prefix}-wrench:before { content: @fa-var-wrench; }
+.@{fa-css-prefix}-tasks:before { content: @fa-var-tasks; }
+.@{fa-css-prefix}-filter:before { content: @fa-var-filter; }
+.@{fa-css-prefix}-briefcase:before { content: @fa-var-briefcase; }
+.@{fa-css-prefix}-arrows-alt:before { content: @fa-var-arrows-alt; }
+.@{fa-css-prefix}-group:before,
+.@{fa-css-prefix}-users:before { content: @fa-var-users; }
+.@{fa-css-prefix}-chain:before,
+.@{fa-css-prefix}-link:before { content: @fa-var-link; }
+.@{fa-css-prefix}-cloud:before { content: @fa-var-cloud; }
+.@{fa-css-prefix}-flask:before { content: @fa-var-flask; }
+.@{fa-css-prefix}-cut:before,
+.@{fa-css-prefix}-scissors:before { content: @fa-var-scissors; }
+.@{fa-css-prefix}-copy:before,
+.@{fa-css-prefix}-files-o:before { content: @fa-var-files-o; }
+.@{fa-css-prefix}-paperclip:before { content: @fa-var-paperclip; }
+.@{fa-css-prefix}-save:before,
+.@{fa-css-prefix}-floppy-o:before { content: @fa-var-floppy-o; }
+.@{fa-css-prefix}-square:before { content: @fa-var-square; }
+.@{fa-css-prefix}-navicon:before,
+.@{fa-css-prefix}-reorder:before,
+.@{fa-css-prefix}-bars:before { content: @fa-var-bars; }
+.@{fa-css-prefix}-list-ul:before { content: @fa-var-list-ul; }
+.@{fa-css-prefix}-list-ol:before { content: @fa-var-list-ol; }
+.@{fa-css-prefix}-strikethrough:before { content: @fa-var-strikethrough; }
+.@{fa-css-prefix}-underline:before { content: @fa-var-underline; }
+.@{fa-css-prefix}-table:before { content: @fa-var-table; }
+.@{fa-css-prefix}-magic:before { content: @fa-var-magic; }
+.@{fa-css-prefix}-truck:before { content: @fa-var-truck; }
+.@{fa-css-prefix}-pinterest:before { content: @fa-var-pinterest; }
+.@{fa-css-prefix}-pinterest-square:before { content: @fa-var-pinterest-square; }
+.@{fa-css-prefix}-google-plus-square:before { content: @fa-var-google-plus-square; }
+.@{fa-css-prefix}-google-plus:before { content: @fa-var-google-plus; }
+.@{fa-css-prefix}-money:before { content: @fa-var-money; }
+.@{fa-css-prefix}-caret-down:before { content: @fa-var-caret-down; }
+.@{fa-css-prefix}-caret-up:before { content: @fa-var-caret-up; }
+.@{fa-css-prefix}-caret-left:before { content: @fa-var-caret-left; }
+.@{fa-css-prefix}-caret-right:before { content: @fa-var-caret-right; }
+.@{fa-css-prefix}-columns:before { content: @fa-var-columns; }
+.@{fa-css-prefix}-unsorted:before,
+.@{fa-css-prefix}-sort:before { content: @fa-var-sort; }
+.@{fa-css-prefix}-sort-down:before,
+.@{fa-css-prefix}-sort-desc:before { content: @fa-var-sort-desc; }
+.@{fa-css-prefix}-sort-up:before,
+.@{fa-css-prefix}-sort-asc:before { content: @fa-var-sort-asc; }
+.@{fa-css-prefix}-envelope:before { content: @fa-var-envelope; }
+.@{fa-css-prefix}-linkedin:before { content: @fa-var-linkedin; }
+.@{fa-css-prefix}-rotate-left:before,
+.@{fa-css-prefix}-undo:before { content: @fa-var-undo; }
+.@{fa-css-prefix}-legal:before,
+.@{fa-css-prefix}-gavel:before { content: @fa-var-gavel; }
+.@{fa-css-prefix}-dashboard:before,
+.@{fa-css-prefix}-tachometer:before { content: @fa-var-tachometer; }
+.@{fa-css-prefix}-comment-o:before { content: @fa-var-comment-o; }
+.@{fa-css-prefix}-comments-o:before { content: @fa-var-comments-o; }
+.@{fa-css-prefix}-flash:before,
+.@{fa-css-prefix}-bolt:before { content: @fa-var-bolt; }
+.@{fa-css-prefix}-sitemap:before { content: @fa-var-sitemap; }
+.@{fa-css-prefix}-umbrella:before { content: @fa-var-umbrella; }
+.@{fa-css-prefix}-paste:before,
+.@{fa-css-prefix}-clipboard:before { content: @fa-var-clipboard; }
+.@{fa-css-prefix}-lightbulb-o:before { content: @fa-var-lightbulb-o; }
+.@{fa-css-prefix}-exchange:before { content: @fa-var-exchange; }
+.@{fa-css-prefix}-cloud-download:before { content: @fa-var-cloud-download; }
+.@{fa-css-prefix}-cloud-upload:before { content: @fa-var-cloud-upload; }
+.@{fa-css-prefix}-user-md:before { content: @fa-var-user-md; }
+.@{fa-css-prefix}-stethoscope:before { content: @fa-var-stethoscope; }
+.@{fa-css-prefix}-suitcase:before { content: @fa-var-suitcase; }
+.@{fa-css-prefix}-bell-o:before { content: @fa-var-bell-o; }
+.@{fa-css-prefix}-coffee:before { content: @fa-var-coffee; }
+.@{fa-css-prefix}-cutlery:before { content: @fa-var-cutlery; }
+.@{fa-css-prefix}-file-text-o:before { content: @fa-var-file-text-o; }
+.@{fa-css-prefix}-building-o:before { content: @fa-var-building-o; }
+.@{fa-css-prefix}-hospital-o:before { content: @fa-var-hospital-o; }
+.@{fa-css-prefix}-ambulance:before { content: @fa-var-ambulance; }
+.@{fa-css-prefix}-medkit:before { content: @fa-var-medkit; }
+.@{fa-css-prefix}-fighter-jet:before { content: @fa-var-fighter-jet; }
+.@{fa-css-prefix}-beer:before { content: @fa-var-beer; }
+.@{fa-css-prefix}-h-square:before { content: @fa-var-h-square; }
+.@{fa-css-prefix}-plus-square:before { content: @fa-var-plus-square; }
+.@{fa-css-prefix}-angle-double-left:before { content: @fa-var-angle-double-left; }
+.@{fa-css-prefix}-angle-double-right:before { content: @fa-var-angle-double-right; }
+.@{fa-css-prefix}-angle-double-up:before { content: @fa-var-angle-double-up; }
+.@{fa-css-prefix}-angle-double-down:before { content: @fa-var-angle-double-down; }
+.@{fa-css-prefix}-angle-left:before { content: @fa-var-angle-left; }
+.@{fa-css-prefix}-angle-right:before { content: @fa-var-angle-right; }
+.@{fa-css-prefix}-angle-up:before { content: @fa-var-angle-up; }
+.@{fa-css-prefix}-angle-down:before { content: @fa-var-angle-down; }
+.@{fa-css-prefix}-desktop:before { content: @fa-var-desktop; }
+.@{fa-css-prefix}-laptop:before { content: @fa-var-laptop; }
+.@{fa-css-prefix}-tablet:before { content: @fa-var-tablet; }
+.@{fa-css-prefix}-mobile-phone:before,
+.@{fa-css-prefix}-mobile:before { content: @fa-var-mobile; }
+.@{fa-css-prefix}-circle-o:before { content: @fa-var-circle-o; }
+.@{fa-css-prefix}-quote-left:before { content: @fa-var-quote-left; }
+.@{fa-css-prefix}-quote-right:before { content: @fa-var-quote-right; }
+.@{fa-css-prefix}-spinner:before { content: @fa-var-spinner; }
+.@{fa-css-prefix}-circle:before { content: @fa-var-circle; }
+.@{fa-css-prefix}-mail-reply:before,
+.@{fa-css-prefix}-reply:before { content: @fa-var-reply; }
+.@{fa-css-prefix}-github-alt:before { content: @fa-var-github-alt; }
+.@{fa-css-prefix}-folder-o:before { content: @fa-var-folder-o; }
+.@{fa-css-prefix}-folder-open-o:before { content: @fa-var-folder-open-o; }
+.@{fa-css-prefix}-smile-o:before { content: @fa-var-smile-o; }
+.@{fa-css-prefix}-frown-o:before { content: @fa-var-frown-o; }
+.@{fa-css-prefix}-meh-o:before { content: @fa-var-meh-o; }
+.@{fa-css-prefix}-gamepad:before { content: @fa-var-gamepad; }
+.@{fa-css-prefix}-keyboard-o:before { content: @fa-var-keyboard-o; }
+.@{fa-css-prefix}-flag-o:before { content: @fa-var-flag-o; }
+.@{fa-css-prefix}-flag-checkered:before { content: @fa-var-flag-checkered; }
+.@{fa-css-prefix}-terminal:before { content: @fa-var-terminal; }
+.@{fa-css-prefix}-code:before { content: @fa-var-code; }
+.@{fa-css-prefix}-mail-reply-all:before,
+.@{fa-css-prefix}-reply-all:before { content: @fa-var-reply-all; }
+.@{fa-css-prefix}-star-half-empty:before,
+.@{fa-css-prefix}-star-half-full:before,
+.@{fa-css-prefix}-star-half-o:before { content: @fa-var-star-half-o; }
+.@{fa-css-prefix}-location-arrow:before { content: @fa-var-location-arrow; }
+.@{fa-css-prefix}-crop:before { content: @fa-var-crop; }
+.@{fa-css-prefix}-code-fork:before { content: @fa-var-code-fork; }
+.@{fa-css-prefix}-unlink:before,
+.@{fa-css-prefix}-chain-broken:before { content: @fa-var-chain-broken; }
+.@{fa-css-prefix}-question:before { content: @fa-var-question; }
+.@{fa-css-prefix}-info:before { content: @fa-var-info; }
+.@{fa-css-prefix}-exclamation:before { content: @fa-var-exclamation; }
+.@{fa-css-prefix}-superscript:before { content: @fa-var-superscript; }
+.@{fa-css-prefix}-subscript:before { content: @fa-var-subscript; }
+.@{fa-css-prefix}-eraser:before { content: @fa-var-eraser; }
+.@{fa-css-prefix}-puzzle-piece:before { content: @fa-var-puzzle-piece; }
+.@{fa-css-prefix}-microphone:before { content: @fa-var-microphone; }
+.@{fa-css-prefix}-microphone-slash:before { content: @fa-var-microphone-slash; }
+.@{fa-css-prefix}-shield:before { content: @fa-var-shield; }
+.@{fa-css-prefix}-calendar-o:before { content: @fa-var-calendar-o; }
+.@{fa-css-prefix}-fire-extinguisher:before { content: @fa-var-fire-extinguisher; }
+.@{fa-css-prefix}-rocket:before { content: @fa-var-rocket; }
+.@{fa-css-prefix}-maxcdn:before { content: @fa-var-maxcdn; }
+.@{fa-css-prefix}-chevron-circle-left:before { content: @fa-var-chevron-circle-left; }
+.@{fa-css-prefix}-chevron-circle-right:before { content: @fa-var-chevron-circle-right; }
+.@{fa-css-prefix}-chevron-circle-up:before { content: @fa-var-chevron-circle-up; }
+.@{fa-css-prefix}-chevron-circle-down:before { content: @fa-var-chevron-circle-down; }
+.@{fa-css-prefix}-html5:before { content: @fa-var-html5; }
+.@{fa-css-prefix}-css3:before { content: @fa-var-css3; }
+.@{fa-css-prefix}-anchor:before { content: @fa-var-anchor; }
+.@{fa-css-prefix}-unlock-alt:before { content: @fa-var-unlock-alt; }
+.@{fa-css-prefix}-bullseye:before { content: @fa-var-bullseye; }
+.@{fa-css-prefix}-ellipsis-h:before { content: @fa-var-ellipsis-h; }
+.@{fa-css-prefix}-ellipsis-v:before { content: @fa-var-ellipsis-v; }
+.@{fa-css-prefix}-rss-square:before { content: @fa-var-rss-square; }
+.@{fa-css-prefix}-play-circle:before { content: @fa-var-play-circle; }
+.@{fa-css-prefix}-ticket:before { content: @fa-var-ticket; }
+.@{fa-css-prefix}-minus-square:before { content: @fa-var-minus-square; }
+.@{fa-css-prefix}-minus-square-o:before { content: @fa-var-minus-square-o; }
+.@{fa-css-prefix}-level-up:before { content: @fa-var-level-up; }
+.@{fa-css-prefix}-level-down:before { content: @fa-var-level-down; }
+.@{fa-css-prefix}-check-square:before { content: @fa-var-check-square; }
+.@{fa-css-prefix}-pencil-square:before { content: @fa-var-pencil-square; }
+.@{fa-css-prefix}-external-link-square:before { content: @fa-var-external-link-square; }
+.@{fa-css-prefix}-share-square:before { content: @fa-var-share-square; }
+.@{fa-css-prefix}-compass:before { content: @fa-var-compass; }
+.@{fa-css-prefix}-toggle-down:before,
+.@{fa-css-prefix}-caret-square-o-down:before { content: @fa-var-caret-square-o-down; }
+.@{fa-css-prefix}-toggle-up:before,
+.@{fa-css-prefix}-caret-square-o-up:before { content: @fa-var-caret-square-o-up; }
+.@{fa-css-prefix}-toggle-right:before,
+.@{fa-css-prefix}-caret-square-o-right:before { content: @fa-var-caret-square-o-right; }
+.@{fa-css-prefix}-euro:before,
+.@{fa-css-prefix}-eur:before { content: @fa-var-eur; }
+.@{fa-css-prefix}-gbp:before { content: @fa-var-gbp; }
+.@{fa-css-prefix}-dollar:before,
+.@{fa-css-prefix}-usd:before { content: @fa-var-usd; }
+.@{fa-css-prefix}-rupee:before,
+.@{fa-css-prefix}-inr:before { content: @fa-var-inr; }
+.@{fa-css-prefix}-cny:before,
+.@{fa-css-prefix}-rmb:before,
+.@{fa-css-prefix}-yen:before,
+.@{fa-css-prefix}-jpy:before { content: @fa-var-jpy; }
+.@{fa-css-prefix}-ruble:before,
+.@{fa-css-prefix}-rouble:before,
+.@{fa-css-prefix}-rub:before { content: @fa-var-rub; }
+.@{fa-css-prefix}-won:before,
+.@{fa-css-prefix}-krw:before { content: @fa-var-krw; }
+.@{fa-css-prefix}-bitcoin:before,
+.@{fa-css-prefix}-btc:before { content: @fa-var-btc; }
+.@{fa-css-prefix}-file:before { content: @fa-var-file; }
+.@{fa-css-prefix}-file-text:before { content: @fa-var-file-text; }
+.@{fa-css-prefix}-sort-alpha-asc:before { content: @fa-var-sort-alpha-asc; }
+.@{fa-css-prefix}-sort-alpha-desc:before { content: @fa-var-sort-alpha-desc; }
+.@{fa-css-prefix}-sort-amount-asc:before { content: @fa-var-sort-amount-asc; }
+.@{fa-css-prefix}-sort-amount-desc:before { content: @fa-var-sort-amount-desc; }
+.@{fa-css-prefix}-sort-numeric-asc:before { content: @fa-var-sort-numeric-asc; }
+.@{fa-css-prefix}-sort-numeric-desc:before { content: @fa-var-sort-numeric-desc; }
+.@{fa-css-prefix}-thumbs-up:before { content: @fa-var-thumbs-up; }
+.@{fa-css-prefix}-thumbs-down:before { content: @fa-var-thumbs-down; }
+.@{fa-css-prefix}-youtube-square:before { content: @fa-var-youtube-square; }
+.@{fa-css-prefix}-youtube:before { content: @fa-var-youtube; }
+.@{fa-css-prefix}-xing:before { content: @fa-var-xing; }
+.@{fa-css-prefix}-xing-square:before { content: @fa-var-xing-square; }
+.@{fa-css-prefix}-youtube-play:before { content: @fa-var-youtube-play; }
+.@{fa-css-prefix}-dropbox:before { content: @fa-var-dropbox; }
+.@{fa-css-prefix}-stack-overflow:before { content: @fa-var-stack-overflow; }
+.@{fa-css-prefix}-instagram:before { content: @fa-var-instagram; }
+.@{fa-css-prefix}-flickr:before { content: @fa-var-flickr; }
+.@{fa-css-prefix}-adn:before { content: @fa-var-adn; }
+.@{fa-css-prefix}-bitbucket:before { content: @fa-var-bitbucket; }
+.@{fa-css-prefix}-bitbucket-square:before { content: @fa-var-bitbucket-square; }
+.@{fa-css-prefix}-tumblr:before { content: @fa-var-tumblr; }
+.@{fa-css-prefix}-tumblr-square:before { content: @fa-var-tumblr-square; }
+.@{fa-css-prefix}-long-arrow-down:before { content: @fa-var-long-arrow-down; }
+.@{fa-css-prefix}-long-arrow-up:before { content: @fa-var-long-arrow-up; }
+.@{fa-css-prefix}-long-arrow-left:before { content: @fa-var-long-arrow-left; }
+.@{fa-css-prefix}-long-arrow-right:before { content: @fa-var-long-arrow-right; }
+.@{fa-css-prefix}-apple:before { content: @fa-var-apple; }
+.@{fa-css-prefix}-windows:before { content: @fa-var-windows; }
+.@{fa-css-prefix}-android:before { content: @fa-var-android; }
+.@{fa-css-prefix}-linux:before { content: @fa-var-linux; }
+.@{fa-css-prefix}-dribbble:before { content: @fa-var-dribbble; }
+.@{fa-css-prefix}-skype:before { content: @fa-var-skype; }
+.@{fa-css-prefix}-foursquare:before { content: @fa-var-foursquare; }
+.@{fa-css-prefix}-trello:before { content: @fa-var-trello; }
+.@{fa-css-prefix}-female:before { content: @fa-var-female; }
+.@{fa-css-prefix}-male:before { content: @fa-var-male; }
+.@{fa-css-prefix}-gittip:before,
+.@{fa-css-prefix}-gratipay:before { content: @fa-var-gratipay; }
+.@{fa-css-prefix}-sun-o:before { content: @fa-var-sun-o; }
+.@{fa-css-prefix}-moon-o:before { content: @fa-var-moon-o; }
+.@{fa-css-prefix}-archive:before { content: @fa-var-archive; }
+.@{fa-css-prefix}-bug:before { content: @fa-var-bug; }
+.@{fa-css-prefix}-vk:before { content: @fa-var-vk; }
+.@{fa-css-prefix}-weibo:before { content: @fa-var-weibo; }
+.@{fa-css-prefix}-renren:before { content: @fa-var-renren; }
+.@{fa-css-prefix}-pagelines:before { content: @fa-var-pagelines; }
+.@{fa-css-prefix}-stack-exchange:before { content: @fa-var-stack-exchange; }
+.@{fa-css-prefix}-arrow-circle-o-right:before { content: @fa-var-arrow-circle-o-right; }
+.@{fa-css-prefix}-arrow-circle-o-left:before { content: @fa-var-arrow-circle-o-left; }
+.@{fa-css-prefix}-toggle-left:before,
+.@{fa-css-prefix}-caret-square-o-left:before { content: @fa-var-caret-square-o-left; }
+.@{fa-css-prefix}-dot-circle-o:before { content: @fa-var-dot-circle-o; }
+.@{fa-css-prefix}-wheelchair:before { content: @fa-var-wheelchair; }
+.@{fa-css-prefix}-vimeo-square:before { content: @fa-var-vimeo-square; }
+.@{fa-css-prefix}-turkish-lira:before,
+.@{fa-css-prefix}-try:before { content: @fa-var-try; }
+.@{fa-css-prefix}-plus-square-o:before { content: @fa-var-plus-square-o; }
+.@{fa-css-prefix}-space-shuttle:before { content: @fa-var-space-shuttle; }
+.@{fa-css-prefix}-slack:before { content: @fa-var-slack; }
+.@{fa-css-prefix}-envelope-square:before { content: @fa-var-envelope-square; }
+.@{fa-css-prefix}-wordpress:before { content: @fa-var-wordpress; }
+.@{fa-css-prefix}-openid:before { content: @fa-var-openid; }
+.@{fa-css-prefix}-institution:before,
+.@{fa-css-prefix}-bank:before,
+.@{fa-css-prefix}-university:before { content: @fa-var-university; }
+.@{fa-css-prefix}-mortar-board:before,
+.@{fa-css-prefix}-graduation-cap:before { content: @fa-var-graduation-cap; }
+.@{fa-css-prefix}-yahoo:before { content: @fa-var-yahoo; }
+.@{fa-css-prefix}-google:before { content: @fa-var-google; }
+.@{fa-css-prefix}-reddit:before { content: @fa-var-reddit; }
+.@{fa-css-prefix}-reddit-square:before { content: @fa-var-reddit-square; }
+.@{fa-css-prefix}-stumbleupon-circle:before { content: @fa-var-stumbleupon-circle; }
+.@{fa-css-prefix}-stumbleupon:before { content: @fa-var-stumbleupon; }
+.@{fa-css-prefix}-delicious:before { content: @fa-var-delicious; }
+.@{fa-css-prefix}-digg:before { content: @fa-var-digg; }
+.@{fa-css-prefix}-pied-piper-pp:before { content: @fa-var-pied-piper-pp; }
+.@{fa-css-prefix}-pied-piper-alt:before { content: @fa-var-pied-piper-alt; }
+.@{fa-css-prefix}-drupal:before { content: @fa-var-drupal; }
+.@{fa-css-prefix}-joomla:before { content: @fa-var-joomla; }
+.@{fa-css-prefix}-language:before { content: @fa-var-language; }
+.@{fa-css-prefix}-fax:before { content: @fa-var-fax; }
+.@{fa-css-prefix}-building:before { content: @fa-var-building; }
+.@{fa-css-prefix}-child:before { content: @fa-var-child; }
+.@{fa-css-prefix}-paw:before { content: @fa-var-paw; }
+.@{fa-css-prefix}-spoon:before { content: @fa-var-spoon; }
+.@{fa-css-prefix}-cube:before { content: @fa-var-cube; }
+.@{fa-css-prefix}-cubes:before { content: @fa-var-cubes; }
+.@{fa-css-prefix}-behance:before { content: @fa-var-behance; }
+.@{fa-css-prefix}-behance-square:before { content: @fa-var-behance-square; }
+.@{fa-css-prefix}-steam:before { content: @fa-var-steam; }
+.@{fa-css-prefix}-steam-square:before { content: @fa-var-steam-square; }
+.@{fa-css-prefix}-recycle:before { content: @fa-var-recycle; }
+.@{fa-css-prefix}-automobile:before,
+.@{fa-css-prefix}-car:before { content: @fa-var-car; }
+.@{fa-css-prefix}-cab:before,
+.@{fa-css-prefix}-taxi:before { content: @fa-var-taxi; }
+.@{fa-css-prefix}-tree:before { content: @fa-var-tree; }
+.@{fa-css-prefix}-spotify:before { content: @fa-var-spotify; }
+.@{fa-css-prefix}-deviantart:before { content: @fa-var-deviantart; }
+.@{fa-css-prefix}-soundcloud:before { content: @fa-var-soundcloud; }
+.@{fa-css-prefix}-database:before { content: @fa-var-database; }
+.@{fa-css-prefix}-file-pdf-o:before { content: @fa-var-file-pdf-o; }
+.@{fa-css-prefix}-file-word-o:before { content: @fa-var-file-word-o; }
+.@{fa-css-prefix}-file-excel-o:before { content: @fa-var-file-excel-o; }
+.@{fa-css-prefix}-file-powerpoint-o:before { content: @fa-var-file-powerpoint-o; }
+.@{fa-css-prefix}-file-photo-o:before,
+.@{fa-css-prefix}-file-picture-o:before,
+.@{fa-css-prefix}-file-image-o:before { content: @fa-var-file-image-o; }
+.@{fa-css-prefix}-file-zip-o:before,
+.@{fa-css-prefix}-file-archive-o:before { content: @fa-var-file-archive-o; }
+.@{fa-css-prefix}-file-sound-o:before,
+.@{fa-css-prefix}-file-audio-o:before { content: @fa-var-file-audio-o; }
+.@{fa-css-prefix}-file-movie-o:before,
+.@{fa-css-prefix}-file-video-o:before { content: @fa-var-file-video-o; }
+.@{fa-css-prefix}-file-code-o:before { content: @fa-var-file-code-o; }
+.@{fa-css-prefix}-vine:before { content: @fa-var-vine; }
+.@{fa-css-prefix}-codepen:before { content: @fa-var-codepen; }
+.@{fa-css-prefix}-jsfiddle:before { content: @fa-var-jsfiddle; }
+.@{fa-css-prefix}-life-bouy:before,
+.@{fa-css-prefix}-life-buoy:before,
+.@{fa-css-prefix}-life-saver:before,
+.@{fa-css-prefix}-support:before,
+.@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; }
+.@{fa-css-prefix}-circle-o-notch:before { content: @fa-var-circle-o-notch; }
+.@{fa-css-prefix}-ra:before,
+.@{fa-css-prefix}-resistance:before,
+.@{fa-css-prefix}-rebel:before { content: @fa-var-rebel; }
+.@{fa-css-prefix}-ge:before,
+.@{fa-css-prefix}-empire:before { content: @fa-var-empire; }
+.@{fa-css-prefix}-git-square:before { content: @fa-var-git-square; }
+.@{fa-css-prefix}-git:before { content: @fa-var-git; }
+.@{fa-css-prefix}-y-combinator-square:before,
+.@{fa-css-prefix}-yc-square:before,
+.@{fa-css-prefix}-hacker-news:before { content: @fa-var-hacker-news; }
+.@{fa-css-prefix}-tencent-weibo:before { content: @fa-var-tencent-weibo; }
+.@{fa-css-prefix}-qq:before { content: @fa-var-qq; }
+.@{fa-css-prefix}-wechat:before,
+.@{fa-css-prefix}-weixin:before { content: @fa-var-weixin; }
+.@{fa-css-prefix}-send:before,
+.@{fa-css-prefix}-paper-plane:before { content: @fa-var-paper-plane; }
+.@{fa-css-prefix}-send-o:before,
+.@{fa-css-prefix}-paper-plane-o:before { content: @fa-var-paper-plane-o; }
+.@{fa-css-prefix}-history:before { content: @fa-var-history; }
+.@{fa-css-prefix}-circle-thin:before { content: @fa-var-circle-thin; }
+.@{fa-css-prefix}-header:before { content: @fa-var-header; }
+.@{fa-css-prefix}-paragraph:before { content: @fa-var-paragraph; }
+.@{fa-css-prefix}-sliders:before { content: @fa-var-sliders; }
+.@{fa-css-prefix}-share-alt:before { content: @fa-var-share-alt; }
+.@{fa-css-prefix}-share-alt-square:before { content: @fa-var-share-alt-square; }
+.@{fa-css-prefix}-bomb:before { content: @fa-var-bomb; }
+.@{fa-css-prefix}-soccer-ball-o:before,
+.@{fa-css-prefix}-futbol-o:before { content: @fa-var-futbol-o; }
+.@{fa-css-prefix}-tty:before { content: @fa-var-tty; }
+.@{fa-css-prefix}-binoculars:before { content: @fa-var-binoculars; }
+.@{fa-css-prefix}-plug:before { content: @fa-var-plug; }
+.@{fa-css-prefix}-slideshare:before { content: @fa-var-slideshare; }
+.@{fa-css-prefix}-twitch:before { content: @fa-var-twitch; }
+.@{fa-css-prefix}-yelp:before { content: @fa-var-yelp; }
+.@{fa-css-prefix}-newspaper-o:before { content: @fa-var-newspaper-o; }
+.@{fa-css-prefix}-wifi:before { content: @fa-var-wifi; }
+.@{fa-css-prefix}-calculator:before { content: @fa-var-calculator; }
+.@{fa-css-prefix}-paypal:before { content: @fa-var-paypal; }
+.@{fa-css-prefix}-google-wallet:before { content: @fa-var-google-wallet; }
+.@{fa-css-prefix}-cc-visa:before { content: @fa-var-cc-visa; }
+.@{fa-css-prefix}-cc-mastercard:before { content: @fa-var-cc-mastercard; }
+.@{fa-css-prefix}-cc-discover:before { content: @fa-var-cc-discover; }
+.@{fa-css-prefix}-cc-amex:before { content: @fa-var-cc-amex; }
+.@{fa-css-prefix}-cc-paypal:before { content: @fa-var-cc-paypal; }
+.@{fa-css-prefix}-cc-stripe:before { content: @fa-var-cc-stripe; }
+.@{fa-css-prefix}-bell-slash:before { content: @fa-var-bell-slash; }
+.@{fa-css-prefix}-bell-slash-o:before { content: @fa-var-bell-slash-o; }
+.@{fa-css-prefix}-trash:before { content: @fa-var-trash; }
+.@{fa-css-prefix}-copyright:before { content: @fa-var-copyright; }
+.@{fa-css-prefix}-at:before { content: @fa-var-at; }
+.@{fa-css-prefix}-eyedropper:before { content: @fa-var-eyedropper; }
+.@{fa-css-prefix}-paint-brush:before { content: @fa-var-paint-brush; }
+.@{fa-css-prefix}-birthday-cake:before { content: @fa-var-birthday-cake; }
+.@{fa-css-prefix}-area-chart:before { content: @fa-var-area-chart; }
+.@{fa-css-prefix}-pie-chart:before { content: @fa-var-pie-chart; }
+.@{fa-css-prefix}-line-chart:before { content: @fa-var-line-chart; }
+.@{fa-css-prefix}-lastfm:before { content: @fa-var-lastfm; }
+.@{fa-css-prefix}-lastfm-square:before { content: @fa-var-lastfm-square; }
+.@{fa-css-prefix}-toggle-off:before { content: @fa-var-toggle-off; }
+.@{fa-css-prefix}-toggle-on:before { content: @fa-var-toggle-on; }
+.@{fa-css-prefix}-bicycle:before { content: @fa-var-bicycle; }
+.@{fa-css-prefix}-bus:before { content: @fa-var-bus; }
+.@{fa-css-prefix}-ioxhost:before { content: @fa-var-ioxhost; }
+.@{fa-css-prefix}-angellist:before { content: @fa-var-angellist; }
+.@{fa-css-prefix}-cc:before { content: @fa-var-cc; }
+.@{fa-css-prefix}-shekel:before,
+.@{fa-css-prefix}-sheqel:before,
+.@{fa-css-prefix}-ils:before { content: @fa-var-ils; }
+.@{fa-css-prefix}-meanpath:before { content: @fa-var-meanpath; }
+.@{fa-css-prefix}-buysellads:before { content: @fa-var-buysellads; }
+.@{fa-css-prefix}-connectdevelop:before { content: @fa-var-connectdevelop; }
+.@{fa-css-prefix}-dashcube:before { content: @fa-var-dashcube; }
+.@{fa-css-prefix}-forumbee:before { content: @fa-var-forumbee; }
+.@{fa-css-prefix}-leanpub:before { content: @fa-var-leanpub; }
+.@{fa-css-prefix}-sellsy:before { content: @fa-var-sellsy; }
+.@{fa-css-prefix}-shirtsinbulk:before { content: @fa-var-shirtsinbulk; }
+.@{fa-css-prefix}-simplybuilt:before { content: @fa-var-simplybuilt; }
+.@{fa-css-prefix}-skyatlas:before { content: @fa-var-skyatlas; }
+.@{fa-css-prefix}-cart-plus:before { content: @fa-var-cart-plus; }
+.@{fa-css-prefix}-cart-arrow-down:before { content: @fa-var-cart-arrow-down; }
+.@{fa-css-prefix}-diamond:before { content: @fa-var-diamond; }
+.@{fa-css-prefix}-ship:before { content: @fa-var-ship; }
+.@{fa-css-prefix}-user-secret:before { content: @fa-var-user-secret; }
+.@{fa-css-prefix}-motorcycle:before { content: @fa-var-motorcycle; }
+.@{fa-css-prefix}-street-view:before { content: @fa-var-street-view; }
+.@{fa-css-prefix}-heartbeat:before { content: @fa-var-heartbeat; }
+.@{fa-css-prefix}-venus:before { content: @fa-var-venus; }
+.@{fa-css-prefix}-mars:before { content: @fa-var-mars; }
+.@{fa-css-prefix}-mercury:before { content: @fa-var-mercury; }
+.@{fa-css-prefix}-intersex:before,
+.@{fa-css-prefix}-transgender:before { content: @fa-var-transgender; }
+.@{fa-css-prefix}-transgender-alt:before { content: @fa-var-transgender-alt; }
+.@{fa-css-prefix}-venus-double:before { content: @fa-var-venus-double; }
+.@{fa-css-prefix}-mars-double:before { content: @fa-var-mars-double; }
+.@{fa-css-prefix}-venus-mars:before { content: @fa-var-venus-mars; }
+.@{fa-css-prefix}-mars-stroke:before { content: @fa-var-mars-stroke; }
+.@{fa-css-prefix}-mars-stroke-v:before { content: @fa-var-mars-stroke-v; }
+.@{fa-css-prefix}-mars-stroke-h:before { content: @fa-var-mars-stroke-h; }
+.@{fa-css-prefix}-neuter:before { content: @fa-var-neuter; }
+.@{fa-css-prefix}-genderless:before { content: @fa-var-genderless; }
+.@{fa-css-prefix}-facebook-official:before { content: @fa-var-facebook-official; }
+.@{fa-css-prefix}-pinterest-p:before { content: @fa-var-pinterest-p; }
+.@{fa-css-prefix}-whatsapp:before { content: @fa-var-whatsapp; }
+.@{fa-css-prefix}-server:before { content: @fa-var-server; }
+.@{fa-css-prefix}-user-plus:before { content: @fa-var-user-plus; }
+.@{fa-css-prefix}-user-times:before { content: @fa-var-user-times; }
+.@{fa-css-prefix}-hotel:before,
+.@{fa-css-prefix}-bed:before { content: @fa-var-bed; }
+.@{fa-css-prefix}-viacoin:before { content: @fa-var-viacoin; }
+.@{fa-css-prefix}-train:before { content: @fa-var-train; }
+.@{fa-css-prefix}-subway:before { content: @fa-var-subway; }
+.@{fa-css-prefix}-medium:before { content: @fa-var-medium; }
+.@{fa-css-prefix}-yc:before,
+.@{fa-css-prefix}-y-combinator:before { content: @fa-var-y-combinator; }
+.@{fa-css-prefix}-optin-monster:before { content: @fa-var-optin-monster; }
+.@{fa-css-prefix}-opencart:before { content: @fa-var-opencart; }
+.@{fa-css-prefix}-expeditedssl:before { content: @fa-var-expeditedssl; }
+.@{fa-css-prefix}-battery-4:before,
+.@{fa-css-prefix}-battery:before,
+.@{fa-css-prefix}-battery-full:before { content: @fa-var-battery-full; }
+.@{fa-css-prefix}-battery-3:before,
+.@{fa-css-prefix}-battery-three-quarters:before { content: @fa-var-battery-three-quarters; }
+.@{fa-css-prefix}-battery-2:before,
+.@{fa-css-prefix}-battery-half:before { content: @fa-var-battery-half; }
+.@{fa-css-prefix}-battery-1:before,
+.@{fa-css-prefix}-battery-quarter:before { content: @fa-var-battery-quarter; }
+.@{fa-css-prefix}-battery-0:before,
+.@{fa-css-prefix}-battery-empty:before { content: @fa-var-battery-empty; }
+.@{fa-css-prefix}-mouse-pointer:before { content: @fa-var-mouse-pointer; }
+.@{fa-css-prefix}-i-cursor:before { content: @fa-var-i-cursor; }
+.@{fa-css-prefix}-object-group:before { content: @fa-var-object-group; }
+.@{fa-css-prefix}-object-ungroup:before { content: @fa-var-object-ungroup; }
+.@{fa-css-prefix}-sticky-note:before { content: @fa-var-sticky-note; }
+.@{fa-css-prefix}-sticky-note-o:before { content: @fa-var-sticky-note-o; }
+.@{fa-css-prefix}-cc-jcb:before { content: @fa-var-cc-jcb; }
+.@{fa-css-prefix}-cc-diners-club:before { content: @fa-var-cc-diners-club; }
+.@{fa-css-prefix}-clone:before { content: @fa-var-clone; }
+.@{fa-css-prefix}-balance-scale:before { content: @fa-var-balance-scale; }
+.@{fa-css-prefix}-hourglass-o:before { content: @fa-var-hourglass-o; }
+.@{fa-css-prefix}-hourglass-1:before,
+.@{fa-css-prefix}-hourglass-start:before { content: @fa-var-hourglass-start; }
+.@{fa-css-prefix}-hourglass-2:before,
+.@{fa-css-prefix}-hourglass-half:before { content: @fa-var-hourglass-half; }
+.@{fa-css-prefix}-hourglass-3:before,
+.@{fa-css-prefix}-hourglass-end:before { content: @fa-var-hourglass-end; }
+.@{fa-css-prefix}-hourglass:before { content: @fa-var-hourglass; }
+.@{fa-css-prefix}-hand-grab-o:before,
+.@{fa-css-prefix}-hand-rock-o:before { content: @fa-var-hand-rock-o; }
+.@{fa-css-prefix}-hand-stop-o:before,
+.@{fa-css-prefix}-hand-paper-o:before { content: @fa-var-hand-paper-o; }
+.@{fa-css-prefix}-hand-scissors-o:before { content: @fa-var-hand-scissors-o; }
+.@{fa-css-prefix}-hand-lizard-o:before { content: @fa-var-hand-lizard-o; }
+.@{fa-css-prefix}-hand-spock-o:before { content: @fa-var-hand-spock-o; }
+.@{fa-css-prefix}-hand-pointer-o:before { content: @fa-var-hand-pointer-o; }
+.@{fa-css-prefix}-hand-peace-o:before { content: @fa-var-hand-peace-o; }
+.@{fa-css-prefix}-trademark:before { content: @fa-var-trademark; }
+.@{fa-css-prefix}-registered:before { content: @fa-var-registered; }
+.@{fa-css-prefix}-creative-commons:before { content: @fa-var-creative-commons; }
+.@{fa-css-prefix}-gg:before { content: @fa-var-gg; }
+.@{fa-css-prefix}-gg-circle:before { content: @fa-var-gg-circle; }
+.@{fa-css-prefix}-tripadvisor:before { content: @fa-var-tripadvisor; }
+.@{fa-css-prefix}-odnoklassniki:before { content: @fa-var-odnoklassniki; }
+.@{fa-css-prefix}-odnoklassniki-square:before { content: @fa-var-odnoklassniki-square; }
+.@{fa-css-prefix}-get-pocket:before { content: @fa-var-get-pocket; }
+.@{fa-css-prefix}-wikipedia-w:before { content: @fa-var-wikipedia-w; }
+.@{fa-css-prefix}-safari:before { content: @fa-var-safari; }
+.@{fa-css-prefix}-chrome:before { content: @fa-var-chrome; }
+.@{fa-css-prefix}-firefox:before { content: @fa-var-firefox; }
+.@{fa-css-prefix}-opera:before { content: @fa-var-opera; }
+.@{fa-css-prefix}-internet-explorer:before { content: @fa-var-internet-explorer; }
+.@{fa-css-prefix}-tv:before,
+.@{fa-css-prefix}-television:before { content: @fa-var-television; }
+.@{fa-css-prefix}-contao:before { content: @fa-var-contao; }
+.@{fa-css-prefix}-500px:before { content: @fa-var-500px; }
+.@{fa-css-prefix}-amazon:before { content: @fa-var-amazon; }
+.@{fa-css-prefix}-calendar-plus-o:before { content: @fa-var-calendar-plus-o; }
+.@{fa-css-prefix}-calendar-minus-o:before { content: @fa-var-calendar-minus-o; }
+.@{fa-css-prefix}-calendar-times-o:before { content: @fa-var-calendar-times-o; }
+.@{fa-css-prefix}-calendar-check-o:before { content: @fa-var-calendar-check-o; }
+.@{fa-css-prefix}-industry:before { content: @fa-var-industry; }
+.@{fa-css-prefix}-map-pin:before { content: @fa-var-map-pin; }
+.@{fa-css-prefix}-map-signs:before { content: @fa-var-map-signs; }
+.@{fa-css-prefix}-map-o:before { content: @fa-var-map-o; }
+.@{fa-css-prefix}-map:before { content: @fa-var-map; }
+.@{fa-css-prefix}-commenting:before { content: @fa-var-commenting; }
+.@{fa-css-prefix}-commenting-o:before { content: @fa-var-commenting-o; }
+.@{fa-css-prefix}-houzz:before { content: @fa-var-houzz; }
+.@{fa-css-prefix}-vimeo:before { content: @fa-var-vimeo; }
+.@{fa-css-prefix}-black-tie:before { content: @fa-var-black-tie; }
+.@{fa-css-prefix}-fonticons:before { content: @fa-var-fonticons; }
+.@{fa-css-prefix}-reddit-alien:before { content: @fa-var-reddit-alien; }
+.@{fa-css-prefix}-edge:before { content: @fa-var-edge; }
+.@{fa-css-prefix}-credit-card-alt:before { content: @fa-var-credit-card-alt; }
+.@{fa-css-prefix}-codiepie:before { content: @fa-var-codiepie; }
+.@{fa-css-prefix}-modx:before { content: @fa-var-modx; }
+.@{fa-css-prefix}-fort-awesome:before { content: @fa-var-fort-awesome; }
+.@{fa-css-prefix}-usb:before { content: @fa-var-usb; }
+.@{fa-css-prefix}-product-hunt:before { content: @fa-var-product-hunt; }
+.@{fa-css-prefix}-mixcloud:before { content: @fa-var-mixcloud; }
+.@{fa-css-prefix}-scribd:before { content: @fa-var-scribd; }
+.@{fa-css-prefix}-pause-circle:before { content: @fa-var-pause-circle; }
+.@{fa-css-prefix}-pause-circle-o:before { content: @fa-var-pause-circle-o; }
+.@{fa-css-prefix}-stop-circle:before { content: @fa-var-stop-circle; }
+.@{fa-css-prefix}-stop-circle-o:before { content: @fa-var-stop-circle-o; }
+.@{fa-css-prefix}-shopping-bag:before { content: @fa-var-shopping-bag; }
+.@{fa-css-prefix}-shopping-basket:before { content: @fa-var-shopping-basket; }
+.@{fa-css-prefix}-hashtag:before { content: @fa-var-hashtag; }
+.@{fa-css-prefix}-bluetooth:before { content: @fa-var-bluetooth; }
+.@{fa-css-prefix}-bluetooth-b:before { content: @fa-var-bluetooth-b; }
+.@{fa-css-prefix}-percent:before { content: @fa-var-percent; }
+.@{fa-css-prefix}-gitlab:before { content: @fa-var-gitlab; }
+.@{fa-css-prefix}-wpbeginner:before { content: @fa-var-wpbeginner; }
+.@{fa-css-prefix}-wpforms:before { content: @fa-var-wpforms; }
+.@{fa-css-prefix}-envira:before { content: @fa-var-envira; }
+.@{fa-css-prefix}-universal-access:before { content: @fa-var-universal-access; }
+.@{fa-css-prefix}-wheelchair-alt:before { content: @fa-var-wheelchair-alt; }
+.@{fa-css-prefix}-question-circle-o:before { content: @fa-var-question-circle-o; }
+.@{fa-css-prefix}-blind:before { content: @fa-var-blind; }
+.@{fa-css-prefix}-audio-description:before { content: @fa-var-audio-description; }
+.@{fa-css-prefix}-volume-control-phone:before { content: @fa-var-volume-control-phone; }
+.@{fa-css-prefix}-braille:before { content: @fa-var-braille; }
+.@{fa-css-prefix}-assistive-listening-systems:before { content: @fa-var-assistive-listening-systems; }
+.@{fa-css-prefix}-asl-interpreting:before,
+.@{fa-css-prefix}-american-sign-language-interpreting:before { content: @fa-var-american-sign-language-interpreting; }
+.@{fa-css-prefix}-deafness:before,
+.@{fa-css-prefix}-hard-of-hearing:before,
+.@{fa-css-prefix}-deaf:before { content: @fa-var-deaf; }
+.@{fa-css-prefix}-glide:before { content: @fa-var-glide; }
+.@{fa-css-prefix}-glide-g:before { content: @fa-var-glide-g; }
+.@{fa-css-prefix}-signing:before,
+.@{fa-css-prefix}-sign-language:before { content: @fa-var-sign-language; }
+.@{fa-css-prefix}-low-vision:before { content: @fa-var-low-vision; }
+.@{fa-css-prefix}-viadeo:before { content: @fa-var-viadeo; }
+.@{fa-css-prefix}-viadeo-square:before { content: @fa-var-viadeo-square; }
+.@{fa-css-prefix}-snapchat:before { content: @fa-var-snapchat; }
+.@{fa-css-prefix}-snapchat-ghost:before { content: @fa-var-snapchat-ghost; }
+.@{fa-css-prefix}-snapchat-square:before { content: @fa-var-snapchat-square; }
+.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
+.@{fa-css-prefix}-first-order:before { content: @fa-var-first-order; }
+.@{fa-css-prefix}-yoast:before { content: @fa-var-yoast; }
+.@{fa-css-prefix}-themeisle:before { content: @fa-var-themeisle; }
+.@{fa-css-prefix}-google-plus-circle:before,
+.@{fa-css-prefix}-google-plus-official:before { content: @fa-var-google-plus-official; }
+.@{fa-css-prefix}-fa:before,
+.@{fa-css-prefix}-font-awesome:before { content: @fa-var-font-awesome; }
+.@{fa-css-prefix}-handshake-o:before { content: @fa-var-handshake-o; }
+.@{fa-css-prefix}-envelope-open:before { content: @fa-var-envelope-open; }
+.@{fa-css-prefix}-envelope-open-o:before { content: @fa-var-envelope-open-o; }
+.@{fa-css-prefix}-linode:before { content: @fa-var-linode; }
+.@{fa-css-prefix}-address-book:before { content: @fa-var-address-book; }
+.@{fa-css-prefix}-address-book-o:before { content: @fa-var-address-book-o; }
+.@{fa-css-prefix}-vcard:before,
+.@{fa-css-prefix}-address-card:before { content: @fa-var-address-card; }
+.@{fa-css-prefix}-vcard-o:before,
+.@{fa-css-prefix}-address-card-o:before { content: @fa-var-address-card-o; }
+.@{fa-css-prefix}-user-circle:before { content: @fa-var-user-circle; }
+.@{fa-css-prefix}-user-circle-o:before { content: @fa-var-user-circle-o; }
+.@{fa-css-prefix}-user-o:before { content: @fa-var-user-o; }
+.@{fa-css-prefix}-id-badge:before { content: @fa-var-id-badge; }
+.@{fa-css-prefix}-drivers-license:before,
+.@{fa-css-prefix}-id-card:before { content: @fa-var-id-card; }
+.@{fa-css-prefix}-drivers-license-o:before,
+.@{fa-css-prefix}-id-card-o:before { content: @fa-var-id-card-o; }
+.@{fa-css-prefix}-quora:before { content: @fa-var-quora; }
+.@{fa-css-prefix}-free-code-camp:before { content: @fa-var-free-code-camp; }
+.@{fa-css-prefix}-telegram:before { content: @fa-var-telegram; }
+.@{fa-css-prefix}-thermometer-4:before,
+.@{fa-css-prefix}-thermometer:before,
+.@{fa-css-prefix}-thermometer-full:before { content: @fa-var-thermometer-full; }
+.@{fa-css-prefix}-thermometer-3:before,
+.@{fa-css-prefix}-thermometer-three-quarters:before { content: @fa-var-thermometer-three-quarters; }
+.@{fa-css-prefix}-thermometer-2:before,
+.@{fa-css-prefix}-thermometer-half:before { content: @fa-var-thermometer-half; }
+.@{fa-css-prefix}-thermometer-1:before,
+.@{fa-css-prefix}-thermometer-quarter:before { content: @fa-var-thermometer-quarter; }
+.@{fa-css-prefix}-thermometer-0:before,
+.@{fa-css-prefix}-thermometer-empty:before { content: @fa-var-thermometer-empty; }
+.@{fa-css-prefix}-shower:before { content: @fa-var-shower; }
+.@{fa-css-prefix}-bathtub:before,
+.@{fa-css-prefix}-s15:before,
+.@{fa-css-prefix}-bath:before { content: @fa-var-bath; }
+.@{fa-css-prefix}-podcast:before { content: @fa-var-podcast; }
+.@{fa-css-prefix}-window-maximize:before { content: @fa-var-window-maximize; }
+.@{fa-css-prefix}-window-minimize:before { content: @fa-var-window-minimize; }
+.@{fa-css-prefix}-window-restore:before { content: @fa-var-window-restore; }
+.@{fa-css-prefix}-times-rectangle:before,
+.@{fa-css-prefix}-window-close:before { content: @fa-var-window-close; }
+.@{fa-css-prefix}-times-rectangle-o:before,
+.@{fa-css-prefix}-window-close-o:before { content: @fa-var-window-close-o; }
+.@{fa-css-prefix}-bandcamp:before { content: @fa-var-bandcamp; }
+.@{fa-css-prefix}-grav:before { content: @fa-var-grav; }
+.@{fa-css-prefix}-etsy:before { content: @fa-var-etsy; }
+.@{fa-css-prefix}-imdb:before { content: @fa-var-imdb; }
+.@{fa-css-prefix}-ravelry:before { content: @fa-var-ravelry; }
+.@{fa-css-prefix}-eercast:before { content: @fa-var-eercast; }
+.@{fa-css-prefix}-microchip:before { content: @fa-var-microchip; }
+.@{fa-css-prefix}-snowflake-o:before { content: @fa-var-snowflake-o; }
+.@{fa-css-prefix}-superpowers:before { content: @fa-var-superpowers; }
+.@{fa-css-prefix}-wpexplorer:before { content: @fa-var-wpexplorer; }
+.@{fa-css-prefix}-meetup:before { content: @fa-var-meetup; }

src/static/font-awesome/less/larger.less

@@ -0,0 +1,13 @@
+// Icon Sizes
+// -------------------------
+
+/* makes the font 33% larger relative to the icon container */
+.@{fa-css-prefix}-lg {
+  font-size: (4em / 3);
+  line-height: (3em / 4);
+  vertical-align: -15%;
+}
+.@{fa-css-prefix}-2x { font-size: 2em; }
+.@{fa-css-prefix}-3x { font-size: 3em; }
+.@{fa-css-prefix}-4x { font-size: 4em; }
+.@{fa-css-prefix}-5x { font-size: 5em; }

src/static/font-awesome/less/list.less

@@ -0,0 +1,19 @@
+// List Icons
+// -------------------------
+
+.@{fa-css-prefix}-ul {
+  padding-left: 0;
+  margin-left: @fa-li-width;
+  list-style-type: none;
+  > li { position: relative; }
+}
+.@{fa-css-prefix}-li {
+  position: absolute;
+  left: -@fa-li-width;
+  width: @fa-li-width;
+  top: (2em / 14);
+  text-align: center;
+  &.@{fa-css-prefix}-lg {
+    left: (-@fa-li-width + (4em / 14));
+  }
+}

src/static/font-awesome/less/mixins.less

@@ -0,0 +1,60 @@
+// Mixins
+// --------------------------
+
+.fa-icon() {
+  display: inline-block;
+  font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}
+
+.fa-icon-rotate(@degrees, @rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation})";
+  -webkit-transform: rotate(@degrees);
+      -ms-transform: rotate(@degrees);
+          transform: rotate(@degrees);
+}
+
+.fa-icon-flip(@horiz, @vert, @rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation}, mirror=1)";
+  -webkit-transform: scale(@horiz, @vert);
+      -ms-transform: scale(@horiz, @vert);
+          transform: scale(@horiz, @vert);
+}
+
+
+// Only display content to screen readers. A la Bootstrap 4.
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+.sr-only() {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+//
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+//
+// Credit: HTML5 Boilerplate
+
+.sr-only-focusable() {
+  &:active,
+  &:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
+}

src/static/font-awesome/less/path.less

@@ -0,0 +1,15 @@
+/* FONT PATH
+ * -------------------------- */
+
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
+    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
+  // src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  font-weight: normal;
+  font-style: normal;
+}

src/static/font-awesome/less/rotated-flipped.less

@@ -0,0 +1,20 @@
+// Rotated & Flipped Icons
+// -------------------------
+
+.@{fa-css-prefix}-rotate-90  { .fa-icon-rotate(90deg, 1);  }
+.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); }
+.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); }
+
+.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
+.@{fa-css-prefix}-flip-vertical   { .fa-icon-flip(1, -1, 2); }
+
+// Hook for IE8-9
+// -------------------------
+
+:root .@{fa-css-prefix}-rotate-90,
+:root .@{fa-css-prefix}-rotate-180,
+:root .@{fa-css-prefix}-rotate-270,
+:root .@{fa-css-prefix}-flip-horizontal,
+:root .@{fa-css-prefix}-flip-vertical {
+  filter: none;
+}

src/static/font-awesome/less/screen-reader.less

@@ -0,0 +1,5 @@
+// Screen Readers
+// -------------------------
+
+.sr-only { .sr-only(); }
+.sr-only-focusable { .sr-only-focusable(); }

src/static/font-awesome/less/stacked.less

@@ -0,0 +1,20 @@
+// Stacked Icons
+// -------------------------
+
+.@{fa-css-prefix}-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.@{fa-css-prefix}-stack-1x { line-height: inherit; }
+.@{fa-css-prefix}-stack-2x { font-size: 2em; }
+.@{fa-css-prefix}-inverse { color: @fa-inverse; }

src/static/font-awesome/less/variables.less

@@ -0,0 +1,800 @@
+// Variables
+// --------------------------
+
+@fa-font-path:        "../fonts";
+@fa-font-size-base:   14px;
+@fa-line-height-base: 1;
+//@fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts"; // for referencing Bootstrap CDN font files directly
+@fa-css-prefix:       fa;
+@fa-version:          "4.7.0";
+@fa-border-color:     #eee;
+@fa-inverse:          #fff;
+@fa-li-width:         (30em / 14);
+
+@fa-var-500px: "\f26e";
+@fa-var-address-book: "\f2b9";
+@fa-var-address-book-o: "\f2ba";
+@fa-var-address-card: "\f2bb";
+@fa-var-address-card-o: "\f2bc";
+@fa-var-adjust: "\f042";
+@fa-var-adn: "\f170";
+@fa-var-align-center: "\f037";
+@fa-var-align-justify: "\f039";
+@fa-var-align-left: "\f036";
+@fa-var-align-right: "\f038";
+@fa-var-amazon: "\f270";
+@fa-var-ambulance: "\f0f9";
+@fa-var-american-sign-language-interpreting: "\f2a3";
+@fa-var-anchor: "\f13d";
+@fa-var-android: "\f17b";
+@fa-var-angellist: "\f209";
+@fa-var-angle-double-down: "\f103";
+@fa-var-angle-double-left: "\f100";
+@fa-var-angle-double-right: "\f101";
+@fa-var-angle-double-up: "\f102";
+@fa-var-angle-down: "\f107";
+@fa-var-angle-left: "\f104";
+@fa-var-angle-right: "\f105";
+@fa-var-angle-up: "\f106";
+@fa-var-apple: "\f179";
+@fa-var-archive: "\f187";
+@fa-var-area-chart: "\f1fe";
+@fa-var-arrow-circle-down: "\f0ab";
+@fa-var-arrow-circle-left: "\f0a8";
+@fa-var-arrow-circle-o-down: "\f01a";
+@fa-var-arrow-circle-o-left: "\f190";
+@fa-var-arrow-circle-o-right: "\f18e";
+@fa-var-arrow-circle-o-up: "\f01b";
+@fa-var-arrow-circle-right: "\f0a9";
+@fa-var-arrow-circle-up: "\f0aa";
+@fa-var-arrow-down: "\f063";
+@fa-var-arrow-left: "\f060";
+@fa-var-arrow-right: "\f061";
+@fa-var-arrow-up: "\f062";
+@fa-var-arrows: "\f047";
+@fa-var-arrows-alt: "\f0b2";
+@fa-var-arrows-h: "\f07e";
+@fa-var-arrows-v: "\f07d";
+@fa-var-asl-interpreting: "\f2a3";
+@fa-var-assistive-listening-systems: "\f2a2";
+@fa-var-asterisk: "\f069";
+@fa-var-at: "\f1fa";
+@fa-var-audio-description: "\f29e";
+@fa-var-automobile: "\f1b9";
+@fa-var-backward: "\f04a";
+@fa-var-balance-scale: "\f24e";
+@fa-var-ban: "\f05e";
+@fa-var-bandcamp: "\f2d5";
+@fa-var-bank: "\f19c";
+@fa-var-bar-chart: "\f080";
+@fa-var-bar-chart-o: "\f080";
+@fa-var-barcode: "\f02a";
+@fa-var-bars: "\f0c9";
+@fa-var-bath: "\f2cd";
+@fa-var-bathtub: "\f2cd";
+@fa-var-battery: "\f240";
+@fa-var-battery-0: "\f244";
+@fa-var-battery-1: "\f243";
+@fa-var-battery-2: "\f242";
+@fa-var-battery-3: "\f241";
+@fa-var-battery-4: "\f240";
+@fa-var-battery-empty: "\f244";
+@fa-var-battery-full: "\f240";
+@fa-var-battery-half: "\f242";
+@fa-var-battery-quarter: "\f243";
+@fa-var-battery-three-quarters: "\f241";
+@fa-var-bed: "\f236";
+@fa-var-beer: "\f0fc";
+@fa-var-behance: "\f1b4";
+@fa-var-behance-square: "\f1b5";
+@fa-var-bell: "\f0f3";
+@fa-var-bell-o: "\f0a2";
+@fa-var-bell-slash: "\f1f6";
+@fa-var-bell-slash-o: "\f1f7";
+@fa-var-bicycle: "\f206";
+@fa-var-binoculars: "\f1e5";
+@fa-var-birthday-cake: "\f1fd";
+@fa-var-bitbucket: "\f171";
+@fa-var-bitbucket-square: "\f172";
+@fa-var-bitcoin: "\f15a";
+@fa-var-black-tie: "\f27e";
+@fa-var-blind: "\f29d";
+@fa-var-bluetooth: "\f293";
+@fa-var-bluetooth-b: "\f294";
+@fa-var-bold: "\f032";
+@fa-var-bolt: "\f0e7";
+@fa-var-bomb: "\f1e2";
+@fa-var-book: "\f02d";
+@fa-var-bookmark: "\f02e";
+@fa-var-bookmark-o: "\f097";
+@fa-var-braille: "\f2a1";
+@fa-var-briefcase: "\f0b1";
+@fa-var-btc: "\f15a";
+@fa-var-bug: "\f188";
+@fa-var-building: "\f1ad";
+@fa-var-building-o: "\f0f7";
+@fa-var-bullhorn: "\f0a1";
+@fa-var-bullseye: "\f140";
+@fa-var-bus: "\f207";
+@fa-var-buysellads: "\f20d";
+@fa-var-cab: "\f1ba";
+@fa-var-calculator: "\f1ec";
+@fa-var-calendar: "\f073";
+@fa-var-calendar-check-o: "\f274";
+@fa-var-calendar-minus-o: "\f272";
+@fa-var-calendar-o: "\f133";
+@fa-var-calendar-plus-o: "\f271";
+@fa-var-calendar-times-o: "\f273";
+@fa-var-camera: "\f030";
+@fa-var-camera-retro: "\f083";
+@fa-var-car: "\f1b9";
+@fa-var-caret-down: "\f0d7";
+@fa-var-caret-left: "\f0d9";
+@fa-var-caret-right: "\f0da";
+@fa-var-caret-square-o-down: "\f150";
+@fa-var-caret-square-o-left: "\f191";
+@fa-var-caret-square-o-right: "\f152";
+@fa-var-caret-square-o-up: "\f151";
+@fa-var-caret-up: "\f0d8";
+@fa-var-cart-arrow-down: "\f218";
+@fa-var-cart-plus: "\f217";
+@fa-var-cc: "\f20a";
+@fa-var-cc-amex: "\f1f3";
+@fa-var-cc-diners-club: "\f24c";
+@fa-var-cc-discover: "\f1f2";
+@fa-var-cc-jcb: "\f24b";
+@fa-var-cc-mastercard: "\f1f1";
+@fa-var-cc-paypal: "\f1f4";
+@fa-var-cc-stripe: "\f1f5";
+@fa-var-cc-visa: "\f1f0";
+@fa-var-certificate: "\f0a3";
+@fa-var-chain: "\f0c1";
+@fa-var-chain-broken: "\f127";
+@fa-var-check: "\f00c";
+@fa-var-check-circle: "\f058";
+@fa-var-check-circle-o: "\f05d";
+@fa-var-check-square: "\f14a";
+@fa-var-check-square-o: "\f046";
+@fa-var-chevron-circle-down: "\f13a";
+@fa-var-chevron-circle-left: "\f137";
+@fa-var-chevron-circle-right: "\f138";
+@fa-var-chevron-circle-up: "\f139";
+@fa-var-chevron-down: "\f078";
+@fa-var-chevron-left: "\f053";
+@fa-var-chevron-right: "\f054";
+@fa-var-chevron-up: "\f077";
+@fa-var-child: "\f1ae";
+@fa-var-chrome: "\f268";
+@fa-var-circle: "\f111";
+@fa-var-circle-o: "\f10c";
+@fa-var-circle-o-notch: "\f1ce";
+@fa-var-circle-thin: "\f1db";
+@fa-var-clipboard: "\f0ea";
+@fa-var-clock-o: "\f017";
+@fa-var-clone: "\f24d";
+@fa-var-close: "\f00d";
+@fa-var-cloud: "\f0c2";
+@fa-var-cloud-download: "\f0ed";
+@fa-var-cloud-upload: "\f0ee";
+@fa-var-cny: "\f157";
+@fa-var-code: "\f121";
+@fa-var-code-fork: "\f126";
+@fa-var-codepen: "\f1cb";
+@fa-var-codiepie: "\f284";
+@fa-var-coffee: "\f0f4";
+@fa-var-cog: "\f013";
+@fa-var-cogs: "\f085";
+@fa-var-columns: "\f0db";
+@fa-var-comment: "\f075";
+@fa-var-comment-o: "\f0e5";
+@fa-var-commenting: "\f27a";
+@fa-var-commenting-o: "\f27b";
+@fa-var-comments: "\f086";
+@fa-var-comments-o: "\f0e6";
+@fa-var-compass: "\f14e";
+@fa-var-compress: "\f066";
+@fa-var-connectdevelop: "\f20e";
+@fa-var-contao: "\f26d";
+@fa-var-copy: "\f0c5";
+@fa-var-copyright: "\f1f9";
+@fa-var-creative-commons: "\f25e";
+@fa-var-credit-card: "\f09d";
+@fa-var-credit-card-alt: "\f283";
+@fa-var-crop: "\f125";
+@fa-var-crosshairs: "\f05b";
+@fa-var-css3: "\f13c";
+@fa-var-cube: "\f1b2";
+@fa-var-cubes: "\f1b3";
+@fa-var-cut: "\f0c4";
+@fa-var-cutlery: "\f0f5";
+@fa-var-dashboard: "\f0e4";
+@fa-var-dashcube: "\f210";
+@fa-var-database: "\f1c0";
+@fa-var-deaf: "\f2a4";
+@fa-var-deafness: "\f2a4";
+@fa-var-dedent: "\f03b";
+@fa-var-delicious: "\f1a5";
+@fa-var-desktop: "\f108";
+@fa-var-deviantart: "\f1bd";
+@fa-var-diamond: "\f219";
+@fa-var-digg: "\f1a6";
+@fa-var-dollar: "\f155";
+@fa-var-dot-circle-o: "\f192";
+@fa-var-download: "\f019";
+@fa-var-dribbble: "\f17d";
+@fa-var-drivers-license: "\f2c2";
+@fa-var-drivers-license-o: "\f2c3";
+@fa-var-dropbox: "\f16b";
+@fa-var-drupal: "\f1a9";
+@fa-var-edge: "\f282";
+@fa-var-edit: "\f044";
+@fa-var-eercast: "\f2da";
+@fa-var-eject: "\f052";
+@fa-var-ellipsis-h: "\f141";
+@fa-var-ellipsis-v: "\f142";
+@fa-var-empire: "\f1d1";
+@fa-var-envelope: "\f0e0";
+@fa-var-envelope-o: "\f003";
+@fa-var-envelope-open: "\f2b6";
+@fa-var-envelope-open-o: "\f2b7";
+@fa-var-envelope-square: "\f199";
+@fa-var-envira: "\f299";
+@fa-var-eraser: "\f12d";
+@fa-var-etsy: "\f2d7";
+@fa-var-eur: "\f153";
+@fa-var-euro: "\f153";
+@fa-var-exchange: "\f0ec";
+@fa-var-exclamation: "\f12a";
+@fa-var-exclamation-circle: "\f06a";
+@fa-var-exclamation-triangle: "\f071";
+@fa-var-expand: "\f065";
+@fa-var-expeditedssl: "\f23e";
+@fa-var-external-link: "\f08e";
+@fa-var-external-link-square: "\f14c";
+@fa-var-eye: "\f06e";
+@fa-var-eye-slash: "\f070";
+@fa-var-eyedropper: "\f1fb";
+@fa-var-fa: "\f2b4";
+@fa-var-facebook: "\f09a";
+@fa-var-facebook-f: "\f09a";
+@fa-var-facebook-official: "\f230";
+@fa-var-facebook-square: "\f082";
+@fa-var-fast-backward: "\f049";
+@fa-var-fast-forward: "\f050";
+@fa-var-fax: "\f1ac";
+@fa-var-feed: "\f09e";
+@fa-var-female: "\f182";
+@fa-var-fighter-jet: "\f0fb";
+@fa-var-file: "\f15b";
+@fa-var-file-archive-o: "\f1c6";
+@fa-var-file-audio-o: "\f1c7";
+@fa-var-file-code-o: "\f1c9";
+@fa-var-file-excel-o: "\f1c3";
+@fa-var-file-image-o: "\f1c5";
+@fa-var-file-movie-o: "\f1c8";
+@fa-var-file-o: "\f016";
+@fa-var-file-pdf-o: "\f1c1";
+@fa-var-file-photo-o: "\f1c5";
+@fa-var-file-picture-o: "\f1c5";
+@fa-var-file-powerpoint-o: "\f1c4";
+@fa-var-file-sound-o: "\f1c7";
+@fa-var-file-text: "\f15c";
+@fa-var-file-text-o: "\f0f6";
+@fa-var-file-video-o: "\f1c8";
+@fa-var-file-word-o: "\f1c2";
+@fa-var-file-zip-o: "\f1c6";
+@fa-var-files-o: "\f0c5";
+@fa-var-film: "\f008";
+@fa-var-filter: "\f0b0";
+@fa-var-fire: "\f06d";
+@fa-var-fire-extinguisher: "\f134";
+@fa-var-firefox: "\f269";
+@fa-var-first-order: "\f2b0";
+@fa-var-flag: "\f024";
+@fa-var-flag-checkered: "\f11e";
+@fa-var-flag-o: "\f11d";
+@fa-var-flash: "\f0e7";
+@fa-var-flask: "\f0c3";
+@fa-var-flickr: "\f16e";
+@fa-var-floppy-o: "\f0c7";
+@fa-var-folder: "\f07b";
+@fa-var-folder-o: "\f114";
+@fa-var-folder-open: "\f07c";
+@fa-var-folder-open-o: "\f115";
+@fa-var-font: "\f031";
+@fa-var-font-awesome: "\f2b4";
+@fa-var-fonticons: "\f280";
+@fa-var-fort-awesome: "\f286";
+@fa-var-forumbee: "\f211";
+@fa-var-forward: "\f04e";
+@fa-var-foursquare: "\f180";
+@fa-var-free-code-camp: "\f2c5";
+@fa-var-frown-o: "\f119";
+@fa-var-futbol-o: "\f1e3";
+@fa-var-gamepad: "\f11b";
+@fa-var-gavel: "\f0e3";
+@fa-var-gbp: "\f154";
+@fa-var-ge: "\f1d1";
+@fa-var-gear: "\f013";
+@fa-var-gears: "\f085";
+@fa-var-genderless: "\f22d";
+@fa-var-get-pocket: "\f265";
+@fa-var-gg: "\f260";
+@fa-var-gg-circle: "\f261";
+@fa-var-gift: "\f06b";
+@fa-var-git: "\f1d3";
+@fa-var-git-square: "\f1d2";
+@fa-var-github: "\f09b";
+@fa-var-github-alt: "\f113";
+@fa-var-github-square: "\f092";
+@fa-var-gitlab: "\f296";
+@fa-var-gittip: "\f184";
+@fa-var-glass: "\f000";
+@fa-var-glide: "\f2a5";
+@fa-var-glide-g: "\f2a6";
+@fa-var-globe: "\f0ac";
+@fa-var-google: "\f1a0";
+@fa-var-google-plus: "\f0d5";
+@fa-var-google-plus-circle: "\f2b3";
+@fa-var-google-plus-official: "\f2b3";
+@fa-var-google-plus-square: "\f0d4";
+@fa-var-google-wallet: "\f1ee";
+@fa-var-graduation-cap: "\f19d";
+@fa-var-gratipay: "\f184";
+@fa-var-grav: "\f2d6";
+@fa-var-group: "\f0c0";
+@fa-var-h-square: "\f0fd";
+@fa-var-hacker-news: "\f1d4";
+@fa-var-hand-grab-o: "\f255";
+@fa-var-hand-lizard-o: "\f258";
+@fa-var-hand-o-down: "\f0a7";
+@fa-var-hand-o-left: "\f0a5";
+@fa-var-hand-o-right: "\f0a4";
+@fa-var-hand-o-up: "\f0a6";
+@fa-var-hand-paper-o: "\f256";
+@fa-var-hand-peace-o: "\f25b";
+@fa-var-hand-pointer-o: "\f25a";
+@fa-var-hand-rock-o: "\f255";
+@fa-var-hand-scissors-o: "\f257";
+@fa-var-hand-spock-o: "\f259";
+@fa-var-hand-stop-o: "\f256";
+@fa-var-handshake-o: "\f2b5";
+@fa-var-hard-of-hearing: "\f2a4";
+@fa-var-hashtag: "\f292";
+@fa-var-hdd-o: "\f0a0";
+@fa-var-header: "\f1dc";
+@fa-var-headphones: "\f025";
+@fa-var-heart: "\f004";
+@fa-var-heart-o: "\f08a";
+@fa-var-heartbeat: "\f21e";
+@fa-var-history: "\f1da";
+@fa-var-home: "\f015";
+@fa-var-hospital-o: "\f0f8";
+@fa-var-hotel: "\f236";
+@fa-var-hourglass: "\f254";
+@fa-var-hourglass-1: "\f251";
+@fa-var-hourglass-2: "\f252";
+@fa-var-hourglass-3: "\f253";
+@fa-var-hourglass-end: "\f253";
+@fa-var-hourglass-half: "\f252";
+@fa-var-hourglass-o: "\f250";
+@fa-var-hourglass-start: "\f251";
+@fa-var-houzz: "\f27c";
+@fa-var-html5: "\f13b";
+@fa-var-i-cursor: "\f246";
+@fa-var-id-badge: "\f2c1";
+@fa-var-id-card: "\f2c2";
+@fa-var-id-card-o: "\f2c3";
+@fa-var-ils: "\f20b";
+@fa-var-image: "\f03e";
+@fa-var-imdb: "\f2d8";
+@fa-var-inbox: "\f01c";
+@fa-var-indent: "\f03c";
+@fa-var-industry: "\f275";
+@fa-var-info: "\f129";
+@fa-var-info-circle: "\f05a";
+@fa-var-inr: "\f156";
+@fa-var-instagram: "\f16d";
+@fa-var-institution: "\f19c";
+@fa-var-internet-explorer: "\f26b";
+@fa-var-intersex: "\f224";
+@fa-var-ioxhost: "\f208";
+@fa-var-italic: "\f033";
+@fa-var-joomla: "\f1aa";
+@fa-var-jpy: "\f157";
+@fa-var-jsfiddle: "\f1cc";
+@fa-var-key: "\f084";
+@fa-var-keyboard-o: "\f11c";
+@fa-var-krw: "\f159";
+@fa-var-language: "\f1ab";
+@fa-var-laptop: "\f109";
+@fa-var-lastfm: "\f202";
+@fa-var-lastfm-square: "\f203";
+@fa-var-leaf: "\f06c";
+@fa-var-leanpub: "\f212";
+@fa-var-legal: "\f0e3";
+@fa-var-lemon-o: "\f094";
+@fa-var-level-down: "\f149";
+@fa-var-level-up: "\f148";
+@fa-var-life-bouy: "\f1cd";
+@fa-var-life-buoy: "\f1cd";
+@fa-var-life-ring: "\f1cd";
+@fa-var-life-saver: "\f1cd";
+@fa-var-lightbulb-o: "\f0eb";
+@fa-var-line-chart: "\f201";
+@fa-var-link: "\f0c1";
+@fa-var-linkedin: "\f0e1";
+@fa-var-linkedin-square: "\f08c";
+@fa-var-linode: "\f2b8";
+@fa-var-linux: "\f17c";
+@fa-var-list: "\f03a";
+@fa-var-list-alt: "\f022";
+@fa-var-list-ol: "\f0cb";
+@fa-var-list-ul: "\f0ca";
+@fa-var-location-arrow: "\f124";
+@fa-var-lock: "\f023";
+@fa-var-long-arrow-down: "\f175";
+@fa-var-long-arrow-left: "\f177";
+@fa-var-long-arrow-right: "\f178";
+@fa-var-long-arrow-up: "\f176";
+@fa-var-low-vision: "\f2a8";
+@fa-var-magic: "\f0d0";
+@fa-var-magnet: "\f076";
+@fa-var-mail-forward: "\f064";
+@fa-var-mail-reply: "\f112";
+@fa-var-mail-reply-all: "\f122";
+@fa-var-male: "\f183";
+@fa-var-map: "\f279";
+@fa-var-map-marker: "\f041";
+@fa-var-map-o: "\f278";
+@fa-var-map-pin: "\f276";
+@fa-var-map-signs: "\f277";
+@fa-var-mars: "\f222";
+@fa-var-mars-double: "\f227";
+@fa-var-mars-stroke: "\f229";
+@fa-var-mars-stroke-h: "\f22b";
+@fa-var-mars-stroke-v: "\f22a";
+@fa-var-maxcdn: "\f136";
+@fa-var-meanpath: "\f20c";
+@fa-var-medium: "\f23a";
+@fa-var-medkit: "\f0fa";
+@fa-var-meetup: "\f2e0";
+@fa-var-meh-o: "\f11a";
+@fa-var-mercury: "\f223";
+@fa-var-microchip: "\f2db";
+@fa-var-microphone: "\f130";
+@fa-var-microphone-slash: "\f131";
+@fa-var-minus: "\f068";
+@fa-var-minus-circle: "\f056";
+@fa-var-minus-square: "\f146";
+@fa-var-minus-square-o: "\f147";
+@fa-var-mixcloud: "\f289";
+@fa-var-mobile: "\f10b";
+@fa-var-mobile-phone: "\f10b";
+@fa-var-modx: "\f285";
+@fa-var-money: "\f0d6";
+@fa-var-moon-o: "\f186";
+@fa-var-mortar-board: "\f19d";
+@fa-var-motorcycle: "\f21c";
+@fa-var-mouse-pointer: "\f245";
+@fa-var-music: "\f001";
+@fa-var-navicon: "\f0c9";
+@fa-var-neuter: "\f22c";
+@fa-var-newspaper-o: "\f1ea";
+@fa-var-object-group: "\f247";
+@fa-var-object-ungroup: "\f248";
+@fa-var-odnoklassniki: "\f263";
+@fa-var-odnoklassniki-square: "\f264";
+@fa-var-opencart: "\f23d";
+@fa-var-openid: "\f19b";
+@fa-var-opera: "\f26a";
+@fa-var-optin-monster: "\f23c";
+@fa-var-outdent: "\f03b";
+@fa-var-pagelines: "\f18c";
+@fa-var-paint-brush: "\f1fc";
+@fa-var-paper-plane: "\f1d8";
+@fa-var-paper-plane-o: "\f1d9";
+@fa-var-paperclip: "\f0c6";
+@fa-var-paragraph: "\f1dd";
+@fa-var-paste: "\f0ea";
+@fa-var-pause: "\f04c";
+@fa-var-pause-circle: "\f28b";
+@fa-var-pause-circle-o: "\f28c";
+@fa-var-paw: "\f1b0";
+@fa-var-paypal: "\f1ed";
+@fa-var-pencil: "\f040";
+@fa-var-pencil-square: "\f14b";
+@fa-var-pencil-square-o: "\f044";
+@fa-var-percent: "\f295";
+@fa-var-phone: "\f095";
+@fa-var-phone-square: "\f098";
+@fa-var-photo: "\f03e";
+@fa-var-picture-o: "\f03e";
+@fa-var-pie-chart: "\f200";
+@fa-var-pied-piper: "\f2ae";
+@fa-var-pied-piper-alt: "\f1a8";
+@fa-var-pied-piper-pp: "\f1a7";
+@fa-var-pinterest: "\f0d2";
+@fa-var-pinterest-p: "\f231";
+@fa-var-pinterest-square: "\f0d3";
+@fa-var-plane: "\f072";
+@fa-var-play: "\f04b";
+@fa-var-play-circle: "\f144";
+@fa-var-play-circle-o: "\f01d";
+@fa-var-plug: "\f1e6";
+@fa-var-plus: "\f067";
+@fa-var-plus-circle: "\f055";
+@fa-var-plus-square: "\f0fe";
+@fa-var-plus-square-o: "\f196";
+@fa-var-podcast: "\f2ce";
+@fa-var-power-off: "\f011";
+@fa-var-print: "\f02f";
+@fa-var-product-hunt: "\f288";
+@fa-var-puzzle-piece: "\f12e";
+@fa-var-qq: "\f1d6";
+@fa-var-qrcode: "\f029";
+@fa-var-question: "\f128";
+@fa-var-question-circle: "\f059";
+@fa-var-question-circle-o: "\f29c";
+@fa-var-quora: "\f2c4";
+@fa-var-quote-left: "\f10d";
+@fa-var-quote-right: "\f10e";
+@fa-var-ra: "\f1d0";
+@fa-var-random: "\f074";
+@fa-var-ravelry: "\f2d9";
+@fa-var-rebel: "\f1d0";
+@fa-var-recycle: "\f1b8";
+@fa-var-reddit: "\f1a1";
+@fa-var-reddit-alien: "\f281";
+@fa-var-reddit-square: "\f1a2";
+@fa-var-refresh: "\f021";
+@fa-var-registered: "\f25d";
+@fa-var-remove: "\f00d";
+@fa-var-renren: "\f18b";
+@fa-var-reorder: "\f0c9";
+@fa-var-repeat: "\f01e";
+@fa-var-reply: "\f112";
+@fa-var-reply-all: "\f122";
+@fa-var-resistance: "\f1d0";
+@fa-var-retweet: "\f079";
+@fa-var-rmb: "\f157";
+@fa-var-road: "\f018";
+@fa-var-rocket: "\f135";
+@fa-var-rotate-left: "\f0e2";
+@fa-var-rotate-right: "\f01e";
+@fa-var-rouble: "\f158";
+@fa-var-rss: "\f09e";
+@fa-var-rss-square: "\f143";
+@fa-var-rub: "\f158";
+@fa-var-ruble: "\f158";
+@fa-var-rupee: "\f156";
+@fa-var-s15: "\f2cd";
+@fa-var-safari: "\f267";
+@fa-var-save: "\f0c7";
+@fa-var-scissors: "\f0c4";
+@fa-var-scribd: "\f28a";
+@fa-var-search: "\f002";
+@fa-var-search-minus: "\f010";
+@fa-var-search-plus: "\f00e";
+@fa-var-sellsy: "\f213";
+@fa-var-send: "\f1d8";
+@fa-var-send-o: "\f1d9";
+@fa-var-server: "\f233";
+@fa-var-share: "\f064";
+@fa-var-share-alt: "\f1e0";
+@fa-var-share-alt-square: "\f1e1";
+@fa-var-share-square: "\f14d";
+@fa-var-share-square-o: "\f045";
+@fa-var-shekel: "\f20b";
+@fa-var-sheqel: "\f20b";
+@fa-var-shield: "\f132";
+@fa-var-ship: "\f21a";
+@fa-var-shirtsinbulk: "\f214";
+@fa-var-shopping-bag: "\f290";
+@fa-var-shopping-basket: "\f291";
+@fa-var-shopping-cart: "\f07a";
+@fa-var-shower: "\f2cc";
+@fa-var-sign-in: "\f090";
+@fa-var-sign-language: "\f2a7";
+@fa-var-sign-out: "\f08b";
+@fa-var-signal: "\f012";
+@fa-var-signing: "\f2a7";
+@fa-var-simplybuilt: "\f215";
+@fa-var-sitemap: "\f0e8";
+@fa-var-skyatlas: "\f216";
+@fa-var-skype: "\f17e";
+@fa-var-slack: "\f198";
+@fa-var-sliders: "\f1de";
+@fa-var-slideshare: "\f1e7";
+@fa-var-smile-o: "\f118";
+@fa-var-snapchat: "\f2ab";
+@fa-var-snapchat-ghost: "\f2ac";
+@fa-var-snapchat-square: "\f2ad";
+@fa-var-snowflake-o: "\f2dc";
+@fa-var-soccer-ball-o: "\f1e3";
+@fa-var-sort: "\f0dc";
+@fa-var-sort-alpha-asc: "\f15d";
+@fa-var-sort-alpha-desc: "\f15e";
+@fa-var-sort-amount-asc: "\f160";
+@fa-var-sort-amount-desc: "\f161";
+@fa-var-sort-asc: "\f0de";
+@fa-var-sort-desc: "\f0dd";
+@fa-var-sort-down: "\f0dd";
+@fa-var-sort-numeric-asc: "\f162";
+@fa-var-sort-numeric-desc: "\f163";
+@fa-var-sort-up: "\f0de";
+@fa-var-soundcloud: "\f1be";
+@fa-var-space-shuttle: "\f197";
+@fa-var-spinner: "\f110";
+@fa-var-spoon: "\f1b1";
+@fa-var-spotify: "\f1bc";
+@fa-var-square: "\f0c8";
+@fa-var-square-o: "\f096";
+@fa-var-stack-exchange: "\f18d";
+@fa-var-stack-overflow: "\f16c";
+@fa-var-star: "\f005";
+@fa-var-star-half: "\f089";
+@fa-var-star-half-empty: "\f123";
+@fa-var-star-half-full: "\f123";
+@fa-var-star-half-o: "\f123";
+@fa-var-star-o: "\f006";
+@fa-var-steam: "\f1b6";
+@fa-var-steam-square: "\f1b7";
+@fa-var-step-backward: "\f048";
+@fa-var-step-forward: "\f051";
+@fa-var-stethoscope: "\f0f1";
+@fa-var-sticky-note: "\f249";
+@fa-var-sticky-note-o: "\f24a";
+@fa-var-stop: "\f04d";
+@fa-var-stop-circle: "\f28d";
+@fa-var-stop-circle-o: "\f28e";
+@fa-var-street-view: "\f21d";
+@fa-var-strikethrough: "\f0cc";
+@fa-var-stumbleupon: "\f1a4";
+@fa-var-stumbleupon-circle: "\f1a3";
+@fa-var-subscript: "\f12c";
+@fa-var-subway: "\f239";
+@fa-var-suitcase: "\f0f2";
+@fa-var-sun-o: "\f185";
+@fa-var-superpowers: "\f2dd";
+@fa-var-superscript: "\f12b";
+@fa-var-support: "\f1cd";
+@fa-var-table: "\f0ce";
+@fa-var-tablet: "\f10a";
+@fa-var-tachometer: "\f0e4";
+@fa-var-tag: "\f02b";
+@fa-var-tags: "\f02c";
+@fa-var-tasks: "\f0ae";
+@fa-var-taxi: "\f1ba";
+@fa-var-telegram: "\f2c6";
+@fa-var-television: "\f26c";
+@fa-var-tencent-weibo: "\f1d5";
+@fa-var-terminal: "\f120";
+@fa-var-text-height: "\f034";
+@fa-var-text-width: "\f035";
+@fa-var-th: "\f00a";
+@fa-var-th-large: "\f009";
+@fa-var-th-list: "\f00b";
+@fa-var-themeisle: "\f2b2";
+@fa-var-thermometer: "\f2c7";
+@fa-var-thermometer-0: "\f2cb";
+@fa-var-thermometer-1: "\f2ca";
+@fa-var-thermometer-2: "\f2c9";
+@fa-var-thermometer-3: "\f2c8";
+@fa-var-thermometer-4: "\f2c7";
+@fa-var-thermometer-empty: "\f2cb";
+@fa-var-thermometer-full: "\f2c7";
+@fa-var-thermometer-half: "\f2c9";
+@fa-var-thermometer-quarter: "\f2ca";
+@fa-var-thermometer-three-quarters: "\f2c8";
+@fa-var-thumb-tack: "\f08d";
+@fa-var-thumbs-down: "\f165";
+@fa-var-thumbs-o-down: "\f088";
+@fa-var-thumbs-o-up: "\f087";
+@fa-var-thumbs-up: "\f164";
+@fa-var-ticket: "\f145";
+@fa-var-times: "\f00d";
+@fa-var-times-circle: "\f057";
+@fa-var-times-circle-o: "\f05c";
+@fa-var-times-rectangle: "\f2d3";
+@fa-var-times-rectangle-o: "\f2d4";
+@fa-var-tint: "\f043";
+@fa-var-toggle-down: "\f150";
+@fa-var-toggle-left: "\f191";
+@fa-var-toggle-off: "\f204";
+@fa-var-toggle-on: "\f205";
+@fa-var-toggle-right: "\f152";
+@fa-var-toggle-up: "\f151";
+@fa-var-trademark: "\f25c";
+@fa-var-train: "\f238";
+@fa-var-transgender: "\f224";
+@fa-var-transgender-alt: "\f225";
+@fa-var-trash: "\f1f8";
+@fa-var-trash-o: "\f014";
+@fa-var-tree: "\f1bb";
+@fa-var-trello: "\f181";
+@fa-var-tripadvisor: "\f262";
+@fa-var-trophy: "\f091";
+@fa-var-truck: "\f0d1";
+@fa-var-try: "\f195";
+@fa-var-tty: "\f1e4";
+@fa-var-tumblr: "\f173";
+@fa-var-tumblr-square: "\f174";
+@fa-var-turkish-lira: "\f195";
+@fa-var-tv: "\f26c";
+@fa-var-twitch: "\f1e8";
+@fa-var-twitter: "\f099";
+@fa-var-twitter-square: "\f081";
+@fa-var-umbrella: "\f0e9";
+@fa-var-underline: "\f0cd";
+@fa-var-undo: "\f0e2";
+@fa-var-universal-access: "\f29a";
+@fa-var-university: "\f19c";
+@fa-var-unlink: "\f127";
+@fa-var-unlock: "\f09c";
+@fa-var-unlock-alt: "\f13e";
+@fa-var-unsorted: "\f0dc";
+@fa-var-upload: "\f093";
+@fa-var-usb: "\f287";
+@fa-var-usd: "\f155";
+@fa-var-user: "\f007";
+@fa-var-user-circle: "\f2bd";
+@fa-var-user-circle-o: "\f2be";
+@fa-var-user-md: "\f0f0";
+@fa-var-user-o: "\f2c0";
+@fa-var-user-plus: "\f234";
+@fa-var-user-secret: "\f21b";
+@fa-var-user-times: "\f235";
+@fa-var-users: "\f0c0";
+@fa-var-vcard: "\f2bb";
+@fa-var-vcard-o: "\f2bc";
+@fa-var-venus: "\f221";
+@fa-var-venus-double: "\f226";
+@fa-var-venus-mars: "\f228";
+@fa-var-viacoin: "\f237";
+@fa-var-viadeo: "\f2a9";
+@fa-var-viadeo-square: "\f2aa";
+@fa-var-video-camera: "\f03d";
+@fa-var-vimeo: "\f27d";
+@fa-var-vimeo-square: "\f194";
+@fa-var-vine: "\f1ca";
+@fa-var-vk: "\f189";
+@fa-var-volume-control-phone: "\f2a0";
+@fa-var-volume-down: "\f027";
+@fa-var-volume-off: "\f026";
+@fa-var-volume-up: "\f028";
+@fa-var-warning: "\f071";
+@fa-var-wechat: "\f1d7";
+@fa-var-weibo: "\f18a";
+@fa-var-weixin: "\f1d7";
+@fa-var-whatsapp: "\f232";
+@fa-var-wheelchair: "\f193";
+@fa-var-wheelchair-alt: "\f29b";
+@fa-var-wifi: "\f1eb";
+@fa-var-wikipedia-w: "\f266";
+@fa-var-window-close: "\f2d3";
+@fa-var-window-close-o: "\f2d4";
+@fa-var-window-maximize: "\f2d0";
+@fa-var-window-minimize: "\f2d1";
+@fa-var-window-restore: "\f2d2";
+@fa-var-windows: "\f17a";
+@fa-var-won: "\f159";
+@fa-var-wordpress: "\f19a";
+@fa-var-wpbeginner: "\f297";
+@fa-var-wpexplorer: "\f2de";
+@fa-var-wpforms: "\f298";
+@fa-var-wrench: "\f0ad";
+@fa-var-xing: "\f168";
+@fa-var-xing-square: "\f169";
+@fa-var-y-combinator: "\f23b";
+@fa-var-y-combinator-square: "\f1d4";
+@fa-var-yahoo: "\f19e";
+@fa-var-yc: "\f23b";
+@fa-var-yc-square: "\f1d4";
+@fa-var-yelp: "\f1e9";
+@fa-var-yen: "\f157";
+@fa-var-yoast: "\f2b1";
+@fa-var-youtube: "\f167";
+@fa-var-youtube-play: "\f16a";
+@fa-var-youtube-square: "\f166";
+

src/static/font-awesome/scss/_animated.scss

@@ -0,0 +1,34 @@
+// Spinning Icons
+// --------------------------
+
+.#{$fa-css-prefix}-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+          animation: fa-spin 2s infinite linear;
+}
+
+.#{$fa-css-prefix}-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8);
+}
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}

src/static/font-awesome/scss/_bordered-pulled.scss

@@ -0,0 +1,25 @@
+// Bordered & Pulled
+// -------------------------
+
+.#{$fa-css-prefix}-border {
+  padding: .2em .25em .15em;
+  border: solid .08em $fa-border-color;
+  border-radius: .1em;
+}
+
+.#{$fa-css-prefix}-pull-left { float: left; }
+.#{$fa-css-prefix}-pull-right { float: right; }
+
+.#{$fa-css-prefix} {
+  &.#{$fa-css-prefix}-pull-left { margin-right: .3em; }
+  &.#{$fa-css-prefix}-pull-right { margin-left: .3em; }
+}
+
+/* Deprecated as of 4.4.0 */
+.pull-right { float: right; }
+.pull-left { float: left; }
+
+.#{$fa-css-prefix} {
+  &.pull-left { margin-right: .3em; }
+  &.pull-right { margin-left: .3em; }
+}