app/controllers/admin/speakers_controller.rb app/views/admin/speakers/_form.html.erb app/views/admin/speakers/edit.html.erb app/views/admin/speakers/new.html.erb app/views/pages/agenda.html.erb app/views/pages/speakers.html.erb @@ -1,7 +1,7 @@ require "ostruct" class PagesController < ApplicationController - # caches_action :index, :banners, :talker + caches_action :index, :banners, :talker, :register, :contact, :speakers, :agenda def index end @@ -36,6 +36,14 @@ class PagesController < ApplicationController def register end + def speakers + @speakers = Speaker.all :order => "name" + end + + def agenda + @agenda = Agenda.all :order => "start_at" + end + private def contact_valid?(contact) contact.errors = [] @@ -82,3 +90,45 @@ class PagesController < ApplicationController end end + +class Agenda + def self.all(*args) + agenda = [] + + items = [ + ["08:00", "08:50", "Credenciamento", nil], + ["08:50", "09:00", "Abertura", nil], + ["09:00", "09:40", "Palestra I", 1], + ["09:40", "10:20", "Palestra II", nil], + ["10:20", "10:40", "Coffee-break", nil], + ["10:40", "11:20", "Palestra III", nil], + ["11:20", "12:00", "Palestra IV", nil], + ["12:00", "14:00", "Intervalo para almoço (*)", nil], + ["14:00", "14:40", "Palestra V", nil], + ["14:40", "15:20", "Palestra VI", nil], + ["15:20", "15:40", "Coffee-break", nil], + ["15:40", "16:20", "Palestra VII", nil], + ["16:20", "17:00", "Palestra VIII", nil], + ["17:00", "17:40", "Palestra XI", nil], + ["17:40", "18:00", "Sorteiros e encerramento", nil], + ["18:00", "Cansar", "#horaextra", nil], + ] + + + items.each do |item| + os = OpenStruct.new :start_at => item[0], :end_at => item[1], :event => item[2], :speaker_id => item[3] + + def os.speaker + return nil if self.speaker_id.nil? + @speaker ||= Speaker.find(speaker_id) rescue nil + end + + def os.what_happen + speaker ? "<a href='/palestrantes#speaker-#{speaker.id}'>#{speaker.name} - #{speaker.presentation}</a>" : self.event + end + agenda << os + end + + agenda + end +end \ No newline at end of file app/controllers/pages_controller.rb @@ -9,14 +9,20 @@ class UserSessionsController < ApplicationController flash[:notice] = "Seja bem vindo #{current_user.name}" redirect_to home_url else + flash[:error] = "Você não está tentando hackear, né?" render :action => 'new' end end def destroy - @user_session = UserSession.find - flash[:notice] = "Volte sempre #{current_user.name}." - @user_session.destroy + if current_user + @user_session = UserSession.find + flash[:notice] = "Volte sempre #{current_user.name}." + @user_session.destroy + else + flash[:notice] = "Você nem estava logado" + end + redirect_to home_url end end app/controllers/user_sessions_controller.rb @@ -6,7 +6,7 @@ class UsersController < ApplicationController def create @user = User.new(params[:user]) if @user.save - flash[:notice] = "Registration successfully." + flash[:notice] = "Seja bem vindo #{@user.name}" redirect_to home_url else render :action => 'new' @@ -20,7 +20,7 @@ class UsersController < ApplicationController def update @user = current_user if @user.update_attributes(params[:user]) - flash[:notice] = "Successfully updated profile." + flash[:notice] = "Seu dados foram atualizados" redirect_to home_url else render :action => 'edit' app/controllers/users_controller.rb @@ -1,4 +1,11 @@ <div id="header" class="clearfix"> <h1 class="site-name"><%= link_to image_tag('logo_dev.jpg', :alt => "Dev in Sampa"), home_path %></h1> <%= image_tag 'banner_data.jpg', :alt => '28/11/2009 das 9:00 às 18:00', :class => 'banner-data' %> -</div> \ No newline at end of file + + <% if current_user %> + <div id="logged_menu"> + Olá <%= current_user.name %> | <%= link_to "Sair", logout_path %> + </div> + <% end %> +</div> + app/views/layouts/_header.html.erb @@ -2,8 +2,8 @@ <ul id="navigation" class="clearfix"> <li class="<%= class_selected("pages", "index") %>"><%= link_to "Página inicial", home_path %></li> <li class="<%= class_selected("pages", "register") %>"><%= link_to "Inscrição", register_path %></li> -  - <li class="<%= class_selected("agenda", "index") %>"><%= link_to "Programação", agenda_path %></li> + <li class="<%= class_selected("pages", "agenda") %>"><%= link_to "Programação", agenda_path %></li> + <li class="<%= class_selected("pages", "speakers") %>"><%= link_to "Palestrantes", speakers_path %></li> <li class="<%= class_selected("pages", "banners") %>"><%= link_to "Divulgar", banners_path %></li> <li class="<%= class_selected("pages", "contact") %>"><%= link_to "Contato", contact_path %></li> </ul> app/views/layouts/_menu.html.erb @@ -3,14 +3,14 @@ <% form_for @user_session do |f| %> <%= f.error_messages %> <p> - <%= f.label :username %><br /> + <%= f.label :username, "Usuário" %><br /> <%= f.text_field :username %> </p> <p> - <%= f.label :password %><br /> + <%= f.label :password, "Senha" %><br /> <%= f.password_field :password %> </p> - <p><%= f.submit "Submit" %></p> + <p><%= f.submit "Confirmar" %></p> <% end %> <%= link_to "Registrar", new_user_path %> \ No newline at end of file app/views/user_sessions/new.html.erb @@ -18,7 +18,7 @@ Rails::Initializer.run do |config| # config.gem "bj" # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" # config.gem "sqlite3-ruby", :lib => "sqlite3" - # config.gem "aws-s3", :lib => "aws/s3" + config.gem "RedCloth" # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named config/environment.rb @@ -14,5 +14,4 @@ config.action_view.debug_rjs = true config.action_controller.perform_caching = false # Don't care if the mailer can't send -config.action_mailer.raise_delivery_errors = true#false - +config.action_mailer.raise_delivery_errors = false \ No newline at end of file config/environments/development.rb @@ -1,19 +1,26 @@ ActionController::Routing::Routes.draw do |map| - # map.resources :user_sessions - # map.resources :users - # - # map.login "acesso", :controller => "user_sessions", :action => "new" - # map.logout "sair", :controller => "user_sessions", :action => "destroy" + map.namespace :admin do |admin| + admin.resources :speakers + end - map.home "/", :controller => "pages", :action => "index" - map.agenda "/programacao", :controller => "agenda", :action => "index" - map.contact "/contato", :controller => "pages", :action => "contact" + map.resources :users, :as => "usuarios" + map.resources :user_sessions, :as => "acesso" - map.banners "/divulgar", :controller => "pages", :action => "banners" + map.with_options :controller => 'user_sessions' do |user_sessions| + user_sessions.login "/login", :action => "new" + user_sessions.logout "/logout", :action => "destroy" + end - map.wanna_talk "/quero-palestrar", :controller => "pages", :action => "talker" + map.with_options :controller => 'pages' do |pages| + pages.home "/", :action => "index" + pages.contact "/contato", :action => "contact" + pages.banners "/divulgar", :action => "banners" + pages.wanna_talk "/quero-palestrar", :action => "talker" + pages.register "/inscricao", :action => "register" + pages.speakers "/palestrantes", :action => "speakers" + pages.agenda "/programacao", :action => "agenda" + end - map.register "/inscricao", :controller => "pages", :action => "register" end # The priority is based upon order of creation: first created -> highest priority. config/routes.rb @@ -16,8 +16,6 @@ class CreateSpeakers < ActiveRecord::Migration end def self.down - remove_index :speakers, :name - drop_table :speakers end end db/migrate/20091024145537_create_speakers.rb @@ -12,20 +12,20 @@ $(document).ready(function() { $("#map-zoom-in").toggle(); }); - $("textarea").focus(function() { + $(".banner textarea, .banner-quadrado textarea").focus(function() { // only select if the text has not changed if(this.value == this.defaultValue) { this.select(); } }); - $("textarea").click(function() { + $(".banner textarea, .banner-quadrado textarea").click(function() { // only select if the text has not changed if(this.value == this.defaultValue) { this.select(); } }); - $("table.agenda tr:odd").addClass('odd'); + // $("table.agenda tr:odd").addClass('odd'); }) \ No newline at end of file public/javascripts/application.js @@ -3,6 +3,10 @@ padding: 0; } +h1, h2, h3, h4 { + clear: both; +} + body { color: #000; font-family: "Lucida Grande", arial, verdana, sans-serif; @@ -10,6 +14,10 @@ body { background: #fff; } +label span { + color: #666; + font-size: .6em ; +} /***** Commons settings *****/ fieldset { border: 0; } legend { display: none; } @@ -21,6 +29,14 @@ a { text-decoration: underline; } .clearfix { height: 1%; } .clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.float-left { + float: left; +} + +.float-right { + float: right; +} + #container { width: 980px; margin: 0 auto; @@ -40,6 +56,12 @@ a { text-decoration: underline; } right: 0; } +#header #logged_menu { + position: absolute; + top: 30px; + right: 0; +} + #menu { height: 70px; background: #666 url('/images/bg_menu.jpg') repeat-x; @@ -70,7 +92,8 @@ ul#navigation li { ul#navigation li.selected { color: #fff; background: #666; - padding: 10px 7px; + padding: 0; + padding: 10px 0px; } ul#navigation li.selected a { @@ -241,6 +264,11 @@ ul#navigation li a:hover { background: #e5e5e5; } +#content .speaker img { + max-width: 300px; + margin: 25px 15px 5px; +} + #content #warning { height: 70px; background: #FFDB70 url('/images/bg_warning.jpg') no-repeat; public/stylesheets/application.css app/controllers/agenda_controller.rb app/views/agenda/index.html.erb spec/controllers/agenda_controller_spec.rb a89a83c2be8084fa076665a44fa26a0630b3f189 tinogomes tinorj@gmail.com http://github.com/tinogomes/devinsampa/commit/22bf4053bb75c0549dc67e17a6ae0a11ec0486d1 22bf4053bb75c0549dc67e17a6ae0a11ec0486d1

2009-11-06T09:56:39-08:00

CRUD for speakers, list dinamically speakers, list agenda fake, cosmetic adjustiments c004b8271d861eb7cb09c0e497e6cdbe54a4b83f tinogomes tinorj@gmail.com