Mercurial > epgrec.yaz
changeset 170:1c4558d1a449
merged with upstream
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Sun, 18 Apr 2010 22:48:48 +0900 |
| parents | 4dee3368df63 (diff) e379552d084c (current diff) |
| children | 2a944f0c15c5 |
| files | Reservation.class.php |
| diffstat | 4 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fix_permission.sh Sun Apr 18 22:48:48 2010 +0900 @@ -0,0 +1,3 @@ +#!/bin/sh +chmod 777 cache settings templates templates_c thumbs +chmod -f 666 settings/config.xml
--- a/index.php Sun Apr 18 18:06:39 2010 +0900 +++ b/index.php Sun Apr 18 22:48:48 2010 +0900 @@ -226,7 +226,7 @@ // date("Y-m-d H:i:s", $timestamp); $sitetitle = date( "Y", $top_time ) . "年" . date( "m", $top_time ) . "月" . date( "d", $top_time ) . "日". date( "H", $top_time ) . - "時～".( $type == "GR" ? "地上デジタル" : "BSデジタル" )."番組表"; + "時〜".( $type == "GR" ? "地上デジタル" : "BSデジタル" )."番組表"; $smarty->assign("sitetitle", $sitetitle );
--- a/templates/envSetting.html Sun Apr 18 18:06:39 2010 +0900 +++ b/templates/envSetting.html Sun Apr 18 22:48:48 2010 +0900 @@ -176,7 +176,7 @@ <h3>ページに表示する番組表の長さ（時間）</h3> <div class="setting"> <div class="caption">1ページに表示する番組表の長さを時間で設定します。標準は8時間分です。</div> -<input type="text" name="program_length" value="{$settings->program_length}" size="2" class="required digits" min="2" max="24" /> +<input type="text" name="program_length" value="{$settings->program_length}" size="2" class="required digits" min="2" /> </div>