merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,3 +1,3 @@
.barContainer{margin-right:103px;position:relative;height:100%;}
.graphHr{position:relative; display:inline-block; background:transparent url(images/iconBar.gif) 4px 0 repeat-x; top:5px; height:5px; }
.graphHr span{position:absolute; top:-5px; left:100%; padding-left:3px; width:100px; }
.graphHr{position:relative; display:inline-block; background:transparent url(images/iconBar.gif) 4px 0 repeat-x;height:5px}
.graphHr>span{position:absolute;top:-7px;left:100%;padding-left:4px;width:100px}

View file

@ -4,80 +4,84 @@
<!--// datepicker javascript plugin load -->
<!--%load_js_plugin("ui.datepicker")-->
<script type="text/javascript">
<script>
function moveDate() {
document.forms['calendar'].submit();
return true;
}
</script>
<h3 class="h3">{$lang->counter} {$lang->cmd_management}</h3>
<form action="./index.php" method="get" name="calendar" id="fo_calendar">
<div class="x_page-header">
<h1>{$lang->counter} {$lang->cmd_management}</h1>
</div>
<form action="./index.php" method="get" name="calendar" id="fo_calendar" style="margin-bottom:30px">
<input type="hidden" name="module" value="{$module}" />
<input type="hidden" name="act" value="{$act}" />
<input type="hidden" name="selected_date" id="selected_date" value="{zDate('Ymd',$selected_date)}" />
<div class="table">
<table width="100%" border="1" cellspacing="0">
<thead>
<table class="x_table x_table-striped x_table-hover">
<thead>
<tr>
<th scope="row">{$lang->total_counter}</th>
<th scope="row"> <span id="str_selected_date">{zdate($selected_date, "Y-m-d")}</span>
<input type="hidden" class="inputDate" value="{zdate($selected_date,'Y-m-d')}" />
<script type="text/javascript">
(function($){
$(function(){
var option = {
changeMonth: true
,changeYear: true
,gotoCurrent: false
,dateFormat:'yy-mm-dd'
,yearRange:'-100:+10'
,showOn:"button"
,buttonImage:"./modules/counter/tpl/images/buttonCalendar.gif"
,buttonImageOnly:true
,mandatory:true
,onSelect:function(){
$("#str_selected_date").html(this.value);
$("#selected_date").val(this.value.replace(/-/g,''));
moveDate();
}
};
<th scope="row">
<span id="str_selected_date">{zdate($selected_date, "Y-m-d")}</span>
<input type="hidden" class="inputDate" value="{zdate($selected_date,'Y-m-d')}" />
<script>
(function($){
$(function(){
var option = {
changeMonth: true
,changeYear: true
,gotoCurrent: false
,dateFormat:'yy-mm-dd'
,yearRange:'-100:+10'
,showOn:"button"
,buttonImage:"./modules/counter/tpl/images/buttonCalendar.gif"
,buttonImageOnly:false
,mandatory:true
,onSelect:function(){
$("#str_selected_date").html(this.value);
$("#selected_date").val(this.value.replace(/-/g,''));
moveDate();
}
};
$.extend(option,$.datepicker.regional['{$lang_type}']);
$(".inputDate").datepicker(option);
});
})(jQuery);
</script> </th>
$.extend(option,$.datepicker.regional['{$lang_type}']);
$(".inputDate").datepicker(option);
});
})(jQuery);
</script>
<style scoped>
.ui-datepicker-trigger{cursor:pointer;border:0;background:none;padding:0}
</style>
</th>
</tr>
</thead>
<tbody>
</thead>
<tbody>
<tr>
<td>Visitor <strong>{number_format($total_counter->unique_visitor)}</strong> &nbsp;/&nbsp; Pageview : <strong>{number_format($total_counter->pageview)}</strong></td>
<td>Visitor : <strong>{number_format($selected_day_counter->unique_visitor)}</strong> &nbsp;/&nbsp; Pageview : <strong>{number_format($selected_day_counter->pageview)}</strong></td>
</tr>
</tbody>
</table>
</div>
</form>
<div class="cnb">
<ul>
<!--@foreach($lang->cmd_select_counter_type as $key => $val)-->
<li <!--@if($type==$key || (!$type && $key == "hour"))-->class="active"<!--@end-->><a href="{getUrl('type',$key)}">{$val}</a></li>
<!--@end-->
</ul>
</div>
</tbody>
</table>
</form>
<ul class="x_nav x_nav-tabs">
<li loop="$lang->cmd_select_counter_type => $key, $val" class="x_active"|cond="$type==$key || (!$type && $key == 'hour')">
<a href="{getUrl('type',$key)}">{$val}</a>
</li>
</ul>
<!-- 일자를 옮기는 form -->
<form action="./" method="get" id="fo_counter">
<input type="hidden" name="module" value="{$module}" />
<input type="hidden" name="act" value="{$act}" />
<input type="hidden" name="selected_date" value="{$selected_date}" />
<input type="hidden" name="module" value="{$module}" />
<input type="hidden" name="act" value="{$act}" />
<input type="hidden" name="selected_date" value="{$selected_date}" />
</form>
<!-- unique visitor 그래프 -->
<div class="table">
<table width="100%" border="1" cellspacing="0">
<table class="x_table x_table-striped x_table-hover">
<!--@foreach($detail_status->list as $key => $val)-->
<!--@if($detail_status->sum>0)-->
{@$percent = sprintf("%0.2f", $val / $detail_status->sum * 100 )}
@ -87,31 +91,30 @@
{@$img_width = 1}
<!--@end-->
<tr>
<!--@if(Context::getLangType()=='en')-->
<th scope="row"> <!--// 시간대별 -->
<th scope="row" cond="Context::getLangType()=='en'"> <!--// 시간대별 -->
<!--@if($type == 'year')-->
<em>{$key}</em>
{$key}
<!--@elseif($type == 'month')-->
<em>{$key}</em>
{$key}
<!--@elseif($type == 'day')-->
<em>{$key}</em> {$lang->unit_day}
{$key} {$lang->unit_day}
<!--@else-->
<em>{$key}</em>
<!--@end--> </th>
<!--@else-->
<th scope="row"> <!--// 시간대별 -->
{$key}
<!--@end-->
</th>
<th scope="row" cond="Context::getLangType()!='en'"> <!--// 시간대별 -->
<!--@if($type == 'year')-->
<em>{$key}</em> {$lang->unit_year}
{$key} {$lang->unit_year}
<!--@elseif($type == 'month')-->
<em>{$key}</em> {$lang->unit_month}
{$key} {$lang->unit_month}
<!--@elseif($type == 'day')-->
<em>{$key}</em> {$lang->unit_day}
{$key} {$lang->unit_day}
<!--@else-->
<em>{$key}</em> {$lang->unit_hour}
<!--@end--> </th>
<!--@end-->
{$key} {$lang->unit_hour}
<!--@end-->
</th>
{@ $img_width = (int)$percent; $img_width = $img_width?$img_width.'%':'3px'; }
<td >
<td>
<div class="barContainer">
<span class="graphHr" style="width:{$img_width}">
<span>{number_format($val)}({$percent}%)</span>
@ -120,5 +123,4 @@
</td>
</tr>
<!--@end-->
</table>
</div>
</table>