merge sandbox to trunk for 1.4.3.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2010-08-25 06:19:21 +00:00
parent 289973781a
commit 200d63636c
195 changed files with 8166 additions and 3576 deletions

View file

@ -0,0 +1,16 @@
{'<?xml version="1.0" encoding="utf-8"?>'}
<feed xmlns="http://www.w3.org/2005/Atom">
<!--#include("./include.channel.html")-->
<!--@if($articles->list)-->
<!--@if($articles->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($articles->next_url)}" /><!--@end-->
<!--@foreach($articles->list as $key => $article)-->
<!--#include("./include.articles.html")-->
<!--@end-->
<!--@elseif($deleted->list)-->
<!--@if($deleted->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($deleted->next_url)}" /><!--@end-->
<!--@foreach($deleted->list as $key => $delete)-->
<!--#include("./include.deleted.html")-->
<!--@end-->
<!--@end-->
</feed>

View file

@ -0,0 +1,5 @@
{'<?xml version="1.0" encoding="utf-8"?>'}
<entry xmlns="http://www.w3.org/2005/Atom">
<!--#include("./include.channel.html")-->
</entry>

View file

@ -0,0 +1,60 @@
<!--%import("css/syndication.css")-->
<!--%import("js/syndication.js")-->
<!--%import("filter/insert_service.xml")-->
<h3 class="xeAdmin">{$lang->syndication} <span class="gray">{$lang->cmd_management}</span></h3>
<p class="summary">{$lang->about_syndication}</p>
<form action="./" method="get" onsubmit="return procFilter(this, insert_service);">
<input type="hidden" name="year" value="{$year}" />
<table cellspacing="0" class="rowTable">
<tr>
<th scope="row"><div>{$lang->my_syndication_url}</div></th>
<td>
http://<input type="text" id="site_url" name="site_url" value="{$site_url}" class="inputTypeText siteUrl" />
<span class="button green"><input type="button" value="{$lang->cmd_check_syndication_echo}" onclick="pingSite(jQuery('#site_url').val())" /></span>
<p>{$lang->about_my_syndication_url}</p>
<p class="ping_test_result"></p>
</td>
</tr>
<tr>
<th scope="row"><div>{$lang->syndication_service}</div></th>
<td>
<ul class="syndiService">
<!--@foreach($services as $key => $val)-->
<li>
<input type="checkbox" name="target_services" value="{$val->service}" id="target_service_{$val->service}" <!--@if($val->selected)-->checked="checked"<!--@end--> />
<label for="target_service_{$val->service}">{$val->service}</label>
<!--@if($val->selected)--><span class="button green small"><input type="button" value="{$lang->cmd_check_syndication_status}" onclick="checkSyndicationStatus('{$val->service}')" /></span><!--@end-->
</li>
<!--@end-->
</ul>
<div class="print_result_status"></div>
<p>{$lang->about_syndication}</p>
</td>
</tr>
<tr>
<th scope="row"><div>{$lang->except_module}</div></th>
<td>
<select name="_except_module" id="_except_module" size="10" class="exceptModuleList">
{@$except_module_srls = array()}
<!--@foreach($except_module as $v)-->
{@$except_module_srls[] = $v->module_srl}
<option value="{$v->module_srl}">{$v->browser_title} ({$v->mid})</option>
<!--@end-->
</select>
<ul class="midCommand">
<li><a href="{getUrl('','module','module','act','dispModuleSelectList','id','except_module')}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_insert}</span></a></li>
<li><a href="#" onclick="removeExceptModule('except_module');return false;" class="button red"><span>{$lang->cmd_delete}</span></a></li>
</ul>
<p>{$lang->about_except_module}</p>
<input type="hidden" name="except_module" id="except_module" value="{implode(',',$except_module_srls)}" />
</td>
</tr>
<tr>
<th colspan="2" class="button">
<span class="button black strong"><input type="submit" value="{$lang->cmd_apply}" accesskey="s" /></span>
</th>
</tr>
</table>
</form>

View file

@ -0,0 +1,17 @@
@charset "utf-8";
input.siteUrl { width:400px; }
ul.syndiService { list-style:none; margin:0; padding:0;}
ul.syndiService li { padding:10px 0; margin:0;}
select.exceptModuleList { width:400px; }
ul.midCommand { margin:20px 0 0 0; padding:0; list-style:none; }
ul.midCommand li { display:inline; margin:0 20px 0 0; padding:0;}
/* Vertical Bar Graph */
.vGraph{ padding:20px 0;}
.vGraph ul{ margin:0; padding:0; height:100px; border:1px solid #ddd; border-top:0; border-right:0; font-size:11px; font-family:Tahoma, Geneva, sans-serif; list-style:none;}
.vGraph ul:after{ content:""; display:block; clear:both;}
.vGraph li{ float:left; display:inline; width:8%; height:100%; margin:0 3%; position:relative; text-align:center; white-space:nowrap;}
.vGraph .gTerm{ position:relative; display:inline-block; width:100%; height:20px; line-height:20px; margin:0 -100% -20px 0; padding:100px 0 0 0; vertical-align:bottom; color:#767676; font-weight:bold;}
.vGraph .gBar{ position:relative; display:inline-block; width:100%; margin:-1px 0 0 0; border:1px solid #ccc; border-bottom:0; background:#e9e9e9; vertical-align:bottom;}
.vGraph .gBar span{ position:absolute; width:100%; top:-20px; left:0; color:#767676;}

View file

@ -0,0 +1,5 @@
{'<?xml version="1.0" encoding="utf-8"?>'}
<feed xmlns="http://www.w3.org/2005/Atom">
<error>-1</error>
<message>{$message}</message>
</feed>

View file

@ -0,0 +1,8 @@
<filter name="insert_service" module="syndication" act="procSyndicationAdminInsertService" confirm_msg_code="confirm_submit">
<form />
<parameter />
<response>
<tag name="error" />
<tag name="message" />
</response>
</filter>

View file

@ -0,0 +1,14 @@
<entry>
<id>{htmlspecialchars($article->id)}</id>
<title>{htmlspecialchars($article->title)}</title>
<updated>{$article->updated}</updated>
<link rel="alternative" href="{$article->alternative_href}" />
<link rel="channel" href="{htmlspecialchars($article->channel_id)}" />
<link rel="channel-alternative" href="{$article->channel_alternative_href}" />
<published>{date('Y-m-d\TH:i:s',ztime($article->regdate)).$time_zone}</published>
<author>
<name>{htmlspecialchars($article->nick_name)}</name>
</author>
<content>{htmlspecialchars($article->content)}</content>
</entry>

View file

@ -0,0 +1,8 @@
<id>{htmlspecialchars($channel_info->id)}</id>
<title>{htmlspecialchars($channel_info->title)}</title>
<updated>{$channel_info->updated}</updated>
<link rel="self" href="{htmlspecialchars($channel_info->self_href)}" />
<link rel="alternative" href="{$channel_info->alternative_href}" />
<!--@if($channel_info->rss_href)--><link rel="rss" href="{$channel_info->rss_href}" /><!--@end-->
<type>{$channel_info->type}</type>
<summary>{htmlspecialchars($channel_info->summary)}</summary>

View file

@ -0,0 +1,8 @@
<entry>
<id>{htmlspecialchars($channel_info->id)}</id>
<title>{htmlspecialchars($channel_info->title)}</title>
<updated>{$channel_info->updated}</updated>
<link rel="self" href="{htmlspecialchars($channel_info->self_href)}" />
<link rel="alternative" href="{$channel_info->alternative_href}" />
<summary>{htmlspecialchars($channel_info->summary)}</summary>
</entry>

View file

@ -0,0 +1,8 @@
<entry>
<id>{htmlspecialchars($delete->id)}</id>
<title>{htmlspecialchars($delete->title)}</title>
<updated>{$delete->deleted}</updated>
<link rel="alternative" href="{$delete->alternative_href}" />
<deleted>{$delete->deleted}</deleted>
</entry>

View file

@ -0,0 +1,5 @@
<id>{htmlspecialchars($site_info->id)}</id>
<title>{htmlspecialchars($site_info->title)}</title>
<updated>{$site_info->updated}</updated>
<link rel="self" href="{htmlspecialchars($site_info->self_href)}" />
<link rel="alternative" href="{$site_info->alternative_href}" />

View file

@ -0,0 +1,55 @@
function insertSelectedModules(id, module_srl, mid, browser_title) {
var sel_obj = xGetElementById('_'+id);
for(var i=0;i<sel_obj.options.length;i++) if(sel_obj.options[i].value==module_srl) return;
var opt = new Option(browser_title+' ('+mid+')', module_srl, false, false);
sel_obj.options[sel_obj.options.length] = opt;
if(sel_obj.options.length>8) sel_obj.size = sel_obj.options.length;
doSyncExceptModules(id);
}
function removeExceptModule(id) {
var sel_obj = xGetElementById('_'+id);
sel_obj.remove(sel_obj.selectedIndex);
if(sel_obj.options.length) sel_obj.selectedIndex = sel_obj.options.length-1;
doSyncExceptModules(id);
}
function doSyncExceptModules(id) {
var selected_module_srls = new Array();
var sel_obj = xGetElementById('_'+id);
for(var i=0;i<sel_obj.options.length;i++) {
selected_module_srls.push(sel_obj.options[i].value);
}
xGetElementById(id).value = selected_module_srls.join(',');
}
function pingSite(site_url){
jQuery('p.ping_test_result').html('');
var response_tags = new Array('error','message','ping_result');
exec_xml('syndication','procSyndicationAdminCheckSitePingResult',{'site_url':site_url},function(ret_obj,response_tags){
var error = ret_obj['error'];
var message = ret_obj['message'];
var ping_result = ret_obj['ping_result'];
if(ping_result) jQuery('p.ping_test_result').text(ping_result);
alert(message);
},response_tags);
}
function checkSyndicationStatus(service){
jQuery('p.print_result_status').html('');
var response_tags = new Array('error','message','result_status');
exec_xml('syndication','procSyndicationAdminCheckApiStatus',{target_service:service},function(ret_obj,response_tags){
var error = ret_obj['error'];
var message = ret_obj['message'];
var result = ret_obj['result_status'];
if(result) jQuery('div.print_result_status').html(result);
if(error!=0) alert(message);
},response_tags);
}

View file

@ -0,0 +1,41 @@
<h3>Naver Syndication Status</h3>
<h4>{$lang->syndication_status_result}</h4>
<table>
<tbody>
<tr>
<th>{$lang->site}</th>
<td>{$result->site_name}</td>
</tr>
<tr>
<th>{$lang->syndication_status}</th>
<td><strong>{$result->status}</strong></td>
</tr>
<tr>
<th>{$lang->syndication_synic_start_date}</th>
<td>{$result->first_update}</td>
</tr>
<tr>
<th>{$lang->syndication_synic_last_date}</th>
<td>{$result->last_update}</td>
</tr>
<tr>
<th>{$lang->syndication_visit_ok_count}</th>
<td>{number_format($result->visit_ok_count)}</td>
</tr>
<tr>
<th>{$lang->syndication_visit_fail_count}</th>
<td>{number_format($result->visit_fail_count)}</td>
</tr>
</tbody>
</table>
<h4>{$lang->syndication_sync_article}</h4>
<div class="vGraph">
<!--@if($result->article_count)-->
<ul>
<!--@foreach($result->article_count as $date => $count)-->
<li><span class="gTerm">{$date}</span><span class="gBar" style="height:{intval(($count/$result->max_article_count)*100)}%"><span>{number_format($count)}</span></span></li>
<!--@end-->
</ul>
<!--@end-->
</div>

View file

@ -0,0 +1,21 @@
{'<?xml version="1.0" encoding="utf-8"?>'}
<feed xmlns="http://www.w3.org/2005/Atom">
<!--#include("./include.site.html")-->
<!--@if(count($channels))-->
<!--@foreach($channels as $key => $channel_info)-->
<entry>
<!--#include("./include.channel.html")-->
</entry>
<!--@end-->
<!--@elseif(count($articles->list))-->
<!--@if($articles->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($articles->next_url)}" /><!--@end-->
<!--@foreach($articles->list as $key => $article)-->
<!--#include("./include.articles.html")-->
<!--@end-->
<!--@elseif(count($deleted->list))-->
<!--@if($deleted->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($deleted->next_url)}" /><!--@end-->
<!--@foreach($deleted->list as $key => $delete)-->
<!--#include("./include.deleted.html")-->
<!--@end-->
<!--@end-->
</feed>

View file

@ -0,0 +1,4 @@
{'<?xml version="1.0" encoding="utf-8"?>'}
<entry xmlns="http://www.w3.org/2005/Atom">
<!--#include("./include.site.html")-->
</entry>