ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 3301


Ignore:
Timestamp:
Jun 19, 2007, 5:00:54 PM (12 years ago)
Author:
ToshihiroK
Message:

個人用ブランチ修正 2.6

Location:
OpenPNE/branches/kimura/2.6/webapp_biz/modules
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/kimura/2.6/webapp_biz/modules/biz/templates/fh_biz_schedule_calendar.tpl

    r2856 r3301  
    112112</div></a>
    113113        ({elseif $item_schedule.begin_date != $item_schedule.finish_date})  <!--バナー予定 -->
    114 ({assign var="begin_time_H" value=$item_schedule.begin_date|date_format:"%H"})
    115 ({assign var="begin_time_M" value=$item_schedule.begin_date|date_format:"%M"})
     114({assign var="begin_time_H" value=$item_schedule.begin_time|date_format:"%H"})
     115({assign var="begin_time_M" value=$item_schedule.begin_time|date_format:"%M"})
    116116({if $item_schedule.finish_time})
    117         ({assign var="finish_time_H" value=$item_schedule.finish_date|date_format:"%H"})
    118         ({assign var="finish_time_M" value=$item_schedule.finish_date|date_format:"%M"})
     117        ({assign var="finish_time_H" value=$item_schedule.finish_time|date_format:"%H"})
     118        ({assign var="finish_time_M" value=$item_schedule.finish_time|date_format:"%M"})
    119119({/if})
    120120({ext_include file="inc_biz_schedule_week_time.tpl"})
  • OpenPNE/branches/kimura/2.6/webapp_biz/modules/biz/templates/fh_biz_schedule_view.tpl

    r2440 r3301  
    7676<div style="padding:4px 3px;">
    7777
     78({strip})
    7879({if $schedule.rep_type_loc})
    7980        毎週 ({$schedule.rep_type_loc})曜日
     
    8182        ({$schedule.begin_date})
    8283({/if})
    83 
    84 ({$schedule.begin_time}) ({if $schedule.begin_time})~({/if})
    85 
    8684({if $schedule.begin_date != $schedule.finish_date})
    87         ({$schedule.finish_date})
    88 ({/if})
    89 
     85        ~({$schedule.finish_date})
     86({/if})
     87({/strip})
     88
     89({strip})
     90({$schedule.begin_time})
     91({if $schedule.begin_time || $schedule.finish_time})~({/if})
    9092({$schedule.finish_time})
     93({/strip})
    9194
    9295</div>
  • OpenPNE/branches/kimura/2.6/webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl

    r3255 r3301  
    229229({$item_schedule.c_member_name})
    230230</div></a>
    231         ({elseif $item_schedule.begin_date != $item_schedule.finish_date})  <!--バナー予定 -->
    232 ({assign var="begin_time_H" value=$item_schedule.begin_date|date_format:"%H"})
    233 ({assign var="begin_time_M" value=$item_schedule.begin_date|date_format:"%M"})
     231        ({elseif $item_schedule.begin_date < $item_schedule.finish_date})  <!--バナー予定 -->
     232({assign var="begin_time_H" value=$item_schedule.begin_time|date_format:"%H"})
     233({assign var="begin_time_M" value=$item_schedule.begin_time|date_format:"%M"})
    234234({if $item_schedule.finish_time})
    235 ({assign var="finish_time_H" value=$item_schedule.finish_date|date_format:"%H"})
    236 ({assign var="finish_time_M" value=$item_schedule.finish_date|date_format:"%M"})
    237 ({/if})
    238 ({ext_include file="inc_biz_schedule_week_time.tpl"})
    239 <div class="padding_s" style="padding-top:0;">
    240 <a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$item_schedule.biz_schedule_id})({if $cmd=='f'})&amp;target_id=({$member_info.c_member_id})({/if})">({$item_schedule.title})</a>
    241  </div>
     235({assign var="finish_time_H" value=$item_schedule.finish_time|date_format:"%H"})
     236({assign var="finish_time_M" value=$item_schedule.finish_time|date_format:"%M"})
     237({/if})
     238({ext_include file="inc_biz_schedule_week_time.tpl"}) 
     239<div class="padding_s" style="padding-top:0;"> 
     240<a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$item_schedule.biz_schedule_id})({if $cmd=='f'})&amp;target_id=({$member_info.c_member_id})({/if})">({$item_schedule.title})</a> 
     241 </div> 
    242242        ({else})
    243243({assign var="begin_time_H" value=$item_schedule.begin_time|date_format:"%H"})
  • OpenPNE/branches/kimura/2.6/webapp_biz/modules/ktai_biz/page/fh_calendar_week.php

    r3219 r3301  
    6969                foreach ($banner as $value) {
    7070                    array_push($schedule, $value);
     71                }
    7172            }
    7273
  • OpenPNE/branches/kimura/2.6/webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_view.tpl

    r1775 r3301  
    1212期間:({$repeat_term})週間<br>
    1313({else})
    14         ({$schedule.begin_date})
     14({strip})
     15    ({$schedule.begin_date})
    1516       
    16         ({$schedule.begin_time}) ({if $schedule.begin_time})~({/if})
    1717({if $schedule.begin_date != $schedule.finish_date})
    18         ({$schedule.finish_date})
     18        ({$schedule.finish_date})
    1919({/if})
     20({/strip})
     21
     22({strip})
     23({$schedule.begin_time})
     24({if $schedule.begin_time || $schedule.finish_time})~({/if})
    2025({$schedule.finish_time}) <br>
     26({/strip})
    2127({/if})
    2228
  • OpenPNE/branches/kimura/2.6/webapp_biz/modules/ktai_biz/templates/fh_calendar_week.tpl

    r543 r3301  
    5353
    5454<a href="({t_url m=ktai_biz a=page_fh_biz_schedule_view})&amp;target_id=({$c_member.c_member_id})&amp;id=({$item_schedule.biz_schedule_id})&amp;({$tail})">
     55({strip})
    5556({if $item_schedule.begin_time})
    5657({$item_schedule.begin_time|date_format:"%H:%M"})
    5758({/if})
     59
     60({if $item_schedule.begin_time || $item_schedule.finish_time})
     61-
     62({/if})
     63
    5864({if $item_schedule.finish_time})
    59 -
    6065({$item_schedule.finish_time|date_format:"%H:%M"})
    6166({/if})
     67({/strip})
     68
    6269({$item_schedule.title|truncate:13:"-":true})</a>&nbsp;
    6370
Note: See TracChangeset for help on using the changeset viewer.