From 32f81334d6b26a2829f63b7122c4da811ee77d4e Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Thu, 25 Aug 2011 08:00:03 +0000 Subject: [PATCH] Content UI debugging. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8889 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../member_communication.addon.php | 8 ++++---- common/css/xe.css | 10 ++++++++++ common/css/xe.min.css | 10 ++++++++++ common/js/common.js | 3 --- modules/admin/tpl/css/admin.css | 7 ------- modules/admin/tpl/css/admin.min.css | 7 ------- modules/autoinstall/tpl/list.html | 2 +- modules/comment/comment.model.php | 1 - modules/comment/tpl/comment_list.html | 6 +++--- modules/document/document.model.php | 1 - modules/document/tpl/declared_list.html | 4 ++-- modules/document/tpl/document_list.html | 6 +++--- modules/file/tpl/file_list.html | 8 ++++---- modules/member/member.model.php | 9 ++------- modules/module/tpl/module_langcode.html | 4 ++-- modules/poll/tpl/poll_list.html | 6 +++--- modules/rss/tpl/rss_admin_index.html | 4 ++-- modules/trackback/tpl/trackback_list.html | 4 ++-- modules/trash/tpl/trash_list.html | 4 ++-- 19 files changed, 50 insertions(+), 54 deletions(-) create mode 100644 common/css/xe.css create mode 100644 common/css/xe.min.css diff --git a/addons/member_communication/member_communication.addon.php b/addons/member_communication/member_communication.addon.php index e018e1b78..1555c0f2a 100644 --- a/addons/member_communication/member_communication.addon.php +++ b/addons/member_communication/member_communication.addon.php @@ -51,9 +51,9 @@ // Add a feature to display own message box. if($logged_info->member_srl == $member_srl) { // Add your own viewing Note Template - $oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationMessages'), 'cmd_view_message_box', './modules/communication/tpl/images/icon_message_box.gif', 'self'); + $oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationMessages'), 'cmd_view_message_box', '', 'self'); // Display a list of friends - $oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationFriend'), 'cmd_view_friend', './modules/communication/tpl/images/icon_friend_box.gif', 'self'); + $oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationFriend'), 'cmd_view_friend', '', 'self'); // If not, Add menus to send message and to add friends } else { // Get member information @@ -64,10 +64,10 @@ $logged_info = Context::get('logged_info'); // Add a menu for sending message if( $logged_info->is_admin == 'Y' || $target_member_info->allow_message =='Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl))) - $oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationSendMessage','receiver_srl',$member_srl), 'cmd_send_message', './modules/communication/tpl/images/icon_write_message.gif', 'popup'); + $oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationSendMessage','receiver_srl',$member_srl), 'cmd_send_message', '', 'popup'); // Add a menu for listing friends (if a friend is new) if(!$oCommunicationModel->isAddedFriend($member_srl)) - $oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationAddFriend','target_srl',$member_srl), 'cmd_add_friend', './modules/communication/tpl/images/icon_add_friend.gif', 'popup'); + $oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationAddFriend','target_srl',$member_srl), 'cmd_add_friend', '', 'popup'); } } ?> diff --git a/common/css/xe.css b/common/css/xe.css new file mode 100644 index 000000000..ae76f6294 --- /dev/null +++ b/common/css/xe.css @@ -0,0 +1,10 @@ +@charset "utf-8"; +/* NHN (developers@xpressengine.com) */ +/* Popup Menu Area */ +#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;-moz-box-shadow:0 0 6px #666;-webkit-box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} +#popup_menu_area ul{list-style:none;margin:0;padding:0} +#popup_menu_area li{margin:0;padding:0} +#popup_menu_area a{text-decoration:none;color:#333} +#popup_menu_area a:hover, +#popup_menu_area a:avtive, +#popup_menu_area a:focus{text-decoration:underline} diff --git a/common/css/xe.min.css b/common/css/xe.min.css new file mode 100644 index 000000000..ae76f6294 --- /dev/null +++ b/common/css/xe.min.css @@ -0,0 +1,10 @@ +@charset "utf-8"; +/* NHN (developers@xpressengine.com) */ +/* Popup Menu Area */ +#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;-moz-box-shadow:0 0 6px #666;-webkit-box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} +#popup_menu_area ul{list-style:none;margin:0;padding:0} +#popup_menu_area li{margin:0;padding:0} +#popup_menu_area a{text-decoration:none;color:#333} +#popup_menu_area a:hover, +#popup_menu_area a:avtive, +#popup_menu_area a:focus{text-decoration:underline} diff --git a/common/js/common.js b/common/js/common.js index f5b2465c6..d564bc64d 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -101,9 +101,6 @@ if(jQuery) jQuery.noConflict(); case "popup" : click_str = " onclick=\"popopen(this.href,'"+target+"'); return false;\""; break; - case "self" : - //click_str = " onclick=\"location.href='"+url+"' return false;\""; - break; case "javascript" : click_str = " onclick=\""+url+"; return false; \""; url="#"; diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index a7caf73dd..4abb92c3b 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -188,12 +188,6 @@ p{line-height:1.5} .prgrs.prgrsLarge .pBar, .prgrs.prgrsLarge .pAction, .prgrs.prgrsLarge .pNum{height:34px;line-height:34px;font-size:14px} -/* Layer */ -.layer{position:absolute;background:#fff;padding:0 1em;*padding:1em;border:8px solid #ddd;font-weight:normal;z-index:2;zoom:1;border-radius:5px;box-shadow:0 0 6px #666;-moz-box-shadow:0 0 6px #666;-webkit-box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} -.layer h2{margin-top:1em} -.layer ul, .layer ol, .layer .lined, .layer .table{margin-bottom:1em} -.layerClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px} -.layerBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden} /* Modal Window */ .modal{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100} .modal .bg{position:absolute;background:#000;_background:none;width:100%;height:100%;opacity:.5;z-index:2;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);zoom:1} @@ -240,7 +234,6 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n .header h1{margin:0 100px 10px 1.3em;font-size:24px;line-height:32px} .header h1 *{vertical-align:middle} .header h1 a{color:#fff;text-shadow:1px 1px 0 #000;filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=1, OffY=1, Color=#000000, Positive=true);zoom:1} -.header h1 img{height:32px} .header h1 .url{font-size:12px;font-weight:normal} .header .siteTool{position:absolute !important;top:42px;right:0;padding:0 2em 0 0;z-index:2} .header .siteTool .i{position:relative;z-index:2;display:inline-block;color:#fff;padding:0 6px;line-height:24px} diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css index a7caf73dd..4abb92c3b 100644 --- a/modules/admin/tpl/css/admin.min.css +++ b/modules/admin/tpl/css/admin.min.css @@ -188,12 +188,6 @@ p{line-height:1.5} .prgrs.prgrsLarge .pBar, .prgrs.prgrsLarge .pAction, .prgrs.prgrsLarge .pNum{height:34px;line-height:34px;font-size:14px} -/* Layer */ -.layer{position:absolute;background:#fff;padding:0 1em;*padding:1em;border:8px solid #ddd;font-weight:normal;z-index:2;zoom:1;border-radius:5px;box-shadow:0 0 6px #666;-moz-box-shadow:0 0 6px #666;-webkit-box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)} -.layer h2{margin-top:1em} -.layer ul, .layer ol, .layer .lined, .layer .table{margin-bottom:1em} -.layerClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px} -.layerBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden} /* Modal Window */ .modal{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100} .modal .bg{position:absolute;background:#000;_background:none;width:100%;height:100%;opacity:.5;z-index:2;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);zoom:1} @@ -240,7 +234,6 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n .header h1{margin:0 100px 10px 1.3em;font-size:24px;line-height:32px} .header h1 *{vertical-align:middle} .header h1 a{color:#fff;text-shadow:1px 1px 0 #000;filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=1, OffY=1, Color=#000000, Positive=true);zoom:1} -.header h1 img{height:32px} .header h1 .url{font-size:12px;font-weight:normal} .header .siteTool{position:absolute !important;top:42px;right:0;padding:0 2em 0 0;z-index:2} .header .siteTool .i{position:relative;z-index:2;display:inline-block;color:#fff;padding:0 6px;line-height:24px} diff --git a/modules/autoinstall/tpl/list.html b/modules/autoinstall/tpl/list.html index 589348e7d..54af5dcb1 100644 --- a/modules/autoinstall/tpl/list.html +++ b/modules/autoinstall/tpl/list.html @@ -89,7 +89,7 @@ {$page_no} - ... + ... {$page_navigation->last_page} LAST » diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index c18b680b8..e3f03333b 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -67,7 +67,6 @@ if($oComment->isExists()) { // Find a post of the corresponding ip address $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','ipaddress','search_keyword',$oComment->getIpAddress()); - $icon_path = './modules/member/tpl/images/icon_management.gif'; $oCommentController->addCommentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress'); $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oComment->getIpAddress()); diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html index 5342e4127..ba4f45885 100644 --- a/modules/comment/tpl/comment_list.html +++ b/modules/comment/tpl/comment_list.html @@ -52,7 +52,7 @@ {@ $comment = cut_str(trim(htmlspecialchars(strip_tags($val->content))), 200, '...')} {$comment}{$lang->no_text_comment} - {htmlspecialchars($val->nick_name)} + {htmlspecialchars($val->nick_name)} 0/0 {(zdate($val->regdate,"Y-m-d\nH:i:s"))} {$val->ipaddress} @@ -110,7 +110,7 @@ « FIRST 1 - ... + ... {@$last_page = $page_no} @@ -118,7 +118,7 @@ {$page_no} - ... + ... {$page_navigation->last_page} LAST » diff --git a/modules/document/document.model.php b/modules/document/document.model.php index addf74e69..095199aa3 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -501,7 +501,6 @@ if($oDocument->isExists()) { // Find a post equivalent to ip address $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->getIpAddress()); - $icon_path = './modules/member/tpl/images/icon_management.gif'; $oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress'); $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument->getIpAddress()); diff --git a/modules/document/tpl/declared_list.html b/modules/document/tpl/declared_list.html index 4cc0e4101..7e6c91c81 100644 --- a/modules/document/tpl/declared_list.html +++ b/modules/document/tpl/declared_list.html @@ -125,7 +125,7 @@ « FIRST 1 - ... + ... {@$last_page = $page_no} @@ -133,7 +133,7 @@ {$page_no} - ... + ... {$page_navigation->last_page} LAST » diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html index 17d450b43..e707e1c0d 100644 --- a/modules/document/tpl/document_list.html +++ b/modules/document/tpl/document_list.html @@ -57,7 +57,7 @@ {$oDocument->getTitle()} - {$oDocument->getNickName()} + {$oDocument->getNickName()} {$oDocument->get('readed_count')} {$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')} {$oDocument->getRegdate("Y-m-d H:i")} @@ -136,7 +136,7 @@ « FIRST 1 - ... + ... {@$last_page = $page_no} @@ -144,7 +144,7 @@ {$page_no} - ... + ... {$page_navigation->last_page} LAST » diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html index 4a4abc7e5..f0baf4d38 100644 --- a/modules/file/tpl/file_list.html +++ b/modules/file/tpl/file_list.html @@ -87,9 +87,9 @@ {$val->download_count} - {$document_list[$document_srl]->getNickName()} + {$document_list[$document_srl]->getNickName()} - {$comment_list[$val->upload_target_srl]->getNickName()} + {$comment_list[$val->upload_target_srl]->getNickName()} {zdate($val->regdate,"Y-m-d H:i")} @@ -143,7 +143,7 @@ « FIRST 1 - ... + ... {@$last_page = $page_no} @@ -151,7 +151,7 @@ {$page_no} - ... + ... {$page_navigation->last_page} LAST » diff --git a/modules/member/member.model.php b/modules/member/member.model.php index f0ab5ae8c..2a9497c0d 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -69,7 +69,6 @@ // Display member information (Don't display to non-logged user) if($logged_info->member_srl) { $url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl); - $icon_path = './modules/member/tpl/images/icon_view_info.gif'; $oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path,'self'); } // When click other's nickname @@ -77,30 +76,26 @@ // Send an email if($member_info->email_address) { $url = 'mailto:'.htmlspecialchars($member_info->email_address); - $icon_path = './modules/member/tpl/images/icon_sendmail.gif'; $oMemberController->addMemberPopupMenu($url,'cmd_send_email',$icon_path); } } // View homepage info if($member_info->homepage) - $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage), 'homepage', './modules/member/tpl/images/icon_homepage.gif','blank'); + $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage), 'homepage', '', 'blank'); // View blog info if($member_info->blog) - $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog), 'blog', './modules/member/tpl/images/icon_blog.gif','blank'); + $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog), 'blog', '', 'blank'); // Call a trigger (after) ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null); // Display a menu for editting member info to a top administrator if($logged_info->is_admin == 'Y') { $url = getUrl('','module','admin','act','dispMemberAdminInsert','member_srl',$member_srl); - $icon_path = './modules/member/tpl/images/icon_management.gif'; $oMemberController->addMemberPopupMenu($url,'cmd_manage_member_info',$icon_path,'MemberModifyInfo'); $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','member_srl','search_keyword',$member_srl); - $icon_path = './modules/member/tpl/images/icon_trace_document.gif'; $oMemberController->addMemberPopupMenu($url,'cmd_trace_document',$icon_path,'TraceMemberDocument'); $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','member_srl','search_keyword',$member_srl); - $icon_path = './modules/member/tpl/images/icon_trace_comment.gif'; $oMemberController->addMemberPopupMenu($url,'cmd_trace_comment',$icon_path,'TraceMemberComment'); } // Change a language of pop-up menu diff --git a/modules/module/tpl/module_langcode.html b/modules/module/tpl/module_langcode.html index 1e866b1cc..3ea42bd58 100644 --- a/modules/module/tpl/module_langcode.html +++ b/modules/module/tpl/module_langcode.html @@ -52,7 +52,7 @@ « FIRST 1 - ... + ... {@$last_page = $page_no} @@ -60,7 +60,7 @@ {$page_no} - ... + ... {$page_navigation->last_page} LAST » diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html index de8babebc..645881a82 100644 --- a/modules/poll/tpl/poll_list.html +++ b/modules/poll/tpl/poll_list.html @@ -36,7 +36,7 @@ {htmlspecialchars($val->title)} {$lang->single_check}{$lang->multi_check} {$val->poll_count} - {$val->nick_name} + {$val->nick_name} {zdate($val->regdate,"Y-m-d H:i")} @@ -85,7 +85,7 @@ « FIRST 1 - ... + ... {@$last_page = $page_no} @@ -93,7 +93,7 @@ {$page_no} - ... + ... {$page_navigation->last_page} LAST » diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html index 0b1ea257f..7b497e6e0 100644 --- a/modules/rss/tpl/rss_admin_index.html +++ b/modules/rss/tpl/rss_admin_index.html @@ -12,7 +12,7 @@

  • {$lang->total_feed}

    - use_total_feed || $total_config->use_total_feed == 'Y')-->checked="checked" /> + use_total_feed || $total_config->use_total_feed == 'Y')-->checked="checked" /> use_total_feed == 'N')-->checked="checked" />

    • @@ -29,7 +29,7 @@

    image - +

    diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html index 5ca1b56ce..1a4d77020 100644 --- a/modules/trackback/tpl/trackback_list.html +++ b/modules/trackback/tpl/trackback_list.html @@ -84,7 +84,7 @@ « FIRST 1 - ... + ... {@$last_page = $page_no} @@ -92,7 +92,7 @@ {$page_no} - ... + ... {$page_navigation->last_page} LAST » diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html index b165fedea..3aee23922 100644 --- a/modules/trash/tpl/trash_list.html +++ b/modules/trash/tpl/trash_list.html @@ -114,7 +114,7 @@ var confirm_restore_msg = '{$lang->confirm_restore}'; « FIRST 1 - ... + ... {@$last_page = $page_no} @@ -122,7 +122,7 @@ var confirm_restore_msg = '{$lang->confirm_restore}'; {$page_no} - ... + ... {$page_navigation->last_page} LAST »