app/controllers/admin/departments_controller.rb app/controllers/admin/events_controller.rb app/controllers/events_controller.rb app/controllers/users_controller.rb app/helpers/admin/departments_helper.rb app/helpers/admin/events_helper.rb app/helpers/events_helper.rb app/helpers/users_helper.rb app/models/department.rb app/models/event.rb app/views/admin/departments/_form.html.erb app/views/admin/departments/index.html.erb app/views/admin/events/_form.html.erb app/views/admin/events/index.html.erb app/views/admin/scaffold/_data_table.html.erb app/views/events/_list.html.erb app/views/events/arquivo.html.erb app/views/events/index.html.erb app/views/events/show.html.erb app/views/users/index.html.erb app/views/users/show.html.erb db/migrate/20091025005432_add_birth_info_to_users.rb db/migrate/20091026143546_create_departments.rb db/migrate/20091027001635_create_events.rb public/images/admin/editora_callis.png public/javascripts/users/by_month.js test/factories/departments.rb test/factories/events.rb test/fixtures/events.yml test/functional/admin/departments_controller_test.rb test/functional/admin/events_controller_test.rb test/functional/events_controller_test.rb test/functional/users_controller_test.rb test/unit/department_test.rb test/unit/event_test.rb test/unit/helpers/admin/departments_helper_test.rb test/unit/helpers/admin/events_helper_test.rb test/unit/helpers/events_helper_test.rb test/unit/helpers/users_helper_test.rb vendor/plugins/paperclip/LICENSE vendor/plugins/paperclip/README.rdoc vendor/plugins/paperclip/Rakefile vendor/plugins/paperclip/cucumber/paperclip_steps.rb vendor/plugins/paperclip/generators/paperclip/USAGE vendor/plugins/paperclip/generators/paperclip/paperclip_generator.rb vendor/plugins/paperclip/generators/paperclip/templates/paperclip_migration.rb.erb vendor/plugins/paperclip/init.rb vendor/plugins/paperclip/lib/paperclip.rb vendor/plugins/paperclip/lib/paperclip/attachment.rb vendor/plugins/paperclip/lib/paperclip/callback_compatability.rb vendor/plugins/paperclip/lib/paperclip/geometry.rb vendor/plugins/paperclip/lib/paperclip/interpolations.rb vendor/plugins/paperclip/lib/paperclip/iostream.rb vendor/plugins/paperclip/lib/paperclip/matchers.rb vendor/plugins/paperclip/lib/paperclip/matchers/have_attached_file_matcher.rb vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_presence_matcher.rb vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_size_matcher.rb vendor/plugins/paperclip/lib/paperclip/processor.rb vendor/plugins/paperclip/lib/paperclip/storage.rb vendor/plugins/paperclip/lib/paperclip/thumbnail.rb vendor/plugins/paperclip/lib/paperclip/upfile.rb vendor/plugins/paperclip/paperclip.gemspec vendor/plugins/paperclip/shoulda_macros/paperclip.rb vendor/plugins/paperclip/tasks/paperclip_tasks.rake vendor/plugins/paperclip/test/.gitignore vendor/plugins/paperclip/test/attachment_test.rb vendor/plugins/paperclip/test/database.yml vendor/plugins/paperclip/test/fixtures/12k.png vendor/plugins/paperclip/test/fixtures/50x50.png vendor/plugins/paperclip/test/fixtures/5k.png vendor/plugins/paperclip/test/fixtures/bad.png vendor/plugins/paperclip/test/fixtures/s3.yml vendor/plugins/paperclip/test/fixtures/text.txt vendor/plugins/paperclip/test/fixtures/twopage.pdf vendor/plugins/paperclip/test/geometry_test.rb vendor/plugins/paperclip/test/helper.rb vendor/plugins/paperclip/test/integration_test.rb vendor/plugins/paperclip/test/interpolations_test.rb vendor/plugins/paperclip/test/iostream_test.rb vendor/plugins/paperclip/test/matchers/have_attached_file_matcher_test.rb vendor/plugins/paperclip/test/matchers/validate_attachment_content_type_matcher_test.rb vendor/plugins/paperclip/test/matchers/validate_attachment_presence_matcher_test.rb vendor/plugins/paperclip/test/matchers/validate_attachment_size_matcher_test.rb vendor/plugins/paperclip/test/paperclip_test.rb vendor/plugins/paperclip/test/processor_test.rb vendor/plugins/paperclip/test/storage_test.rb vendor/plugins/paperclip/test/thumbnail_test.rb vendor/plugins/paperclip/test/upfile_test.rb @@ -4,6 +4,8 @@ class PagesController < ApplicationController def index @pages = Page.main_pages + @users = User.by_month(Date.today.month) + @events = Event.upcoming(:limit => 4) end def contato app/controllers/pages_controller.rb @@ -9,11 +9,21 @@ class User < ActiveRecord::Base end has_and_belongs_to_many :roles + + belongs_to :department validates_presence_of :name named_scope :admins, :include => :roles, :conditions => "roles.name = 'admin'" + default_scope :order => "name ASC" + + has_attached_file :avatar, + :styles => { :thumb => "70x80#", :list => "120x140#", :big => "420x580>" }, + :path => PAPERCLIP_PATH, + :url => PAPERCLIP_URL, + :default_url => "" + # has_role? simply needs to return true or false whether a user has a role or not. # It may be a good idea to have "admin" roles return true always def has_role?(role_in_question) @@ -22,4 +32,20 @@ class User < ActiveRecord::Base (@_list.include?(role_in_question.to_s) ) end + def age + now = Date.today + year = now.year - birthday.year if birthday + + if (birthday + year.year) > now + year = year - 1 + else + year + end + end + + private + def self.by_month(month) + all(:conditions => ["MONTH(birthday) = ?", month]) + end + end app/models/user.rb @@ -1,10 +1,12 @@ <ul id="menu"> + <li><%= link_to "Departamentos", admin_departments_path %></li> <li> - <%= link_to t(:menu_users), admin_users_path %> + <%= link_to "Funcionários", admin_users_path %> <ul> <li><%= link_to t(:menu_users), admin_users_path %></li> <li><%= link_to t(:menu_admins), admin_users_path(:role => 'admin') %></li> </ul> </li> <li><%= link_to t(:menu_pages), admin_pages_path %></li> + <li><%= link_to "Eventos", admin_events_path %></li> </ul> \ No newline at end of file app/views/admin/layouts/_menu.html.erb @@ -18,7 +18,7 @@ <%= render :partial=>"admin/layouts/info" if logged_in? %> -<%= image_tag("admin/dbd.gif") %> +<%= image_tag("admin/editora_callis.png") %> <%= render :partial=>"admin/layouts/menu" if logged_in? %> @@ -31,7 +31,7 @@ <%= yield %> </div> -<div id="footer"><%=t :created_by %> <%= link_to "DBurns Design", "http://www.dburnsdesign.com", :target => "_blank" %></div> +<div id="footer"><%=t :created_by %> <%= link_to "Philipe Casarotte", "http://philipecasarotte.com.br", :target => "_blank" %></div> </body> </html> app/views/admin/layouts/admin.html.erb @@ -1,7 +1,15 @@ <% f.inputs do %> + <p> + <%= f.label :avatar, "Foto" %> + <%= f.file_field :avatar %> + </p> <%= f.input :login %> <%= f.input :name %> <%= f.input :email %> + <%= f.label :birthday, "Aniversário" %> + <%= f.date_select :birthday, :start_year => 1930 %> + <%= f.input :telephone, :label => "Telefone/Ramal" %> + <%= f.input :department, :label => "Departamento" %> <%= f.input :password %> <%= f.input :password_confirmation %> <%= f.input :roles, :as => :check_boxes %> app/views/admin/users/_form.html.erb @@ -3,17 +3,23 @@ <table id="table"> <thead> <tr> + <th></th> <th>Login</th> <th><%=t :user_name %></th> <th><%=t :user_email %></th> + <th>Departamento</th> + <th>Telefone</th> </tr> </thead> <tbody> <%- @users.each do |user|%> <tr> + <td><%= image_tag user.avatar.url(:thumb) if user.avatar.url.present? %></td> <td><%=h user.login %></td> <td><%=h user.name %></td> <td><%=h user.email %></td> + <td><%= user.department.name rescue "" %></td> + <td><%= user.telephone %></td> <td><%=link_to t(:edit), edit_object_url(user) %></td> <td><%=link_to t(:destroy), object_url(user), :confirm => t(:are_you_sure), :method => :delete %></td> app/views/admin/users/index.html.erb @@ -28,9 +28,9 @@ <p>Intranet Editora Callis | <%= link_to "Administrativo", admin_root_path %></p> <ul> <li><%= link_to "Home", root_path %></li> - <li><%= link_to "Procedimentos", "procedures_path" %></li> - <li><%= link_to "Eventos", "events_path" %></li> - <li><%= link_to "Aniversáriantes", "users_path" %></li> + <li><%= link_to "Procedimentos", procedures_path %></li> + <li><%= link_to "Eventos", events_path %></li> + <li><%= link_to "Aniversáriantes", users_path %></li> </ul> </div> <% [:error, :notice].each do |message| %> app/views/layouts/application.html.erb @@ -2,35 +2,48 @@ <div id="events"> <h2>Próximos Eventos</h2> <ul> + <% @events.each do |event| %> <li> - <% link_to "event_path(event)" do %> - <small>23 de Nov, 2009</small> - <h3>Lorem sit amet dolen ipsum</h3> - <% end %> - </li> - <li> - <% link_to "event_path(event)" do %> - <small>23 de Nov, 2009</small> - <h3>Lorem sit amet dolen ipsum</h3> - <% end %> - </li> - <li> - <% link_to "event_path(event)" do %> - <small>23 de Nov, 2009</small> - <h3>Lorem sit amet dolen ipsum</h3> - <% end %> - </li> - <li> - <% link_to "event_path(event)" do %> - <small>23 de Nov, 2009</small> - <h3>Lorem sit amet dolen ipsum</h3> + <% link_to event_path(event.permalink) do %> + <small><%= l(event.happens_on, :format => :short) %></small> + <h3><%= event.name.summary 30 %></h3> <% end %> </li> + <% end %> </ul> </div> <div id="births"> <h2>Aniversáriantes</h2> +<% if @users.any? %> + <ul> + <% @users.each do |user| %> + <li> + <% link_to user_path(user) do %> + <%= image_tag user.avatar.url(:thumb), :size => "70x80" if user.avatar.url.present? %> + <h3><%= user.name %></h3> + <% if user.birthday.present? %> + <big><%= l(user.birthday, :format => :short) %></big> + <small><%= "#{user.age} anos" if user.birthday.present? %></small> + <% end %> + <% end %> + </li> + <% end %> + </ul> +<% else %> + Nenhum aniversáriante<br/> + no mês de <%= l(Date.today, :format => :only_month) %> +<% end %> </div> <div id="procedures"> <h2>Procedimentos</h2> + <% form_tag search_procedures_path, :method => :get do %> + <%= text_field_tag "q", params[:q] || "digite aqui sua palavra-chave" %> + <%= submit_tag("Buscar", :class => "submit") %> + <% end %> + <h2>Últimos Cadastrados</h2> + <ul> + <li><%= link_to "Lorem ipsum dolor sit amet, consectetur adipisicing elit".summary(50), "#" %></li> + <li><%= link_to "Lorem ipsum dolor sit amet, consectetur adipisicing elit".summary(50), "#" %></li> + <li><%= link_to "Lorem ipsum dolor sit amet, consectetur adipisicing elit".summary(50), "#" %></li> + </ul> </div> \ No newline at end of file app/views/pages/index.html.erb @@ -79,6 +79,9 @@ Rails::Initializer.run do |config| SITE_URL = "http://www.#{SITE_DOMAIN}/" SITE_EMAIL = "contact@#{SITE_DOMAIN}" SITE_META_KEYWORDS = "" + + PAPERCLIP_PATH = ":rails_root/public/system/:class/:id/:style/:basename.:extension" + PAPERCLIP_URL = "/system/:class/:id/:style/:basename.:extension" $VERBOSE = old_verbose end config/environment.rb @@ -49,6 +49,7 @@ pt-BR: short: "%d de %B" long: "%d de %B de %Y" only_day: "%d" + only_month: "%B" day_names: [Domingo, Segunda, Terça, Quarta, Quinta, Sexta, Sábado] abbr_day_names: [Dom, Seg, Ter, Qua, Qui, Sex, Sáb] config/locales/pt-BR.yml @@ -5,13 +5,19 @@ ActionController::Routing::Routes.draw do |map| admin.logout 'logout', :controller => "user_sessions", :action => "destroy" admin.resource :user_session admin.resources :pages, :as => :paginas, :collection=>{ :reorder=>:get, :order=>:post } - admin.resources :users, :usuarios + admin.resources :departments, :as => :departamentos + admin.resources :users, :as => :aniversariantes + admin.resources :events, :as => :eventos + admin.resources :procedures, :as => :procedimentos admin.root :controller => 'pages' end map.pages '/paginas/:action', :controller => 'pages' map.resources :pages, :as => :paginas - + map.resources :users, :as => :aniversariantes + map.resources :events, :as => :eventos, :collection => { :arquivo => :get } + map.resources :procedures, :as => :procedimentos, :collection => { :search => :get } + map.not_found '/404', :controller => 'pages', :action => '404' map.application_error '/500', :controller => 'pages', :action => '500' map.unprocessable_entity '/422', :controller => 'pages', :action => '422' config/routes.rb @@ -1,27 +1,55 @@ -contact: - name: "Contact" - body: "Coming soon" - permalink: "contact" +home: + id: 7 + name: "Home" + body: "Em Breve" + permalink: "home" parent: is_protected: 1 -page_not_found: - name: "Page Not Found" - body: "Coming soon" +procedimentos: + id: 6 + name: "Procedimentos" + body: "Em Breve" + permalink: "procedimentos" + parent: + is_protected: 1 + +eventos: + id: 5 + name: "Eventos" + body: "Em Breve" + permalink: "eventos" + parent: + is_protected: 1 + +aniversariantes: + id: 4 + name: "Aniversariantes" + body: "Em Breve" + permalink: "aniversariantes" + parent: + is_protected: 1 + +pagina_nao_encontrada: + id: 3 + name: "Página não Encontrada" + body: "Em Breve" permalink: "404" parent: is_protected: 1 -unexpected_error: +erro_inesperado: + id: 2 name: "Unexpected Error" - body: "Coming soon" + body: "Em Breve" permalink: "500" parent: is_protected: 1 -unprocessable_entity: - name: "Unprocessable Entity" - body: "Coming soon" +entidade_desconhecida: + id: 1 + name: "Entidade Desconhecida" + body: "Em Breve" permalink: "422" parent: is_protected: 1 \ No newline at end of file lib/dburns/pages.yml @@ -1,14 +1,15 @@ * {margin:0;padding:0;} -body {background: #FFF url('/images/admin/background.jpg') repeat-x; color:#fff; font:12px Verdana, Arial, Tahoma, sans-serif;} +body {background-color:black; color:#fff; font:12px Verdana, Arial, Tahoma, sans-serif;} .clear {clear:both;} -a {color:#FF0000;text-decoration:none;font-weight:bold;} +a {color:#00CCCC;text-decoration:none;font-weight:bold;} a:hover {color:#000;} a img {border:none;} h1,h2, -h3,h4 {color:#FF0000;} +h3,h4, +legend span {color:#00CCCC;} h1 {font-size:18px; margin: 20px.1em 0;} h2 {font-size:16px; margin: 0.3em 0; padding-top: 0.8em;} @@ -28,19 +29,19 @@ dt {font-weight: bold;padding-left: 4px;vertical-align: top;} dd {margin-left: 10em;margin-top: -2em;vertical-align: top;} /* INFO */ -#info {float:right; margin:20px 20px 50px 0;color:#FFCC00;text-align:right;} -#info a {color:#FFCC00;text-decoration:none;} +#info {float:right; margin:20px 20px 50px 0;color:white;text-align:right;} +#info a {color:#00CCCC;text-decoration:none;} #info a:hover {text-decoration:underline;} /* MENU */ #menu {margin-top:10px;} #menu li {float:left; list-style-type:none; margin:0 2px; z-index:100; position:relative;} -#menu a {color:#FFCC00; display:block; width:auto; background:#000; border:solid 1px #666; border-width: 0 1px 1px 1px; padding:5px 10px; } +#menu a {color:#00CCCC; display:block; width:auto; background:#000; padding:5px 10px; } #menu a:hover {color:#FFF;} /* FOOTER */ -#footer {clear: both; padding: 6px 20px; font-size:80%; text-align:right; color:#000;} -#footer a {color:#000;} +#footer {clear: both; padding: 6px 20px; font-size:80%; text-align:right; color:white;} +#footer a {color:#00CCCC;} #footer a:hover {text-decoration:underline;} /* CONTENT */ public/stylesheets/admin/default.css @@ -4,16 +4,21 @@ img {border:none;} a {color:#00CCCC;text-decoration:none;} a:hover {text-decoration:underline;} -h1 {} +p {margin-bottom:14px;} + +h1 {font-size:42px;color:black;font-weight:normal;padding-bottom:20px;margin-bottom:20px;border-bottom:1px solid #C7C7C7;} +h1 small {float:right;color:#C7C7C7;} +h1 small.link {font-size:14px;margin-top:15px;} +h1 small.select {color:#00CCCC;font-size:14px;margin-top:15px;} h2 {font-size:28px;font-weight:normal;border-bottom:1px solid #C7C7C7;margin-bottom:10px;padding-bottom:10px;} h3 {font-size:16px;} -body {background:white url(../images/bg/body.gif) repeat-x;color:#C7C7C7;font:12px Arial, Verdana, Tahoma, sans-serif;} +body {background:white url(../images/bg/body.gif) repeat-x;color:black;font:12px Arial, Verdana, Tahoma, sans-serif;} #main {margin:0 auto;width:920px;} /*Top*/ -#top {border-bottom:1px solid #C7C7C7;margin-bottom:20px;padding-bottom:20px;height:140px;} +#top {border-bottom:1px solid #C7C7C7;color:#C7C7C7;margin-bottom:20px;padding-bottom:20px;height:140px;} #top img {float:left;} #top p {text-align:right;margin:15px 0 105px 0;} #top ul {float:right;} @@ -24,7 +29,7 @@ body {background:white url(../images/bg/body.gif) repeat-x;color:#C7C7C7;font:12 #banner {border-bottom:1px solid #C7C7C7;margin-bottom:20px;padding-bottom:20px;} /*Home*/ -#events {float:left;width:350px;margin-right:20px;} +#events {float:left;width:350px;margin-right:20px;color:#C7C7C7;} #events li {border-bottom:1px solid #C7C7C7;margin-bottom:10px;list-style:none;height:40px;} #events li a {color:black;} #events li a:hover {color:#00CCCC;text-decoration:none;} @@ -32,9 +37,46 @@ body {background:white url(../images/bg/body.gif) repeat-x;color:#C7C7C7;font:12 #events li small {font-size:12px;float:left;width:100px;border-right:1px solid #C7C7C7;margin-right:10px;padding:10px 10px 0 0;height:20px;} #events li h3 {padding-top:8px;} -#births {float:left;width:250px;margin-right:20px;} +#births {float:left;width:250px;margin-right:20px;color:#C7C7C7;} +#births li {margin-bottom:10px;list-style:none;height:90px;} +#births li a:hover {text-decoration:none;} +#births li a:hover img {border-color:#00CCCC;} +#births li a:hover h3 {color:#00CCCC;} +#births li a:hover small, +#births li a:hover big {color:black;} +#births li img {float:left;margin-right:10px;border:solid 3px white;} +#births li h3 {color:black;font-size:14px;} +#births li big, +#births li small {display:block;} +#births li big {font-style:italic;color:#999;font-size:14px;} +#births li small {color:#C7C7C7;font-size:14px;} + +#procedures {float:right;width:280px;color:#C7C7C7;} +#procedures form {float:left;width:280px;margin-bottom:20px;} +#procedures input {height:30px;width:197px;border:none;background-color:#C7C7C7;float:left;color:#999;font-size:13px;font-style:italic;padding-left:3px;} +#procedures input.submit {height:30px;width:80px;border:none;background-color:#00CCCC;float:left;color:white;font-size:16px;} +#procedures li {border-bottom:1px solid #C7C7C7;margin-bottom:10px;list-style:none;height:20px;font-weight:bold;} +#procedures li a {color:black;} +#procedures li a:hover {color:#00CCCC;text-decoration:none;} + +/*Events*/ +#events.full {float:left;width:920px;} +#events.full li {border-bottom:1px solid #C7C7C7;margin-bottom:10px;list-style:none;height:130px;} +#events.full li small {float:none;border:none;font-size:18px;margin:0;padding:0;} +small.event {display:block;font-size:18px;color:#00CCCC;margin-bottom:15px;} +#events.full li h3 {font-size:24px;margin-bottom:10px;} -#procedures {float:right;width:280px;} +/*Users*/ +#births.full {float:left;width:920px;} +#births.full li {display:inline;} +#births.full li a {display:block;padding:20px;float:left;width:260px;height:150px;background-color:#C7C7C7;margin:3px;} +#births.full li.odd a {background-color:white;} +#births.full li a:hover {background-color:black;color:white;} +#births.full li a:hover small, +#births.full li a:hover big {color:white;} +#births.full li img {border-color:#C7C7C7;} /*Footer*/ -#footer {float:left;border-top:1px solid #C7C7C7;margin-top:20px;padding-top:20px;text-align:center;width:920px;} \ No newline at end of file +#footer, +#navigation {float:left;border-top:1px solid #C7C7C7;margin-top:20px;padding:20px 0;text-align:center;width:920px;} +#navigation {text-align:right;} public/stylesheets/default.css @@ -9,7 +9,7 @@ #menu {font:14px "Gill Sans","Trebuchet MS",Arial, Verdana, Tahoma, sans-serif;} #menu li {display:inline;list-style-type:none; margin:0 2px;background:#000;} /*#menu li.selected, #menu li.selected a {background:white; color:#000;}*/ -#menu a {color:#FFCC00;padding:5px 10px;border:solid 1px #666;} -#menu li a {border-width: 0 1px 1px 1px;background:#000;display:block;} -#menu a:hover{color:#FFF;} +#menu a {color:white;padding:5px 10px;border:solid 1px white;} +#menu li a {border-width:1px 1px 0 1px;background:#000;display:block;} +#menu a:hover{color:#00CCCC;} #menu li ul li {*margin:-4px 0;} \ No newline at end of file public/stylesheets/plugins/superfish.css @@ -14,6 +14,7 @@ Factory.define :user do |u| u.login Factory.next(:login) u.email Factory.next(:email) u.name 'User' + u.birthday "1985-05-08" u.password 'secret' u.password_confirmation 'secret' u.password_salt salt = Authlogic::Random.hex_token @@ -26,6 +27,7 @@ Factory.define :quentin, :parent => :user do |u| u.email Factory.next(:email) u.name 'Quentin' u.password 'monkey' + u.birthday "1985-05-08" u.password_confirmation 'monkey' u.password_salt salt = Authlogic::Random.hex_token u.crypted_password Authlogic::CryptoProviders::Sha512.encrypt("monkey" + salt) @@ -35,6 +37,7 @@ Factory.define :admin, :parent => :user do |u| u.login Factory.next(:login) u.email Factory.next(:email) u.name 'Admin' + u.birthday "1985-05-08" u.password 'monkey' u.password_confirmation 'monkey' u.password_salt salt = Authlogic::Random.hex_token test/factories/users.rb 4a6d95662c642db83cb59f04bad8f264c89b15fc Philipe Casarotte phisoccer@globo.com http://github.com/philipecasarotte/callis/commit/56ff5e8e3a2102d9e6de3b45c73ac0837e91861e 56ff5e8e3a2102d9e6de3b45c73ac0837e91861e 2009-11-05T05:13:50-08:00 2009-11-05T05:13:50-08:00 admin customization papaerlcip b973013bcc79a77240513b5992341886cbed77bf Philipe Casarotte phisoccer@globo.com