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

Changeset 3302


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

#879:BIZ:繰り返さない予定が期間どおり表示されない
2.8 修正しました

Location:
OpenPNE/branches/2.8.x/webapp_biz/modules
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/2.8.x/webapp_biz/modules/biz/templates/fh_biz_schedule_calendar.tpl

    r2880 r3302  
    110110</div></a>
    111111        ({elseif $item_schedule.begin_date != $item_schedule.finish_date})  <!--バナー予定 -->
    112 ({assign var="begin_time_H" value=$item_schedule.begin_date|date_format:"%H"})
    113 ({assign var="begin_time_M" value=$item_schedule.begin_date|date_format:"%M"})
     112({assign var="begin_time_H" value=$item_schedule.begin_time|date_format:"%H"})
     113({assign var="begin_time_M" value=$item_schedule.begin_time|date_format:"%M"})
    114114({if $item_schedule.finish_time})
    115         ({assign var="finish_time_H" value=$item_schedule.finish_date|date_format:"%H"})
    116         ({assign var="finish_time_M" value=$item_schedule.finish_date|date_format:"%M"})
     115        ({assign var="finish_time_H" value=$item_schedule.finish_time|date_format:"%H"})
     116        ({assign var="finish_time_M" value=$item_schedule.finish_time|date_format:"%M"})
    117117({/if})
    118118({ext_include file="inc_biz_schedule_week_time.tpl"})
  • OpenPNE/branches/2.8.x/webapp_biz/modules/biz/templates/fh_biz_schedule_view.tpl

    r2880 r3302  
    7676<div style="padding:4px 3px;">
    7777
     78({strip})
    7879({if $schedule.rep_type_loc})
    7980        毎週 ({$schedule.rep_type_loc})曜日
     
    8283({/if})
    8384
    84 ({$schedule.begin_time}) ({if $schedule.begin_time})~({/if})
    85 
    8685({if $schedule.begin_date != $schedule.finish_date})
    87         ({$schedule.finish_date})
    88 ({/if})
    89 
     86        ~({$schedule.finish_date})
     87({/if})
     88({/strip})
     89
     90({strip})
     91({$schedule.begin_time})
     92({if $schedule.begin_time || $schedule.finish_time})~({/if})
    9093({$schedule.finish_time})
     94({/strip})
    9195
    9296</div>
  • OpenPNE/branches/2.8.x/webapp_biz/modules/biz/templates/inc_biz_schedule_week.tpl

    r3298 r3302  
    243243</div></a>
    244244        ({elseif $item_schedule.begin_date != $item_schedule.finish_date})  <!--バナー予定 -->
    245 ({assign var="begin_time_H" value=$item_schedule.begin_date|date_format:"%H"})
    246 ({assign var="begin_time_M" value=$item_schedule.begin_date|date_format:"%M"})
     245({assign var="begin_time_H" value=$item_schedule.begin_time|date_format:"%H"})
     246({assign var="begin_time_M" value=$item_schedule.begin_time|date_format:"%M"})
    247247({if $item_schedule.finish_time})
    248 ({assign var="finish_time_H" value=$item_schedule.finish_date|date_format:"%H"})
    249 ({assign var="finish_time_M" value=$item_schedule.finish_date|date_format:"%M"})
     248({assign var="finish_time_H" value=$item_schedule.finish_time|date_format:"%H"})
     249({assign var="finish_time_M" value=$item_schedule.finish_time|date_format:"%M"})
    250250({/if})
    251251({ext_include file="inc_biz_schedule_week_time.tpl"})
  • OpenPNE/branches/2.8.x/webapp_biz/modules/ktai_biz/page/fh_calendar_week.php

    r1856 r3302  
    6767
    6868            if (!empty($banner)) {
    69                 array_push($schedule, $banner);
     69                foreach ($banner as $value) {
     70                    array_push($schedule, $value);
     71                }
    7072            }
    7173
  • OpenPNE/branches/2.8.x/webapp_biz/modules/ktai_biz/templates/fh_biz_schedule_view.tpl

    r2835 r3302  
    1212期間:({$repeat_term})週間<br>
    1313({else})
     14({strip})
    1415        ({$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/2.8.x/webapp_biz/modules/ktai_biz/templates/fh_calendar_week.tpl

    r543 r3302  
    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})
    6268({$item_schedule.title|truncate:13:"-":true})</a>&nbsp;
    6369
Note: See TracChangeset for help on using the changeset viewer.