epg取得前の表示の乱れ対応

Signed-off-by: osamu(atelier TRUMP HOUSE) <trumphouseusers@sourceforge.jp>

diff --git a/index.php b/index.php
index b7c3ac1..50a41a6 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -116,6 +116,7 @@ foreach( $channel_map as $channel_disc => $channel ) {
                }
        }
         catch( exception $e ) {
+               $num_ch++;      // epgの無いチャンネル対応
 //             exit( $e->getMessage() );
 //             何もしない
        }

diff --git a/templates/index.html b/templates/index.html
index 27ee9ab..d452b3c 100755 (executable)
--- a/templates/index.html
+++ b/templates/index.html
@@ -628,7 +628,7 @@ h2 {padding: 4px}
 <!-- チャンネル局名 -->
 <div id="ch_title_bar" style="position:absolute;bottom:0;">
   <div class="tvtimeDM" style="float:left;">&nbsp;</div>
-  {foreach from=$programs item=program}
+  {foreach from=$programs item=program}{if isset($program.ch_hash)}
   <div id="ch_title_{$program.ch_hash}"  class="ch_title{if $program.skip == 1} ch_title_skip{/if}" >
     <div class="ch_hash">{$program.ch_hash}</div>
     <div class="ch_disc">{$program.channel_disc}</div>
@@ -637,7 +637,9 @@ h2 {padding: 4px}
     <div class="ch_name">{$program.station_name}</div>
     <div id="ch_title_str_{$program.ch_hash}" {if $program.skip == 1}class="ch_skip_color" {/if} style="cursor: pointer;" onClick="javascript:PRG.chdialog('{$program.ch_hash}')" >{$program.station_name}</div>
   </div>
-  {/foreach}
+  {else}
+  <div class="ch_title"><div style="font-style:italic">no epg</div></div>
+  {/if}{/foreach}
 </div>
 
 <br style="clear:left;" />
@@ -656,10 +658,12 @@ h2 {padding: 4px}
 </div>
 
 <div id="tv_chs" style="width: {$chs_width}px" >
-   {foreach from=$programs item=program}
+   {foreach from=$programs item=program}{if isset($program.ch_hash)}
    <div id="tv_chs_{$program.ch_hash}" class="ch_set{if $program.skip == 1} ch_set_skip{/if}" >
     <div class="ch_programs" >
-    {foreach from=$program.list item=item}
+       {else}
+       <div class="ch_set"><div class="ch_programs">
+    {/if}{foreach from=$program.list item=item}{if isset($item.id)}
       <div {if $item.id}id="prgID_{$item.id}"{/if} class="prg {if ! $item.id}prg_none {/if} ctg_{$item.category_name}{if $item.rec gt 0} prg_rec{/if}" style="height:{$item.height}px;">
         <div class="prg_dummy">
           <div class="prg_title">{$item.title|escape}</div>
@@ -671,7 +675,9 @@ h2 {padding: 4px}
           <div class="prg_id">{$item.id}</div>
         </div>
       </div>
-    {/foreach}
+       {else}
+       <div class="prg"><div class="prg_dummy" style="font-style:italic">no prg</div></div>
+    {/if}{/foreach}
     </div>
    </div>
    {/foreach}