DedeBIZ
/
DedeV6
Obserwuj 2
Polub 0
Forkuj 0
Kod Oczekujące zmiany 0 Wydania 31 Aktywność
Przeglądaj źródła

调整

tags/6.1.7
xushubieli 3 lat temu
rodzic
f7c7e93df5
commit
a6828cd598
18 zmienionych plików z 39 dodań i 39 usunięć
Widok podzielony
Opcje porównania
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania
  1. +1
    -1
      src/admin/css/albumupload.css
  2. +1
    -1
      src/admin/css/frame.css
  3. +2
    -2
      src/admin/css/indexbody.css
  4. +4
    -4
      src/admin/css/menuold.css
  5. +2
    -2
      src/admin/index_menu_module.php
  6. +1
    -1
      src/admin/js/album.js
  7. +1
    -1
      src/admin/js/context_menu.js
  8. +1
    -1
      src/admin/js/contextmenu.css
  9. +1
    -1
      src/admin/js/dialog.js
  10. +5
    -5
      src/admin/js/main.js
  11. +2
    -2
      src/admin/js/mode/htmlmixed/htmlmixed.js
  12. +2
    -2
      src/admin/js/mode/php/php.js
  13. +2
    -2
      src/admin/testenv.php
  14. +10
    -10
      src/static/web/css/admin.css
  15. +1
    -1
      src/theme/plus/download_links_templet.htm
  16. +1
    -1
      src/theme/plus/qrcode.htm
  17. +1
    -1
      src/theme/templets/advancedsearch.htm
  18. +1
    -1
      src/theme/templets/singlepage.htm

+ 1
- 1
src/admin/css/albumupload.css Wyświetl plik

@@ -1 +1 @@
div.flash{margin:10px 5px;width:375px;border-color:#D9E4FF;border-radius:.2rem}#btnSubmit{margin:0 0 0 155px}.progressWrapper{width:357px;overflow:hidden}.progressContainer{padding:4px;margin:5px;background-color:#f8f8f8;border:solid 1px #E8E8E8;overflow:hidden}.message{margin:10px 0;padding:10px 20px;background-color:#FFC;border:solid 1px #FD9;overflow:hidden}.red{background-color:#FFEBEB;border:solid 1px #B50000}.green{background-color:#EBFFEB;border:solid 1px #DDF0DD}.blue{background-color:#F0F5FF;border:solid 1px #CEE2F2}.progressName{width:320px;height:14px;text-align:left;white-space:nowrap;overflow:hidden}.progressBarInProgress,.progressBarComplete,.progressBarError{margin-top:2px;width:0;height:2px;font-size:0;background-color:blue}.progressBarComplete{width:100%;background-color:green;visibility:hidden}.progressBarError{width:100%;background-color:#dc3545;visibility:hidden}.progressBarStatus{margin-top:2px;width:340px;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:240px;height:180px;margin-right:10px;margin-bottom:10px;border:1px dashed #eee;background:#f8f8f8;text-align:center;padding:10px}.albEdit{height:180px}.picinfo{height:30px;line-height:30px;margin:10px 0}.thumbnails img,.thumbnailsEdit img{margin:5px}.albCt img{height:100px!important}
div.flash{margin:10px 5px;width:375px;border-color:#D9E4FF;border-radius:.2rem}#btnSubmit{margin:0 0 0 155px}.progressWrapper{width:357px;overflow:hidden}.progressContainer{padding:4px;margin:5px;background-color:#f8f8f8;border:solid 1px #E8E8E8;overflow:hidden}.message{margin:10px 0;padding:10px 20px;background-color:#FFC;border:solid 1px #FD9;overflow:hidden}.red{background-color:#FFEBEB;border:solid 1px #B50000}.green{background-color:#EBFFEB;border:solid 1px #DDF0DD}.blue{background-color:#F0F5FF;border:solid 1px #CEE2F2}.progressName{width:320px;height:14px;text-align:left;white-space:nowrap;overflow:hidden}.progressBarInProgress,.progressBarComplete,.progressBarError{margin-top:2px;width:0;height:2px;font-size:0;background-color:blue}.progressBarComplete{width:100%;background-color:green;visibility:hidden}.progressBarError{width:100%;background-color:#dc3545;visibility:hidden}.progressBarStatus{margin-top:2px;width:340px;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:240px;height:180px;margin-right:10px;margin-bottom:10px;border:1px dashed #eee;background:#f8f8f8;text-align:center;padding:10px}.albEdit{height:180px}.picinfo{height:30px;line-height:30px;margin:10px 0}.thumbnails img,.thumbnailsEdit img{margin:5px}.albCt img{height:100px!important}

+ 1
- 1
src/admin/css/frame.css Wyświetl plik

@@ -270,7 +270,7 @@ body.hidemenu .right {
.mapitem ul li {
text-indent:20px;
line-height:24px;
background:url(../static/web/img/arrr.gif)0 8px no-repeat
background:url(../../static/web/img/arrr.gif)0 8px no-repeat
}
.allmenu a {
color:#5C604F


+ 2
- 2
src/admin/css/indexbody.css Wyświetl plik

@@ -106,7 +106,7 @@
}
.dbox dt.rside {
border-bottom:1px solid #DEEAB6;
background:url(../static/web/img/wbg.gif)repeat-x
background:url(../../static/web/img/wbg.gif)repeat-x
}
.dbox dd {
padding:0
@@ -117,7 +117,7 @@
#updatetest {
padding:6px;
padding-left:110px;
background:url(../images/ico_spider.gif)no-repeat scroll 10px 15px transparent
background:url(../../images/ico_spider.gif)no-repeat scroll 10px 15px transparent
}
#quickmenu {
width:100%;


+ 4
- 4
src/admin/css/menuold.css Wyświetl plik

@@ -13,7 +13,7 @@ dl.bitem {
margin:0 0px 6px 6px
}
dl.bitem dt {
background:url(../static/web/img/menubg.gif);
background:url(../../static/web/img/menubg.gif);
height:26px;
line-height:26px;
text-align:center;
@@ -33,11 +33,11 @@ dl.bitem dd {
}
div.items {
line-height:22px;
background:url(../static/web/img/arr4.gif) no-repeat 10px 9px
background:url(../../static/web/img/arr4.gif) no-repeat 10px 9px
}
span.items {
padding:10px 0px 10px 22px;
background:url(../static/web/img/arr4.gif) no-repeat 10px 12px
background:url(../../static/web/img/arr4.gif) no-repeat 10px 12px
}
ul {
padding-top:2px
@@ -48,5 +48,5 @@ li {
.sitemu li {
padding:0 0px 0px 22px;
line-height:24px;
background:url(../static/web/img/arr4.gif) no-repeat 10px 9px
background:url(../../static/web/img/arr4.gif) no-repeat 10px 9px
}

+ 2
- 2
src/admin/index_menu_module.php Wyświetl plik

@@ -19,8 +19,8 @@ require(DEDEADMIN.'/inc/inc_menu_func.php');
<html>
<head>
<title>DedeBIZ menu</title>
<link rel="stylesheet" href="../static/web/css/admin.css" type="text/css" />
<link rel="stylesheet" href="css/menuold.css" type="text/css" />
<link rel="stylesheet" href="../static/web/css/admin.css" />
<link rel="stylesheet" href="css/menuold.css" />
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>" />
<base target="main" />
</head>


+ 1
- 1
src/admin/js/album.js Wyświetl plik

@@ -111,7 +111,7 @@ function seePicNewAlb(f, imgdid, frname, hpos, acname) {
newobj.style.top = hpos;
newobj.style.left = 100;
document.body.appendChild(newobj);
newobj.innerHTML = '<img src="../static/web/img/loadinglit.gif" alit="" />上传中...';
newobj.innerHTML = '<img src="../../static/web/img/loadinglit.gif" alit="" />上传中...';
}
newobj.style.display = 'block';
//提交后还原form的action等参数


+ 1
- 1
src/admin/js/context_menu.js Wyświetl plik

@@ -126,7 +126,7 @@ ContextMenu.populatePopup = function (arr, win) {
doc.body.innerHTML = '';
//if (doc.getElementsByTagName("LINK").length == 0){
doc.open();
doc.write('<html><head><link rel="StyleSheet" type="text/css" href="js/contextmenu.css"></head><body></body></html>');
doc.write('<html><head><link rel="StyleSheet" href="js/contextmenu.css"></head><body></body></html>');
doc.close();
//}
for (i = 0; i < alen; i++) {


+ 1
- 1
src/admin/js/contextmenu.css Wyświetl plik

@@ -4,7 +4,7 @@
}
.WebFX-ContextMenu-Body {
background-color:#EEFFEC;
background-image:url('../static/web/img/mmenubg.gif');
background-image:url(../../static/web/img/mmenubg.gif);
margin:0;
padding:1px;
border:1px solid #E0E7C9


+ 1
- 1
src/admin/js/dialog.js Wyświetl plik

@@ -22,7 +22,7 @@ function AlertMsg(title, id) {
msgcolor = "#000";//内容颜色
bordercolor = "#5A6D58";//边框颜色
titlecolor = "#254015";//标题颜色
titlebg = "#369 url(../static/web/img/tbg.gif)";//标题背景
titlebg = "#369 url(../../static/web/img/tbg.gif)";//标题背景
//遮罩背景设置
content = "<div id=show_news>对不起，载入失败</div>";
var sWidth, sHeight;


+ 5
- 5
src/admin/js/main.js Wyświetl plik

@@ -21,7 +21,7 @@ function $Obj(objname) {
/*
function ShowColor()
{
var fcolor=showModalDialog("../static/web/img/color.htm?ok",false,"dialogWidth:106px;dialogHeight:110px;status:0;dialogTop:"+(+120)+";dialogLeft:"+(+120));
var fcolor=showModalDialog("../../static/web/img/color.htm?ok",false,"dialogWidth:106px;dialogHeight:110px;status:0;dialogTop:"+(+120)+";dialogLeft:"+(+120));
if(fcolor!=null && fcolor!="undefined") document.form1.color.value = fcolor;
}
*/
@@ -41,7 +41,7 @@ function ColorSel(c, oname) {
}

function ShowColor(e, o) {
LoadNewDiv(e, '../static/web/img/colornew.htm', 'colordlg');
LoadNewDiv(e, '../../static/web/img/colornew.htm', 'colordlg');
}

function ShowHide(objname) {
@@ -118,7 +118,7 @@ function SeePicNew(f, imgdid, frname, hpos, acname) {
newobj.style.left = 100;
newobj.style.display = 'block';
document.body.appendChild(newobj);
newobj.innerHTML = '<img src="../static/web/img/loadinglit.gif" alit="" />上传中...';
newobj.innerHTML = '<img src="../../static/web/img/loadinglit.gif" alit="" />上传中...';
}
newobj.style.display = 'block';
//提交后还原form的action等参数
@@ -389,7 +389,7 @@ function LoadQuickDiv(e, surl, oname, w, h) {
newobj.style.minWidth = "450px";
newobj.style.top = posTop + "px";
newobj.style.left = posLeft + "px";
newobj.innerHTML = '<div style="margin-top:10px;margin-left:10px;"><img src="../static/web/img/loadinglit.gif">Loading...</div>';
newobj.innerHTML = '<div style="margin-top:10px;margin-left:10px;"><img src="../../static/web/img/loadinglit.gif">Loading...</div>';
newobj.style.display = 'block';
fetch(surl).then(resp=>resp.text()).then((d)=>{
newobj.innerHTML = d;
@@ -731,7 +731,7 @@ $(document).ready(function () {
litpicImgSrc = "";
litpicImg = "";
$("#litpic_b64").val(litpicImg);
$("#litPic").attr("src", "../static/web/img/defaultpic.jpg");
$("#litPic").attr("src", "../../static/web/img/defaultpic.jpg");
})

// 添加图片


+ 2
- 2
src/admin/js/mode/htmlmixed/htmlmixed.js Wyświetl plik

@@ -3,9 +3,9 @@

(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css"));
mod(require("../../lib/codemirror"), require("../../xml/xml"), require("../../javascript/javascript"), require("../../css/css"));
else if (typeof define == "function" && define.amd) // AMD
define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod);
define(["../../lib/codemirror", "../../xml/xml", "../../javascript/javascript", "../../css/css"], mod);
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {


+ 2
- 2
src/admin/js/mode/php/php.js Wyświetl plik

@@ -3,9 +3,9 @@

(function(mod) {
if (typeof exports == "object" && typeof module == "object") // CommonJS
mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../clike/clike"));
mod(require("../../lib/codemirror"), require("../../htmlmixed/htmlmixed"), require("../../clike/clike"));
else if (typeof define == "function" && define.amd) // AMD
define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../clike/clike"], mod);
define(["../../lib/codemirror", "../../htmlmixed/htmlmixed", "../../clike/clike"], mod);
else // Plain browser env
mod(CodeMirror);
})(function(CodeMirror) {


+ 2
- 2
src/admin/testenv.php Wyświetl plik

@@ -18,8 +18,8 @@ $action = isset($action) ? $action : '';
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['cfg_soft_lang']; ?>">
<title>系统运行目录权限检测</title>
<link rel="stylesheet" type="text/css" href="../static/web/css/admin.css" />
<link rel="stylesheet" type="text/css" href="css/indexbody.css" />
<link rel="stylesheet" href="../static/web/css/admin.css" />
<link rel="stylesheet" href="css/indexbody.css" />
<script type="text/javascript" src="../static/web/js/jquery.min.js"></script>
</head>
<body leftmargin="8" topmargin='8' bgcolor="#FFFFFF" style="min-width:840px">


+ 10
- 10
src/static/web/css/admin.css Wyświetl plik

@@ -173,7 +173,7 @@ a:visited {
height:30px;
line-height:30px;
border-bottom:1px solid #C9CFC1;
background:#F9FCDC url(../static/web/img/dlgtitle.gif)repeat-x;
background:#F9FCDC url(/static/web/img/dlgtitle.gif)repeat-x;
text-align:right
}
.coolbg5 {
@@ -204,7 +204,7 @@ a:visited {
height:30px;
line-height:30px;
border-bottom:1px solid #C9CFC1;
background:url(../static/web/img/dlgtitle.gif)repeat-x;
background:url(/static/web/img/dlgtitle.gif)repeat-x;
text-align:left;
cursor:move
}
@@ -300,7 +300,7 @@ a:visited {
}
.nbt {
padding:2px;
background:#fff url(../static/web/img/allbtbg.gif);
background:#fff url(/static/web/img/allbtbg.gif);
border:1px solid #A5AF83
}
.tdt {
@@ -322,7 +322,7 @@ a:visited {
width:98%;
height:30px;
border:1px dotted #BFD67C;
background:url(../static/web/img/wbg.gif)
background:url(/static/web/img/wbg.gif)
}
.bodytitle div {
float:left;
@@ -354,19 +354,19 @@ option.alltype {
padding-left:16px;
height:18px;
line-height:18px;
background:url(../static/web/img/arr4.gif)3px 4px no-repeat
background:url(/static/web/img/arr4.gif)3px 4px no-repeat
}
option.btype {
padding-left:16px;
height:18px;
line-height:18px;
background:url(../static/web/img/arr4.gif)3px 4px no-repeat
background:url(/static/web/img/arr4.gif)3px 4px no-repeat
}
option.stype {
padding-left:26px;
height:18px;
line-height:18px;
background:url(../static/web/img/arrr.gif)10px 4px no-repeat
background:url(/static/web/img/arrr.gif)10px 4px no-repeat
}
.ilist {
border-top:1px dashed #eee;
@@ -380,7 +380,7 @@ option.stype {
float:left;
padding:0;
height:18px;
background:url(../static/web/img/typeid2bg.gif)no-repeat;
background:url(/static/web/img/typeid2bg.gif)no-repeat;
border:0
}
#litpic {
@@ -399,10 +399,10 @@ option.stype {
}
#starttime,#endtime,#pubdate,#uptime {
padding-left:30px;
background:url(../static/web/img/calendar.gif)10px no-repeat
background:url(/static/web/img/calendar.gif)10px no-repeat
}
#title {
background:url(../static/web/img/ruler.gif)repeat-x 0px 10px
background:url(/static/web/img/ruler.gif)repeat-x 0px 10px
}
.spec {
width:60px


+ 1
- 1
src/theme/plus/download_links_templet.htm Wyświetl plik

@@ -9,7 +9,7 @@
<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/style.css">
<link rel="stylesheet" href="<?php echo $cfg_cmsurl; ?>/static/web/css/index.css">
<script src="<?php echo $cfg_cmsurl; ?>/static/web/js/jquery.min.js"></script>
<style type="text/css">
<style>
.formbox li{
list-style: url(none) none;
}


+ 1
- 1
src/theme/plus/qrcode.htm Wyświetl plik

@@ -3,7 +3,7 @@
<head>
<title>扫描二维码</title>
<meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
<style type="text/css">
<style>
body {
margin: 0;
}


+ 1
- 1
src/theme/templets/advancedsearch.htm Wyświetl plik

@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
<title>搜索结果页 - <?php echo $cfg_webname;?></title>
<style type="text/css">
<style>
*{
padding:0;
margin:0;


+ 1
- 1
src/theme/templets/singlepage.htm Wyświetl plik

@@ -5,7 +5,7 @@
<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
<meta name="keywords" content="{dede:field.keywords/}" />
<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
<link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
<link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" />
<script language='javascript' type='text/javascript'>
function checkSubmit(){
if(document.feedback.msg.value!='') document.feedback.submit();


Napisz Podgląd
Ładowanie…
Anuluj
Zapisz