Avatares

app/views/courses/_right_panel.html.haml

@@ -1,3 +1,3 @@
 -# cache(course_path(@course.id, :part => :right)) do
 = render :file => 'widgets/calendario'
-= render :file => 'widgets/news'
+= render :file => 'widgets/users'

app/views/log/_attachment_log_entry.html.haml

@@ -1,6 +1,6 @@
-= "Anexo " + link_to(h(entry.attachment.file_name), course_attachment_url(entry.course, entry.attachment))
+= "criou "     if entry.kind_of?(AttachmentCreateLogEntry)
+= "editou "    if entry.kind_of?(AttachmentEditLogEntry)
+= "excluiu "   if entry.kind_of?(AttachmentDeleteLogEntry)
+= "restaurou " if entry.kind_of?(AttachmentRestoreLogEntry)
 
-= "criado "     if entry.kind_of?(AttachmentCreateLogEntry)
-= "editado "    if entry.kind_of?(AttachmentEditLogEntry)
-= "excluído "   if entry.kind_of?(AttachmentDeleteLogEntry)
-= "restaurado " if entry.kind_of?(AttachmentRestoreLogEntry)
+= "o anexo " + link_to(h(entry.attachment.file_name), course_attachment_url(entry.course, entry.attachment))

app/views/log/_event_log_entry.html.haml

@@ -1,6 +1,6 @@
-= "Evento " + link_to(h(entry.event.title), course_event_url(entry.course, entry.event, :version => entry.version))
+= "criou "     if entry.kind_of?(EventCreateLogEntry)
+= "editou "    if entry.kind_of?(EventEditLogEntry)
+= "excluiu "   if entry.kind_of?(EventDeleteLogEntry)
+= "restaurou " if entry.kind_of?(EventRestoreLogEntry)
 
-= "criado "     if entry.kind_of?(EventCreateLogEntry)
-= "editado "    if entry.kind_of?(EventEditLogEntry)
-= "excluído "   if entry.kind_of?(EventDeleteLogEntry)
-= "restaurado " if entry.kind_of?(EventRestoreLogEntry)
+= "o evento " + link_to(h(entry.event.title), course_event_url(entry.course, entry.event, :version => entry.version))

app/views/log/_news_log_entry.html.haml

@@ -1,6 +1,6 @@
-= "Notícia " + link_to(h(entry.news.title), course_news_instance_url(entry.course, entry.news, :version => entry.version))
+= "criou "     if entry.kind_of?(NewsCreateLogEntry)
+= "editou "    if entry.kind_of?(NewsEditLogEntry)
+= "excluiu "   if entry.kind_of?(NewsDeleteLogEntry)
+= "restaurou " if entry.kind_of?(NewsRestoreLogEntry)
 
-= "criada "     if entry.kind_of?(NewsCreateLogEntry)
-= "editada "    if entry.kind_of?(NewsEditLogEntry)
-= "excluída "   if entry.kind_of?(NewsDeleteLogEntry)
-= "restaurada " if entry.kind_of?(NewsRestoreLogEntry)
+= "a notícia " + link_to(h(entry.news.title), course_news_instance_url(entry.course, entry.news, :version => entry.version))

app/views/log/_wiki_log_entry.html.haml

@@ -1,19 +1,21 @@
-- if entry.version
-  = "Página " + link_to(h(entry.wiki_page.title), course_wiki_instance_url(entry.course, entry.wiki_page.id, :version => entry.version))
-- else
-  = "Página " + link_to(h(entry.wiki_page.title), course_wiki_instance_url(entry.course, entry.wiki_page.id))
+= "criou "     if entry.kind_of?(WikiCreateLogEntry)
+= "editou "    if entry.kind_of?(WikiEditLogEntry)
+= "excluiu "   if entry.kind_of?(WikiDeleteLogEntry)
+= "restaurou " if entry.kind_of?(WikiRestoreLogEntry)
+
+- if entry.version
+  = "a página " + link_to(h(entry.wiki_page.title), course_wiki_instance_url(entry.course, entry.wiki_page.id, :version => entry.version))
+- else
+  = "a página " + link_to(h(entry.wiki_page.title), course_wiki_instance_url(entry.course, entry.wiki_page.id))
 
-= "criada "     if entry.kind_of?(WikiCreateLogEntry)
-= "editada "    if entry.kind_of?(WikiEditLogEntry)
-= "excluída "   if entry.kind_of?(WikiDeleteLogEntry)
-= "restaurada " if entry.kind_of?(WikiRestoreLogEntry)
 
 - current_version = entry.wiki_page.versions.find_by_version(entry.version)
-- previous_version = current_version.previous
+- previous_version = current_version.previous if current_version
 
 - if entry.kind_of?(WikiEditLogEntry)
-  - if current_version.description and !current_version.description.empty?
-    = "(<i>#{h(current_version.description)}</i>)"
+  - unless current_version.nil?
+    - if current_version.description and !current_version.description.empty?
+      = "(<i>#{h(current_version.description)}</i>)"
 
   - unless previous_version.nil?
     = "(" + link_to("diff", diff_course_wiki_instance_url(entry.course, entry.wiki_page.id, :from => previous_version.version, :to => entry.version)) + ")" 

app/views/log/index.html.haml

@@ -4,18 +4,20 @@
 -# if @course
   =# auto_discovery_link_tag :rss, course_log_url(@course.id, :format => :rss)
 
+- @log_entries_by_day = @log_entries.group_by { |l| l.created_at.beginning_of_day }
 .box
-  %table
-    %tr
-      %th Data
-      %th Usuário
-      - unless @course
-        %th Disciplina
-      %th Descrição
-    - @log_entries.each do |entry|
-      %tr
-        %td= tz(entry.created_at).strftime("%d/%m/%y %H:%M:%S")
-        %td= link_to truncate(h(entry.user.display_name), :length => 20), user_url(entry.user.id)
-        - unless @course
-          %td= link_to h(entry.course.short_name), course_url(entry.course)
-        %td= render(:partial => 'log/log_entry', :locals => { :entry => entry })
+  %ul.log_entries
+    - @log_entries_by_day.each do |day, entries|
+      %h3
+        =tz(day).strftime("%d de %B de %Y")
+      - entries.each do |entry|
+        %li
+          .date
+            = tz(entry.created_at).strftime("%H:%M")
+          %img.avatar{:src => gravatar_url_for(entry.user.email, 27)}
+          = "Disciplina " + link_to(h(entry.course.full_name), course_url(entry.course))
+          %br
+          =link_to truncate(h(entry.user.display_name), :length => 20), user_url(entry.user.id)
+          = render(:partial => 'log/log_entry', :locals => { :entry => entry }) 
+
+= will_paginate @log_entries

app/views/stylesheets/wiki.css.erb

@@ -295,7 +295,7 @@ body {
 	border-bottom: 0px solid #ccc;
 }
 
-.widget_news li, .widget_events li, #shoutbox li, #shoutbox {
+.widget_users li, .widget_news li, .widget_events li {
   font-size: 11px;
 }
 
@@ -666,6 +666,14 @@ form dl {
   margin: 5px 18px 0px 0px;
 }
 
+.user_list {
+  list-style: none;
+}
+
+.user_list li {
+  background-image: none;
+}
+
 .card h1 { margin-bottom: 0px; }
 .card p { margin-top: 0px; }
 
@@ -827,7 +835,26 @@ form dt p {
   margin: 9px 0px;
 }
 
+.log_entries .date {
+  float: left;
+  width: 50px;
+  margin: 0px 15px 0px -90px;
+}
 
-xbody { background-image: url(<%= App.base_path %>/prototype/line.png); background-repeat: repeat; }
-xhtml * { background-color: transparent !important; }
+.log_entries .avatar {
+  float: left;
+  margin: 0px 0px 0px -40px;
+}
+
+.log_entries * {
+  vertical-align: top;
+  background-image: none !important;
+}
+
+.log_entries li {
+  padding-left: 110px !important;
+}
+
+/*body { background-image: url(<%= App.base_path %>/prototype/line.png); background-repeat: repeat; }
+html * { background-color: transparent !important; }*/
 

app/views/users/_user.html.haml

@@ -1 +1,3 @@
-%li= link_to h(user.name), user_path(user)
+%li
+  %img.avatar{:src => gravatar_url_for(user.email, 27)}
+  = link_to h(user.display_name), user_url(user)

app/views/users/dashboard.html.haml

@@ -6,7 +6,7 @@
 .dashboard
   .box
     .cmd
-      =link_to "rss", dashboard_url(:secret => @current_user.secret, :format => 'rss')
+      =link_to "rss", formatted_dashboard_url(:secret => @current_user.secret, :format => 'rss')
     - last_time = nil
 
     %h3 Notícias Recentes
@@ -26,7 +26,7 @@
 
   .box
     .cmd
-      =link_to "ical", dashboard_url(:secret => @current_user.secret, :format => 'ics')
+      =link_to "ical", formatted_dashboard_url(:secret => @current_user.secret, :format => 'ics')
     - last_time = nil
 
     %h3 Próximos Eventos

app/views/users/index.html.haml

@@ -3,5 +3,6 @@
 %h1.title Usuários
 
 .box
-  %ul
+  %ul.user_list
     = render :partial => @users
+  = will_paginate @users

app/views/widgets/_menu_disciplina.html.erb

@@ -3,7 +3,8 @@
 		<h1>Disciplina</h1>
 		<ul>
 			<li><%= link_to "Visão Geral", course_url(@course) %></li>
-			<li><%= link_to "Noticias", course_news_url(@course) %></li>
+			<li><%= link_to "Participantes", course_events_url(@course) %></li>
+			<li><%= link_to "Notícias", course_news_url(@course) %></li>
 			<li><%= link_to "Calendário", course_events_url(@course) %></li>
 			<li><%= link_to "Mudanças recentes", course_log_url(@course) %></li>
 		</ul>