jro_apps/redmine Commit - r1327:6d2a89142af2

public/images/changeset.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/comments.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/document.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/message.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/news.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/ticket.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/ticket_checked.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/ticket_edit.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/wiki_edit.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

app/models/journal.rb +1 0

               acts_as_event :title => Proc.new {|o| "#{o.issue.tracker.name} ##{o.issue.id}: #{o.issue.subject}" + ((s = o.new_status) ? " (#{s})" : '') },
                             :description => :notes,
                             :author => :user,
+                            :type => Proc.new {|o| (s = o.new_status) && s.is_closed? ? 'issue-closed' : 'issue-edit' },
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
               def save

app/models/message.rb +1 0

                                  :date_column => 'created_on'
               acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                             :description => :content,
+                            :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
                             :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id, :id => o.id}}
               attr_protected :locked, :sticky

app/models/wiki_content.rb +1 0

                 acts_as_event :title => Proc.new {|o| "#{l(:label_wiki_edit)}: #{o.page.title} (##{o.version})"},
                               :description => :comments,
                               :datetime => :updated_on,
+                              :type => 'wiki-page',
                               :url => Proc.new {|o| {:controller => 'wiki', :id => o.page.wiki.project_id, :page => o.page.title, :version => o.version}}
                 def text=(plain)

app/views/projects/activity.rhtml +1 -1

             <h3><%= format_activity_day(day) %></h3>
             <dl>
             <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-              <dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
+              <dt class="<%= e.event_type %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
               <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %> <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
               <dd><% unless e.event_description.blank? -%>
               <span class="description"><%= format_activity_description(e.event_description) %></span><br />

public/images/attachment.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

public/stylesheets/application.css +12 -2

             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             div#activity dl { margin-left: 2em; }
-            div#activity dd { margin-bottom: 1em; }
+            div#activity dd { margin-bottom: 1em; padding-left: 18px; }
-            div#activity dt { margin-bottom: 1px; }
+            div#activity dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description { font-style: italic; }
             div#activity span.project:after { content: " -"; }
+            div#activity dt.issue { background-image: url(../images/ticket.png); }
+            div#activity dt.issue-edit { background-image: url(../images/ticket_edit.png); }
+            div#activity dt.issue-closed { background-image: url(../images/ticket_checked.png); }
+            div#activity dt.changeset { background-image: url(../images/changeset.png); }
+            div#activity dt.news { background-image: url(../images/news.png); }
+            div#activity dt.message { background-image: url(../images/message.png); }
+            div#activity dt.reply { background-image: url(../images/comments.png); }
+            div#activity dt.wiki-page { background-image: url(../images/wiki_edit.png); }
+            div#activity dt.attachment { background-image: url(../images/attachment.png); }
+            div#activity dt.document { background-image: url(../images/document.png); }
             div#roadmap fieldset.related-issues { margin-bottom: 1em; }
             div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }

test/functional/projects_controller_test.rb +1 -1

                            :content => /#{2.days.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
-                               :attributes => { :class => 'journal' },
+                               :attributes => { :class => 'issue-edit' },
                                :child => { :tag => "a",
                                  :content => /(#{IssueStatus.find(2).name})/,
                                }

vendor/plugins/acts_as_event/lib/acts_as_event.rb +13 -6

                   module ClassMethods
                     def acts_as_event(options = {})
                       return if self.included_modules.include?(Redmine::Acts::Event::InstanceMethods)
-                      options[:datetime] ||= 'created_on'
+                      options[:datetime] ||= :created_on
-                      options[:title] ||= 'title'
+                      options[:title] ||= :title
-                      options[:description] ||= 'description'
+                      options[:description] ||= :description
-                      options[:author] ||= 'author'
+                      options[:author] ||= :author
                       options[:url] ||= {:controller => 'welcome'}
+                      options[:type] ||= self.name.underscore.dasherize
                       cattr_accessor :event_options
                       self.event_options = options
                       send :include, Redmine::Acts::Event::InstanceMethods
                       base.extend ClassMethods
                     end
-                    %w(datetime title description author).each do |attr|
+                    %w(datetime title description author type).each do |attr|
                       src = <<-END_SRC
                         def event_#{attr}
                           option = event_options[:#{attr}]
-                          option.is_a?(Proc) ? option.call(self) : send(option)
+                          if option.is_a?(Proc)
+                            option.call(self)
+                          elsif option.is_a?(Symbol)
+                            send(option)
+                          else
+                            option
+                          end
                         end
                       END_SRC
                       class_eval src, __FILE__, __LINE__

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages