[Opda-develop] OPDA/themes/default/layouts default.rhtml,1.8,1.9

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

Update of /cvsroot/opda/OPDA/themes/default/layouts
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18171/themes/default/layouts

Modified Files:
	default.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: default.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/themes/default/layouts/default.rhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** default.rhtml	12 Jul 2006 20:32:24 -0000	1.8
--- default.rhtml	16 Jul 2006 04:13:57 -0000	1.9
***************
*** 5,9 ****
    <title>OPDA - Podcasts</title>
    <%= stylesheet_link_tag 'scaffold' %>
!    <%= stylesheet_link_tag 'default' %>
    <%= javascript_include_tag :defaults %>
  </head>
--- 5,9 ----
    <title>OPDA - Podcasts</title>
    <%= stylesheet_link_tag 'scaffold' %>
!    <%= theme_stylesheet_link_tag 'default' %>
    <%= javascript_include_tag :defaults %>
  </head>
***************
*** 13,22 ****
  	<p><span class="floatright">
  		<% if !session[:user] %> 
! 			<%= link_to 'Login', :controller => 'user', :action => 'login' %>
  		<% else %>
! 			<%= link_to 'Logout', :controller => 'user', :action => 'logout' %>
  		<%end%>			
  		</span> </p>
! 	<h1>OPDA</h1> 
  
  <!--Begin Nav Buttons -->
--- 13,22 ----
  	<p><span class="floatright">
  		<% if !session[:user] %> 
! 			<%= link_to 'Login'.t, :controller => 'user', :action => 'login' %>
  		<% else %>
! 			<%= link_to 'Logout'.t, :controller => 'user', :action => 'logout' %>
  		<%end%>			
  		</span> </p>
! 	<h1><%= link_to 'OPDA'.t, :controller => 'channels', :action => 'index' %></h1> 
  
  <!--Begin Nav Buttons -->
***************
*** 24,29 ****
  <% if session[:user] %><li class="right"><%= link_to 'My subscriptions'.t,:controller => 'subscription_lists', :action => 'list' %></li><% end %>
  <% if session[:user] %><li class="right"><%= link_to 'Add a Podcast'.t,:controller => 'channels', :action => 'new' %></li><% end %>
! <li class="right"><%= link_to 'Home'.t,:controller => 'user', :action => 'home' %></li>
! <% if session[:user] && session[:user].admin? %><li class="farright"><%= link_to 'Admin',:controller => 'admin/panel', :action => 'index' %><%end%></li></ul>
  </div>  <!---End Nav Buttons -->
  </div>  <!-- End Header -->
--- 24,29 ----
  <% if session[:user] %><li class="right"><%= link_to 'My subscriptions'.t,:controller => 'subscription_lists', :action => 'list' %></li><% end %>
  <% if session[:user] %><li class="right"><%= link_to 'Add a Podcast'.t,:controller => 'channels', :action => 'new' %></li><% end %>
! <li class="right"><%= link_to 'Home'.t,:controller => 'channels', :action => 'index' %></li>
! <% if session[:user] && session[:user].admin? %><li class="farright"><%= link_to 'Admin'.t,:controller => 'admin/panel', :action => 'index' %><%end%></li></ul>
  </div>  <!---End Nav Buttons -->
  </div>  <!-- End Header -->
***************
*** 32,35 ****
--- 32,38 ----
  <div id="content">
  <p style="color: green"><%= flash[:notice] %></p>
+ <% if controller.controller_name == 'channels' && controller.action_name == 'index'%>
+ <!-- no sidebar -->
+ <% else %>
  <div id="sidebar">
  <div id="sidetags">
***************
*** 40,43 ****
--- 43,47 ----
  </div>
  </div>
+ <% end %>
  <%= @content_for_layout %>
  </div> <!-- end content -->