fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Layout Skin, Login Widget ... etc.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2011-09-20 07:01:46 +00:00
parent 87bcf369c9
commit bd7b16fbca
21 changed files with 171 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/admin/tpl/css/admin.css
View file

@ -3,6 +3,7 @@
/* Element Reset */ /* Element Reset */
body{margin:0} body{margin:0}
header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{display:block} header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{display:block}
body>.popup{margin:1em}
.x, .x,
.x table, .x table,
.x input, .x input,

1
modules/admin/tpl/css/admin.min.css vendored
View file

@ -3,6 +3,7 @@
/* Element Reset */ /* Element Reset */
body{margin:0} body{margin:0}
header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{display:block} header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{display:block}
body>.popup{margin:1em}
.x, .x,
.x table, .x table,
.x input, .x input,

2
modules/editor/components/image_gallery/tpl/popup.js
View file

@ -101,7 +101,7 @@ function insertSlideShow() {
selected_node.setAttribute("images_list", images_list); selected_node.setAttribute("images_list", images_list);
selected_node.style.width = width+"px"; selected_node.style.width = width+"px";
} else { } else {
var text = "<img src=\"../../../../common/tpl/images/blank.gif\" editor_component=\"image_gallery\" width=\""+width+"\" gallery_style=\""+gallery_style+"\" align=\""+gallery_align+"\" gallery_align=\""+gallery_align+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\"width:"+width+"px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;\" images_list=\""+images_list+"\" />"; var text = "<img src=\"../../../../common/img/blank.gif\" editor_component=\"image_gallery\" width=\""+width+"\" gallery_style=\""+gallery_style+"\" align=\""+gallery_align+"\" gallery_align=\""+gallery_align+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\"width:"+width+"px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;\" images_list=\""+images_list+"\" />";
opener.editorFocus(opener.editorPrevSrl); opener.editorFocus(opener.editorPrevSrl);
var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl) var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
opener.editorReplaceHTML(iframe_obj, text); opener.editorReplaceHTML(iframe_obj, text);

2
modules/editor/components/image_gallery/tpl/popup.min.js vendored
View file

@ -3,7 +3,7 @@ function getSlideShow(){var c,b,d="",e,a,f,g;if(typeof opener!="undefined"){c=op
a,manual_select_color("border",get_by_id("border_color_input")),get_by_id("bg_color_input").value=f,manual_select_color("bg",get_by_id("bg_color_input")),d=b.attr("images_list");b=get_by_id("fo").editor_sequence.value;if(b=opener.get_by_id("uploaded_file_list_"+b)){c=get_by_id("image_list");for(e=0;e<b.length;e++){a=b.options[e];f=a.value;if(!f)break;f=opener.uploadedFiles[f].download_url.replace(request_uri,"");/(jpg|jpeg|gif|png)$/i.test(f)&&(g=!1,d.indexOf(f)!=-1&&(g=!0),a=new Option(a.text,a.value, a,manual_select_color("border",get_by_id("border_color_input")),get_by_id("bg_color_input").value=f,manual_select_color("bg",get_by_id("bg_color_input")),d=b.attr("images_list");b=get_by_id("fo").editor_sequence.value;if(b=opener.get_by_id("uploaded_file_list_"+b)){c=get_by_id("image_list");for(e=0;e<b.length;e++){a=b.options[e];f=a.value;if(!f)break;f=opener.uploadedFiles[f].download_url.replace(request_uri,"");/(jpg|jpeg|gif|png)$/i.test(f)&&(g=!1,d.indexOf(f)!=-1&&(g=!0),a=new Option(a.text,a.value,
!1,g),c.options.add(a))}}}} !1,g),c.options.add(a))}}}}
function insertSlideShow(){if(typeof opener!="undefined"){for(var c=[],b=get_by_id("image_list"),d=0;d<b.length;d++){var e=b.options[d];e.selected&&(e=opener.uploadedFiles[e.value].download_url.replace(request_uri,""),c[c.length]=e)}if(c.length){for(var b=get_by_id("width").value,e=get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value,a=get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value,f=get_by_id("border_thickness").value,g=get_by_id("border_color_input").value, function insertSlideShow(){if(typeof opener!="undefined"){for(var c=[],b=get_by_id("image_list"),d=0;d<b.length;d++){var e=b.options[d];e.selected&&(e=opener.uploadedFiles[e.value].download_url.replace(request_uri,""),c[c.length]=e)}if(c.length){for(var b=get_by_id("width").value,e=get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value,a=get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value,f=get_by_id("border_thickness").value,g=get_by_id("border_color_input").value,
i=get_by_id("bg_color_input").value,h="",d=0;d<c.length;d++)h+=c[d].trim()+" ";selected_node?(selected_node.setAttribute("width",b),selected_node.setAttribute("gallery_style",e),selected_node.setAttribute("align",a),selected_node.setAttribute("gallery_align",a),selected_node.setAttribute("border_thickness",f),selected_node.setAttribute("border_color",g),selected_node.setAttribute("bg_color",i),selected_node.setAttribute("images_list",h),selected_node.style.width=b+"px"):(c='<img src="../../../../common/tpl/images/blank.gif" editor_component="image_gallery" width="'+ i=get_by_id("bg_color_input").value,h="",d=0;d<c.length;d++)h+=c[d].trim()+" ";selected_node?(selected_node.setAttribute("width",b),selected_node.setAttribute("gallery_style",e),selected_node.setAttribute("align",a),selected_node.setAttribute("gallery_align",a),selected_node.setAttribute("border_thickness",f),selected_node.setAttribute("border_color",g),selected_node.setAttribute("bg_color",i),selected_node.setAttribute("images_list",h),selected_node.style.width=b+"px"):(c='<img src="../../../../common/img/blank.gif" editor_component="image_gallery" width="'+
b+'" gallery_style="'+e+'" align="'+a+'" gallery_align="'+a+'" border_thickness="'+f+'" border_color="'+g+'" bg_color="'+i+'" style="width:'+b+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;" images_list="'+h+'" />',opener.editorFocus(opener.editorPrevSrl),d=opener.editorGetIFrame(opener.editorPrevSrl),opener.editorReplaceHTML(d,c));opener.editorFocus(opener.editorPrevSrl)}window.close()}} b+'" gallery_style="'+e+'" align="'+a+'" gallery_align="'+a+'" border_thickness="'+f+'" border_color="'+g+'" bg_color="'+i+'" style="width:'+b+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;" images_list="'+h+'" />',opener.editorFocus(opener.editorPrevSrl),d=opener.editorGetIFrame(opener.editorPrevSrl),opener.editorReplaceHTML(d,c));opener.editorFocus(opener.editorPrevSrl)}window.close()}}
function select_color(c,b){get_by_id(c+"_preview_color").style.backgroundColor="#"+b;get_by_id(c+"_color_input").value=b}function manual_select_color(c,b){if(b.value.length==6)code=b.value,get_by_id(c+"_preview_color").style.backgroundColor="#"+code} function select_color(c,b){get_by_id(c+"_preview_color").style.backgroundColor="#"+b;get_by_id(c+"_color_input").value=b}function manual_select_color(c,b){if(b.value.length==6)code=b.value,get_by_id(c+"_preview_color").style.backgroundColor="#"+code}
function printColor(c,b){for(var d=["22","44","66","88","AA","CC","EE"],e="",a=0;a<8;a+=1)e+=printColorBlock(c,a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16),b);for(a=0;a<d.length;a+=3)for(var f=0;f<d.length;f+=2)for(var g=0;g<d.length;g++)e+=printColorBlock(c,d[a]+d[f]+d[g],b);for(a=8;a<16;a+=1)e+=printColorBlock(c,a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16),b);document.write(e)} function printColor(c,b){for(var d=["22","44","66","88","AA","CC","EE"],e="",a=0;a<8;a+=1)e+=printColorBlock(c,a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16),b);for(a=0;a<d.length;a+=3)for(var f=0;f<d.length;f+=2)for(var g=0;g<d.length;g++)e+=printColorBlock(c,d[a]+d[f]+d[g],b);for(a=8;a<16;a+=1)e+=printColorBlock(c,a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16),b);document.write(e)}

2
modules/editor/components/multimedia_link/tpl/popup.js
View file

@ -42,7 +42,7 @@ $('a._insert').click(function(){
return; return;
} }
var html = '<img src="../../../../common/tpl/images/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />'; var html = '<img src="../../../../common/img/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />';
html = html.replace(/(\w+)=""/, function(m0,m1) { html = html.replace(/(\w+)=""/, function(m0,m1) {
return attrs[m1] ? (m1+'="'+attrs[m1]+'"') : ''; return attrs[m1] ? (m1+'="'+attrs[m1]+'"') : '';

2
modules/editor/components/multimedia_link/tpl/popup.min.js vendored
View file

@ -2,4 +2,4 @@
* popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 멀티미디어 컴포넌트 코드를 체크하여 * popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 멀티미디어 컴포넌트 코드를 체크하여
* 있으면 가져와서 원하는 곳에 삽입 * 있으면 가져와서 원하는 곳에 삽입
**/ **/
jQuery(function($){(function(){if(!is_def(opener))return;var $node=$(opener.editorPrevNode).filter('img'),attrs;if(!$node.length)return;attrs={url:$node.attr('multimedia_src'),caption:$node.attr('alt'),width:$node.width()-4,height:$node.height()-4,wmode:$node.attr('wmode')};$.each(attrs,function(key,val){get_by_id('multimedia_'+key).value=val})})();$('a._insert').click(function(){if(!is_def(opener))return;var el_wmode=get_by_id('fo').elements['multimedia_wmode'],attrs={alt:get_by_id('multimedia_caption').value,width:get_by_id('multimedia_width').value||400,height:get_by_id('multimedia_height').value||400,wmode:el_wmode.value||el_wmode.options[0].value,auto_start:get_by_id('multimedia_auto_start').checked?'true':'false',multimedia_src:get_by_id('multimedia_url').value.replace(request_uri,'')};if(!attrs.multimedia_src){window.close();return};var html='<img src="../../../../common/tpl/images/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />';html=html.replace(/(\w+)=""/,function(m0,m1){return attrs[m1]?(m1+'="'+attrs[m1]+'"'):''});opener.editorFocus(opener.editorPrevSrl);var iframe_obj=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(iframe_obj,html);opener.editorFocus(opener.editorPrevSrl);window.close()})}) jQuery(function($){(function(){if(!is_def(opener))return;var $node=$(opener.editorPrevNode).filter('img'),attrs;if(!$node.length)return;attrs={url:$node.attr('multimedia_src'),caption:$node.attr('alt'),width:$node.width()-4,height:$node.height()-4,wmode:$node.attr('wmode')};$.each(attrs,function(key,val){get_by_id('multimedia_'+key).value=val})})();$('a._insert').click(function(){if(!is_def(opener))return;var el_wmode=get_by_id('fo').elements['multimedia_wmode'],attrs={alt:get_by_id('multimedia_caption').value,width:get_by_id('multimedia_width').value||400,height:get_by_id('multimedia_height').value||400,wmode:el_wmode.value||el_wmode.options[0].value,auto_start:get_by_id('multimedia_auto_start').checked?'true':'false',multimedia_src:get_by_id('multimedia_url').value.replace(request_uri,'')};if(!attrs.multimedia_src){window.close();return};var html='<img src="../../../../common/img/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />';html=html.replace(/(\w+)=""/,function(m0,m1){return attrs[m1]?(m1+'="'+attrs[m1]+'"'):''});opener.editorFocus(opener.editorPrevSrl);var iframe_obj=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(iframe_obj,html);opener.editorFocus(opener.editorPrevSrl);window.close()})})

2
modules/editor/components/poll_maker/tpl/popup.js
View file

@ -15,7 +15,7 @@ function completeInsertPoll(ret_obj) {
var poll_srl = ret_obj["poll_srl"]; var poll_srl = ret_obj["poll_srl"];
if(!poll_srl) return null; if(!poll_srl) return null;
var text = "<img src=\"../../../../common/tpl/images/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\" />"; var text = "<img src=\"../../../../common/img/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\" />";
alert(ret_obj['message']); alert(ret_obj['message']);

2
modules/editor/skins/xeed/editor.html
View file

@ -297,7 +297,7 @@
<p class="nofile">{$lang->edit->no_image}</p> <p class="nofile">{$lang->edit->no_image}</p>
<ul> <ul>
<li> <li>
<button type="button" class="ob"><img src="../../../../../../common/tpl/images/blank.gif" alt="" /></button> <button type="button" class="ob"><img src="../../../../../../common/img/blank.gif" alt="" /></button>
<button type="button" class="ctr ins" title="{$lang->edit->link_file}"><span>{$lang->edit->link_file}</span></button> <button type="button" class="ctr ins" title="{$lang->edit->link_file}"><span>{$lang->edit->link_file}</span></button>
<button type="button" class="ctr del" title="{$lang->cmd_delete}"><span>{$lang->cmd_delete}</span></button> <br /> <button type="button" class="ctr del" title="{$lang->cmd_delete}"><span>{$lang->cmd_delete}</span></button> <br />
<input name="" type="checkbox" value="" class="icx" id="img1" /> <label for="img1">@exThumbH.jpg</label> <input name="" type="checkbox" value="" class="icx" id="img1" /> <label for="img1">@exThumbH.jpg</label>

2
modules/editor/skins/xeed/js/xeed.js
View file

@ -2512,7 +2512,7 @@ FileUpload = xe.createPlugin('FileUpload', {
if (type == 'img') { if (type == 'img') {
code = '<img src="'+url+'" alt="'+name+'" />\n'; code = '<img src="'+url+'" alt="'+name+'" />\n';
} else if (type == 'media') { } else if (type == 'media') {
code = '<img src="./common/tpl/images/blank.gif" editor_component="multimedia_link" multimedia_src="'+url+'" width="400" height="320" style="display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;" auto_start="false" alt="" class="_resizable" />'; code = '<img src="./common/img/blank.gif" editor_component="multimedia_link" multimedia_src="'+url+'" width="400" height="320" style="display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;" auto_start="false" alt="" class="_resizable" />';
} }
if (!code) { if (!code) {

4
modules/editor/tpl/js/uploader.js
View file

@ -348,7 +348,7 @@ function previewFiles(event, file_srl) {
if(fileinfo.direct_download != 'Y' || !match) { if(fileinfo.direct_download != 'Y' || !match) {
html = '<img src="'+request_uri+'modules/editor/tpl/images/files.gif" border="0" width="100%" height="100%" />'; html = '<img src="'+request_uri+'modules/editor/tpl/images/files.gif" border="0" width="100%" height="100%" />';
} else if(match[1]) { // flash video file } else if(match[1]) { // flash video file
html = '<embed src="'+request_uri+'common/tpl/images/flvplayer.swf?autoStart=false&file='+uploaded_filename+'" width="100%" height="100%" type="application/x-shockwave-flash" />'; html = '<embed src="'+request_uri+'common/img/flvplayer.swf?autoStart=false&file='+uploaded_filename+'" width="100%" height="100%" type="application/x-shockwave-flash" />';
} else if(match[2]) { // shockwave flash file } else if(match[2]) { // shockwave flash file
html = '<embed src="'+request_uri+filename+'" width="100%" height="100%" type="application/x-shockwave-flash" />'; html = '<embed src="'+request_uri+filename+'" width="100%" height="100%" type="application/x-shockwave-flash" />';
} else if(match[3]) { // movie file } else if(match[3]) { // movie file
@ -422,7 +422,7 @@ function insertUploadedFile(editorSequence) {
text.push(temp_code); text.push(temp_code);
// 이미지외의 경우는 multimedia_link 컴포넌트 연결 // 이미지외의 경우는 multimedia_link 컴포넌트 연결
} else { } else {
text.push("<img src=\"common/tpl/images/blank.gif\" editor_component=\"multimedia_link\" multimedia_src=\""+file.download_url+"\" width=\"400\" height=\"320\" style=\"display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;\" auto_start=\"false\" alt=\"\" />"); text.push("<img src=\"common/img/blank.gif\" editor_component=\"multimedia_link\" multimedia_src=\""+file.download_url+"\" width=\"400\" height=\"320\" style=\"display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;\" auto_start=\"false\" alt=\"\" />");
} }
// binary파일의 경우 url_link 컴포넌트 연결 // binary파일의 경우 url_link 컴포넌트 연결

2
modules/importer/ttimport.class.php
View file

@ -488,7 +488,7 @@
return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4])); return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
// If other multimedia file but image is, // If other multimedia file but image is,
} else { } else {
return sprintf('<img src="./common/tpl/images/blank.gif" editor_component="multimedia_link" multimedia_src="%s" width="400" height="320" style="display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;" auto_start="false" alt="" />', $obj->url); return sprintf('<img src="./common/img/blank.gif" editor_component="multimedia_link" multimedia_src="%s" width="400" height="320" style="display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;" auto_start="false" alt="" />', $obj->url);
} }
// If binary file is // If binary file is
} else { } else {

12
modules/install/tpl/css/install.css
View file

@ -113,11 +113,15 @@ html{height:100%;background:url(../img/bgHtml.gif) repeat-x 0 0}
.agreement em{color:#f60} .agreement em{color:#f60}
.agreement p{line-height:1.5} .agreement p{line-height:1.5}
/* Message */ /* Message */
.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 17px;padding:0 1em;border-radius:5px;line-height:1.4} .message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}
body>.message{margin:1em}
.message p{margin:1em 0 !important}
.message em{font-style:normal;color:#e00} .message em{font-style:normal;color:#e00}
.message.info, .message.info,
.message.error, .message.error,
.message.update{padding-left:55px} .message.update{padding-left:55px}
.message.info{border-color:#E0E8EC;background:#EDF9FF url(../../../admin/tpl/img/msg.Info.png) no-repeat 1em .5em} .message.info{border-color:#E0E8EC;background:#EDF9FF url(../../common/img/msg.Info.png) no-repeat 1em .5em}
.message.error{border-color:#EFDCDC;background:#FFECEC url(../../../admin/tpl/img/msg.error.png) no-repeat 1em .5em} .message.error{border-color:#EFDCDC;background:#FFECEC url(../../common/img/msg.error.png) no-repeat 1em .5em}
.message.update{border-color:#EAE9DC;background:#FFFDEF url(../../../admin/tpl/img/msg.update.png) no-repeat 1em .5em} .message.update{border-color:#EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em}
/* Waiting for server response */
.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100; border:1px solid #EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px}

2
modules/layout/tpl/js/faceoff.js
View file

@ -215,7 +215,7 @@ var FaceOff = {
var content = $(this).children('div.widgetContent'); var content = $(this).children('div.widgetContent');
if (!content.length) return; if (!content.length) return;
return text.push('<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" '+attr.join(' ')+' />'); return text.push('<img src="./common/img/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" '+attr.join(' ')+' />');
default: default:
var div = $('<div>'); var div = $('<div>');
var attr = []; var attr = [];

2
modules/page/page.admin.controller.php
View file

@ -96,7 +96,7 @@
function putDocumentsInPageToArray($target, &$array) function putDocumentsInPageToArray($target, &$array)
{ {
if(!$target) return; if(!$target) return;
preg_match_all('!<img src="./common/tpl/images/widget_bg.jpg" ([^>]+)!is', $target, $matches); preg_match_all('!<img src="./common/img/widget_bg.jpg" ([^>]+)!is', $target, $matches);
$pattern = '!document_srl="(\d+)"!'; $pattern = '!document_srl="(\d+)"!';
foreach($matches[1] as $match) foreach($matches[1] as $match)
{ {

2
modules/widget/tpl/js/widget.js
View file

@ -137,7 +137,7 @@ function getContentWidgetCode(childObj, widget) {
if(!value) continue; if(!value) continue;
attrs += name+'="'+escape(value)+'" '; attrs += name+'="'+escape(value)+'" ';
} }
return '<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" document_srl="'+document_srl+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj, 'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj,'bottom')+'" '+attrs+' />'; return '<img src="./common/img/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" document_srl="'+document_srl+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj, 'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj,'bottom')+'" '+attrs+' />';
}else{ }else{
return ''; return '';
} }

83
widgets/login_info/skins/xe_official/css/black.css
View file

@ -1,51 +1,32 @@
.login_black { margin:0; padding:0; border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block; } .login_black{margin:0;padding:0;border:2px solid #515151;width:196px;position:relative;_padding-top:2px;display:block;font-size:12px }
*:first-child+html body#black .login_black { padding-top:2px;} .login_black legend{position:absolute;width:1px;height:1px;overflow:hidden}
.login_black legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .login_black fieldset{position:relative;border:1px solid #6b6b6b;padding:11px 11px 7px 11px;width:172px;margin:0}
.login_black form { position:relative; border:1px solid #6b6b6b; padding:11px 11px 7px 11px; width:172px;} .login_black fieldset .idpwWrap{overflow:hidden;clear:both;width:172px}
.login_black form .idpwWrap { overflow:hidden; clear:both; width:172px;} .login_black fieldset .idpw{float:left;width:110px}
.login_black form .idpw { float:left; width:110px;} .login_black fieldset .idpw input{border:1px solid #6b6b6b;color:#cbcbcb;width:105px;background:#515151;padding:1px 5px;margin-bottom:2px;font:.9em Tahoma}
.login_black form .idpw input { border:1px solid #6b6b6b; color:#cbcbcb; width:105px; background:#515151; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;} .login_black fieldset .login{float:right}
.login_black form .login { float:right;} .login_black fieldset p.securitySignIn{clear:both;padding:0 0 0 18px;margin:4px 0 0 0}
.login_black fieldset p.noneSSL{background:url("../images/none_ssl.png") no-repeat left top}
.login_black form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; } .login_black fieldset p.SSL{background:url("../images/ssl.png") no-repeat left top}
.login_black form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; } .login_black fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
.login_black form p.SSL { background:url("../images/ssl.png") no-repeat left top; } .login_black fieldset p.SSL a{color:#9CAC74;text-decoration:none}
.login_black form p.noneSSL a { color:#BF6801; text-decoration:none; } .login_black fieldset p.keep{margin:5px 0;clear:both;padding:0}
.login_black form p.SSL a { color:#9CAC74; text-decoration:none; } .login_black fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0}
.login_black fieldset p.keep label{font:.9em;color:#818181}
.login_black form p.save { margin:0; clear:both; padding:.3em 0;} .login_black fieldset p.keep_msg{color:#818181}
.login_black form p.save input { vertical-align:middle; _margin:-3px;} .login_black fieldset ul.help{margin:0;border-top:1px solid #515151;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none}
*:first-child+html body#black .login_black form p input { margin:-3px; } .login_black fieldset ul.help li{list-style:none;float:left;display:block;padding:0}
.login_black form p.save label { font:.9em; color:#818181;} .login_black fieldset ul.help li.first-child{background:none;padding-left:0}
.login_black form ul.help { margin:0; border-top:1px solid #515151; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none;} .login_black fieldset ul.help li a{color:#818181;font:.9em;white-space:nowrap;text-decoration:none}
.login_black form ul.help li { list-style:none; float:left; display:block; padding:0 3px 0 7px; background:url(../images/black/vrType1.gif) no-repeat left center;} .login_black fieldset ul.help li a:hover{text-decoration:underline}
.login_black form ul.help li.first-child { background:none; padding-left:0;} .login_black fieldset ul.help li.first-child a{color:#cbcbcb}
.login_black form ul.help li a { color:#818181; font:.9em; white-space:nowrap; text-decoration:none;} .login_black fieldset .userName{margin:0;position:relative;width:172px;overflow:hidden;border-bottom:1px solid #515151;padding:0 0 6px 0;margin-top:-5px}
.login_black form ul.help li a:hover { text-decoration:underline;} .login_black fieldset .userName strong{color:#cbcbcb;padding:4px 0 0 2px;font:bold .9em Tahoma}
.login_black form ul.help li.first-child a { color:#cbcbcb;} .login_black fieldset .userName a{position:relative;right:0px}
.login_black form .userName { margin:0; position:relative; width:172px; overflow:hidden; border-bottom:1px solid #515151; padding:0 0 6px 0; margin-top:-5px;} .login_black fieldset .userName img{border:none}
.login_black form .userName strong { color:#cbcbcb; padding:4px 0 0 2px; font:bold .9em Tahoma;} .login_black fieldset ul.userMenu{margin:0;position:relative;padding:0 0 6px 4px;overflow:hidden;margin-top:10px}
.login_black form .userName a { position:relative; right:0px; } .login_black fieldset ul.userMenu li{list-style:none;color:#cbcbcb;list-style:none;padding-left:10px;background:url(../images/black/bulletFF1A00.gif) no-repeat left 4px;margin-bottom:5px}
.login_black form .userName img { border:none; } .login_black fieldset ul.userMenu li a{color:#cbcbcb;text-decoration:none}
.login_black form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;} .login_black fieldset ul.userMenu li a:hover{text-decoration:underline}
.login_black form ul.userMenu li { list-style:none; color:#cbcbcb; list-style:none;padding-left:10px; background:url(../images/black/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;} .login_black fieldset p.latestLogin{margin:5px 0;color:#818181;font:.9em}
.login_black form ul.userMenu li a { color:#cbcbcb;text-decoration:none;} .login_black fieldset p.latestLogin span{font:1em Tahoma}
.login_black form ul.userMenu li a:hover {text-decoration:underline;}
.login_black form p.latestLogin { margin:0; color:#818181; font:.9em;}
.login_black form p.latestLogin span { font:1em Tahoma;}
img.login_mask { width:201px; height:5px; background:#3d3d3d; display:block;}
.openid_login_black { padding:0; margin:0; border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block;}
*:first-child+html body#black .openid_login_black { padding-top:2px;}
.openid_login_black legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
.openid_login_black form { position:relative; border:1px solid #6b6b6b; padding:11px 11px 7px 11px; width:172px;}
.openid_login_black form .idpwWrap { overflow:hidden; clear:both; width:172px;}
.openid_login_black form .idpw { float:left;}
.openid_login_black form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
.openid_login_black form .idpw input { border:1px solid #6b6b6b; color:#cbcbcb; width:105px; background:#515151; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
.openid_login_black form .login { float:right;}
.openid_login_black form p.save { margin:0; padding:0; clear:both; padding:.3em 0;}
.openid_login_black form p.save input { vertical-align:middle; _margin:-3px;}
*:first-child+html body .openid_login_black form p input { margin:-3px; }
.openid_login_black form p.save label { font:.9em; color:#818181;}

82
widgets/login_info/skins/xe_official/css/default.css
View file

@ -1,50 +1,32 @@
.login_default { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block;} .login_default{margin:0;padding:0;border:2px solid #d9d9d9;width:196px;position:relative;_padding-top:2px;display:block;font-size:12px}
*:first-child+html body .login_default { padding-top:2px;} .login_default legend{position:absolute;width:1px;height:1px;overflow:hidden}
.login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .login_default fieldset{position:relative;border:1px solid #cacaca;padding:11px 11px 7px 11px;width:172px;margin:0}
.login_default form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px;} .login_default fieldset .idpwWrap{overflow:hidden;clear:both;width:172px}
.login_default form .idpwWrap { overflow:hidden; clear:both; width:172px;} .login_default fieldset .idpw{float:left;width:110px}
.login_default form .idpw { float:left; width:110px; } .login_default fieldset .idpw input{border:1px solid #c9c9c9;color:#282828;width:105px;background:#fbfbfb;padding:1px 5px;margin-bottom:2px;font:.9em Tahoma}
.login_default form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;} .login_default fieldset .login{float:right}
.login_default form .login { float:right;} .login_default fieldset p.securitySignIn{clear:both;padding:0 0 0 18px;margin:4px 0 0 0}
.login_default fieldset p.noneSSL{background:url("../images/none_ssl.png") no-repeat left top}
.login_default form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; } .login_default fieldset p.SSL{background:url("../images/ssl.png") no-repeat left top}
.login_default form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; } .login_default fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
.login_default form p.SSL { background:url("../images/ssl.png") no-repeat left top; } .login_default fieldset p.SSL a{color:#9CAC74;text-decoration:none}
.login_default form p.noneSSL a { color:#BF6801; text-decoration:none; } .login_default fieldset p.keep{margin:5px 0;clear:both;padding:0}
.login_default form p.SSL a { color:#9CAC74; text-decoration:none; } .login_default fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0}
.login_default fieldset p.keep label{font:.9em;color:#666}
.login_default form p.save { margin:0; clear:both; padding:.3em 0;} .login_default fieldset p.keep_msg{color:#666}
.login_default form p.save input { vertical-align:middle; _margin:-3px;} .login_default fieldset ul.help{margin:0;border-top:1px solid #e4e4e4;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none}
*:first-child+html body .login_default form p input { margin:-3px; } .login_default fieldset ul.help li{display:block;padding:0 3px 0 0}
.login_default form p.save label { font:.9em; color:#999999;} .login_default fieldset ul.help li.first-child{background:none;padding-left:0;margin-bottom:3px}
.login_default form ul.help { margin:0; border-top:1px solid #e4e4e4; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none; } .login_default fieldset ul.help li a{color:#54564b;font:.9em;white-space:nowrap;text-decoration:none}
.login_default form ul.help li { display:block; padding:0 3px 0 0; } .login_default fieldset ul.help li.first-child a{color:#54564b;text-decoration:none}
.login_default form ul.help li.first-child { background:none; padding-left:0; margin-bottom:3px; } .login_default fieldset ul.help li a:hover{text-decoration:underline}
.login_default form ul.help li a { color:#54564b; font:.9em; white-space:nowrap; text-decoration:none; } .login_default fieldset .userName{position:relative;width:172px;overflow:hidden;border-bottom:1px solid #e4e4e4;padding:0 0 6px 0;margin-top:-5px}
.login_default form ul.help li.first-child a { color:#54564b; text-decoration:none;} .login_default fieldset .userName strong{color:#282828;padding:4px 0 0 2px;font:bold .9em Tahoma}
.login_default form ul.help li a:hover { text-decoration:underline; } .login_default fieldset .userName a{position:relative;right:0px}
.login_default form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #e4e4e4; padding:0 0 6px 0; margin-top:-5px;} .login_default fieldset .userName img{border:none}
.login_default form .userName strong { color:#282828; padding:4px 0 0 2px; font:bold .9em Tahoma;} .login_default fieldset ul.userMenu{margin:0;position:relative;padding:0;margin-top:10px}
.login_default form .userName a { position:relative; right:0px; } .login_default fieldset ul.userMenu li{list-style:none;margin-bottom:5px}
.login_default form .userName img { border:none; } .login_default fieldset ul.userMenu li a{color:#54564b;text-decoration:none}
.login_default form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; margin-top:10px;} .login_default fieldset ul.userMenu li a:hover{text-decoration:underline}
.login_default form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/default/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;} .login_default fieldset p.latestLogin{margin:5px 0;color:#666}
.login_default form ul.userMenu li a { color:#54564b; text-decoration:none;} .login_default fieldset p.latestLogin span{font:1em Tahoma}
.login_default form ul.userMenu li a:hover { text-decoration:underline;}
.login_default form p.latestLogin { margin:0; color:#999999; font:.9em;}
.login_default form p.latestLogin span { font:1em Tahoma;}
img.login_mask { width:201px; height:5px; background:#ffffff; display:block;}
.openid_login_default { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; }
*:first-child+html body .openid_login_default { padding-top:2px;}
.openid_login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
.openid_login_default form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; }
.openid_login_default form .idpwWrap { overflow:hidden; clear:both; width:172px;}
.openid_login_default form .idpw { float:left;}
.openid_login_default form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
.openid_login_default form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; }
.openid_login_default form .login { float:right;}
.openid_login_default form p.save { margin:0; padding:0; clear:both; padding:.3em 0;}
.openid_login_default form p.save input { vertical-align:middle; _margin:-3px;}
*:first-child+html body .openid_login_default form p input { margin:-3px; }
.openid_login_default form p.save label { font:.9em; color:#999999;}

80
widgets/login_info/skins/xe_official/css/white.css
View file

@ -1,48 +1,32 @@
.login_white { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block;} .login_white{margin:0;padding:0;border:2px solid #d9d9d9;width:196px;position:relative;_padding-top:2px;display:block;font-size:12px}
*:first-child+html body#white .login_white { padding-top:2px;} .login_white legend{position:absolute;width:1px;height:1px;overflow:hidden}
.login_white legend { display:none; width:0; height:0; overflow:hidden; font-size:0;} .login_white fieldset{position:relative;border:1px solid #cacaca;padding:11px 11px 7px 11px;width:172px;overflow:hidden;margin:0}
.login_white form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; overflow:hidden;} .login_white fieldset .idpwWrap{overflow:hidden;clear:both;width:172px}
.login_white form .idpwWrap { overflow:hidden; clear:both; width:172px;} .login_white fieldset .idpw{float:left;width:110px}
.login_white form .idpw { float:left; width:110px;} .login_white fieldset .idpw input{border:1px solid #c9c9c9;color:#282828;width:105px;background:#fbfbfb;padding:1px 5px;margin-bottom:2px;font:.9em Tahoma}
.login_white form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;} .login_white fieldset .login{float:right}
.login_white form .login { float:right;} .login_white fieldset p.securitySignIn{clear:both;padding:0 0 0 18px;margin:4px 0 0 0}
.login_white fieldset p.noneSSL{background:url("../images/none_ssl.png") no-repeat left top}
.login_white form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; } .login_white fieldset p.SSL{background:url("../images/ssl.png") no-repeat left top}
.login_white form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; } .login_white fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
.login_white form p.SSL { background:url("../images/ssl.png") no-repeat left top; } .login_white fieldset p.SSL a{color:#9CAC74;text-decoration:none}
.login_white form p.noneSSL a { color:#BF6801; text-decoration:none; } .login_white fieldset p.keep{margin:5px 0;clear:both;padding:0}
.login_white form p.SSL a { color:#9CAC74; text-decoration:none; } .login_white fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0 }
.login_white fieldset p.keep label{font:.9em;color:#666}
.login_white form p.save { margin:0; clear:both; padding:.3em 0;} .login_white fieldset p.keep_msg{color:#666}
.login_white form p.save input { vertical-align:middle; _margin:-3px;} .login_white fieldset ul.help{margin:0;border-top:1px solid #e4e4e4;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none}
*:first-child+html body#white .login_white form p input { margin:-3px; } .login_white fieldset ul.help li{list-style:none;float:left;display:block;padding:0 3px 0 7px;background:url(../images/white/vrType1.gif) no-repeat left center}
.login_white form p.save label { font:.9em; color:#999999;} .login_white fieldset ul.help li.first-child{background:none;padding-left:0}
.login_white form ul.help { margin:0; border-top:1px solid #e4e4e4; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none;} .login_white fieldset ul.help li a{color:#666;font:.9em;white-space:nowrap;text-decoration:none}
.login_white form ul.help li { list-style:none; float:left; display:block; padding:0 3px 0 7px; background:url(../images/white/vrType1.gif) no-repeat left center;} .login_white fieldset ul.help li a:hover{text-decoration:underline}
.login_white form ul.help li.first-child { background:none; padding-left:0;} .login_white fieldset ul.help li.first-child a{color:#54564b}
.login_white form ul.help li a { color:#999999; font:.9em; white-space:nowrap; text-decoration:none; } .login_white fieldset .userName{position:relative;width:172px;overflow:hidden;border-bottom:1px solid #e4e4e4;padding:0 0 6px 0;margin-top:-5px}
.login_white form ul.help li a:hover { text-decoration:underline; } .login_white fieldset .userName strong{color:#282828;padding:4px 0 0 2px;font:bold .9em Tahoma}
.login_white form ul.help li.first-child a { color:#54564b;} .login_white fieldset .userName a{position:relative;right:0px}
.login_white form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #e4e4e4; padding:0 0 6px 0; margin-top:-5px;} .login_white fieldset .userName img{border:none}
.login_white form .userName strong { color:#282828; padding:4px 0 0 2px; font:bold .9em Tahoma;} .login_white fieldset ul.userMenu{margin:0;position:relative;padding:0 0 6px 4px;overflow:hidden;margin-top:10px}
.login_white form .userName a { position:relative; right:0px; } .login_white fieldset ul.userMenu li{list-style:none;padding-left:10px;background:url(../images/white/bulletFF1A00.gif) no-repeat left 4px;margin-bottom:5px}
.login_white form .userName img { border:none; } .login_white fieldset ul.userMenu li a{color:#54564b;text-decoration:none}
.login_white form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;} .login_white fieldset ul.userMenu li a:hover{text-decoration:underline}
.login_white form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/white/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;} .login_white fieldset p.latestLogin{margin:5px 0;color:#666;font:.9em}
.login_white form ul.userMenu li a { color:#54564b; text-decoration:none; } .login_white fieldset p.latestLogin span{font:1em Tahoma}
.login_white form ul.userMenu li a:hover { text-decoration:underline; }
.login_white form p.latestLogin { margin:0; color:#999999; font:.9em;}
.login_white form p.latestLogin span { font:1em Tahoma;}
img.login_mask { width:201px; height:5px; background:#ffffff; display:block;}
.openid_login_white { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; }
*:first-child+html body .openid_login_white { padding-top:2px;}
.openid_login_white legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
.openid_login_white form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; }
.openid_login_white form .idpwWrap { overflow:hidden; clear:both; width:172px;}
.openid_login_white form .idpw { float:left;}
.openid_login_white form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
.openid_login_white form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; }
.openid_login_white form .login { float:right;}
.openid_login_white form p.save { margin:0; padding: 0; }
.openid_login_white form p.save label { font:.9em; color:#999999;}

29
widgets/login_info/skins/xe_official/js/login.js
View file

@ -1,32 +1,21 @@
/* 로그인 후 */ /* After Login */
function completeLogin(ret_obj, response_tags, params, fo_obj) { function completeLogin(ret_obj, response_tags, params, fo_obj) {
var url = current_url.setQuery('act',''); var url = current_url.setQuery('act','');
location.href = url; location.href = url;
} }
/* 오픈아이디 로그인 후 */
function completeOpenIDLogin(ret_obj, response_tags) {
var redirect_url = ret_obj['redirect_url'];
location.href = redirect_url;
}
jQuery(function($){ jQuery(function($){
// keep signed? // keep signed?
$('#keep_signed').click(function(){ if(this.checked) return confirm(xe.lang.about_keep_signed) }); var keep_msg = $('.keep_msg');
keep_msg.hide();
// toggle login form $('#keep_signed').change(function(){
var $chk_openid = if($(this).is(':checked')){
$('#use_open_id,#use_open_id_2').click(function(){ keep_msg.slideDown(200);
$('#login').toggle().is(':hidden')? } else {
$chk_openid.attr('checked','checked') : keep_msg.slideUp(200);
$chk_openid.removeAttr('checked'); }
$('#openid_login').toggle();
}); });
// hide openid login form
$('#openid_login').hide();
// focus userid input box // focus userid input box
if (!$(document).scrollTop()) { if (!$(document).scrollTop()) {
try { try {

81
widgets/login_info/skins/xe_official/login_form.html
View file

@ -11,62 +11,33 @@
<!--%import("./filter/openid_login.xml")--> <!--%import("./filter/openid_login.xml")-->
<!--%import("./js/login.js")--> <!--%import("./js/login.js")-->
<fieldset id="login" class="login_{$colorset}">
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}"> <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p> <p>{$XE_VALIDATOR_MESSAGE}</p>
</div> </div>
<legend>{$lang->cmd_login}</legend> <form id="fo_login_widget" action="./" method="post" ruleset="@login" class="login_{$colorset}">
<form id="fo_login_widget" action="./" method="post" ruleset="@login"> <fieldset>
<input type="hidden" name="act" value="procMemberLogin" /> <legend>{$lang->cmd_login}</legend>
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" /> <input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<div class="idpwWrap"> <div class="idpwWrap">
<div class="idpw"> <div class="idpw">
<input name="user_id" type="text" title="user id" /> <input name="user_id" type="text" title="user id" />
<input name="password" type="password" title="password" /> <input name="password" type="password" title="password" />
</div> </div>
<input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" /> <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
</div> </div>
<p cond="$member_config->enable_ssl=='Y'" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->"> <p cond="$member_config->enable_ssl=='Y'" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
<a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a> <a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
</p> </p>
<p class="save"> <p class="keep">
<input type="checkbox" name="keep_signed" id="keep_signed" value="Y" /> <input type="checkbox" name="keep_signed" id="keep_signed" value="Y" />
<label for="keep_signed">{$lang->keep_signed}</label> <label for="keep_signed">{$lang->keep_signed}</label>
</p>
<block cond="$member_config->enable_openid=='Y'"> <p class="keep_msg">{$lang->about_keep_warning}</p>
<br /> <ul class="help">
<input name="use_open_id" id="use_open_id" type="checkbox" value="Y" /> <li><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<label for="use_open_id">Open ID</label> <li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
</block> <li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
</p> </ul>
<ul class="help"> </fieldset>
<li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
<li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
</ul>
</form> </form>
</fieldset>
<!-- OpenID -->
<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;" cond="$member_config->enable_openid=='Y'">
<legend>{$lang->cmd_login}</legend>
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post">
<input type="hidden" name="_filter" value="openid_login" />
<div class="idpwWrap">
<div class="idpw">
<p>{$lang->openid}</p>
<input type="text" name="openid" class="openid_user_id" />
</div>
<input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
</div>
<p class="save">
<input name="use_open_id" id="use_open_id_2" type="checkbox" value="Y" />
<label for="use_open_id_2">Open ID</label>
</p>
</form>
</fieldset>
<script type="text/javascript">
xe.lang.about_keep_signed = '{$lang->about_keep_signed}';
</script>

47
widgets/login_info/skins/xe_official/login_info.html
View file

@ -1,31 +1,18 @@
<!--// colorset의 값에 따라 css 파일을 import 한다 --> <load cond="$colorset=='black'" target="css/black.css" />
<!--@if($colorset=="black")--> <load cond="$colorset=='white'" target="css/white.css" />
<!--%import("css/black.css")--> <load cond="$colorset!='black|white'" target="css/default.css" />
<!--@elseif($colorset=="white")--> <load target="./filter/logout.xml" />
<!--%import("css/white.css")--> <form action="" method="post" class="login_{$colorset}">
<!--@else--> <fieldset>
<!--%import("css/default.css")--> <legend>{$lang->cmd_login}</legend>
<!--@end--> <div class="userName">
<a href="#popup_menu_area" class="member_{$logged_info->member_srl}">{$logged_info->nick_name}</a>
<!--%import("./filter/logout.xml")--> <a href="{getUrl('act','dispMemberLogout')}">Log out</a>
<p class="latestLogin">{$lang->last_login}: {zDate($logged_info->last_login, "Y-m-d")}</p>
<fieldset id="login" class="login_{$colorset}"> </div>
<legend>{$lang->cmd_login}</legend> <ul class="userMenu">
<form action="" method="post"> <li loop="$logged_info->menu_list => $key,$val"><a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
<li cond="$logged_info->is_admin=='Y' && !$site_module_info->site_srl"><a href="{getUrl('','module','admin')}">{$lang->cmd_management}</a></li>
<div class="userName"> </ul>
<div class="fl"><div class="member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div></div> </fieldset>
<div class="fr"><a href="{getUrl('act','dispMemberLogout')}"><img src="./images/{$colorset}/buttonLogout.gif" alt="{$lang->cmd_logout}" width="47" height="18" /></a></div>
</div>
<ul class="userMenu">
<!--@foreach($logged_info->menu_list as $key => $val)-->
<li><a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
<!--@end-->
<!--@if($logged_info->is_admin=="Y" && !$site_module_info->site_srl)-->
<li><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></li>
<!--@end-->
</ul>
<p class="latestLogin">{$lang->last_login}<br /><span>{zDate($logged_info->last_login, "Y-m-d H:i")}</span></p>
</form> </form>
</fieldset>