reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10717 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 06:27:55 +00:00
parent a4b3a914a5
commit f7330acf02
13 changed files with 137 additions and 144 deletions

View file

@ -784,7 +784,7 @@
$count_query .= (__DEBUG_QUERY__&1 && $queryObject->queryID)?sprintf (' '.$this->comment_syntax, $queryObject->queryID):'';
$result = $this->_query($count_query, $connection);
$count_output = $this->_fetch($result);
$total_count = (int)(isset($count_output->output) ? $count_output->count : NULL);
$total_count = (int)(isset($count_output->count) ? $count_output->count : NULL);
$list_count = $limit->list_count->getValue();
if (!$list_count) $list_count = 20;
@ -866,4 +866,4 @@
}
return new DBCubrid;
?>
?>

View file

@ -35,11 +35,11 @@
function getArgument(){
return null;
}
function getArguments(){
return array();
}
}
?>
?>

View file

@ -70,6 +70,8 @@
$map = &$this->cssMap;
$mapIndex = &$this->cssMapIndex;
$key = $file->filePath . $file->fileName . "\t" . $file->targetIe . "\t" . $file->media;
$this->_arrangeCssIndex($pathInfo['dirname'], $file);
}
else if ($file->fileExtension == 'js')
{
@ -265,4 +267,18 @@
return $path;
}
private function _arrangeCssIndex($dirName, $file)
{
if($file->index !== 0)
{
return;
}
$dirName = str_replace('./', '', $dirName);
$tmp = explode('/', $dirName);
$cssSortList = array('common'=>-100000, 'layouts'=>-90000, 'modules'=>-80000, 'widgets'=>-70000, 'addons'=>-60000);
$file->index = $cssSortList[$tmp[0]];
}
}

View file

@ -7,6 +7,6 @@ fr,Français
de,Deutsch
ru,Русский
es,Español
tr,Turkçe
tr,Türkçe
vi,Tiếng Việt
mn,Mongolian

View file

@ -3002,6 +3002,10 @@ Xin vui lòng kiểm tra lại thông tin Database.]]></value>
<value xml:lang="zh-TW"><![CDATA[註冊失敗。]]></value>
<value xml:lang="de"><![CDATA[Misserfolg der Registrierung]]></value>
</item>
<item name="fail_to_update">
<value xml:lang="ko"><![CDATA[수정하지 못했습니다.]]></value>
<value xml:lang="en"><![CDATA[Fail to update.]]></value>
</item>
<item name="fail_to_delete">
<value xml:lang="ko"><![CDATA[삭제 실패했습니다.]]></value>
<value xml:lang="en"><![CDATA[Failed to delete.]]></value>

View file

@ -325,10 +325,12 @@
$logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl;
// Check variables
$friend_srl_list = trim(Context::get('friend_srl_list'));
if(!$friend_srl_list) return new Object(-1, 'msg_cart_is_null');
$friend_srl_list = Context::get('friend_srl_list');
$friend_srl_list = explode('|@|', $friend_srl_list);
if(!is_array($friend_srl_list))
{
$friend_srl_list = explode('|@|', $friend_srl_list);
}
if(!count($friend_srl_list)) return new Object(-1, 'msg_cart_is_null');
$friend_count = count($friend_srl_list);

View file

@ -37,7 +37,7 @@
<th>{$lang->friend_group}</th>
<th>{$lang->nick_name}</th>
<th>{$lang->regdate}</th>
<th><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list', { wrap:'fo_friend_list' });" /></th>
<th><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list[]', { wrap:'fo_friend_list' });" /></th>
</tr>
</thead>
<tbody>
@ -45,7 +45,7 @@
<td>{$val->group_title?$val->group_title:"&nbsp;"}</td>
<td><a href="#popup_menu_area" class="member_{$val->target_srl}">{$val->nick_name}</a></td>
<td>{zdate($val->regdate,"Y-m-d")}</td>
<td><input type="checkbox" name="friend_srl_list" value="{$val->friend_srl}" /></td>
<td><input type="checkbox" name="friend_srl_list[]" value="{$val->friend_srl}" /></td>
</tr>
</tbody>
</table>

View file

@ -51,15 +51,9 @@
$style = $xml_obj->attrs->style;
$margin = (int)$xml_obj->attrs->margin;
if(!$alt) {
$tmp_arr = explode('/',$src);
$alt = array_pop($tmp_arr);
}
$src = str_replace(array('&','"'), array('&amp;','&qout;'), $src);
$src = str_replace('&amp;amp;', '&amp;', $src);
if(!$alt) $alt = $src;
// Image containing the address to the address conversion request uri (rss output, etc. purposes)
$temp_src = explode('/', $src);
if(substr($src, 0,2)=='./') $src = Context::getRequestUri().substr($src, 2);
@ -72,9 +66,8 @@
$attr_output = array();
$attr_output = array("src=\"".$src."\"");
if($alt) {
$attr_output[] = "alt=\"".$alt."\"";
}
$attr_output[] = "alt=\"".$alt."\"";
if($title) {
$attr_output[] = "title=\"".$title."\"";
}

View file

@ -695,8 +695,11 @@
/**
* @brief Change user-defined language
**/
function replaceDefinedLangCode(&$output) {
$output = preg_replace_callback('!\$user\_lang\-\>([A-Za-z0-9\_]+)!s', array($this,'_replaceLangCode'), $output);
function replaceDefinedLangCode(&$output, $isReplaceLangCode = true) {
if($isReplaceLangCode)
{
$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
}
}
function _replaceLangCode($matches) {
static $lang = null;

View file

@ -254,7 +254,8 @@
Context::set('content', $content);
// Convert them to teach the widget
$oWidgetController = &getController('widget');
$content = $oWidgetController->transWidgetCode($content, true);
$content = $oWidgetController->transWidgetCode($content, true, false);
$content = str_replace('$', '&#36;', $content);
Context::set('page_content', $content);
// Set widget list
$oWidgetModel = &getModel('widget');

View file

@ -230,10 +230,10 @@
/**
* @breif By converting the specific content of the widget tag return
**/
function transWidgetCode($content, $javascript_mode = false) {
function transWidgetCode($content, $javascript_mode = false, $isReplaceLangCode = true) {
// Changing user-defined language
$oModuleController = &getController('module');
$oModuleController->replaceDefinedLangCode($content);
$oModuleController->replaceDefinedLangCode($content, $isReplaceLangCode);
// Check whether to include information about editing
$this->javascript_mode = $javascript_mode;
// Widget code box change

View file

@ -1,54 +1,43 @@
@charset "utf-8";
.xeBanner { position:relative; z-index:100;}
.xeBanner .section{ position:static; height:100%;width:100%; padding-top:1px; margin:0 !important; }
.xeBanner{position:relative; z-index:100}
.xeBanner .section{position:static; height:100%;width:100%; padding-top:1px; margin:0 !important}
.xeBanner.v1 #v1,
.xeBanner.v2 #v2,
.xeBanner.v3 #v3{ display:block;}
.xeBanner #v1{ background-position:0 0;}
/*.xeBanner #v2{ background-position:0 -347px;}
.xeBanner #v3{ background-position:0 -694px;}*/
.xeBanner.v3 #v3{display:block}
.xeBanner #v1{background-position:0 0}
.xeBanner .section h2,
.xeBanner .section p{ position:relative; margin:0; z-index:-1; line-height:1.2;}
.xeBanner .section a{ position:absolute; height:22px; top:160px; left:15px; font-size:11px; padding:0 8px; overflow:hidden; text-decoration:none;}
.xeBanner .section a span{ position:relative; top:-22px;}
ul.pagination {width:75px;height:10px;margin:0 auto !important;text-align:center !important;}
ul.pagination li {float:left;list-style:none;width:10px;height:10px;margin-right:5px;background:url(../images/slide_page_off.gif) no-repeat top left;}
ul.pagination li.current {background:url(../images/slide_page_on.gif) no-repeat top left;}
ul.pagination a {text-decoration:none;outline:none;ie-dummy: expression(this.hideFocus=true);}
.xeBanner .section p{position:relative; margin:0; z-index:-1; line-height:1.2}
.xeBanner .section a{position:absolute; height:22px; top:160px; left:15px; font-size:11px; padding:0 8px; overflow:hidden; text-decoration:none}
.xeBanner .section a span{position:relative; top:-22px}
ul.pagination{width:75px;height:10px;margin:0 auto !important;text-align:center !important}
ul.pagination li{float:left;list-style:none;width:10px;height:10px;margin-right:5px;background:url(../images/slide_page_off.gif) no-repeat top left}
ul.pagination li.current{background:url(../images/slide_page_on.gif) no-repeat top left}
ul.pagination a{text-decoration:none;outline:none;ie-dummy: expression(this.hideFocus=true)}
/* slide_widget */
.slide_widget {position:relative;}
.slide_widget .mask {position:relative;z-index:80;margin:0 auto;padding:0;overflow:hidden;}
.slide_widget ul {margin:0;}
.slide_widget li {float:left;list-style:none;}
.slide_widget{position:relative}
.slide_widget .mask{position:relative;z-index:80;margin:0 auto;padding:0;overflow:hidden}
.slide_widget ul{margin:0}
.slide_widget li{float:left;list-style:none}
/* slide_widget */
#slide_widget {width:100%;height:446px; position:relative;background:url(../images/slide_box_bg.gif) repeat-x top left;}
#slide_widget .mask {width:958px;height:418px;position:relative;z-index:80;margin:0 auto;padding:0;overflow:hidden;}
#slide_widget ul {margin:0; padding:0;}
#slide_widget li {float:left;list-style:none;}
ul.imgSet {height:418px;position:absolute;left:width:100%;top:0;}
.imgSet li {width:958px;height:420px;float:left;}
.imgSet div.item {position:relative;z-index:50;}
.imgSet li p {position:absolute;x:0;y:0;z-index:20;margin:0;}
.slides_container div.shadow {position:absolute;left:0;margin-top:-105px;z-index:10;}
.slides_container .section img{position:relative;z-index:50;}
ul.paging {width:75px;height:10px;margin:0 auto !important;text-align:center;}
.paging li {width:10px;height:10px;margin-right:5px;}
.paging li.on {background:url(../images/slide_page_on.gif) no-repeat top left;}
.paging li.off {background:url(../images/slide_page_off.gif) no-repeat top left;}
.paging li span {visibility:hidden;}
.paging a {text-decoration:none;}
#shadow {left: 15px;margin-top: -105px;position: absolute;z-index: -10;}
.slide_widget .mask {width:958px !important;}
#slides,.slides_container,.slides_container div {width:958px !important;height:431px !important;display:block;}
.buttonBox {z-index:201}
.section div {z-index:200}
.slide_widget ul {position:relative;bottom:18px;z-index:150;}
#slide_widget{width:100%;height:446px; position:relative;background:url(../images/slide_box_bg.gif) repeat-x top left}
#slide_widget .mask{width:958px;height:418px;position:relative;z-index:80;margin:0 auto;padding:0;overflow:hidden}
#slide_widget ul{margin:0; padding:0}
#slide_widget li{float:left;list-style:none}
ul.imgSet{height:418px;position:absolute;left:width:100%;top:0}
.imgSet li{width:958px;height:420px;float:left}
.imgSet div.item{position:relative;z-index:50}
.imgSet li p{position:absolute;x:0;y:0;z-index:20;margin:0}
.slides_container div.shadow{position:absolute;left:0;margin-top:-105px;z-index:10}
.slides_container .section img{position:relative;z-index:50}
ul.paging{width:75px;height:10px;margin:0 auto !important;text-align:center}
.pagingli{width:10px;height:10px;margin-right:5px}
.paging li.on{background:url(../images/slide_page_on.gif) no-repeat top left}
.paging li.off{background:url(../images/slide_page_off.gif) no-repeat top left}
.pagingli span{visibility:hidden}
.paginga{text-decoration:none}
#shadow{left: 15px;margin-top: -105px;position: absolute;z-index: -10}
.slide_widget .mask{width:958px !important}
#slides,.slides_container,.slides_container div{width:958px !important;height:431px !important;display:block}
.buttonBox{z-index:201}
.section div{z-index:200}
.slide_widget ul{position:relative;bottom:18px;z-index:150}

View file

@ -1,77 +1,62 @@
@charset "utf-8";
/* CSS Document */
body {font-size: 12px;font-family:sans-serif; margin: 0; padding: 0;}
img{border:none;}
body{font-size:12px;font-family:sans-serif;margin:0;padding:0}
img{border:none}
/* head */
#wrap {width:100%;}
#wrap .top {width:100%;height:73px;z-index:300;background:url(../images/header_bg.gif) repeat-x top left;}
#wrap .header {width:960px;height:73px;margin:0 auto;position:relative; z-index:150;}
.header .logo {margin-top:15px;float:left;}
.header ul {margin:0;padding:0;}
.header li {list-style:none;}
#wrap .main {width:100%;z-index:200;}
.main .container {width:960px;position:relative;padding-top:50px;margin:0 auto 30px auto;_margin-bottom:50px;overflow:hidden;}
#wrap .slide_banner {width:100%;height:446px;background:url(../images/slide_box_bg.gif) repeat-x top left; padding-top:15px;}
.container .search_box_layout {position:absolute;top:10px;right:0px;}
.search_box_layout .inputBox {width:218px;height:29px;background:url(../images/search_box_bg.gif) no-repeat top left;}
.search_box_layout .inputBox .iText {width:175px;float:left;background:none;;outline:none;border:0 none;padding-left:10px;margin-top:3px;}
.search_box_layout .inputBox .is_submit {width:15px;height:14px;float:right;margin-top:6px;margin-right:10px;}
#wrap{width:100%}
#wrap .top{width:100%;height:73px;z-index:300;background:url(../images/header_bg.gif) repeat-x top left}
#wrap .header{width:960px;height:73px;margin:0 auto;position:relative;z-index:150}
.header .logo{margin-top:15px;float:left}
.header ul{margin:0;padding:0}
.header li{list-style:none}
#wrap .main{width:100%;z-index:200}
.main .container{width:960px;position:relative;padding-top:50px;margin:0 auto 30px auto;_margin-bottom:50px;overflow:hidden}
#wrap .slide_banner{width:100%;height:446px;background:url(../images/slide_box_bg.gif) repeat-x top left;padding-top:15px}
.container .search_box_layout{position:absolute;top:10px;right:0px}
.search_box_layout .inputBox{width:218px;height:29px;background:url(../images/search_box_bg.gif) no-repeat top left}
.search_box_layout .inputBox .iText{width:175px;float:left;background:none;;outline:none;border:0 none;padding-left:10px;margin-top:3px}
.search_box_layout .inputBox .is_submit{width:15px;height:14px;float:right;margin-top:6px;margin-right:10px}
/* GNB */
.header .gnb {position:absolute;top:36px; left:220px;z-index:300;}
.gnb li.m1 {width:109px;height:35px;float:left;position:relative;}
.gnb li.m_on {background:url(../images/gnb_m1_on_n.gif) no-repeat top left;}
.gnb a {font-family:Arial, Helvetica, sans-serif;font-weight:bold;outline:none;ie-dummy: expression(this.hideFocus=true);}
.gnb li.m1 a.m1_a {color:#FFF;font-size:14px;line-height:14px;text-decoration:none;
display:block;width:109px;height:35px;cursor:pointer;}
.gnb li.m_on a.m1_a {color:#0f0f0f !important;}
.gnb li.m1 span.m1_span {display:block;width:109px;height:25px;text-align:center;padding-top:10px;}
.gnb .lnb {margin:0;padding:1px 0 0 0;background:url(../images/lnb_bg.gif) no-repeat top left;}
.gnb .sub {width:106px;position:absolute;left:2px;z-index:1000; display:none;}
.gnb .lnb .s1 {width:106px;height:32px;background: url(../images/lnb_bg.gif) no-repeat top left;}
.gnb .lnb .s1 a {width:106px;height:24px;padding-top:8px;font-size:12px;text-align:center;color:#5e5e60;display:block;font-weight:bold;text-decoration:none;}
.gnb .lnb .s1 a:hover {color:white;background:url(../images/lnb_bg_on.gif) no-repeat 1px 0;}
.gnb .lnb .s1 a.a_on {color:white;background:url(../images/lnb_bg_on.gif) no-repeat 1px 0;}
.gnb .bottom {width:106px;height:3px;background:url(../images/lnb_bg.gif) no-repeat bottom left;}
.gnb .bottom span {width:0;height:0;background:#000;}
.header .gnb{position:absolute;top:36px;left:220px;z-index:300}
.gnb li.m1{width:109px;height:35px;float:left;position:relative}
.gnb li.m_on{background:url(../images/gnb_m1_on_n.gif) no-repeat top left}
.gnb a{font-family:Arial, Helvetica, sans-serif;font-weight:bold;outline:none;ie-dummy:expression(this.hideFocus=true)}
.gnb li.m1 a.m1_a{color:#FFF;font-size:14px;line-height:14px;text-decoration:none;display:block;width:109px;height:35px;cursor:pointer}
.gnb li.m_on a.m1_a{color:#0f0f0f !important}
.gnb li.m1 span.m1_span{display:block;width:109px;height:25px;text-align:center;padding-top:10px}
.gnb .lnb{margin:0;padding:1px 0 0 0;background:url(../images/lnb_bg.gif) no-repeat top left}
.gnb .sub{width:106px;position:absolute;left:2px;z-index:1000;display:none}
.gnb .lnb .s1{width:106px;height:32px;background:url(../images/lnb_bg.gif) no-repeat top left}
.gnb .lnb .s1 a{width:106px;height:24px;padding-top:8px;font-size:12px;text-align:center;color:#5e5e60;display:block;font-weight:bold;text-decoration:none}
.gnb .lnb .s1 a:hover{color:white;background:url(../images/lnb_bg_on.gif) no-repeat 1px 0}
.gnb .lnb .s1 a.a_on{color:white;background:url(../images/lnb_bg_on.gif) no-repeat 1px 0}
.gnb .bottom{width:106px;height:3px;background:url(../images/lnb_bg.gif) no-repeat bottom left}
.gnb .bottom span{width:0;height:0;background:#000}
/* slide_widget */
#slide_widget {width:100%;height:446px; position:relative;background:url(../images/slide_box_bg.gif) repeat-x top left;}
#slide_widget .mask {width:958px;height:446px;position:relative;z-index:80;margin:0 auto;padding:0;overflow:hidden;}
#slide_widget ul {margin:0; padding:0;}
#slide_widget li {float:left;list-style:none;}
ul.imgSet {height:418px;position:absolute;left:width:100%;top:0;}
.imgSet li {width:958px;height:420px;float:left;}
.imgSet div.item {position:relative;z-index:50;}
.imgSet li p {position:absolute;x:0;y:0;z-index:20;margin:0;}
.imgSet li div.shadow {position:absolute;left:15px;top:323px;z-index:10;}
ul.paging {width:75px;height:10px;margin:0 auto !important;text-align:center;}
.paging li {width:10px;height:10px;margin-right:5px;}
.paging li.on {background:url(../images/slide_page_on.gif) no-repeat top left;}
.paging li.off {background:url(../images/slide_page_off.gif) no-repeat top left;}
.paging li span {visibility:hidden;}
.paging a {text-decoration:none;}
.footer {width:960px;margin:0 auto;border-top:#dbdbdb solid 1px;position:relative;font-family:Tahoma, Geneva, sans-serif; }
.footer .footer_p {color:#9fa09f;margin:12px auto;}
#selectLang {position:absolute;top:-1px;right:0;margin:0;}
#selectLang dt {float:left;padding:4px 11px 0 0;font-family:"Times New Roman", Times, serif;font-size:12px;color:#aaabad;}
#selectLang dd {float:left;margin:0;}
#selectLang .langBtn {width:61px;height:20px; cursor:pointer;padding-top:7px;padding-left:7px;color:#5a5a5a;text-decoration:none;font-size:11px;line-height:11px;background:url(../images/btn_language.gif) no-repeat top left;}
#selectLang .langSet {display:none;width:68px;padding:3px 0 0 0;margin:0;position:absolute;bottom:27px;_bottom:26px;z-index:500;background:url(../images/language_ul_top.png) no-repeat top left;}
#selectLang ul li {list-style:none;border-right:#bdbaba solid 1px;border-left:#bdbaba solid 1px; background:#f0f0f0;}
#selectLang ul li a {height:12px;padding:6px 0 6px 7px;display:block;}
#selectLang li.on {border:#c3c3c3 solid 1px;background:#d7d7d7;}
#selectLang li.on a {height:12px;padding:5px 0 5px 7px;}
#selectLang li a {color:#5a5a5a;text-decoration:none;font-size:11px;line-height:11px;vertical-align:text-top;}
#slide_widget{width:100%;height:446px;position:relative;background:url(../images/slide_box_bg.gif) repeat-x top left}
#slide_widget .mask{width:958px;height:446px;position:relative;z-index:80;margin:0 auto;padding:0;overflow:hidden}
#slide_widget ul{margin:0;padding:0}
#slide_widget li{float:left;list-style:none}
ul.imgSet{height:418px;position:absolute;left:width:100%;top:0}
.imgSet li{width:958px;height:420px;float:left}
.imgSet div.item{position:relative;z-index:50}
.imgSet li p{position:absolute;x:0;y:0;z-index:20;margin:0}
.imgSet li div.shadow{position:absolute;left:15px;top:323px;z-index:10}
ul.paging{width:75px;height:10px;margin:0 auto !important;text-align:center}
.pagingli{width:10px;height:10px;margin-right:5px}
.paging li.on{background:url(../images/slide_page_on.gif) no-repeat top left}
.paging li.off{background:url(../images/slide_page_off.gif) no-repeat top left}
.pagingli span{visibility:hidden}
.paginga{text-decoration:none}
.footer{width:960px;margin:0 auto;border-top:#dbdbdb solid 1px;position:relative;font-family:Tahoma, Geneva, sans-serif;}
.footer .footer_p{color:#9fa09f;margin:12px auto}
#selectLang{position:absolute;top:-1px;right:0;margin:0}
#selectLang dt{float:left;padding:4px 11px 0 0;font-family:"Times New Roman", Times, serif;font-size:12px;color:#aaabad}
#selectLang dd{float:left;margin:0}
#selectLang .langBtn{width:61px;height:20px;cursor:pointer;padding-top:7px;padding-left:7px;color:#5a5a5a;text-decoration:none;font-size:11px;line-height:11px;background:url(../images/btn_language.gif) no-repeat top left}
#selectLang .langSet{display:none;width:68px;padding:3px 0 0 0;margin:0;position:absolute;bottom:27px;_bottom:26px;z-index:500;background:url(../images/language_ul_top.png) no-repeat top left}
#selectLang ul li{list-style:none;border-right:#bdbaba solid 1px;border-left:#bdbaba solid 1px;background:#f0f0f0}
#selectLang ul li a{height:12px;padding:6px 0 6px 7px;display:block}
#selectLang li.on{border:#c3c3c3 solid 1px;background:#d7d7d7}
#selectLang li.on a{height:12px;padding:5px 0 5px 7px}
#selectLang li a{color:#5a5a5a;text-decoration:none;font-size:11px;line-height:11px;vertical-align:text-top}