smartphone 애드온에서 문서번호로 링크될경우 내용이 안 나오는 문제 수정 및 플래닛 스마트 모듈에서 내용 출력부분 수정

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6306 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2009-05-08 02:40:54 +00:00
parent c1dee8afa0
commit d524c052d4
4 changed files with 11 additions and 10 deletions

View file

@ -86,7 +86,7 @@
return;
}
if($_GET['mid']) {
if($_GET['mid'] || $_GET['document_srl']) {
if($this->haveSmartphoneModule($this->module_info->module)) {
$oSmartPhoneModule =& getModule($this->module_info->module, 'smartphone');
$vars = get_object_vars($this->oModule);

View file

@ -71,7 +71,7 @@ function showXEMenu() {
padding:0
});
xeSmartMenu.slideIn(0);
} else if(location.href.getQuery('mid')) {
} else if(location.href.getQuery('mid')||location.href.getQuery('document_srl')) {
xeSmartMenu.slideOut(0);
}
}
@ -79,7 +79,7 @@ function showXEMenu() {
function findSmartNode(nodes) {
if(typeof(current_mid)=='undefined') return;
var mid = current_mid;
if(location.href.indexOf(mid)<0) mid = null;
if(location.href.indexOf(mid)<0&&location.href.indexOf('document_srl')<0) mid = null;
for(var text in nodes) {
if(!text) continue;
if(nodes[text].url == mid) {
@ -93,4 +93,4 @@ function findSmartNode(nodes) {
return null;
}
if(!location.href.getQuery('mid')) jQuery(document).ready(showXEMenu);
if(!location.href.getQuery('mid')&&!location.href.getQuery('document_srl')) jQuery(document).ready(showXEMenu);

View file

@ -53,9 +53,9 @@
return $this->getExtraValue(20);
}
function getContent() {
function getContent($add_popup_menu = false, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true) {
if(!$this->document_srl) return;
return parent::getContent(false,true);
return parent::getContent($add_popup_menu, $add_content_info, $resource_realpath, $add_xe_content_class);
}
function getArrTags() {

View file

@ -3,11 +3,12 @@
<!--@foreach($content_list as $no => $item)-->
<li class="item noArrow">
<a href="{getUrl('','mid',$item->getPlanetMid(),'smartphone','true')}"><img src="{$item->getPlanetPhotoSrc(40,40)}" width="40" height="40" alt="" align="left" class="thumbnail"/></a>
<span class="title">
{$item->getContent(false)}
ps. {htmlspecialchars($item->getPostScript())}</p>
<a href="{getUrl('','mid',$item->getPlanetMid(),'smartphone','true')}">
<img src="{$item->getPlanetPhotoSrc(40,40)}" width="40" height="40" alt="" align="left" class="thumbnail"/>
{preg_replace('/<([^>]+)>/is','',$item->getContent(false,false,false,false))}
<!--@if($item->getPostScript())--><br/>ps. {htmlspecialchars($item->getPostScript())}</p><!--@end-->
</a>
</span>
<span class="info">
{$item->get('regdate')}