Changeset 1307

Show
Ignore:
Timestamp:
08/02/08 21:37:22 (4 months ago)
Author:
alban
Message:

Ajout des episode/list. Refs #14

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/controllers/episode_controller.rb

    r1193 r1307  
    3838  end 
    3939 
     40  def list 
     41    @show = current_user.shows.find(params[:show]) 
     42    @episodes = @show.episodes.paginate(:per_page => 10, :page => (params[:page] or 1)) 
     43  end 
     44 
    4045  def delete 
    4146    episode = current_user.find_episode(params[:id]) 
    …… 
    4550  end 
    4651 
    47   def select_image 
     52  def select_image 
    4853    @episode = current_user.find_episode(params[:id]) 
    4954    return unless request.post? 

  • trunk/app/views/show/show.rhtml

    r1255 r1307  
    2626 
    2727  <ul> 
    28   <% for episode in @show.episodes %> 
     28  <% for episode in @show.episodes.first(5) %> 
    2929    <li> 
    3030      <%= link_to("#{episode.order} - #{episode.title}", :controller => "episode", :action => "show", :id => episode) %> 
    …… 
    3333  <% end %> 
    3434  </ul> 
    35   <p>Ajouter <%= link_to("un nouvel épisode", :controller => "episode", :action => "create", :show => @show) %></p> 
     35 
     36  <div class="actions"> 
     37    <%= link_to "Tous les épisodes", :controller => "episode", :action => "list", :show => @show %> 
     38    <%= link_to "Ajouter un nouvel épisode", :controller => "episode", :action => "create", :show => @show %> 
     39  </div> 
    3640<% else %> 
    37   <p>Renseigner <%= link_to("le premier épisode", :controller => "episode", :action => "create", :show => @show) %> de cette émission</p> 
     41  <div class="actions"> 
     42    <%= link_to "Renseigner le premier épisode", :controller => "episode", :action => "create", :show => @show %> 
     43  </div> 
    3844<% end %> 
    3945 

  • trunk/public/stylesheets/screen.css

    r1193 r1307  
    3131#frame h1 { font: normal 145% "Georgia", serif; color: #66af16; margin: 6px 0; } 
    3232#frame h2 { font: normal 120% "Georgia", serif; margin: 6px 0; color: #7dacd1; clear: both; border-bottom: 1px solid #7dacd1; } 
    33 #frame .actions, #frame .tags  { clear: both; margin: 0 0 6px; padding: 4px 0; font-size: 90%; text-align: right; border-top: 1px solid #ccc; } 
     33#frame .actions, #frame .tags, .pagination { clear: both; margin: 0 0 6px; padding: 4px 0; font-size: 90%; text-align: right; } 
     34#frame .actions, #frame .tags { border-top: 1px solid #ccc; } 
    3435#frame .details { position: absolute; top: 10px; right: 0; font-size: 90%; } 
    3536#frame .tags { margin: 6px 0 0; padding: 6px 20px; text-align: left; background: url("../images/tags.png") no-repeat 0px 6px; }