opda-develop — For developers

[Opda-develop] OPDA/app/views/opml_feeds test.rhtml, NONE, 1.1 edit.rhtml, 1.2, 1.3 destroy_result.rhtml, NONE, 1.1 list.rhtml, 1.2, 1.3 _opml_feed.rhtml, NONE, 1.1 show.rhtml, 1.2, 1.3 new.rhtml, 1.2, 1.3 _opml_feeds.rhtml, NONE, 1.1

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

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

Added Files:
	test.rhtml edit.rhtml destroy_result.rhtml list.rhtml 
	_opml_feed.rhtml show.rhtml new.rhtml _opml_feeds.rhtml 
Log Message:
Moved opml_feeds out of admin

--- NEW FILE: test.rhtml ---
<%= debug(@feeds)%>
--- NEW FILE: destroy_result.rhtml ---
<html>
	OPML database cleaned!
	<%= link_to 'Parse', :action => 'parse' %>
	<%= link_to 'Back', :action => 'list' %>	
</html>
--- NEW FILE: _opml_feeds.rhtml ---
<table>
<%= render :partial => 'opml_feed', :collection => @opml_feeds%>
</table>
--- NEW FILE: show.rhtml ---
<% for column in OpmlFeed.content_columns %>
<p>
  <b><%= column.human_name %>:</b> <%=h @opml_feed.send(column.name) %>
</p>
<% end %>

<%= link_to 'Edit', :action => 'edit', :id => @opml_feed %> |
<%= link_to 'Back', :action => 'list' %>

--- NEW FILE: list.rhtml ---
<div id="wideleftcontent">
<%= link_to 'Purge DB (Carefull!)', :action => 'destroy_all' %></br>
<%= link_to 'Parse DB', :action => 'parse' %></br>

<div id="wideleftcontent">
<h1><%= "Your OPML files".t %></h1>
  <%= render :partial => 'opml_feeds' %>
<br />
</div> <!-- end wideleftcontent -->




<%= link_to 'Previous page', { :page => @opml_feed_pages.current.previous } if @opml_feed_pages.current.previous %>
<%= link_to 'Next page', { :page => @opml_feed_pages.current.next } if @opml_feed_pages.current.next %> 

<br />

<%= link_to 'New OPML Feed', :action => 'new' %>
</ div>
--- NEW FILE: _opml_feed.rhtml ---
<tr>
    <td>
        <%=h opml_feed.title %>
    </td>    
    <td>
        <%=h "URL:  " + truncate(opml_feed.opml_url , length = 50, truncate_string = "...")%>
    </td>
</tr>
--- NEW FILE: new.rhtml ---
<div id="wideleftcontent">
<h1><%="Add a new Directory".t%></h1>
<p>
Directories are stored in OPML format. typically this would be 
files with the .opml extension.

You can import an OPML reference which is either a valid
URL to an OPML file or an OPML file locally on your system.
<br/>
<br/>
Press Import when you are done with selecting a file or pasting in the URL.
</p>
<br/>
    <%= form_tag( {:action => 'create'}, :multipart => true )%>
        <table>
            <tr>
                <td>
                    <label for="opml_feed_name"><%= "Name".t %></label>
                </td>
                <td colspan='2'>
                    <%= text_field 'opml', 'title', :size => "10" %><br/>
                <td>
            </tr>
            <tr>
                <td colspan='3'>
                    <br/>
                </td>
            </tr>
                <td>
                    <label for="file">Local Path</label>            
                </td>
                <td colspan='2'>
                    <%= file_field_tag 'file', :size => "70" %>
                </td>
                                
            </tr>
            <tr>
                <td colspan='3'>
                    <%= submit_tag "Import File" %>
                </td>
                    
            </tr>            

            <tr colspan='3'><td><br/><br/></td></tr>
            
            </tr>
                <td>
                    <label for="url">URL: </label>            
                </td>
                <td colspan='2'>
                    <%= text_field 'opml', 'url', :size => "70" %>
                </td>    
            </tr>
            
            <tr>
                <td colspan='3'>
                    <%= submit_tag "Import URL" %>
                </td>    
            </tr>
            
        </table>
    <%= end_form_tag %>
        
    
    <h3>Warning!</h3>
    <p>
    The channels in the OPML file can take some time to process.
    Sit back and enjoy our nice color schema.
    </p>

    <%= link_to 'Back', :action => 'list' %>
</div>
--- NEW FILE: edit.rhtml ---
<h1>Editing opml_feed</h1>

<%= start_form_tag :action => 'update', :id => @opml_feed %>
  <%= render :partial => 'form' %>
  <%= submit_tag 'Edit' %>
<%= end_form_tag %>

<%= link_to 'Show', :action => 'show', :id => @opml_feed %> |
<%= link_to 'Back', :action => 'list' %>

[Opda-develop] OPDA/app/controllers opml_feeds_controller.rb, 1.2, 1.3

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

Update of /cvsroot/opda/OPDA/app/controllers
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv990/app/controllers

Added Files:
	opml_feeds_controller.rb 
Log Message:
Moved opml_feeds out of admin

--- NEW FILE: opml_feeds_controller.rb ---
require 'uri'
require 'open-uri'
require 'rexml/document'

include REXML

class OpmlFeedsController < ApplicationController
  layout "layouts/default"  
  @logger = Logger.new($stdout, shift_age = 7, shift_size = 1048576)
  
  def index
    list
    render :action => 'list'
  end
  
  # TODO, the list should be user subscriptions.
  def list
    @opml_feed_pages, @opml_feeds = paginate :opml_feeds, :per_page => 10
  end
  
  def show
    @opml_feed = OpmlFeed.find(params[:id])
  end
  
  def new
    #    @opml_feed = OpmlFeed.new
  end
  
  
  #
  # Create a new OPML Entry. 
  # It is assumed that the form parameters is a
  # multipart submission.
  #
  #
  def create
    
    opml_feed = OpmlFeed.new
    
    src_filename = params[:file]
    opml_feed.title = params['opml']['title']
    opml_feed.opml_url = params['opml']['url']
    
    logger.info "received" + opml_feed.title
    logger.info "received" + opml_feed.opml_url
    
    parsefile = false
    if !opml_feed.opml_url.empty?
      begin
        uri = URI::parse(opml_feed.opml_url)          
      rescue URI::InvalidURIError => error
        # We assume it's a file name.
        log_error(error)
        logger.info("Will parse OPML as file.")
        parsefile = true
      end
    else
      logger.info("Will parse OPML as file.")
      parsefile = true
    end 
    
    # Parsing of a file is OK, when the the OPML_URL is not provided. 
    # 
    if parsefile      
      if src_filename && !src_filename.original_filename.empty?       
        #        src_filename = sanitize(src_filename)
        hashed_name = Digest::SHA1.hexdigest(Time.now.to_s)         
        filename = "#{RAILS_ROOT}/public/upload/" + hashed_name + "_" + src_filename.original_filename       
        if File.open(filename, 'w'){ |f| 
            f.write(src_filename.read) }  
        end      
        opml_feed.opml_url = filename          
      end
    end
    
    opml_feed.save
    
    if parse(opml_feed, parsefile)
      flash[:notice] = 'OpmlFeed was successfully created.'
      redirect_to :action => 'list'
    else
      render :action => 'new'
    end
  end
  
  def edit
    @opml_feed = OpmlFeed.find(params[:id])
  end
  
  def update
    @opml_feed = OpmlFeed.find(params[:id])
    if @opml_feed.update_attributes(params[:opml_feed])
      flash[:notice] = 'OpmlFeed was successfully updated.'
      redirect_to :action => 'show', :id => @opml_feed
    else
      render :action => 'edit'
    end
  end
  
  def destroy
    OpmlFeed.find(params[:id]).destroy
    redirect_to :action => 'list'
  end
  
  def destroy_all
    @opml_feeds = OpmlFeed.find_all
    @opml_feeds.each do |opml|
      opml.destroy
    end    
    redirect_to :action => 'destroy_result'
  end
  
  def destroy_result        
  end  
  
  ###########################################################################
  # The parse action takes a link to an opml field and reads in the file
  # it then sets up the new opml link in the DB and establishes a
  # Subscription List for the opml list.  Once this has been set up it calls
  # parse_opml() to do the actual parsing of the opml file
  ###########################################################################
  
  def parse(feed, mode)
    
    #Get OPML file 
    file = nil
    
    if mode
      begin    
        file = File.new(feed.opml_url)
      rescue => error
        logger.info "Error: The file can not be accessed" + feed.opml_url
        log_error(error)
      end
    else
      open(feed.opml_url) { |http|
        file = http.read
      } if !file          
    end
    
    begin        
      # Read it into the opml variable
      opml = REXML::Document.new(file)
      logger.info "XML parsing file successfull"
    rescue => error
      log_error(error)
    end
    
    # If the opml file is ok, set up a DB entry and establsh a
    # subscription list for the file to keep track of categories
    
    begin   
      if opml
        @opmlEntry = OpmlFeed.new        
        @opmlEntry.opml_url =  feed.opml_url
        if (feed.link_url && feed.link_url != "")
          @opmlEntry.link_url = feed.link_url
        else
          # TODO: fix getting website address
          # FIXME doesn't work with file names! get this from the opml itself
          @opmlEntry.link_url = "http://" + feed.opml_url.gsub(/https?:\/\/(www.)?/, '').gsub(/\/(.*)/, '')
        end
        #FIXME, should be model validation instead testing the value here.
        if (feed.title && feed.title != "")
          @opmlEntry.title = feed.title
        else
          @opmlEntry.title = opml.elements['opml/head/title'].text  
        end
        
        @opmlEntry.user_id = session[:user].id if session[:user]
        
        #Christophe TODO, why getting the entry if we created one already?
        #        
        
        if !OpmlFeed.find_by_opml_url(feed.opml_url) 
          if (@opmlEntry.save)
            @opmlEntry.reload
            logger.info "OPML: Entry creater" + @opmlEntry.title
          end
        else
          @opmlEntry = OpmlFeed.find_by_opml_url(feed.opml_url)
        end
        
        
        # CHRISTOPHE: The expression below uses condition, but special find mehotds exist.
        # @sublist = SubscriptionList.find(:all, :conditions => ["opml_feed_id=?", @opmlEntry.id])
        
        # Fix a new generic subscription for this user.  
        # If the subscription alread contains the opml_feed_id for this user
        # we skip this process.         
        @user = User.find(session[:user].id) if session[:user]
        if !@user
          raise # We can tie in a OPML feed, if there is no user hence subscrition list.  
        end
        
        @root = @user.subscription_lists.find(:first, :conditions => "parent_id = 0")
        
        # TODO Christophe why, select on OPML_Feed id??       
        #        if !@sublist
        #          @sublist = 
        #        end
        #        
        if @root
#          @sublist = @rootlist.find_all_by_opml_feed_id_(@opmlEntry.id])  
#          if @sublist
            #TODO, Decide to implement a conditional check, could a validation section in model
            # rather!.
            #            raise # We need to exit if this OPMLEntry is already defined for this user.
#          end
          
          parent_id = @root.id
        else  
          parent_id = 0
        end
        
        @sublist = SubscriptionList.new(:parent_id => parent_id) # TODO: fix title on subscription list to be equal to opml title
        @sublist.opml_feed_id = @opmlEntry.id
        @sublist.title = @opmlEntry.title
        @sublist.user_id = session[:user].id if session[:user]
        @sublist.reload if @sublist.save
        
        # send opml file to be parsed - sets root to opml/body, and passes in sublist.id
        # and opmlEntry.id as additional parameters to keep track of where
        # we are in the subscription list tree
        logger.info "Start parsing OPML tags"        
        parse_opml(opml.elements["opml/body"], @sublist.id , @opmlEntry.id)
      end
    rescue => error
      log_error(error)
    end
  end
  
  ####################################################################
  # parse the opml file
  # takes the base to be parsed, the parent_id for this node in the subscription
  # list and the id of the original opml file to associate this link to
  ###################################################################
  
  def parse_opml(opml_node, parent_id, opml_id)
    
    begin
      # get the first outline entry in the opml and start to iterate through
      # the outline elements
      opml_node.elements.each('outline') { |el|
        
        # if the element contains sub elements this means we have a new category
        # so set up the subcategory in the subscription list and call the parser again
        # this is a recursive process to get all the categories into the subscription list
        # tree
        if (el.elements.size != 0) 
          # TODO: what happens if there is already a subscription list and this is an update
          
          @sublist = SubscriptionList.new(:parent_id => parent_id) # TODO: fix title on subscription list to be equal to opml title
          @sublist.opml_feed_id = opml_id
          @sublist.user_id = session[:user].id if session[:user]
          @sublist.title = el.attributes["text"]
          @sublist.reload if @sublist.save
          
          parse_opml(el, @sublist.id, opml_id)
          
          # if there are no sub elements we must have a link to something
          # it might be in an attribute called url or xmlUrl
          # check for the link and set url to equal what we find
          
          
        elsif (el.attributes['url'] || el.attributes['xmlUrl'])   
          url = el.attributes['url'] if (el.attributes['url'])
          url = el.attributes['xmlUrl'] if (el.attributes['xmlUrl'])
          title = el.attributes['text']
          
          logger.info "Outline tag, url=" + url
          
          # then if the link matches an existing channel just add tags for 
          # the opml category and push the channel onto the opml join and
          # subscription list joins
          if (Channel.find_by_feed_url_and_title(url, title))
            @channel = Channel.find_by_feed_url(url)
            @channel.tag(@sublist.title, :separator => ',')
            @channel.opml_feeds << @opmlEntry
            @channel.subscription_lists << @sublist
            # if we don't match both the url and the title
            # add a new channel, add tags, and connect the join tables
          elsif (!Channel.find_by_feed_url(url) && !Channel.find_by_title(title))
            @channel = Channel.new
            @channel.suspended = 1
            @channel.feed_url = url
            @channel.title = title
            @channel.user_id = 1 # TODO: fix user id for new channel
            @channel.tag(@sublist.title, :separator => ',')
            @opmlEntry.channels << @channel
            @sublist.channels << @channel  
            # and what do we do if we have a duplicate
            # of either the url but not the title, or of the title but not the 
            # url
          else
            # TODO: flag as potential duplicate, but have some type of data error
          end
          
        end
      }
    rescue => error
      text = "parsing problem"  
    end
  end
  
end

[Opda-develop] OPDA/app/controllers/admin opml_feeds_controller.rb, 1.7, NONE

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

Update of /cvsroot/opda/OPDA/app/controllers/admin
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv701/app/controllers/admin

Removed Files:
	opml_feeds_controller.rb 
Log Message:
Moved opml_feeds out of admin

--- opml_feeds_controller.rb DELETED ---

[Opda-develop] OPDA/app/views/channels index.rhtml,1.3,1.4

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

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

Modified Files:
	index.rhtml 
Log Message:
made major changes to css to improve ui.  font size will need to be tuned up across the app.  Old default.css moved to default-old.css.

Also updated default.rhtml to use new css

Index: index.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/app/views/channels/index.rhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.rhtml	16 Jul 2006 04:13:56 -0000	1.3
--- index.rhtml	23 Jul 2006 06:26:55 -0000	1.4
***************
*** 1,74 ****
! <div id="threecolumnright">
! <div class="boxtitlerow"><span class="boxtitle">Tags</span></div>
! <div class="tagmatrix">
! <% for tag in @tags %>
!   <% i = rand%>
!   <% if i < 0.6%>
!    <% i=1 %>
!    <% elsif i >= 0.6 && i< 0.775 %>
!    <% i=2 %>
!    <% elsif i >= 0.775 && i< 0.85 %>
!    <% i=3 %>
!    <% elsif i >= 0.85 && i< 0.875 %>
!    <% i=4 %>
!    <% elsif i >= 0.875 && i< 0.92 %>
!    <% i=5 %>
!    <% elsif i >= 0.92 && i< 0.95 %>
!    <% i=6 %>
!    <% elsif i >= 0.95 && i< 0.97 %>
!    <% i=7 %>
!     <% elsif i >= 0.97 && i< 0.99 %>
!    <% i=8 %>
!     <% elsif i >= 0.99 && i<=1.0 %>
!    <% i=9 %>
!    <% end %>
! 
!     <span class="level<%= i %>"><%= link_to h(tag.name),:controller =>'tags', :action => 'show', :id =>  tag.name %></span>
!  
! 
! <% end %>
! </div> <!-- end tagmatrix div -->
! </div> <!-- end 3 threecolumnright div -->
! 
! 
! 
! <div id="threecolumnmiddle">
! <div class="boxtitlerow"><span class="boxtitle">New Casts</span></div>
  
! <% 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 -->
! 
! 
! <div id="threecolumnleft">
! <div class="boxtitlerow"><span class="boxtitle">Featured Casts</span></div>
! <% 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
--- 1,74 ----
!     <div id="sub">
!         <div id="center">
!          
!             <div class="boxtitlerow"><span class="boxtitle">New Casts</span></div>
  
!             <% 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 center -->
!         <hr />
! 	        
!         <div id="left">
!         
!             <div class="boxtitlerow"><span class="boxtitle">Featured Casts</span></div>
!                 <% 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 left -->
!         <hr />
!     </div> <!--end sub -->
! 	    
!     <div id="right">
!         <div class="boxtitlerow"><span class="boxtitle">Tags</span></div>
!             <div class="tagmatrix">
!                 <% for tag in @tags %>
!                     <% i = rand%>
!                     <% if i < 0.6%>
!                     <% i=1 %>
!                     <% elsif i >= 0.6 && i< 0.775 %>
!                     <% i=2 %>
!                     <% elsif i >= 0.775 && i< 0.85 %>
!                     <% i=3 %>
!                     <% elsif i >= 0.85 && i< 0.875 %>
!                     <% i=4 %>
!                     <% elsif i >= 0.875 && i< 0.92 %>
!                     <% i=5 %>
!                     <% elsif i >= 0.92 && i< 0.95 %>
!                     <% i=6 %>
!                     <% elsif i >= 0.95 && i< 0.97 %>
!                     <% i=7 %>
!                     <% elsif i >= 0.97 && i< 0.99 %>
!                     <% i=8 %>
!                     <% elsif i >= 0.99 && i<=1.0 %>
!                     <% i=9 %>
!                     <% end %>
!                     <span class="level<%= i %>"><%= link_to h(tag.name),:controller =>'tags', :action => 'show', :id =>  tag.name %></span>
!                 <% end %>
!             </div> <!-- end tagmatrix div -->
!     </div> <!--end right -->
!     <!-- end content -->
  

[Opda-develop] OPDA/themes/default/layouts default-old.rhtml, NONE, 1.1

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

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

Added Files:
	default-old.rhtml 
Log Message:
made major changes to css to improve ui.  font size will need to be tuned up across the app.  Old default.css moved to default-old.css.

Also updated default.rhtml to use new css

--- NEW FILE: default-old.rhtml ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
  <title>OPDA - Podcasts</title>
    <%= stylesheet_link_tag 'scaffold' %>
    <%= theme_stylesheet_link_tag 'default' %>
    <%= javascript_include_tag :defaults %>
</head>
<!-- TODO -->

<body>
<div id="page">
<div id="header">
	<div class="floatright">
    		<% if !session[:user] %> 
    			<%= link_to 'Login', :controller => 'user', :action => 'login' %>
    		<% else %>
    			<%= link_to 'Logout', :controller => 'user', :action => 'logout' %>
    		<%end%>			
	</div>
	  <div id='logo'><%= link_to (theme_image_tag("logo.png", :border => 0),:controller => 'channels', :action => 'index')%> </div>
    <!--Begin Nav Buttons -->
    <div id = "pagemenu">
        <ul id="navtabs">
            <% if authorized?(:controller =>'user', :action => 'home') %>
                <li class="right">
                    <%= link_to 'My subscriptions'.t,:controller => 'subscription_lists', :action => 'list' %>
                </li>
                <li class="right">
                    <%= link_to 'Add a Podcast'.t,:controller => 'channels', :action => 'new' %>
                </li>
                <li class="right">
                    <%= link_to 'Home'.t,:controller => 'user', :action => 'home' %>
                </li>
            <% end %>
            
            <% if session[:user] && session[:user].admin? %>
                <li class="farright">
                    <%= link_to 'Admin',:controller => 'admin/panel', :action => 'index' %>    
                </li>
            <%end%>
        </ul>
    </div>  <!---End Nav Buttons -->
</div>  <!-- End Header -->

<div id="content">
    <p style="color: green"><%= flash[:notice] %></p>
	<% if controller.controller_name == 'channels' && controller.action_name == 'index'%>
		<!-- no sidebar -->
	<% else %>
    	<%= render_component (:controller => 'sidebar/sidetags', :action => 'sidebar') %>   
	<% end %>
    <%= @content_for_layout %>
</div> <!-- end content -->

<div id = "footer">
<span>Powered by Ruby on Rails</span>	
</div><!--end footer -->

</div> <!-- end page div -->
</body>
</html>

[Opda-develop] OPDA/themes/default/layouts default.rhtml, 1.11, 1.12

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

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

Modified Files:
	default.rhtml 
Log Message:
made major changes to css to improve ui.  font size will need to be tuned up across the app.  Old default.css moved to default-old.css.

Also updated default.rhtml to use new css

Index: default.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/themes/default/layouts/default.rhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** default.rhtml	17 Jul 2006 05:17:56 -0000	1.11
--- default.rhtml	23 Jul 2006 06:26:24 -0000	1.12
***************
*** 1,28 ****
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
!         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html>
  <head>
!   <title>OPDA - Podcasts</title>
!     <%= stylesheet_link_tag 'scaffold' %>
!     <%= theme_stylesheet_link_tag 'default' %>
      <%= javascript_include_tag :defaults %>
- </head>
- <!-- TODO -->
  
  <body>
! <div id="page">
! <div id="header">
! 	<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 -->
      <div id = "pagemenu">
!         <ul id="navtabs">
              <% if authorized?(:controller =>'user', :action => 'home') %>
                  <li class="right">
--- 1,32 ----
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head>
! 	<title>Open Podcast Directory Application</title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
! 
!     <%= theme_stylesheet_link_tag 'default',:media => 'screen,projection' %>
!     <%= javascript_include_tag  'ie7-standard.js' %> 
!  	<!--    <%= javascript_include_tag 'minmax.js' %>		minmax.js by Andrew Clover - http://www.doxdesk.com/software/js/minmax.html 
! 	Adds min/max height and width support to IE5/PC and above. -->
      <%= javascript_include_tag :defaults %>
  
+ </head>
  <body>
! 
! <div id="outer">
!     <div id="header">
!      <div class="floatright">
!         <% if !session[:user] %> 
!     		<%= link_to 'Login', :controller => 'user', :action => 'login' %>
!     	<% else %>
!     		<%= link_to 'Logout', :controller => 'user', :action => 'logout' %>
!     	<%end%>			
! 	</div>
!         <div id='logo'><%= link_to (theme_image_tag("logo.png", :border => 0),:controller => 'channels', :action => 'index')%> </div>
! 
!         <a name="top"></a>
!            <!--Begin Nav Buttons -->
      <div id = "pagemenu">
!         <ul>
              <% if authorized?(:controller =>'user', :action => 'home') %>
                  <li class="right">
***************
*** 44,50 ****
          </ul>
      </div>  <!---End Nav Buttons -->
! </div>  <!-- End Header -->
  
! <div id="content">
      <p style="color: green"><%= flash[:notice] %></p>
  	<% if controller.controller_name == 'channels' && controller.action_name == 'index'%>
--- 48,55 ----
          </ul>
      </div>  <!---End Nav Buttons -->
!     </div>
  
!     <hr />
!     <div id="content">
      <p style="color: green"><%= flash[:notice] %></p>
  	<% if controller.controller_name == 'channels' && controller.action_name == 'index'%>
***************
*** 55,64 ****
      <%= @content_for_layout %>
  </div> <!-- end content -->
  
! <div id = "footer">
! <span>Powered by Ruby on Rails</span>	
! </div><!--end footer -->
  
- </div> <!-- end page div -->
  </body>
! </html>
--- 60,76 ----
      <%= @content_for_layout %>
  </div> <!-- end content -->
+     <hr />
+     <div id="footer">
+         <p>Powered by <a href="http://www.openpodcastdirectory.org">Open Podcast Directory Application</a></p>
+         <ul title="footer menu">
  
!             <li><a href="#" title="Top of Page">Top</a></li>
!             <li><a href="http://www.openpodcastdirectory.org" title="The podcast directory application built for the podcast community">About OPDA</a></li>
!             <li><a href="http://www.openpodcastdirectory.org" title="Help spread the word about OPDA">Spread the OPDA</a></li>
!             <li><a href="http://www.openpodcastdirectory.org" title="Get your OPDA">Site Map</a></li>
!         </ul>
!     </div>
! </div>
  
  </body>
! </html>
\ No newline at end of file

[Opda-develop] OPDA/themes/default/stylesheets default-old.css, NONE, 1.1

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

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

Added Files:
	default-old.css 
Log Message:
made major changes to css to improve ui.  font size will need to be tuned up across the app.  Old default.css moved to default-old.css.

Also updated default.rhtml to use new css

--- NEW FILE: default-old.css ---
/****************************
PAGE CONTROL
  html - overall setting
  body - overall setting
  page - set width for app

 content - set width for content
 threecolumnright - right column for 3 column page
 threecolumnmiddle - middle column for 3 column page
 threecolumnleft - left column for 3 column page
 wideleftcontent - left column for listings/details pages
 
*****************************/

html {
        color: #000000;
        background-color: #3F4B50;
}

body {
        color: #000000;
        background-color: #3F4B50;
		margin: 0;
        padding: 0;
        text-align: center;
        font-size: 62.5%; /* Resets 1em to 10px */
        font-family: Verdana, Arial,  sans-serif;
}	


#page {
        width: 95em;
        margin: 0 auto;
        padding: 0;
        position: relative;
        background-color: #F8F8F8;
}

#content {
 
}
p {
   margin:0;
   padding:0;
}
#threecolumnright, #threecolumnmiddle, #threecolumnleft {
         width: 32%;

}

#threecolumnright {
           padding: 0;
           float:right;
           background-color:#F8F8F8;
           
}

#threecolumnmiddle {
           padding: 0;
           float:right;
           background-color:#F8F8F8;
           margin-right: 2%;
}

#threecolumnleft {
           padding: 0;
           float:left;          
           background-color:#F8F8F8;
}

#wideleftcontent {
           text-align: left;
           float:left;
           width: 740px;
           margin: 10px 0 0 10px;
           padding: 0;
}



/***************************************************
CHANNEL
***************************************************/

span#title {
    font-size: 1.7em;
    color: #006600;
}

span#copyright {
    float:right;
    font-size: 0.9em;
    color: #666;
}

#channelheader {
           text-align: left;
           float:left;
           width: 72em;
           margin: 0 0 0 0px;
           padding: 0;
           border: 1px solid;
}

.boxtitlerow{
           text-align: left;

           float:left;
           width: 100%;
           background:  #2C9B9B;
           margin: 0 0 0 0;
           padding: 0.5em 0 0.5em 0;
}

#channelheaderleft{
           text-align: left;
           float:left;
           width: 20em;
           margin: 1em 0 0 1em;
           padding: 0;
}


#channelheaderright{
           text-align: left;
           float:left;
           width: 48em;
           margin: 1em 0 0 1em;
           padding: 0;

}

#channelheaderbottom {
           text-align: left;
           float:left;
           width: 70em;
           margin: 1em 0 1em 1em;
           padding: 0;

}
#tags {
           margin: 1em 0 1em 0;
           font-size : 1.2em;
}
#channelitems{
           text-align: left;
           float:left;
           width: 72em;
           margin: 1em 0 0 0;
           padding: 0;
           border: 1px solid;
}

.itemrow {
           text-align: left;
           float:left;
           width: 70em;
           margin: 1em 0 0 1em;
           padding: 0;
           border-bottom: 1px dashed;
}

.itemtitle {
           font-size: 1.5em;
           font-weight: bold;
}

.itemtext {
           font-size: 1.3em;
           line-height: 1.4em;
}
.boxtitle {
           font-size: 1.8em;
           margin: 0 0 .2em 1em;
           color: #34384B;
}
.channeltext {
           font-size: 1.6em;
           line-height:1.15em;

}
/***************************************************
FOOTER
***************************************************/

#footer {
	clear: left;
	font-size: 9px;
	color: #666;
	margin: 4px 0 20px 30px;
	text-align: center;
	padding-bottom: 15px;
}

#footer a:link, #Footer a:visited {
	color: #666;
	padding: 0;
}

#footer a:hover {
	color: #fff;
	background: #666;
}

#footer span.Right {
float:right;
text-align:right;
color: #666;
margin: 0 50px 0 0;

}
#footer span.Left {
float:left;
text-align:left;
color: #666;

}



/***************************************************
HEADER
***************************************************/
#header {
        width: 95em;
        margin: 0;
        padding: 0;
        position: relative;
        background-color: #000000;
        position: relative;
		height:7em;
		voice-family: "\"}\"";
		voice-family: inherit;
		height:7em;
		}
	html>body #banner {
		height:7em;
		}
}

#header h1{
color: #FFFFFF;
font-weight: bold;
font-size: 25px;
text-align: left;
padding: 0;
margin: 0 0 0 30px;
}


#header h1 a:link, h1 a:visited {
    color:  #FFFFFF;
    text-decoration: none;
    padding: 0;
 
  }

#header h1 a:hover {
    color: #fc0;
    text-decoration: underline;
   background-color:#ffc;
  }


#header p {
	padding: 0 30px 10px 32px;
	margin: 7px 0 0 0;
	font-size: 9px;
	font-weight: normal;
	font-family: verdana;
	text-align: left;
    color: #fff;
    height:8em;
}

#header  div.floatright a {
    color: #fff;
  }

#header  div.floatright a:hover {
    color: #000;
    background-color: #ffc;
  }

#header  div.floatright a.current {
    color: #fc0;
	font-weight: bold;
	text-decoration: none;
  }

#header  div.floatright a.current:hover {
    color: #fc0;
    background-color: #036;
  }


#header div.floatright {
  text-align: right;
  position: relative;
  float: right;
  margin: 0 1em 0 0;
  padding:0;

}

#logo {
  padding: 0;
  position: relative;
  float: left;
  margin: 0 0 0 1em;

}
/*-------------------------------------------------
PAGE NAVBAR MENU
-------------------------------------------------*/
#pagemenu {
      min-width:500px;
	margin: 0px 0 0 30px;
	height: 30px;
	padding: 4em 0 0 0;
}

#pagemenu ul {
      margin: 0;
      padding:0;
}    

#pagemenu li {
        display: inline;
	margin: 0; padding: 0;
	list-style: none;
	border: none;
       background-color:#5D6487
}

#pagemenu a {
        display: block;
        float: left;
        border: 1px solid #666666;
        color: #000000;
        background-color: #FFFFCC;
        text-decoration: none;
	font-size: 12px;
	font-weight: normal;
	padding: 4px 8px 6px 8px;
	margin: 0;
}

#pagemenu a:hover {
        background-color: #FFFF66;
}

#pagemenu a.current {
        background-color:  #E6E6E6;
        color: #006600;
        cursor: default;
        border-bottom: 1px solid  #E6E6E6;
}

#pagemenu li.right a {
        float: right;
		margin-right: 0px;
}
#pagemenu li.farright a {
                float: right;
		margin-right: 30px;
}

/***************************************************
FIELDSET
***************************************************/

fieldset {
	padding: 12px;
	margin-bottom: 25px;
	margin-left: 15px;
	margin-right:20px;
	border: 1px solid #dcdcdc;
	border-top: 1px solid #393;

	
}

}

fieldset p {
	font-size: 1em;
	margin: 0 0 5px 0;
	padding: 0;
	color: #333;
}
fieldset select {
	font-size: 1.3em;
	margin: 10px 0 5px 15px;
	padding: 10px;
	color: #333;
}

fieldset.AccountSubmit p {
	color: #000;
}

fieldset legend {
	font-size: 1.3em;
	font-weight: bold;
	color: #393;
	padding: 0 5px;
}

fieldset legend span {
	color: #666;
	font-weight: normal;
	font-size: 80%;
}

fieldset p {
font-size: 1em;
margin: 10px 10px 10px 10px;
  line-height: 1.5em;
  text-align: justify
}

fieldset input {
	padding: 3px;
	margin-bottom: 4px;
}

fieldset input.big {
	font-size: 1.2em;
	font-weight: bold;
}

fieldset small {
	font-size: .8em;
	line-height: 13px;
	color: #999;
}

fieldset hr {
	margin: 20px 0;
}
fieldset h1 {
font-size: 1.2em;
font-weight: bold;
margin: 10px 10px 5px 10px;
border-bottom: 1px dotted #ccc;
}

fieldset h3 {
	font-size: 1em;
	margin-bottom: 1px;
}

fieldset table th {
	text-align: right;
	font-size: 1em;
	font-weight: normal;
}

fieldset table td {
	text-align: left;
	font-size: 1em;
	font-weight: normal;
}




/*-------------------------------------------------
Sidebar
-------------------------------------------------*/

 #sidebar {
padding:0px;
float:right;
width:18em;
margin: 1em 0.5em 0 0px;
text-align:left;
background-color:#FFFFFF;
border-left: 1px dashed;

}


#sidebar h4 {
	margin: 0.5em 0 1em 1em;
	padding: 0;
	font-size: 1.1em;
	font-weight: bold;
	color: #333;
	border-bottom: 1px solid #ccc;
}

#sidetags li {
   color: #222;
}
#sidetags a {
   color: #104E8B;

}
   
#sidetags li {
   	margin: 0 0 0.4em 1em;
	padding: 0;
	font-size: 1em;
	color: #999;
   }  
   
#sidebar ul {
	padding: 0;
	margin: 0 0 3em 0.8em;
}

ul.subcat {

}

ul.topcatlevel {

}
/*-------------------------------------------------
TAGCLOUND
-------------------------------------------------*/
.tagmatrix {
width: 25em;
margin: 10px 0 10px 20px;
  color: #666;
}

div.tagmatrix span a {
	color: #000;
	margin: 0 0.2em 0 ;
}
div.tagmatrix span.level1 { font-size: 12px; line-height: 17px; }
div.tagmatrix span.level2 { font-size: 14px; line-height: 19px; }
div.tagmatrix span.level3 { font-size: 16px; line-height: 21px; }
div.tagmatrix span.level4 { font-size: 18px; line-height: 23px; }
div.tagmatrix span.level5 { font-size: 20px; line-height: 25px; }
div.tagmatrix span.level6 { font-size: 22px; line-height: 27px; }
div.tagmatrix span.level7 { font-size: 24px; line-height: 29px; }
div.tagmatrix span.level8 { font-size: 26px; line-height: 31px; }
div.tagmatrix span.level9 { font-size: 28px; line-height: 33px; }

div.tagmatrix span.level1 a { background: #FFFBEE; color: #777; }
div.tagmatrix span.level2 a { background: #FFF6DD; color: #555; }
div.tagmatrix span.level3 a { background: #FFF2CD; color: #333; }
div.tagmatrix span.level4 a { background: #FFEEBB; color: #000; }
div.tagmatrix span.level5 a { background: #FFEAAB; color: #000; }
div.tagmatrix span.level6 a { background: #FFE699; color: #000; }
div.tagmatrix span.level7 a { background: #FFE188; color: #000; }
div.tagmatrix span.level8 a { background: #FFDD77; color: #000; }
div.tagmatrix span.level9 a { background: #FFDD77; color: #000; font-weight: bold; padding: 0 4px; }

div.tagmatrix span a:hover,
div.tagmatrix span.level1 a:hover,
div.tagmatrix span.level2 a:hover,
div.tagmatrix span.level3 a:hover {
	color: #000;
	background-color: #fc3;
}


/*-------------------------------------------------
FEATURE BOX
-------------------------------------------------*/

.feature1 {
float:left;
padding:0;
margin:0;
}

.feature0 {
float:right;
padding:0;
margin:0;

}

/*-------------------------------------------------
NEW/RATED BOX
-------------------------------------------------*/
.tinycast {
  text-align: left;
  margin: 1em 0 0 0;
}

.smalltitle {
  font-size: 1.1em;
  font-weight: bold;
}

.smalldescription {
  font-size: 1em;
}


.image50 {
  float:left;
  margin: 0 0.5em 0 0;
  padding:0;
}



/*-------------------------------------------------
MISC STUFF
-------------------------------------------------*/
ul.nobulletlist{
text-indent: -1em;
list-style: none;
padding: 0px;

}
#categorylist ul.subcatlist {
text-indent: -1em;
list-style: none;
padding: 0px;
	margin: 0 0 .6em 0.8em;
}

.bullet {
padding: 0 .4em 0 0;
}
.clearspan {
       clear:both;
}

 	
/* LOGIN FORMATING	*/
#login {
        text-align: left;
        position: relative;
        width: 400px;
        margin: 10% auto 0 auto;
        padding: 10px;
        color: #333333;
        background-color: white;
        border: 10px solid #666666;
      }

#login.login_error {
        border-color: #CC0000;
      }

[Opda-develop] OPDA/themes/default/stylesheets default.css, 1.6, 1.7

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

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

Modified Files:
	default.css 
Log Message:
made major changes to css to improve ui.  font size will need to be tuned up across the app.  Old default.css moved to default-old.css.

Also updated default.rhtml to use new css

Index: default.css
===================================================================
RCS file: /cvsroot/opda/OPDA/themes/default/stylesheets/default.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** default.css	22 Jul 2006 22:57:47 -0000	1.6
--- default.css	23 Jul 2006 06:25:50 -0000	1.7
***************
*** 1,70 ****
- /****************************
- PAGE CONTROL
-   html - overall setting
-   body - overall setting
-   page - set width for app
- 
-  content - set width for content
-  threecolumnright - right column for 3 column page
-  threecolumnmiddle - middle column for 3 column page
-  threecolumnleft - left column for 3 column page
-  wideleftcontent - left column for listings/details pages
-  
- *****************************/
  
! html {
!         color: #000000;
!         background-color: #3F4B50;
  }
  
  body {
          color: #000000;
!         background-color: #3F4B50;
! 		margin: 0;
!         padding: 0;
!         text-align: center;
!         font-size: 62.5%; /* Resets 1em to 10px */
!         font-family: Verdana, Arial,  sans-serif;
! }	
  
  
! #page {
!         width: 95em;
!         margin: 0 auto;
!         padding: 0;
!         position: relative;
!         background-color: #FFFFFF;
  }
  
! #content {
!  
  }
! p {
!    margin:0;
!    padding:0;
  }
- #threecolumnright, #threecolumnmiddle, #threecolumnleft {
-          width: 32%;
  
  }
  
! #threecolumnright {
!            padding: 0;
!            float:right;
!            background-color:#FFF;
!            
  }
  
! #threecolumnmiddle {
!            padding: 0;
!            float:right;
!            background-color:#FFF;
!            margin-right: 2%;
  }
  
! #threecolumnleft {
!            padding: 0;
!            float:left;          
!            background-color:#FFF;
  }
  
--- 1,226 ----
  
! /** Global **/
! /* technique explained @ http://leftjustified.net/journal/2004/10/19/global-ws-reset/  */
! * {
!     margin:0;
!     padding:0;
! }
! h2 {
! 	font:bold 2em/1.4 "Lucida Bright", Georgia, Times, serif;
! 	color:#8B9F86;
! }
! h3 {
! 	font:bold 1em/1.6 "Lucida Bright", Georgia, Times, serif;
! 	color:#845697;
! }
! /* links */
! a {
! 	color:#4C53E0;
! }
! a:focus, a:hover, a:active {
! 	color:#EB8518;
  }
+ /** end global **/
+ 
  
  body {
+     background:#3F4B50;
+ 	font-size:62.5%; /* Resets 1em to 10px */;
+ }
+ 
+ 
+ #outer {
+     margin:0 auto;
+ 	width:94%;
+     min-width:70em;
+     max-width:95em;
+ 	border:10px solid #3F4B50;
+ 	border-width:0 10px;
+     background:#f8f8f8;
+ }
+ 
+ /* float clearing - technique explained @ http://www.csscreator.com/attributes/containedfloat.php */
+ ul#nav:after, #outer:after, #sub:after, form:after, form div:after {
+     content:".";
+     display:block;
+     visibility:hidden;
+     clear:both;
+     height:0;
+ }
+ * html #nav, * html #content, * html form, * html form div {
+ 	height:1%;
+ }
+ 
+ /** hiding of elements for assistive devices (screen readers etc) **/
+ ul#access, .off {
+ 	position:absolute;
+ 	left:-1000em;
+ 	top:-1000em;
+ }
+ /* <hr />'s added to mark-up for browsers without CSS */
+ hr {display:none}
+ 
+ /** Title **/
+ #header {
+ 	background:#000000;
+ 	border:1px solid #3F4B50;
+ }
+ 
+ 
+ #header div.floatright {
+   text-align: right;
+   position: relative;
+   float: right;
+   margin: 0 1em 0 0;
+   padding:0;
+ }
+ /*-------------------------------------------------
+ PAGE NAVBAR MENU
+ -------------------------------------------------*/
+ #pagemenu {
+     min-width:500px;
+ 	margin: 0px 0 0 30px;
+ 	height: 3em;
+ 	padding: 0 0 0 0;
+ }
+ 
+ #pagemenu ul {
+       margin: 0;
+       padding:0;
+ }    
+ 
+ #pagemenu li {
+     display: inline;
+ 	margin: 0; padding: 0;
+ 	list-style: none;
+ 	border: none;
+     background-color:#2C9B9B;
+ }
+ 
+ #pagemenu a {
+         display: block;
+         float: left;
+         border: 1px solid #666666;
          color: #000000;
!         background-color: #99D9F5;
!         text-decoration: none;
! 	font-size: 12px;
! 	font-weight: normal;
! 	padding: 4px 8px 6px 8px;
! 	margin: 0;
! }
  
+ #pagemenu a:hover {
+         background-color: #FFFF66;
+ }
  
! #pagemenu a.current {
!         background-color:  #2C9B9B;
!         color: #006600;
!         cursor: default;
!         border-bottom: 1px solid  #2C9B9B;
  }
  
! #pagemenu li.right a {
!         float: right;
! 		margin-right: 0px;
  }
! #pagemenu li.farright a {
!                 float: right;
! 		margin-right: 30px;
  }
  
+ 
+ /** Unused Navigation **/
+ ul#nav {
+    	list-style:none;
+    	margin:3px 0 1em;
+ 	text-align:center;
+    	background:#fff;
+    	padding-bottom:2px;
+    	border-top:2px solid #D7E7D3;
+    	border-bottom:2px solid #845697;
+ }
+ #nav li {
+     list-style:none;
+     width:25%;
+     float:left;
+ 	display:block;
+     text-align:center;
+ 	background:#EAF0E6 url(img/mnu-btm.gif) repeat-x left bottom;
+ }
+ * html #nav li {
+ 	/** IE/PC hack due to haphazard line breaks when combined widths = 100% **/
+ 	\width:24.9%;
+ }
+ #nav a {
+     display:block;
+ 	font:bold 1em/1.8 'Lucida Grande', Arial, tahoma, verdana, sans-serif;
+ 	text-decoration:none;
+ 	color:#845697;
+ 	margin:1px;
+ 	background:transparent url(img/mnu-top.gif) repeat-x left top;
+ }
+ #nav a:focus, #nav a:hover, #nav a:active {
+ 	border:1px inset #8B9F86;
+ 	margin:0;
+ 	color:#EB8518;
+ 	text-decoration:underline;
+ }
+ /** current menu item **/
+ ul#nav li#active {
+ 	background:#F6F4F8;
+ 	font:bold 1em/1.8 'Lucida Grande', Arial, tahoma, verdana, sans-serif;
+ 	color:#000;
+ 	text-decoration:underline;
  }
  
! 
! /** Content Containers **/
! #content {
! 
! 	border:10px solid #F8F8F8;
! 	border-width:0 10px;
!     background:#F8F8F8;
  }
  
! #sub, #right {
! 	font: 1em/1.5 'Lucida Grande', arial, verdana, sans-serif;
! 	word-spacing:.1em;
! 	margin-bottom:1em;
  }
  
! /******
! div#sub is an extra wrapper, which allows the center column to come first in the source. 
! #sub is floated left, with #center -the content column- nested within and floated to the right.
! concept from http://www.positioniseverything.net/piefecta-rigid.html
! ******/
! #sub {
! 	width:66%;
! 	float:left;
! 	position:relative;
! }
! 
! /***
! Containers should be named according to what they contain. not where they sit in the layout.
! To make identifying each column more simple, I have named them according to their position.
! ***/
! #center {
! 	width:49%;
! 	float:right;
! 	margin: 10px 0 0 0;
! 	
! }
! #left {
! 	width:49%;
! 	float:left;
! 	margin: 10px 0 0 0;
! 	
! }
! #right {
! 	width:33%;
! 	float:right;
! 	margin: 10px 0 0 0;
! 	
  }
  
***************
*** 72,82 ****
             text-align: left;
             float:left;
!            width: 740px;
!            margin: 10px 0 0 10px;
             padding: 0;
  }
  
  
  
  /***************************************************
  CHANNEL
--- 228,362 ----
             text-align: left;
             float:left;
!            width: 70em;
!            margin: 0 0 0 0;
             padding: 0;
  }
+  
+  /** Main Col Contents **/
+ #center p {
+ 	margin:.5em 2% .5em 0;
+ }
+ img.img-right {
+ 	float:right;
+ }
+ 
+ /** Left Col Contents**/
+ #left h2 {
+ 	color:#845697;
+ 	font-size:1.5em;
+ }
+ #left p {
+ 	font-size:.9em;
+ }
+ a.serviceBtn {
+ 	display:block;
+ 	clear:right;
+ 	padding:.1em 2%;
+ 	margin:.5em 0;
+ 	text-align:center;
+ 	text-decoration:none;
+ 	color:#845697;
+ 	font:bold 1em/2 'Lucida Grande', arial, tahoma, verdana, sans-serif;
+ 	background:#F6F4F8 url(img/btn-purple.gif) repeat-x left bottom;
+ 	border:2px outset #845697;
+ }
+ a.serviceBtn:focus, a.serviceBtn:hover, a.serviceBtn:active {
+ 	text-decoration:underline;
+ 	border-style:inset;
+ }
  
  
  
+ /** New Products Special offers **/
+ .offerList {
+ 	background:#EEFAEA;
+ 	border:1px solid #C8DCC2;
+ 	margin:1em 0;
+ }
+ .offerList h2 {
+ 	color:#3A4F3B;
+ 	margin:.1em 2%;
+ }
+ .offerList ul {
+ 	margin:.1em 2%;
+ 	list-style:none;
+ }
+ .offerList ul li {
+ 	list-style:none;
+ 	padding-left:20px;
+ 	margin:.3em 0;
+ 	background:transparent url(img/bullet.gif) no-repeat 2px 50%;
+ }
+ /** Forms **/
+ form {
+ 	margin:1em 0;
+ }
+ legend {
+ 	font:bold 1.1em/1.5 'Lucida Grande', Arial, tahoma, verdana, sans-serif;
+ 	color:#3A4F3B;
+ }
+ input.txt {
+ 	width:98%;
+ 	margin:0 auto .5em;
+ 	border:2px solid #A5ACB2;
+ 	background:#fff;
+ }
+ input.btn {
+ 	background:#BED2B8 url(img/btn.gif) repeat-x;
+ 	padding:.1em;
+ 	width:7em;
+ 	float:right;
+ 	color:#fff;
+ 	font:bold 1em/1.4 "Lucida Bright", Georgia, Times, serif;
+ 	cursor:pointer;
+ }
+ input:focus, input.focus {
+ 	border-style:inset;
+ }
+ label {
+ 	display:block;
+ 	margin-top:.5em;
+ }
+ /* search */
+ #search fieldset {
+ 	border:1px solid #C8DCC2;
+ 	padding:.3em .5em;
+ }
+ /* subscribe */
+ #subscribe {
+ 	background:#F6F4F8;
+ 	border:1px solid #B2A9B9;
+ 	
+ }
+ #subscribe div {
+ 	margin:.3em .5em;
+ }
+ #subscribe h2 {
+ 	color:#845697;
+ }
+ 
+ /** Footer **/
+ #footer {
+ 	clear:both;
+ 	margin-top:1em;
+ 	font:.9em/1 'Lucida Grande', Arial, tahoma, verdana, sans-serif;
+ 	border-top:3px double #C8DCC2;
+ }
+ #footer p {
+ 	margin:1em 1em 1em 0;
+ 	float:right;
+ 	width:30%;
+ 	text-align:right;
+ }
+ #footer ul {
+ 	list-style:none;
+ 	margin-top:.7em;
+ }
+ #footer li {
+ 	display:inline;
+ 	border-right: 1px solid #C8DCC2;
+ 	padding:.3em 2%;
+ }
+ 
  /***************************************************
  CHANNEL
***************
*** 97,101 ****
             text-align: left;
             float:left;
!            width: 72em;
             margin: 0 0 0 0px;
             padding: 0;
--- 377,381 ----
             text-align: left;
             float:left;
!            width: 70em;
             margin: 0 0 0 0px;
             padding: 0;
***************
*** 108,114 ****
             float:left;
             width: 100%;
!            background:  #99D9F5;
             margin: 0 0 0 0;
             padding: 0.5em 0 0.5em 0;
  }
  
--- 388,395 ----
             float:left;
             width: 100%;
!            background:  #2C9B9B;
             margin: 0 0 0 0;
             padding: 0.5em 0 0.5em 0;
+            border-bottom: 10px solid #F8F8F8;
  }
  
***************
*** 146,150 ****
             text-align: left;
             float:left;
!            width: 72em;
             margin: 1em 0 0 0;
             padding: 0;
--- 427,431 ----
             text-align: left;
             float:left;
!            width: 70em;
             margin: 1em 0 0 0;
             padding: 0;
***************
*** 155,159 ****
             text-align: left;
             float:left;
!            width: 70em;
             margin: 1em 0 0 1em;
             padding: 0;
--- 436,440 ----
             text-align: left;
             float:left;
!            width: 68em;
             margin: 1em 0 0 1em;
             padding: 0;
***************
*** 162,172 ****
  
  .itemtitle {
!            font-size: 1.5em;
             font-weight: bold;
  }
  
  .itemtext {
!            font-size: 1.3em;
!            line-height: 1.4em;
  }
  .boxtitle {
--- 443,453 ----
  
  .itemtitle {
!            font-size: 1.8em;
             font-weight: bold;
  }
  
  .itemtext {
!            font-size: 1.5em;
!            line-height: 1.6em;
  }
  .boxtitle {
***************
*** 174,177 ****
--- 455,459 ----
             margin: 0 0 .2em 1em;
             color: #34384B;
+ 
  }
  .channeltext {
***************
*** 180,352 ****
  
  }
- /***************************************************
- FOOTER
- ***************************************************/
- 
- #footer {
- 	clear: left;
- 	font-size: 9px;
- 	color: #666;
- 	margin: 4px 0 20px 30px;
- 	text-align: center;
- 	padding-bottom: 15px;
- }
- 
- #footer a:link, #Footer a:visited {
- 	color: #666;
- 	padding: 0;
- }
- 
- #footer a:hover {
- 	color: #fff;
- 	background: #666;
- }
- 
- #footer span.Right {
- float:right;
- text-align:right;
- color: #666;
- margin: 0 50px 0 0;
- 
- }
- #footer span.Left {
- float:left;
- text-align:left;
- color: #666;
- 
- }
- 
- 
- 
- /***************************************************
- HEADER
- ***************************************************/
- #header {
- 	/*width: 100%;*/
- 	background:#910002;
- 	padding: 4px 0 0.5px 0;
- 	margin: 0;
- 	text-align: left;
-   position: relative;
- }
- 
- #header h1{
- color: #FFFFFF;
- font-weight: bold;
- font-size: 25px;
- text-align: left;
- padding: 0;
- margin: 0 0 0 30px;
- 
- 
- }
- 
- 
- #header h1 a:link, h1 a:visited {
-     color:  #FFFFFF;
-     text-decoration: none;
-     padding: 0;
-  
-   }
- 
- #header h1 a:hover {
-     color: #fc0;
-     text-decoration: underline;
-    background-color:#ffc;
-   }
- 
- 
- #header p {
- 	padding: 0 30px 10px 32px;
- 	margin: 7px 0 0 0;
- 	font-size: 9px;
- 	font-weight: normal;
- 	font-family: verdana;
- 	text-align: left;
-         color: #fff;
- }
- 
- #header p a {
-     color: #fff;
-   }
- 
- #header p a:hover {
-     color: #000;
-     background-color: #ffc;
-   }
- 
- #header p a.current {
-     color: #fc0;
- 	font-weight: bold;
- 	text-decoration: none;
-   }
- 
- #header p a.current:hover {
-     color: #fc0;
-     background-color: #036;
-   }
- 
- 
- #header p span.floatright {
-   text-align: right;
-   width: 300px;
-   position: relative;
-   float: right;
- }
- /*-------------------------------------------------
- PAGE NAVBAR MENU
- -------------------------------------------------*/
- #pagemenu {
-       min-width:500px;
- 	margin: 10px 0 0 30px;
- 	height: 30px;
- 	padding: 0;
- }
- 
- #pagemenu ul {
-       margin: 0;
-       padding:0;
- }    
- 
- #pagemenu li {
-         display: inline;
- 	margin: 0; padding: 0;
- 	list-style: none;
- 	border: none;
-        background-color:#5D6487
- }
- 
- #pagemenu a {
-         display: block;
-         float: left;
-         border: 1px solid #666666;
-         color: #000000;
-         background-color: #FFFFCC;
-         text-decoration: none;
- 	font-size: 12px;
- 	font-weight: normal;
- 	padding: 4px 8px 6px 8px;
- 	margin: 0;
- }
  
- #pagemenu a:hover {
-         background-color: #FFFF66;
- }
  
- #pagemenu a.current {
-         background-color:  #E6E6E6;
-         color: #006600;
-         cursor: default;
-         border-bottom: 1px solid  #E6E6E6;
- }
  
- #pagemenu li.right a {
-         float: right;
- 		margin-right: 0px;
- }
- #pagemenu li.farright a {
-                 float: right;
- 		margin-right: 30px;
- }
  
  /***************************************************
--- 462,468 ----
***************
*** 460,464 ****
  margin: 1em 0.5em 0 0px;
  text-align:left;
! background-color:#FFFFFF;
  border-left: 1px dashed;
  
--- 576,580 ----
  margin: 1em 0.5em 0 0px;
  text-align:left;
! background-color:#F8F8F8;
  border-left: 1px dashed;
  
***************
*** 469,473 ****
  	margin: 0.5em 0 1em 1em;
  	padding: 0;
! 	font-size: 1.1em;
  	font-weight: bold;
  	color: #333;
--- 585,589 ----
  	margin: 0.5em 0 1em 1em;
  	padding: 0;
! 	font-size: 1.5em;
  	font-weight: bold;
  	color: #333;
***************
*** 486,490 ****
     	margin: 0 0 0.4em 1em;
  	padding: 0;
! 	font-size: 1em;
  	color: #999;
     }  
--- 602,606 ----
     	margin: 0 0 0.4em 1em;
  	padding: 0;
! 	font-size: 1.4em;
  	color: #999;
     }  
***************
*** 570,579 ****
  
  .smalltitle {
!   font-size: 1.1em;
    font-weight: bold;
  }
  
  .smalldescription {
!   font-size: 1em;
  }
  
--- 686,695 ----
  
  .smalltitle {
!   font-size: 1.3em;
    font-weight: bold;
  }
  
  .smalldescription {
!   font-size: 1.2em;
  }
  

[Opda-develop] OPDA/themes/default/images plus.gif,NONE,1.1

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

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

Added Files:
	plus.gif 
Log Message:
resized gif

--- NEW FILE: plus.gif ---
(This appears to be a binary file; contents omitted.)

[Opda-develop] OPDA/themes/default/images minus.gif,NONE,1.1

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

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

Added Files:
	minus.gif 
Log Message:
resized gif

--- NEW FILE: minus.gif ---
(This appears to be a binary file; contents omitted.)

[Opda-develop] OPDA/themes/default/stylesheets default.css, 1.5, 1.6

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

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

Modified Files:
	default.css 
Log Message:
mods to make category tree work

Index: default.css
===================================================================
RCS file: /cvsroot/opda/OPDA/themes/default/stylesheets/default.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** default.css	17 Jul 2006 05:17:32 -0000	1.5
--- default.css	22 Jul 2006 22:57:47 -0000	1.6
***************
*** 496,500 ****
  
  ul.subcat {
! display: none;
  }
  
--- 496,500 ----
  
  ul.subcat {
! 
  }
  
***************
*** 591,602 ****
  -------------------------------------------------*/
  ul.nobulletlist{
! font-size: 13px;
! line-height: 1.5em;
! text-indent: 5px;
  list-style: none;
! padding: 3px;
! margin: 2px;
  }
  
  .clearspan {
         clear:both;
--- 591,609 ----
  -------------------------------------------------*/
  ul.nobulletlist{
! text-indent: -1em;
  list-style: none;
! padding: 0px;
! 
! }
! #categorylist ul.subcatlist {
! text-indent: -1em;
! list-style: none;
! padding: 0px;
! 	margin: 0 0 .6em 0.8em;
  }
  
+ .bullet {
+ padding: 0 .4em 0 0;
+ }
  .clearspan {
         clear:both;

[Opda-develop] OPDA/components/sidebar sidetags_controller.rb, 1.4, 1.5

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

Update of /cvsroot/opda/OPDA/components/sidebar
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31147/components/sidebar

Modified Files:
	sidetags_controller.rb 
Log Message:
updated ajax to plus and minus for category tree

Index: sidetags_controller.rb
===================================================================
RCS file: /cvsroot/opda/OPDA/components/sidebar/sidetags_controller.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sidetags_controller.rb	21 Jul 2006 16:11:59 -0000	1.4
--- sidetags_controller.rb	22 Jul 2006 22:57:14 -0000	1.5
***************
*** 47,51 ****
    @id = params[:id]
    render :update do |page|
!     page.toggle "rtbullet#{@id}", "downbullet#{@id}", "subcat#{@id}"
    end
    end
--- 47,51 ----
    @id = params[:id]
    render :update do |page|
!     page.toggle "plus#{@id}", "minus#{@id}", "subcat#{@id}"
    end
    end

[Opda-develop] OPDA/components/sidebar/sidetags category_list.rhtml, 1.3, 1.4

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

Update of /cvsroot/opda/OPDA/components/sidebar/sidetags
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30733/components/sidebar/sidetags

Modified Files:
	category_list.rhtml 
Log Message:
made tree node icons conditionl plus and minus and fixed spacing.

every level of tree should work now

Index: category_list.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/components/sidebar/sidetags/category_list.rhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** category_list.rhtml	21 Jul 2006 16:10:57 -0000	1.3
--- category_list.rhtml	22 Jul 2006 22:56:14 -0000	1.4
***************
*** 1,7 ****
- <!--TODO: fix css to change spacing at bottom of tree branch -->
- <!--TODO: add ajax to next level of tree -->
- <!--TODO: change gifs to be plus and minus -->
  
! <div>
  <h4>Browse Categories</h4>
  <ul class="nobulletlist">
--- 1,5 ----
  
! 
! <div id="categorylist">
  <h4>Browse Categories</h4>
  <ul class="nobulletlist">
***************
*** 9,19 ****
    <% for category in @categories  %>
        <% if category.depth == depth_check %>
! <li><div id="cat<%=category.id%>"><span id="rtbullet<%=category.id%>" class="rtbullet"><%= link_to_remote(theme_image_tag("rtbullet.gif", :border => 0), :url => {:controller => 'sidebar/sidetags', :action => 'show_subcat', :id => category.id})%></span><span id="downbullet<%=category.id%>" class="downbullet"  style="display: none;"><%= link_to_remote(theme_image_tag("downbullet.gif", :border => 0), :url => {:controller => 'sidebar/sidetags', :action => 'show_subcat', :id => category.id}) %></span><%= link_to(h(category.title), {:action => 'show_category', :id => category.id}) %></div></li>
!         <% depth_check = category.depth %>
        <% elsif category.depth > depth_check %>
!      <ul id="subcat<%=category.parent_id%>" class="nobulletlist" style="display:none"><li><div id="cat<%=category.id%>"><span id="rtbullet<%=category.id%>" class="rtbullet"><%= theme_image_tag("rtbullet.gif", :border => 0)%></span><span id="downbullet<%=category.id%>" class="downbullet"   style="display: none;"><%= theme_image_tag("downbullet.gif", :border => 0)%></span><%= link_to(h(category.title), {:action => 'show_category', :id => category.id}) %></div></li>
!       <%  depth_check = category.depth %>
!      <%  elsif category.depth < depth_check %>
!       </ul><li><div id="cat<%=category.id%>"><span id="rtbullet<%=category.id%>" class="rtbullet"><%= theme_image_tag("rtbullet.gif", :border => 0)%></span><span id="downbullet<%=category.id%>" class="downbullet" style="display: none;"><%= theme_image_tag("downbullet.gif", :border => 0)%></span><%= link_to(h(category.title), {:action => 'show_category', :id => category.id}) %></div></li>
       <%    depth_check = category.depth    %>
       <%  end %>
--- 7,21 ----
    <% for category in @categories  %>
        <% if category.depth == depth_check %>
!          <li><div id="cat<%=category.id%>">
!          <%= render :partial => 'category', :object => category %>
!                <% depth_check = category.depth %>
        <% elsif category.depth > depth_check %>
!          <ul id="subcat<%=category.parent_id%>" class="subcatlist" style="display:none">
!          <li><div id="cat<%=category.id%>">
!          <%= render :partial => 'category', :object => category %>
!          <%  depth_check = category.depth %>
!        <%  elsif category.depth < depth_check %>
!          </ul><li><div id="cat<%=category.id%>">
!          <%= render :partial => 'category', :object => category %>     
       <%    depth_check = category.depth    %>
       <%  end %>

[Opda-develop] OPDA/components/sidebar/sidetags _category.rhtml, NONE, 1.1

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

Update of /cvsroot/opda/OPDA/components/sidebar/sidetags
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29966/components/sidebar/sidetags

Added Files:
	_category.rhtml 
Log Message:
new partial to display category node in tree

--- NEW FILE: _category.rhtml ---
         <% if category.children_count() > 0%>
           <span id="plus<%=category.id%>" class="bullet">
           <%= link_to_remote(theme_image_tag("plus.gif", :border => 0), :url => {:controller => 'sidebar/sidetags', :action => 'show_subcat', :id => category.id})%></span><span id="minus<%=category.id%>" class="bullet"  style="display: none;"><%= link_to_remote(theme_image_tag("minus.gif", :border => 0), :url => {:controller => 'sidebar/sidetags', :action => 'show_subcat', :id => category.id}) %></span><%= link_to(h(category.title), {:controller => 'channels', :action => 'show_category', :id => category.id}) %></div></li>
         <% else %>
           <span id="minus<%=category.id%>" class="bullet">
           <%= link_to_remote(theme_image_tag("minus.gif", :border => 0), :url => {:controller => 'sidebar/sidetags', :action => 'show_subcat', :id => category.id})%></span><%= link_to(h(category.title), {:controller => 'channels', :action => 'show_category', :id => category.id}) %></div></li>
         <%end%>

[Opda-develop] OPDA/components/sidebar sidetags_controller.rb, 1.3, 1.4

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

Update of /cvsroot/opda/OPDA/components/sidebar
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19814/components/sidebar

Modified Files:
	sidetags_controller.rb 
Log Message:
added ajax action for category menu

need to update permissions

Index: sidetags_controller.rb
===================================================================
RCS file: /cvsroot/opda/OPDA/components/sidebar/sidetags_controller.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sidetags_controller.rb	16 Jul 2006 19:02:25 -0000	1.3
--- sidetags_controller.rb	21 Jul 2006 16:11:59 -0000	1.4
***************
*** 1,4 ****
--- 1,5 ----
  class Sidebar::SidetagsController < ActionController::Base
    uses_component_template_root
+   theme 'default'
    
    def sidebar
***************
*** 41,43 ****
--- 42,52 ----
        return uri.to_s
   end
+  
+   def show_subcat
+   
+   @id = params[:id]
+   render :update do |page|
+     page.toggle "rtbullet#{@id}", "downbullet#{@id}", "subcat#{@id}"
+   end
+   end
   end
\ No newline at end of file

[Opda-develop] OPDA/components/sidebar/sidetags category_list.rhtml, 1.2, 1.3

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

Update of /cvsroot/opda/OPDA/components/sidebar/sidetags
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19437/components/sidebar/sidetags

Modified Files:
	category_list.rhtml 
Log Message:
added ajax to category menu

Index: category_list.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/components/sidebar/sidetags/category_list.rhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** category_list.rhtml	17 Jul 2006 05:16:51 -0000	1.2
--- category_list.rhtml	21 Jul 2006 16:10:57 -0000	1.3
***************
*** 1,15 ****
  <div>
  <h4>Browse Categories</h4>
! <ul class="topcatlevel">
   <% depth_check = 0 %>
    <% for category in @categories  %>
        <% if category.depth == depth_check %>
!       <li><%= link_to("#{h category.title}", {:action => 'show_category', :id => category.id}) %></li>
          <% depth_check = category.depth %>
        <% elsif category.depth > depth_check %>
!      <ul class="subcat"><li><%= link_to("#{h category.title}", {:action => 'show_category', :id => category.id}) %></li>
        <%  depth_check = category.depth %>
       <%  elsif category.depth < depth_check %>
!       </ul><li><%= link_to("#{h category.title}", {:action => 'show_category', :id => category.id}) %></li>
       <%    depth_check = category.depth    %>
       <%  end %>
--- 1,19 ----
+ <!--TODO: fix css to change spacing at bottom of tree branch -->
+ <!--TODO: add ajax to next level of tree -->
+ <!--TODO: change gifs to be plus and minus -->
+ 
  <div>
  <h4>Browse Categories</h4>
! <ul class="nobulletlist">
   <% depth_check = 0 %>
    <% for category in @categories  %>
        <% if category.depth == depth_check %>
! <li><div id="cat<%=category.id%>"><span id="rtbullet<%=category.id%>" class="rtbullet"><%= link_to_remote(theme_image_tag("rtbullet.gif", :border => 0), :url => {:controller => 'sidebar/sidetags', :action => 'show_subcat', :id => category.id})%></span><span id="downbullet<%=category.id%>" class="downbullet"  style="display: none;"><%= link_to_remote(theme_image_tag("downbullet.gif", :border => 0), :url => {:controller => 'sidebar/sidetags', :action => 'show_subcat', :id => category.id}) %></span><%= link_to(h(category.title), {:action => 'show_category', :id => category.id}) %></div></li>
          <% depth_check = category.depth %>
        <% elsif category.depth > depth_check %>
!      <ul id="subcat<%=category.parent_id%>" class="nobulletlist" style="display:none"><li><div id="cat<%=category.id%>"><span id="rtbullet<%=category.id%>" class="rtbullet"><%= theme_image_tag("rtbullet.gif", :border => 0)%></span><span id="downbullet<%=category.id%>" class="downbullet"   style="display: none;"><%= theme_image_tag("downbullet.gif", :border => 0)%></span><%= link_to(h(category.title), {:action => 'show_category', :id => category.id}) %></div></li>
        <%  depth_check = category.depth %>
       <%  elsif category.depth < depth_check %>
!       </ul><li><div id="cat<%=category.id%>"><span id="rtbullet<%=category.id%>" class="rtbullet"><%= theme_image_tag("rtbullet.gif", :border => 0)%></span><span id="downbullet<%=category.id%>" class="downbullet" style="display: none;"><%= theme_image_tag("downbullet.gif", :border => 0)%></span><%= link_to(h(category.title), {:action => 'show_category', :id => category.id}) %></div></li>
       <%    depth_check = category.depth    %>
       <%  end %>

[Opda-develop] OPDA/themes/default/images defaultart.jpg,NONE,1.1

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

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

Added Files:
	defaultart.jpg 
Log Message:
default art

--- NEW FILE: defaultart.jpg ---
(This appears to be a binary file; contents omitted.)

[Opda-develop] OPDA/config/opda itunes_categories.opml,NONE,1.1

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

Update of /cvsroot/opda/OPDA/config/opda
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16049/config/opda

Added Files:
	itunes_categories.opml 
Log Message:


--- NEW FILE: itunes_categories.opml ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<opml version="1.1">
<head>
</head>
<body>
<outline text = 'Arts'>
<outline text = 'Design' />
<outline text = 'Fashion &amp; Beauty' />
<outline text = 'Food' />
<outline text = 'Literature' />
<outline text = 'Performing Arts' />
<outline text = 'Visual Arts' />
</outline>

<outline text = 'Business'>
<outline text = 'Business News' />
<outline text = 'Careers' />
<outline text = 'Investing' />
<outline text = 'Management &amp; Marketing' />
<outline text = 'Shopping' />
</outline>

<outline text = 'Comedy' />

<outline text = 'Education'>
<outline text = 'Education Technology' />
<outline text = 'Higher Education' />
<outline text = 'K-12' />
<outline text = 'Language Courses' />
<outline text = 'Training' />
</outline>

<outline text = 'Games &amp; Hobbies'>
<outline text = 'Automotive' />
<outline text = 'Aviation' />
<outline text = 'Hobbies' />
<outline text = 'Other Games' />
<outline text = 'Video Games' />
</outline>
<outline text = 'Government &amp; Organizations'>
<outline text = 'Local' />
<outline text = 'National' />
<outline text = 'Non-Profit' />
<outline text = 'Regional' />
</outline>

<outline text = 'Health'>
<outline text = 'Alternative Health' />
<outline text = 'Fitness &amp; Nutrition' />
<outline text = 'Self-Help' />
<outline text = 'Sexuality' />
</outline>
  
<outline text = 'Kids &amp; Family' />

<outline text = 'Music' />

<outline text = 'News &amp; Politic' />

<outline text = 'Religion &amp; Spirituality'>
<outline text = 'Buddhism' />
<outline text = 'Christianity' />
<outline text = 'Hinduism' />
<outline text = 'Islam' />
<outline text = 'Judaism' />
<outline text = 'Other' />
<outline text = 'Spirituality' />
</outline>

<outline text = 'Science &amp; Medicine'>
<outline text = 'Medicine' />
<outline text = 'Natural Sciences' />
<outline text = 'Social Sciences' />
</outline>

<outline text = 'Society &amp; Culture'>
<outline text = 'History' />
<outline text = 'Personal Journals' />
<outline text = 'Philosophy' />
<outline text = 'Places &amp; Travel' />
</outline>

<outline text = 'Sports &amp; Recreation'>
<outline text = 'Amateur' />
<outline text = 'College &amp; High School' />
<outline text = 'Outdoor' />
<outline text = 'Professional' />
</outline>

<outline text = 'Technology'>
<outline text = 'Gadgets' />
<outline text = 'Tech News' />
<outline text = 'Podcasting' />
<outline text = 'Software How-To' />
</outline>

<outline text = 'TV &amp; Film' />
</body>
</opml>

[Opda-develop] OPDA/config/opda - New directory

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

Update of /cvsroot/opda/OPDA/config/opda
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16033/config/opda

Log Message:
Directory /cvsroot/opda/OPDA/config/opda added to the repository

[Opda-develop] OPDA/app/controllers channels_controller.rb, 1.10, 1.11

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

Update of /cvsroot/opda/OPDA/app/controllers
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15284/app/controllers

Modified Files:
	channels_controller.rb 
Log Message:
added show_category action to display category results

Index: channels_controller.rb
===================================================================
RCS file: /cvsroot/opda/OPDA/app/controllers/channels_controller.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** channels_controller.rb	16 Jul 2006 19:07:00 -0000	1.10
--- channels_controller.rb	17 Jul 2006 05:23:16 -0000	1.11
***************
*** 1,4 ****
  class ChannelsController < ApplicationController
! 
  def index
  
--- 1,4 ----
  class ChannelsController < ApplicationController
! model :category
  def index
  
***************
*** 201,205 ****
    
    def show_category
!   
    end
  end
--- 201,207 ----
    
    def show_category
!   @category = Category.find(params[:id])
!   @channels = @category.channels
! 
    end
  end

[Opda-develop] OPDA/app/models category.rb,1.2,1.3

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

Update of /cvsroot/opda/OPDA/app/models
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13412/app/models

Modified Files:
	category.rb 
Log Message:
changed category model to acts as nested set

Index: category.rb
===================================================================
RCS file: /cvsroot/opda/OPDA/app/models/category.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** category.rb	28 Jun 2006 22:02:42 -0000	1.2
--- category.rb	17 Jul 2006 05:18:35 -0000	1.3
***************
*** 2,5 ****
  has_and_belongs_to_many :channels
  has_and_belongs_to_many :items
! acts_as_tree :order => 'title'
  end
--- 2,27 ----
  has_and_belongs_to_many :channels
  has_and_belongs_to_many :items
! acts_as_nested_set :scope => :root
!     
!   def before_create
!     # Update the child object with its parents attrs
!     unless self[:parent_id].to_i.zero?
!       self[:depth] = parent[:depth].to_i + 1
!       self[:root_id] = parent[:root_id].to_i
!     end
!   end
!   
!   def after_create
!     # Update the parent root_id with its id
!     if self[:parent_id].to_i.zero?
!       self[:root_id] = self[:id]
!       self.save
!     else
!       parent.add_child self
!     end
!   end
!   
!   def parent
!     @parent ||= self.class.find(self[:parent_id])
!   end
  end

[Opda-develop] OPDA/themes/default/layouts default.rhtml, 1.10, 1.11

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

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

Modified Files:
	default.rhtml 
Log Message:
fixed css link to theme

Index: default.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/themes/default/layouts/default.rhtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** default.rhtml	16 Jul 2006 19:13:16 -0000	1.10
--- default.rhtml	17 Jul 2006 05:17:56 -0000	1.11
***************
*** 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>

[Opda-develop] OPDA/themes/default/stylesheets default.css, 1.4, 1.5

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

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

Modified Files:
	default.css 
Log Message:
added classes for hidden subcategories

Index: default.css
===================================================================
RCS file: /cvsroot/opda/OPDA/themes/default/stylesheets/default.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** default.css	16 Jul 2006 04:13:56 -0000	1.4
--- default.css	17 Jul 2006 05:17:32 -0000	1.5
***************
*** 495,499 ****
--- 495,505 ----
  }
  
+ ul.subcat {
+ display: none;
+ }
+ 
+ ul.topcatlevel {
  
+ }
  /*-------------------------------------------------
  TAGCLOUND
***************
*** 612,614 ****
  #login.login_error {
          border-color: #CC0000;
!       }
\ No newline at end of file
--- 618,620 ----
  #login.login_error {
          border-color: #CC0000;
!       }

[Opda-develop] OPDA/components/sidebar/sidetags category_list.rhtml, 1.1, 1.2

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

Update of /cvsroot/opda/OPDA/components/sidebar/sidetags
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12661/components/sidebar/sidetags

Modified Files:
	category_list.rhtml 
Log Message:
enhanced category sidebar - sub cats now hidden, need to add ajax toggle

Index: category_list.rhtml
===================================================================
RCS file: /cvsroot/opda/OPDA/components/sidebar/sidetags/category_list.rhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** category_list.rhtml	10 Jul 2006 05:55:00 -0000	1.1
--- category_list.rhtml	17 Jul 2006 05:16:51 -0000	1.2
***************
*** 1,9 ****
! <div id="sidenav-links">
  <h4>Browse Categories</h4>
! <ul>
! <% for category in @categories %>
!        <li><%= link_to h(category.title.to_s.slice(0..19)), :controller => 'channels', :action => 'show_category', :id => category.title %></li>
! <% end %>
! 
  </ul>
  </div>
\ No newline at end of file
--- 1,18 ----
! <div>
  <h4>Browse Categories</h4>
! <ul class="topcatlevel">
!  <% depth_check = 0 %>
!   <% for category in @categories  %>
!       <% if category.depth == depth_check %>
!       <li><%= link_to("#{h category.title}", {:action => 'show_category', :id => category.id}) %></li>
!         <% depth_check = category.depth %>
!       <% elsif category.depth > depth_check %>
!      <ul class="subcat"><li><%= link_to("#{h category.title}", {:action => 'show_category', :id => category.id}) %></li>
!       <%  depth_check = category.depth %>
!      <%  elsif category.depth < depth_check %>
!       </ul><li><%= link_to("#{h category.title}", {:action => 'show_category', :id => category.id}) %></li>
!      <%    depth_check = category.depth    %>
!      <%  end %>
!     <% end %>
  </ul>
  </div>
\ No newline at end of file

[Opda-develop] OPDA/app/views/channels show_category.rhtml, NONE, 1.1

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

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

Added Files:
	show_category.rhtml 
Log Message:
added show category view - needs work


--- NEW FILE: show_category.rhtml ---
<table>
<%= render :partial => 'channel', :collection => @channels %>
</table>