[Opda-develop] OPDA/app/views/channels show.rhtml, 1.2, 1.3 index.rhtml, 1.2, 1.3 _channel.rhtml, 1.1, 1.2

[Alex N. <dig...@us...>]

Update of /cvsroot/opda/OPDA/app/views/channels
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18171/app/views/channels

Modified Files:
	show.rhtml index.rhtml _channel.rhtml 
Log Message:
Added default image for podcast to views
Fixed layout to default for channels/index
mod to css to try new color scheme


Index: index.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/app/views/channels/index.rhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.rhtml	11 Jul 2006 06:49:23 -0000	1.2
--- index.rhtml	16 Jul 2006 04:13:56 -0000	1.3
***************
*** 37,49 ****
  
  <% for channel in @newchannels %>
!   <%   %>
      <div class="tinycast">
      <div class="image50">
!     <%= link_to image_tag(channel.itunes_image,:size => "50x50", :border => 0,:align => 'left'), :action => 'show', :id => channel  if !channel.itunes_image.nil?%>
      </div> <!--end image50 div -->
         <span class="smalltitle"><%= link_to h(channel.title), :action => 'show', :id => channel %></span><br />
!          <span class="smalldescription"><%= h(channel.description.to_s.slice(0..100)) if !channel.description.nil?%></span></p>
      </div> <!-- end tinycast div  -->   
! 
  <% end %>
  </div> <!-- end 3columnmiddle div -->
--- 37,54 ----
  
  <% for channel in @newchannels %>
! 
      <div class="tinycast">
+    
      <div class="image50">
!       <% if channel.itunes_image.nil? %>
!         <%= link_to theme_image_tag("defaultart.jpg",:size => "50x50", :border => 0), :action => 'show', :id => channel%>
!       <% else %>
!       	<%= link_to image_tag(channel.itunes_image,:size => "50x50", :border => 0), :action => 'show', :id => channel%>
!       <% end %>  
      </div> <!--end image50 div -->
         <span class="smalltitle"><%= link_to h(channel.title), :action => 'show', :id => channel %></span><br />
!          <span class="smalldescription"><%= h(channel.description.to_s.slice(0..100)) if !channel.description.nil?%></span>
      </div> <!-- end tinycast div  -->   
!     <div class="clearspan">&nbsp;</div>
  <% end %>
  </div> <!-- end 3columnmiddle div -->
***************
*** 54,64 ****
  <% left_or_right = 0%>
  <% for channel in @featuredchannels %>
!   <%  if !channel.itunes_image.nil? %>
      <% left_or_right = 1- left_or_right %>
      <div class="feature<%=left_or_right%>">
!      <%= link_to image_tag(channel.itunes_image,:size => "144x144", :border => 0), :action => 'show', :id => channel%>
!     <p>Listen | Subscribe</p><br /><br />
      </div>
-   <% end %>
  <% end %>
  </div> <!-- end 3columnleft div -->
\ No newline at end of file
--- 59,74 ----
  <% left_or_right = 0%>
  <% for channel in @featuredchannels %>
! 
      <% left_or_right = 1- left_or_right %>
      <div class="feature<%=left_or_right%>">
! 
!       <% if channel.itunes_image.nil? %>
!         <%= link_to theme_image_tag("defaultart.jpg",:size => "144x144", :border => 0), :action => 'show', :id => channel%>
!       <% else %>
!       	<%= link_to image_tag(channel.itunes_image,:size => "144x144", :border => 0), :action => 'show', :id => channel%>
!       <% end %>  
!     
!       <p>Listen | Subscribe</p><br /><br />
      </div>
  <% end %>
  </div> <!-- end 3columnleft div -->
\ No newline at end of file

Index: show.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/app/views/channels/show.rhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** show.rhtml	10 Jul 2006 05:54:22 -0000	1.2
--- show.rhtml	16 Jul 2006 04:13:56 -0000	1.3
***************
*** 7,11 ****
    <div class="boxtitlerow"><span class="boxtitle"><%= h(@channel.title) %></span></div>
      <div id="channelheaderleft">
!       <p><%= image_tag(@channel.itunes_image,:size => "200x200", :border => 0) if @channel.itunes_image != nil %></p>
        <p>Put listen button here</p>
        <p>Put subscribe button here</p>
--- 7,16 ----
    <div class="boxtitlerow"><span class="boxtitle"><%= h(@channel.title) %></span></div>
      <div id="channelheaderleft">
!       <p>    
!     	<% if @channel.itunes_image.nil?%>
!     	  <%= theme_image_tag("defaultart.jpg",:size => "200x200", :border => 0)%>
!     	<% else %>
!     	  <%= image_tag(@channel.itunes_image,:size => "200x200", :border => 0)%>
!     	<% end %></p>
        <p>Put listen button here</p>
        <p>Put subscribe button here</p>

Index: _channel.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/app/views/channels/_channel.rhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** _channel.rhtml	10 Jul 2006 21:16:17 -0000	1.1
--- _channel.rhtml	16 Jul 2006 04:13:56 -0000	1.2
***************
*** 1,6 ****
    <tr>
      <td>
!     	<!-- CHRISTOPHE TODO: Create a "no image" image --> 
!     	<%= image_tag(channel.itunes_image,:size => "100x100", :border => 0) if channel.itunes_image != nil %>
      </td>
      <td>
--- 1,11 ----
    <tr>
      <td>
!     
!     
!     	<% if channel.itunes_image.nil?%>
!     	  <%= theme_image_tag("defaultart.jpg",:size => "100x100", :border => 0)%>
!     	<% else %>
!     	  <%= image_tag(channel.itunes_image,:size => "100x100", :border => 0)%>
!     	<% end %>
      </td>
      <td>