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

Changeset 3304


Ignore:
Timestamp:
Jun 19, 2007, 7:15:45 PM (12 years ago)
Author:
ToshihiroK
Message:

個人用ブランチ修正 2.6

Location:
OpenPNE/branches/kimura/2.6_2/webapp_biz/modules
Files:
5 edited

Legend:

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

    r3209 r3304  
    111111({$item_schedule.c_member_name})
    112112</div></a>
    113         ({elseif $item_schedule.begin_date < $item_schedule.finish_date})  <!--バナー予定 -->
    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"})
    116 ({ext_include file="inc_biz_schedule_week_time.tpl"})
    117 <div class="padding_s" style="padding-top:0;">
    118 <a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$item_schedule.biz_schedule_id})">({$item_schedule.title})</a>
    119 </div>
     113        ({elseif $item_schedule.begin_date != $item_schedule.finish_date})  <!--バナー予定 -->
     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"})
     116({if $item_schedule.finish_time})
     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"})
     119({/if})
     120({ext_include file="inc_biz_schedule_week_time.tpl"})
     121<div class="padding_s" style="padding-top:0;">
     122<a href="({t_url m=biz a=page_fh_biz_schedule_view})&amp;id=({$item_schedule.biz_schedule_id})">({$item_schedule.title})</a>
     123</div>
    120124        ({else})
    121125({assign var="begin_time_H" value=$item_schedule.begin_time|date_format:"%H"})
  • OpenPNE/branches/kimura/2.6_2/webapp_biz/modules/biz/templates/fh_biz_schedule_view.tpl

    r3209 r3304  
    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 || $schedule.begin_date < $schedule.finish_date || $schedule.finish_time})~({/if})
    85 
    86 ({if $schedule.begin_date < $schedule.finish_date})
    87         ({$schedule.finish_date})
    88 ({/if})
    89 ({if $schedule.finish_time})
    90         ({$schedule.finish_time})
    91 ({/if})
     84({if $schedule.begin_date != $schedule.finish_date})
     85        ~({$schedule.finish_date})
     86({/if})
     87({/strip})
     88
     89({strip})
     90({$schedule.begin_time})
     91({if $schedule.begin_time || $schedule.finish_time})~({/if})
     92({$schedule.finish_time})
     93({/strip})
    9294
    9395</div>
  • OpenPNE/branches/kimura/2.6_2/webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl

    r3257 r3304  
    232232({assign var="begin_time_H" value=$item_schedule.begin_time|date_format:"%H"})
    233233({assign var="begin_time_M" value=$item_schedule.begin_time|date_format:"%M"})
     234({if $item_schedule.finish_time})
     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})
    234238({ext_include file="inc_biz_schedule_week_time.tpl"})
    235239<div class="padding_s" style="padding-top:0;">
  • OpenPNE/branches/kimura/2.6_2/webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_view.tpl

    r3209 r3304  
    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 || $schedule.begin_date < $schedule.finish_date || $schedule.finish_time})~({/if})
    17         ({if $schedule.begin_date < $schedule.finish_date})
    18                 ({$schedule.finish_date})
    19         ({/if})
    20         ({if $schedule.finish_time})
    21                 ({$schedule.finish_time})
    22         ({/if})
    23 <br>
     17({if $schedule.begin_date != $schedule.finish_date})
     18        ~({$schedule.finish_date})
     19({/if})
     20({/strip})
     21
     22({strip})
     23({$schedule.begin_time})
     24({if $schedule.begin_time || $schedule.finish_time})~({/if})
     25({$schedule.finish_time}) <br>
     26({/strip})
    2427({/if})
    2528
  • OpenPNE/branches/kimura/2.6_2/webapp_biz/modules/ktai_biz/templates/fh_calendar_week.tpl

    r3209 r3304  
    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})
    58 ({if $item_schedule.finish_time && !($item_schedule.begin_date < $item_schedule.finish_date)})
     59
     60({if $item_schedule.begin_time || $item_schedule.finish_time})
    5961-
     62({/if})
     63
     64({if $item_schedule.finish_time})
    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.