changeset 165:3d4df1fe4166

merged with upstream
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 08 Apr 2010 04:22:20 +0900
parents 47a3acf19870 (diff) 254d8a21bf36 (current diff)
children 4dee3368df63
files Reservation.class.php config.php.sample recomplete.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	Thu Apr 08 04:22:20 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	Tue Apr 06 11:03:45 2010 +0900
+++ b/index.php	Thu Apr 08 04:22:20 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	Tue Apr 06 11:03:45 2010 +0900
+++ b/templates/envSetting.html	Thu Apr 08 04:22:20 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>
 
 
--- a/video/index.html	Tue Apr 06 11:03:45 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<html></html>