public/images/show_add.png @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- class AccountController < ApplicationController skip_before_filter :login_required @@ -10,6 +11,10 @@ class AccountController < ApplicationController end @user = self.current_user + + @show_count = @user.shows.size + @show_lasts = @user.shows.find(:all, :order => "updated_at desc", :limit => 3) + @episodes_count = @user.episodes.size @episodes_lasts = @user.episodes.sort_by { |e| e.created_at }.first(5).reverse end app/controllers/account_controller.rb @@ -19,6 +19,12 @@ class User < ActiveRecord::Base has_and_belongs_to_many :shows + # doesn't work with has_and_belongs_to_many + # has_many :episodes, :through => :shows + def episodes + shows.collect { |show| show.episodes }.flatten + end + # Authenticates a user by their login name and unencrypted password. Returns the user or nil. def self.authenticate(login, password) user = find_by_login(login) @@ -101,10 +107,6 @@ class User < ActiveRecord::Base content end - def episodes - shows.collect { |show| show.episodes }.flatten - end - protected # before filter def encrypt_password app/models/user.rb @@ -1,29 +1,33 @@ <h2>Vos émissions</h2> <% unless @user.shows.empty? %> - <ul> - <% for show in @user.shows %> - <li><%= link_to(show.name, :controller => "show", :action => "show", :id => show) %></li> + +<p>Vous avez renseigné <%= pluralize(@show_count, "émission") %>. + Les dernières émissions modifiées :</p> +<ul> + <% for show in @show_lasts %> + <li><%= link_to(show.name, :controller => "show", :action => "show", :id => show) %></li> <% end %> - </ul> - <p>Ajouter <%= link_to("une nouvelle émission", :controller => "show", :action => "create") %></p> +</ul> <% else %> - <p>Renseigner <%= link_to("votre première émission", :controller => "show", :action => "create") %></p> +<p>Vous n'avez pas encore renseigné d'émission.</p> <% end %> +<div class="actions"> + <%= link_to "Ajouter une nouvelle émission", {:controller => "show", :action => "create"}, :class => "new_show" %> +</div> + <h2>Episodes</h2> <% unless @user.episodes.empty? %> -<p>Vous avez renseigné <%= pluralize(@episodes_count, "épisode") %></p> - -<p>Les derniers épisodes renseignés :</p> +<p>Vous avez renseigné <%= pluralize(@episodes_count, "épisode") %>. Les derniers épisodes renseignés :</p> <ul> -<% for episode in @episodes_lasts %> + <% for episode in @episodes_lasts %> <li> <%= link_to("#{episode.show.name} - #{episode.title}", - {:controller => "episode", :action => "show", :id => episode}) %> + {:controller => "episode", :action => "show", :id => episode}) %> </li> -<% end %> + <% end %> </ul> <% end %> app/views/account/index.rhtml @@ -121,3 +121,5 @@ p#cloud { margin-bottom: 8px; } .textile_editor_help { padding: 4px 0 10px 10px; font-size: 0.9em; font-style: italic; } #selection li { display: inline; } + +div.actions a.new_show { background:url(../images/show_add.png) no-repeat; padding: 0 0 0 23px; } public/stylesheets/screen.css 8d325c13745ed7bbe9ed55133125652219012d96 Alban Peignier alban.peignier@free.fr http://github.com/albanpeignier/bonnes-ondes/commit/d0d6d9f5a868ac3ec26ab5aa62f6a9da3c1c8e2a d0d6d9f5a868ac3ec26ab5aa62f6a9da3c1c8e2a 2009-06-27T04:47:56-07:00 2009-06-27T04:46:34-07:00 Display only last modified show in user dashboard, use standard div.actions with icon to add show 82fc9d03ed9e44eadceed4acb2025a423eafa317 Alban Peignier alban.peignier@free.fr